Rework repo structure to compile with asciidoctor

Author: jnavila

.gitignore

@@ -8,4 +8,4 @@ progit.pdfmarks
 progit.epub
 progit-kf8.epub
 progit.mobi
-/images/
+

book/A-git-in-other-environments/1-git-other-environments.asc A-git-in-other-environments.asc

@@ -1,3 +1,4 @@
+[#A-git-in-other-environments]
 [appendix]
 //////////////////////////
 == Git in Other Environments
@@ -15,17 +16,17 @@ Now we'll take a look at some of the other kinds of environments where Git can b
 しかし、話はそこで終わりません。Gitは通常、より大きなエコシステムの一部として使用されます。端末からの利用が常に最適解というわけではありません。
 ここでは、端末以外でGitを活用できる環境の例や、そこで他の（あるいは、あなたの）アプリケーションがどのようにGitと協調動作するかを見ていきます。
 
-include::sections/guis.asc[]
+include::book/A-git-in-other-environments/sections/guis.asc[]
 
-include::sections/visualstudio.asc[]
+include::book/A-git-in-other-environments/sections/visualstudio.asc[]
 
-include::sections/eclipse.asc[]
+include::book/A-git-in-other-environments/sections/eclipse.asc[]
 
-include::sections/bash.asc[]
+include::book/A-git-in-other-environments/sections/bash.asc[]
 
-include::sections/zsh.asc[]
+include::book/A-git-in-other-environments/sections/zsh.asc[]
 
-include::sections/powershell.asc[]
+include::book/A-git-in-other-environments/sections/powershell.asc[]
 
 //////////////////////////
 === Summary

book/B-embedding-git/1-embedding-git.asc B-embedding-git.asc

@@ -1,3 +1,4 @@
+[#B-embedding-git]
 [appendix]
 //////////////////////////
 == Embedding Git in your Applications
@@ -16,8 +17,8 @@ If you need to integrate Git with your application, you have essentially three c
 //////////////////////////
 Gitをアプリケーションに統合する場合、やり方は大きく分けて3種類あります。1つ目はシェルのプロセスを生成してGitのコマンドラインツールを使う方法、2つ目はLibgit2を使う方法、3つ目はJGitを使う方法です。
 
-include::sections/command-line.asc[]
+include::book/B-embedding-git/sections/command-line.asc[]
 
-include::sections/libgit2.asc[]
+include::book/B-embedding-git/sections/libgit2.asc[]
 
-include::sections/jgit.asc[]
+include::book/B-embedding-git/sections/jgit.asc[]

book/C-git-commands/1-git-commands.asc C-git-commands.asc

@@ -1,16 +1,18 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'asciidoctor', '1.5.0'
+gem 'asciidoctor', '1.5.6.1'
 
 gem 'json'
 gem 'awesome_print'
 
-gem 'asciidoctor-epub3', '1.0.0.alpha.2'
-gem 'asciidoctor-pdf', '1.5.0.alpha.5'
+gem 'asciidoctor-epub3', :git => 'https://github.com/asciidoctor/asciidoctor-epub3'
+gem 'asciidoctor-pdf', '1.5.0.alpha.16'
 
 gem 'coderay'
 gem 'pygments.rb'
 gem 'thread_safe'
 gem 'epubcheck'
 gem 'kindlegen'
+
+gem 'octokit'

Gemfile

@@ -1,14 +1,13 @@
-namespace :book do
-  desc 'prepare build'
-  task :prebuild do
-    Dir.mkdir 'images' unless Dir.exists? 'images'
-    Dir.glob("book/*/images/*").each do |image|
-      FileUtils.copy(image, "images/" + File.basename(image))
-    end
-  end
+# coding: utf-8
+require 'octokit'
 
+namespace :book do
   desc 'build basic book formats'
-  task :build => :prebuild do
+  task :build do
+
+    puts "Generating contributors list"
+    `git shortlog -s --all| grep -v -E "(Straub|Chacon)" | cut -f 2- | column -c 120 > book/contributors.txt`
+
     puts "Converting to HTML..."
     `bundle exec asciidoctor progit.asc`
     puts " -- HTML output at progit.html"
@@ -17,14 +16,148 @@ namespace :book do
     `bundle exec asciidoctor-epub3 progit.asc`
     puts " -- Epub output at progit.epub"
 
+    sh "epubcheck progit.epub"
+
     puts "Converting to Mobi (kf8)..."
     `bundle exec asciidoctor-epub3 -a ebook-format=kf8 progit.asc`
     puts " -- Mobi output at progit.mobi"
 
     puts "Converting to PDF... (this one takes a while)"
     `bundle exec asciidoctor-pdf progit.asc 2>/dev/null`
-    puts " -- PDF  output at progit.pdf"
+    puts " -- PDF output at progit.pdf"
+  end
+
+  desc 'tag the repo with the latest version'
+  task :tag do
+    api_token = ENV['GITHUB_API_TOKEN']
+    if (api_token && (ENV['TRAVIS_PULL_REQUEST'] == 'false') && (ENV['TRAVIS_BRANCH']=='master'))
+      repo = ENV['TRAVIS_REPO_SLUG']
+      @octokit = Octokit::Client.new(:access_token => api_token)
+      begin
+        last_version=@octokit.latest_release(repo).tag_name
+      rescue
+        last_version="2.1.-1"
+      end
+      new_patchlevel= last_version.split('.')[-1].to_i + 1
+      new_version="2.1.#{new_patchlevel}"
+      obj = @octokit.create_tag(repo, new_version, "Version " + new_version, ENV['TRAVIS_COMMIT'],
+                          'commit',
+                          'Automatic build', '[email protected]',
+                          Time.now.utc.iso8601)
+      @octokit.create_ref(repo, "tags/#{new_version}", obj.sha)
+      p "Created tag #{new_version}"
+    else
+      p 'This only runs on a commit to master'
+    end
+  end
+
+  desc 'convert book to asciidoctor compatibility'
+  task:convert do
+    `cp -aR ../progit2/images .`
+    `sed -i -e 's!/images/!!' .gitignore`
+    `git add images`
+    `git rm -r book/*/images`
+
+    chapters = [
+      ["01", "introduction"              ],
+      ["02", "git-basics"                ],
+      ["03", "git-branching"             ],
+      ["04", "git-server"                ],
+      ["05", "distributed-git"           ],
+      ["06", "github"                    ],
+      ["07", "git-tools"                 ],
+      ["08", "customizing-git"           ],
+      ["09", "git-and-other-scms"        ],
+      ["10", "git-internals"             ],
+      ["A",  "git-in-other-environments" ],
+      ["B",  "embedding-git"             ],
+      ["C",  "git-commands"              ]
+    ]
+
+    crossrefs = {}
+    chapters.each { | num, title |
+      if num =~ /[ABC]/
+        chap = "#{num}-#{title}"
+      else
+        chap = "ch#{num}-#{title}"
+      end
+      Dir[File.join ["book","#{num}-#{title}" , "sections","*.asc"]].map { |filename|
+        File.read(filename).scan(/\[\[(.*?)\]\]/)
+      }.flatten.each { |ref|
+        crossrefs[ref] = "#{chap}"
+      }
+    }
+
+    headrefs = {}
+    chapters.each { | num, title |
+      if num =~ /[ABC]/
+        chap = "#{num}-#{title}"
+      else
+        chap = "ch#{num}-#{title}"
+      end
+      Dir[File.join ["book","#{num}-#{title}", "*.asc"]].map { |filename|
+        File.read(filename).scan(/\[\[(.*?)\]\]/)
+      }.flatten.each { |ref|
+        headrefs[ref] = "#{chap}"
+      }
+    }
+
+    # transform all internal cross refs
+    chapters.each { | num, title |
+      if num =~ /[ABC]/
+        chap = "#{num}-#{title}"
+      else
+        chap = "ch#{num}-#{title}"
+      end
+      files = Dir[File.join ["book","#{num}-#{title}" , "sections","*.asc"]] +
+              Dir[File.join ["book","#{num}-#{title}" ,"1-*.asc"]]
+      p files
+      files.each { |filename|
+        content = File.read(filename)
+        new_contents = content.gsub(/\[\[(.*?)\]\]/, '[[r\1]]').gsub(
+          "&rarr;", "→").gsub(/<<(.*?)>>/) { |match|
+          ch = crossrefs[$1]
+          h = headrefs[$1]
+          # p " #{match} -> #{ch}, #{h}"
+          if ch
+            # if local do not add the file
+            if ch==chap
+              "<<r#{$1}>>"
+            else
+              "<<#{ch}#r#{$1}>>"
+            end
+          elsif h
+            if h==chap
+              "<<#{chap}>>"
+            else
+              "<<#{h}##{h}>>"
+            end
+          end
+        }
+        File.open(filename, "w") {|file| file.puts new_contents }
+      }
+    }
+
+    chapters.each { | num, title |
+      if num =~ /[ABC]/
+        chap = "#{num}-#{title}"
+      else
+        chap = "ch#{num}-#{title}"
+      end
+      Dir[File.join ["book","#{num}-#{title}" ,"1*.asc"]].map { |filename|
+        content = File.read (filename)
+        new_contents = content.gsub(/include::(.*?)asc/) {|match|
+          "include::book/#{num}-#{title}/#{$1}asc"}
+        `git rm #{filename}`
+        File.open("#{chap}.asc", "w") {|file|
+          file.puts "[##{chap}]\n"
+          file.puts new_contents }
+        `git add "#{chap}.asc"`
+      }
+    }
   end
 end
 
+
+
 task :default => "book:build"

Gemfile.lock

@@ -59,12 +59,12 @@ image::images/snapshots.png[Gitは時間を通じたプロジェクトのスナ
 This is an important distinction between Git and nearly all other VCSs.
 It makes Git reconsider almost every aspect of version control that most other systems copied from the previous generation.
 This makes Git more like a mini filesystem with some incredibly powerful tools built on top of it, rather than simply a VCS.
-We'll explore some of the benefits you gain by thinking of your data this way when we cover Git branching in <<_git_branching>>.
+We'll explore some of the benefits you gain by thinking of your data this way when we cover Git branching in <<ch03-git-branching#ch03-git-branching>>.
 //////////////////////////
 これが、Gitと類似の全ての他のVCSとの間の重要な違いです。
 ほとんどの他のシステムが以前の世代から真似してきた、ほとんど全てのバージョン管理のやり方（訳者注：aspectを意訳）を、Gitに見直させます。
 これは、Gitを、単純にVCSと言うより、その上に組み込まれた幾つかの途方も無くパワフルなツールを備えたミニ・ファイルシステムにしています。
-このやり方でデータを考えることで得られる利益の幾つかを、<<_git_branching>>を扱ったときに探求します。
+このやり方でデータを考えることで得られる利益の幾つかを、<<ch03-git-branching#ch03-git-branching>>を扱ったときに探求します。
 
 //////////////////////////
 ==== Nearly Every Operation Is Local
@@ -157,9 +157,9 @@ Gitで行動するとき、ほとんど全てはGitデータベースにデー
 
 //////////////////////////
 This makes using Git a joy because we know we can experiment without the danger of severely screwing things up.
-For a more in-depth look at how Git stores its data and how you can recover data that seems lost, see <<_undoing>>.
+For a more in-depth look at how Git stores its data and how you can recover data that seems lost, see <<ch02-git-basics#r_undoing>>.
 //////////////////////////
-激しく物事をもみくちゃにする危険なしに試行錯誤を行なえるため、これはGitの利用を喜びに変えます。Gitがデータをどのように格納しているのかと失われたように思えるデータをどうやって回復できるのかについての、より詳細な解説に関しては、<<_undoing>>を参照してください。
+激しく物事をもみくちゃにする危険なしに試行錯誤を行なえるため、これはGitの利用を喜びに変えます。Gitがデータをどのように格納しているのかと失われたように思えるデータをどうやって回復できるのかについての、より詳細な解説に関しては、<<ch02-git-basics#r_undoing>>を参照してください。
 
 //////////////////////////
 ==== The Three States
@@ -232,9 +232,9 @@ The basic Git workflow goes something like this:
 If a particular version of a file is in the Git directory, it's considered committed.
 If it has been modified and was added to the staging area, it is staged.
 And if it was changed since it was checked out but has not been staged, it is modified.
-In <<_git_basics_chapter>>, you'll learn more about these states and how you can either take advantage of them or skip the staged part entirely.
+In <<ch02-git-basics#ch02-git-basics>>, you'll learn more about these states and how you can either take advantage of them or skip the staged part entirely.
 //////////////////////////
 もしファイルの特定のバージョンがGitディレクトリの中にあるとしたら、コミット済だと見なされます。
 もし修正されていて、ステージング・エリアに加えられていれば、ステージ済です。
 そして、チェックアウトされてから変更されましたが、ステージされていないとするなら、修正済です。
-<<_git_basics_chapter>>では、これらの状態と、どうやってこれらを利用をするか、もしくは完全にステージ化部分を省略するかに関してより詳しく学習します。
+<<ch02-git-basics#ch02-git-basics>>では、これらの状態と、どうやってこれらを利用をするか、もしくは完全にステージ化部分を省略するかに関してより詳しく学習します。

Rakefile

@@ -1,4 +1,4 @@
-[[_first_time]]
+[[r_first_time]]
 //////////////////////////
 === First-Time Git Setup
 //////////////////////////

book/01-introduction/sections/basics.asc

@@ -1,4 +1,4 @@
-[[_git_help]]
+[[r_git_help]]
 //////////////////////////
 === Getting Help
 //////////////////////////

book/01-introduction/sections/first-time-setup.asc

@@ -41,7 +41,7 @@ Some of the goals of the new system were as follows:
 
 //////////////////////////
 Since its birth in 2005, Git has evolved and matured to be easy to use and yet retain these initial qualities.
-It's incredibly fast, it's very efficient with large projects, and it has an incredible branching system for non-linear development (See <<_git_branching>>).
+It's incredibly fast, it's very efficient with large projects, and it has an incredible branching system for non-linear development (See <<ch03-git-branching#ch03-git-branching>>).
 //////////////////////////
 2005年のその誕生から、Gitは使いやすく発展・成熟してきており、さらにその初期の品質を維持しています。
-とても高速で、巨大プロジェクトではとても効率的で、ノンリニア開発のためのすごい分岐システム（branching system）を備えています（<<_git_branching>>参照）。
+とても高速で、巨大プロジェクトではとても効率的で、ノンリニア開発のためのすごい分岐システム（branching system）を備えています（<<ch03-git-branching#ch03-git-branching>>参照）。

book/01-introduction/sections/help.asc

@@ -1,4 +1,4 @@
-[[_git_aliases]]
+[[r_git_aliases]]
 //////////////////////////
 === Git Aliases
 //////////////////////////