Merge pull request #347 from progit/file_rework

File rework for ebook publishing

Author: networm

.gitignore

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

.travis.yml

@@ -0,0 +1,33 @@
+language: ruby
+sudo: false
+git:
+  depth: false
+cache: bundler
+before_install:
+ - wget https://raw.githubusercontent.com/progit/progit2-pub/master/bootstrap.sh
+ - sh bootstrap.sh
+script: bundle exec rake book:build
+after_success: bundle exec rake book:tag
+deploy:
+  provider: releases
+  file:
+  - progit.epub
+  - progit.mobi
+  - progit.pdf
+  skip_cleanup: true
+  on:
+    tags: true
+  api-key: $GITHUB_API_TOKEN
+branches:
+  only:
+  - master
+  - /^2\.1(\.\d+)+$/
+
+addons:
+  apt:
+    packages:
+      - epubcheck
+notifications:
+  email:
+    on_success: never
+    on_failure: always

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

@@ -1,3 +1,4 @@
+[#A-git-in-other-environments]
 [appendix]
 == 其它环境中的 Git
 
@@ -6,18 +7,18 @@
 但是故事并未就此结束；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[]
 
 === 总结
 

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

@@ -1,3 +1,4 @@
+[#B-embedding-git]
 [appendix]
 == 将 Git 嵌入你的应用
 
@@ -6,8 +7,8 @@
 
 如果你想将 Git 整合进你的应用程序的话，一般来说你有三种可能的选择：启动一个 shell 来使用 Git 的命令行工具；使用 Libgit2；或者使用 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[]

C-git-commands.asc

@@ -1,17 +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.8'
-gem 'asciidoctor-pdf-cjk-kai_gen_gothic', '~> 0.1.1'
+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,92 +1,104 @@
+GIT
+  remote: https://github.com/asciidoctor/asciidoctor-epub3
+  revision: 76c0411690d101aa22d98bad75ffa647a4885647
+  specs:
+    asciidoctor-epub3 (1.5.0.alpha.8.dev)
+      asciidoctor (~> 1.5.0)
+      gepub (~> 0.6.9.2)
+      thread_safe (~> 0.3.6)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.0.2)
-    addressable (2.3.8)
+    Ascii85 (1.0.3)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     afm (0.2.2)
-    asciidoctor (1.5.0)
-    asciidoctor-epub3 (1.0.0.alpha.2)
-      asciidoctor (>= 1.5.0, < 1.6.0)
-      gepub (~> 0.6.9.2)
-      thread_safe (~> 0.3.4)
-    asciidoctor-pdf (1.5.0.alpha.8)
-      asciidoctor (~> 1.5.0)
-      prawn (>= 1.3.0, < 3.0.0)
-      prawn-icon (= 0.6.4)
-      prawn-svg (= 0.20.0)
-      prawn-table (= 0.2.1)
-      prawn-templates (= 0.0.3)
-      safe_yaml (= 1.0.4)
-      thread_safe (= 0.3.4)
+    asciidoctor (1.5.6.1)
+    asciidoctor-pdf (1.5.0.alpha.16)
+      asciidoctor (>= 1.5.0)
+      prawn (>= 1.3.0, < 2.3.0)
+      prawn-icon (= 1.3.0)
+      prawn-svg (>= 0.21.0, < 0.28.0)
+      prawn-table (= 0.2.2)
+      prawn-templates (>= 0.0.3, <= 0.1.1)
+      safe_yaml (~> 1.0.4)
+      thread_safe (~> 0.3.6)
       treetop (= 1.5.3)
-    asciidoctor-pdf-cjk (0.1.2)
-      asciidoctor-pdf (~> 1.5.0.alpha.8)
-    asciidoctor-pdf-cjk-kai_gen_gothic (0.1.1)
-      asciidoctor-pdf-cjk (~> 0.1.2)
-    awesome_print (1.2.0)
-    coderay (1.1.0)
-    css_parser (1.3.7)
+    awesome_print (1.8.0)
+    coderay (1.1.2)
+    css_parser (1.6.0)
       addressable
     epubcheck (3.0.1)
+    faraday (0.14.0)
+      multipart-post (>= 1.2, < 3)
     gepub (0.6.9.2)
       nokogiri (~> 1.6.1)
       rubyzip (>= 1.1.1)
-    hashery (2.1.1)
-    json (1.8.1)
-    kindlegen (2.9.4)
-    mini_portile (0.6.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    pdf-core (0.6.0)
-    pdf-reader (1.3.3)
+    hashery (2.1.2)
+    json (2.1.0)
+    kindlegen (3.0.3)
+      rake
+      rubyzip
+    mini_portile2 (2.1.0)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    octokit (4.8.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pdf-core (0.7.0)
+    pdf-reader (2.1.0)
       Ascii85 (~> 1.0.0)
-      afm (~> 0.2.0)
+      afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
     polyglot (0.3.5)
-    posix-spawn (0.3.9)
-    prawn (2.0.2)
-      pdf-core (~> 0.6.0)
-      ttfunk (~> 1.4.0)
-    prawn-icon (0.6.4)
+    prawn (2.2.2)
+      pdf-core (~> 0.7.0)
+      ttfunk (~> 1.5)
+    prawn-icon (1.3.0)
       prawn (>= 1.1.0, < 3.0.0)
-    prawn-svg (0.20.0)
+    prawn-svg (0.27.1)
       css_parser (~> 1.3)
-      prawn (>= 0.8.4, < 3)
-    prawn-table (0.2.1)
-    prawn-templates (0.0.3)
-      pdf-reader (~> 1.3)
-      prawn (>= 0.15.0)
-    pygments.rb (0.6.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rake (10.3.2)
+      prawn (>= 0.11.1, < 3)
+    prawn-table (0.2.2)
+      prawn (>= 1.3.0, < 3.0.0)
+    prawn-templates (0.1.1)
+      pdf-reader (~> 2.0)
+      prawn (~> 2.2)
+    public_suffix (3.0.2)
+    pygments.rb (1.2.1)
+      multi_json (>= 1.0.0)
+    rake (12.3.0)
     ruby-rc4 (0.1.5)
-    rubyzip (1.1.6)
+    rubyzip (1.2.1)
     safe_yaml (1.0.4)
-    thread_safe (0.3.4)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    thread_safe (0.3.6)
     treetop (1.5.3)
       polyglot (~> 0.3)
-    ttfunk (1.4.0)
-    yajl-ruby (1.1.0)
+    ttfunk (1.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  asciidoctor (= 1.5.0)
-  asciidoctor-epub3 (= 1.0.0.alpha.2)
-  asciidoctor-pdf (= 1.5.0.alpha.8)
-  asciidoctor-pdf-cjk-kai_gen_gothic (~> 0.1.1)
+  asciidoctor (= 1.5.6.1)
+  asciidoctor-epub3!
+  asciidoctor-pdf (= 1.5.0.alpha.16)
   awesome_print
   coderay
   epubcheck
   json
   kindlegen
+  octokit
   pygments.rb
   rake
   thread_safe
 
 BUNDLED WITH
-   1.10.5
+   1.16.1