Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 34 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
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_glob: true
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[#A-git-in-other-environments]
////
Laatst bijgewerkt van progit/progit2 referentie: 6528f318
////
Expand All @@ -12,19 +13,19 @@ Maar daarmee houdt het verhaal niet op; Git wordt normaalgesproken gebruikt als
We zullen nu een kijkje nemen naar andere soorten omgevingen waar Git nuttig kan zijn, en hoe andere applicaties
(inclusief de jouwe) zij aan zij samenwerken met 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[]

=== Samenvatting

Je hebt gezien hoe de kracht van Git kan worden aangewend vanuit de gereedschappen die je in je dagelijkse
werkzaamheden gebruikt, en ook hoe je de Git repositories kunt benaderen vanuit je eigen programmatuur.
werkzaamheden gebruikt, en ook hoe je de Git repositories kunt benaderen vanuit je eigen programmatuur.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[#B-embedding-git]
////
Laatst bijgewerkt van progit/progit2 referentie: a113612f
////
Expand All @@ -12,8 +13,8 @@ Zelfs applicaties voor niet-ontwikkelaars, zoals document editors, kunnen potent
Als je Git wilt integreren met je applicatie, heb je eigenlijk drie opties: een shell openen en de Git commando-regel
tool gebruiken; Libgit2; en 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[]
257 changes: 129 additions & 128 deletions book/C-git-commands/1-git-commands.asc → C-git-commands.asc

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
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 'asciidoctor-pdf-cjk', '~> 0.1.3'
gem 'asciidoctor-pdf-cjk-kai_gen_gothic', '~> 0.1.1'

gem 'coderay'
gem 'pygments.rb'
gem 'thread_safe'
gem 'epubcheck'
gem 'epubcheck-ruby'
gem 'kindlegen'

gem 'octokit'
gem 'github_changelog_generator', github: 'Furtif/github-changelog-generator'
157 changes: 111 additions & 46 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,74 +1,139 @@
GIT
remote: git://github.com/Furtif/github-changelog-generator.git
revision: efa960ce1c189cd999753713fcfbfb6b7514ab45
specs:
github_changelog_generator (1.14.3)
activesupport
faraday-http-cache
multi_json
octokit (~> 4.6)
rainbow (>= 2.2.1)
rake (>= 10.0)
retriable (~> 3.0)

GIT
remote: https://github.com/asciidoctor/asciidoctor-epub3
revision: ba930925a1df617312f986c7599b5162473b716f
specs:
asciidoctor-epub3 (1.5.0.alpha.9.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)
Ascii85 (1.0.3)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
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.5)
asciidoctor (~> 1.5.0)
prawn (= 1.2.1)
prawn-svg (= 0.16.0)
prawn-table (= 0.1.1)
prawn-templates (= 0.0.3)
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)
awesome_print (1.2.0)
coderay (1.1.0)
epubcheck (3.0.1)
asciidoctor-pdf-cjk (0.1.3)
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.8.0)
coderay (1.1.2)
concurrent-ruby (1.0.5)
css_parser (1.6.0)
addressable
epubcheck-ruby (4.0.2.1)
faraday (0.15.0)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
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.2.5)
pdf-reader (1.3.3)
hashery (2.1.2)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
json (2.1.0)
kindlegen (3.0.3)
rake
rubyzip
mini_portile2 (2.1.0)
minitest (5.11.3)
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 (1.2.1)
pdf-core (~> 0.2.5)
ttfunk (~> 1.2.0)
prawn-svg (0.16.0)
prawn (>= 0.8.4)
prawn-table (0.1.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 (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.27.1)
css_parser (~> 1.3)
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)
rainbow (3.0.0)
rake (12.3.1)
retriable (3.1.1)
ruby-rc4 (0.1.5)
rubyzip (1.1.6)
thread_safe (0.3.4)
rubyzip (1.2.1)
safe_yaml (1.0.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.2.2)
yajl-ruby (1.1.0)
ttfunk (1.5.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
asciidoctor (= 1.5.0)
asciidoctor-epub3 (= 1.0.0.alpha.2)
asciidoctor-pdf (= 1.5.0.alpha.5)
asciidoctor (= 1.5.6.1)
asciidoctor-epub3!
asciidoctor-pdf (= 1.5.0.alpha.16)
asciidoctor-pdf-cjk (~> 0.1.3)
asciidoctor-pdf-cjk-kai_gen_gothic (~> 0.1.1)
awesome_print
coderay
epubcheck
epubcheck-ruby
github_changelog_generator!
json
kindlegen
octokit
pygments.rb
rake
thread_safe

BUNDLED WITH
1.16.1
Loading