Skip to content

Commit 980010a

Browse files
jnavilajnavila
authored
Merge pull request #116 from progit/ebook-pub
Ebook pub
2 parents f19b046 + 76f23e3 commit 980010a

File tree

489 files changed

+1092
-774
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

489 files changed

+1092
-774
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ progit.pdfmarks
1010
progit.epub
1111
progit-kf8.epub
1212
progit.mobi
13-
/images/
13+
1414
/bin/

‎.travis.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
language: ruby
2+
sudo: false
3+
git:
4+
depth: false
5+
cache: bundler
6+
before_install:
7+
- wget https://raw.githubusercontent.com/progit/progit2-pub/master/bootstrap.sh
8+
- sh bootstrap.sh
9+
script: bundle exec rake book:build
10+
after_success: bundle exec rake book:tag
11+
deploy:
12+
provider: releases
13+
file_glob: true
14+
file:
15+
- progit*.epub
16+
- progit*.mobi
17+
- progit*.pdf
18+
skip_cleanup: true
19+
on:
20+
tags: true
21+
api-key: $GITHUB_API_TOKEN
22+
branches:
23+
only:
24+
- master
25+
- /^2\.1(\.\d+)+$/
26+
27+
addons:
28+
apt:
29+
packages:
30+
- epubcheck
31+
notifications:
32+
email:
33+
on_success: never
34+
on_failure: always

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

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
[appendix]
2+
[#A-git-in-other-environments]
23
== Git en otros entornos
34

45
Si has leído hasta aquí todo el libro, seguro que has aprendido un montón de cosas sobre el uso de Git con la línea de comandos.
56
Se puede trabajar con archivos locales, conectar nuestro repositorio con otros repositorios en la red y realizar nuestro trabajo eficientemente con ellos. Aunque las opciones no terminan ahí, Git se utiliza con parte de un ecosistema mayor y un terminal no siempre es la mejor forma de trabajar.
67
Vamos a ver otros tipos de entornos en los que Git resulta muy útil y cómo otras aplicaciones (incluidas las tuyas) pueden trabajar conjuntamente con Git.
8+
79
////
810
If you read through the whole book, you've learned a lot about how to use Git at the command line.
911
You can work with local files, connect your repository to others over a network, and work effectively with others.
1012
But the story doesn't end there; Git is usually used as part of a larger ecosystem, and the terminal isn't always the best way to work with it.
1113
Now we'll take a look at some of the other kinds of environments where Git can be useful, and how other applications (including yours) work alongside Git.
1214
////
1315

14-
include::sections/guis.asc[]
16+
include::book/A-git-in-other-environments/sections/guis.asc[]
1517

16-
include::sections/visualstudio.asc[]
18+
include::book/A-git-in-other-environments/sections/visualstudio.asc[]
1719

18-
include::sections/eclipse.asc[]
20+
include::book/A-git-in-other-environments/sections/eclipse.asc[]
1921

2022

21-
include::sections/bash.asc[]
23+
include::book/A-git-in-other-environments/sections/bash.asc[]
2224

23-
include::sections/zsh.asc[]
25+
include::book/A-git-in-other-environments/sections/zsh.asc[]
2426

25-
include::sections/powershell.asc[]
27+
include::book/A-git-in-other-environments/sections/powershell.asc[]
2628

2729
=== Resumen
2830

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
[#B-embedding-git]
12
[appendix]
23
== Integrando Git en tus Aplicaciones
34

4-
Si tu aplicación es para desarrolladores, es muy probable que pueda beneficiarse de la integración con el control de código fuente.
5+
Si tu aplicación es para desarrolladores, es muy probable que pueda beneficiarse de la integración con el control de código fuente.
56
Incluso las aplicaciones que no sean para desarrolladores, tales como editores de documentos, podrían beneficiarse de las características de control de versiones, y el modelo de Git funciona muy bien para muchos escenarios diferentes.
67

78
Si necesitas integrar Git con tu aplicación, tienes básicamente tres opciones: generar un shell y usar la herramienta de línea de comandos de Git; Libgit2; y JGit.
89

9-
include::sections/command-line.asc[]
10+
include::book/B-embedding-git/sections/command-line.asc[]
1011

11-
include::sections/libgit2.asc[]
12+
include::book/B-embedding-git/sections/libgit2.asc[]
1213

13-
include::sections/jgit.asc[]
14+
include::book/B-embedding-git/sections/jgit.asc[]

‎book/C-git-commands/1-git-commands.asc renamed to ‎C-git-commands.asc

+121-121
Large diffs are not rendered by default.

‎Gemfile

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
source 'https://rubygems.org'
22

33
gem 'rake'
4-
gem 'asciidoctor', '1.5.0'
4+
gem 'asciidoctor', '1.5.6.1'
55

66
gem 'json'
77
gem 'awesome_print'
88

9-
gem 'asciidoctor-epub3', '1.0.0.alpha.2'
10-
gem 'asciidoctor-pdf', '1.5.0.alpha.5'
9+
gem 'asciidoctor-epub3', :git => 'https://github.com/asciidoctor/asciidoctor-epub3'
10+
gem 'asciidoctor-pdf', '1.5.0.alpha.16'
11+
gem 'asciidoctor-pdf-cjk', '~> 0.1.3'
12+
gem 'asciidoctor-pdf-cjk-kai_gen_gothic', '~> 0.1.1'
1113

1214
gem 'coderay'
1315
gem 'pygments.rb'
1416
gem 'thread_safe'
1517
gem 'epubcheck'
1618
gem 'kindlegen'
19+
20+
gem 'octokit'
21+
gem 'github_changelog_generator', github: 'Furtif/github-changelog-generator'

‎Gemfile.lock

+109-44
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,139 @@
1+
GIT
2+
remote: git://github.com/Furtif/github-changelog-generator.git
3+
revision: efa960ce1c189cd999753713fcfbfb6b7514ab45
4+
specs:
5+
github_changelog_generator (1.14.3)
6+
activesupport
7+
faraday-http-cache
8+
multi_json
9+
octokit (~> 4.6)
10+
rainbow (>= 2.2.1)
11+
rake (>= 10.0)
12+
retriable (~> 3.0)
13+
14+
GIT
15+
remote: https://github.com/asciidoctor/asciidoctor-epub3
16+
revision: ba930925a1df617312f986c7599b5162473b716f
17+
specs:
18+
asciidoctor-epub3 (1.5.0.alpha.9.dev)
19+
asciidoctor (~> 1.5.0)
20+
gepub (~> 0.6.9.2)
21+
thread_safe (~> 0.3.6)
22+
123
GEM
224
remote: https://rubygems.org/
325
specs:
4-
Ascii85 (1.0.2)
26+
Ascii85 (1.0.3)
27+
activesupport (5.1.5)
28+
concurrent-ruby (~> 1.0, >= 1.0.2)
29+
i18n (~> 0.7)
30+
minitest (~> 5.1)
31+
tzinfo (~> 1.1)
32+
addressable (2.5.2)
33+
public_suffix (>= 2.0.2, < 4.0)
534
afm (0.2.2)
6-
asciidoctor (1.5.0)
7-
asciidoctor-epub3 (1.0.0.alpha.2)
8-
asciidoctor (>= 1.5.0, < 1.6.0)
9-
gepub (~> 0.6.9.2)
10-
thread_safe (~> 0.3.4)
11-
asciidoctor-pdf (1.5.0.alpha.5)
12-
asciidoctor (~> 1.5.0)
13-
prawn (= 1.2.1)
14-
prawn-svg (= 0.16.0)
15-
prawn-table (= 0.1.1)
16-
prawn-templates (= 0.0.3)
35+
asciidoctor (1.5.6.1)
36+
asciidoctor-pdf (1.5.0.alpha.16)
37+
asciidoctor (>= 1.5.0)
38+
prawn (>= 1.3.0, < 2.3.0)
39+
prawn-icon (= 1.3.0)
40+
prawn-svg (>= 0.21.0, < 0.28.0)
41+
prawn-table (= 0.2.2)
42+
prawn-templates (>= 0.0.3, <= 0.1.1)
43+
safe_yaml (~> 1.0.4)
44+
thread_safe (~> 0.3.6)
1745
treetop (= 1.5.3)
18-
awesome_print (1.2.0)
19-
coderay (1.1.0)
46+
asciidoctor-pdf-cjk (0.1.3)
47+
asciidoctor-pdf (~> 1.5.0.alpha.8)
48+
asciidoctor-pdf-cjk-kai_gen_gothic (0.1.1)
49+
asciidoctor-pdf-cjk (~> 0.1.2)
50+
awesome_print (1.8.0)
51+
coderay (1.1.2)
52+
concurrent-ruby (1.0.5)
53+
css_parser (1.6.0)
54+
addressable
2055
epubcheck (3.0.1)
56+
faraday (0.14.0)
57+
multipart-post (>= 1.2, < 3)
58+
faraday-http-cache (2.0.0)
59+
faraday (~> 0.8)
2160
gepub (0.6.9.2)
2261
nokogiri (~> 1.6.1)
2362
rubyzip (>= 1.1.1)
24-
hashery (2.1.1)
25-
json (1.8.1)
26-
kindlegen (2.9.4)
27-
mini_portile (0.6.0)
28-
nokogiri (1.6.3.1)
29-
mini_portile (= 0.6.0)
30-
pdf-core (0.2.5)
31-
pdf-reader (1.3.3)
63+
hashery (2.1.2)
64+
i18n (0.9.5)
65+
concurrent-ruby (~> 1.0)
66+
json (2.1.0)
67+
kindlegen (3.0.3)
68+
rake
69+
rubyzip
70+
mini_portile2 (2.1.0)
71+
minitest (5.11.3)
72+
multi_json (1.13.1)
73+
multipart-post (2.0.0)
74+
nokogiri (1.6.8.1)
75+
mini_portile2 (~> 2.1.0)
76+
octokit (4.8.0)
77+
sawyer (~> 0.8.0, >= 0.5.3)
78+
pdf-core (0.7.0)
79+
pdf-reader (2.1.0)
3280
Ascii85 (~> 1.0.0)
33-
afm (~> 0.2.0)
81+
afm (~> 0.2.1)
3482
hashery (~> 2.0)
3583
ruby-rc4
3684
ttfunk
3785
polyglot (0.3.5)
38-
posix-spawn (0.3.9)
39-
prawn (1.2.1)
40-
pdf-core (~> 0.2.5)
41-
ttfunk (~> 1.2.0)
42-
prawn-svg (0.16.0)
43-
prawn (>= 0.8.4)
44-
prawn-table (0.1.1)
45-
prawn-templates (0.0.3)
46-
pdf-reader (~> 1.3)
47-
prawn (>= 0.15.0)
48-
pygments.rb (0.6.0)
49-
posix-spawn (~> 0.3.6)
50-
yajl-ruby (~> 1.1.0)
51-
rake (10.3.2)
86+
prawn (2.2.2)
87+
pdf-core (~> 0.7.0)
88+
ttfunk (~> 1.5)
89+
prawn-icon (1.3.0)
90+
prawn (>= 1.1.0, < 3.0.0)
91+
prawn-svg (0.27.1)
92+
css_parser (~> 1.3)
93+
prawn (>= 0.11.1, < 3)
94+
prawn-table (0.2.2)
95+
prawn (>= 1.3.0, < 3.0.0)
96+
prawn-templates (0.1.1)
97+
pdf-reader (~> 2.0)
98+
prawn (~> 2.2)
99+
public_suffix (3.0.2)
100+
pygments.rb (1.2.1)
101+
multi_json (>= 1.0.0)
102+
rainbow (3.0.0)
103+
rake (12.3.0)
104+
retriable (3.1.1)
52105
ruby-rc4 (0.1.5)
53-
rubyzip (1.1.6)
54-
thread_safe (0.3.4)
106+
rubyzip (1.2.1)
107+
safe_yaml (1.0.4)
108+
sawyer (0.8.1)
109+
addressable (>= 2.3.5, < 2.6)
110+
faraday (~> 0.8, < 1.0)
111+
thread_safe (0.3.6)
55112
treetop (1.5.3)
56113
polyglot (~> 0.3)
57-
ttfunk (1.2.2)
58-
yajl-ruby (1.1.0)
114+
ttfunk (1.5.1)
115+
tzinfo (1.2.5)
116+
thread_safe (~> 0.1)
59117

60118
PLATFORMS
61119
ruby
62120

63121
DEPENDENCIES
64-
asciidoctor (= 1.5.0)
65-
asciidoctor-epub3 (= 1.0.0.alpha.2)
66-
asciidoctor-pdf (= 1.5.0.alpha.5)
122+
asciidoctor (= 1.5.6.1)
123+
asciidoctor-epub3!
124+
asciidoctor-pdf (= 1.5.0.alpha.16)
125+
asciidoctor-pdf-cjk (~> 0.1.3)
126+
asciidoctor-pdf-cjk-kai_gen_gothic (~> 0.1.1)
67127
awesome_print
68128
coderay
69129
epubcheck
130+
github_changelog_generator!
70131
json
71132
kindlegen
133+
octokit
72134
pygments.rb
73135
rake
74136
thread_safe
137+
138+
BUNDLED WITH
139+
1.16.1

0 commit comments

Comments
 (0)