jgd 1.6.5 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5389f16dd5f6eaf57d48366dfe796b2466aa329
-  data.tar.gz: 78ca6c5a5196bcac4f0d77e81802701f6f47f895
+  metadata.gz: 2746011547d314c9eb9ca0ceead02fe89b7321fc
+  data.tar.gz: 71e749e84a0ca6b58bc162489510a191e9b3fd8d
 SHA512:
-  metadata.gz: 92f7b1788800852350a015625f4759a3b184bf6f411f08ee886876e6e61733024c3252d7ce934cfef4b9b43e47ae5d7f0061aa487e6f214f0784e4deadc274b1
-  data.tar.gz: e5ff1cb25ce7874ed1edf2fc46bf0496b928e19b85baa2e9bf3b22677515ccb0b9cacc7f083733d9e35bbee2652750cac5b3466c6055025e278677e70cea2174
+  metadata.gz: 72bb759837a1209ae6fb3da1256f1f2583df4aec15e53b98921c97b1a57c542caca9864211c6696a94ab76f1cce54370c650b9377206b85be8d6c1aeddca74ec
+  data.tar.gz: fdf0242a835f90037a128d5410aeb3e18684e951725653da2bfd444240ee25f94fb2d91b7a591b05b0fc9e6efc5186d485df82e6c13bf9d4d65acc6c1a4b4949

data/PUZZLES.md

@@ -0,0 +1,4 @@
+## Puzzles
+
+There are 0 active puzzles (0 total):
+

data/README.md

@@ -80,3 +80,6 @@ script:
 ```
 
 Read also [this article](http://www.yegor256.com/2014/06/22/jekyll-github-deploy.html).
+
+PS. You can also specify target branch, with is `gh-pages` by default. Use
+`--branch` command line option.

data/bash/deploy.sh

@@ -4,6 +4,7 @@ set -e
 set -o pipefail
 
 URL=$1
+BRANCH=$2
 SRC=$(pwd)
 TEMP=$(mktemp -d -t jgd-XXX)
 trap "rm -rf ${TEMP}" EXIT
@@ -37,20 +38,20 @@ rm -rf ${CLONE}
 mv ${COPY} ${CLONE}
 cd ${CLONE}
 
-echo -e "\nPreparing gh-pages branch:"
-if [ -z "$(git branch -a | grep origin/gh-pages)" ]; then
-  git checkout --orphan gh-pages
+echo -e "\nPreparing ${BRANCH} branch:"
+if [ -z "$(git branch -a | grep origin/${BRANCH})" ]; then
+  git checkout --orphan "${BRANCH}"
 else
-  git checkout gh-pages
+  git checkout "${BRANCH}"
 fi
 
-echo -e "\nDeploying into gh-pages branch:"
+echo -e "\nDeploying into ${BRANCH} branch:"
 rm -rf *
 cp -R ${TEMP}/_site/* .
 rm -f README.md
 git add .
 git commit -am "new version $(date)" --allow-empty
-git push origin gh-pages 2>&1 | sed 's|'$URL'|[skipped]|g'
+git push origin ${BRANCH} 2>&1 | sed 's|'$URL'|[skipped]|g'
 
 echo -e "\nCleaning up:"
 rm -rf "${CLONE}"

data/bin/jgd

@@ -9,8 +9,11 @@ jgd is an automated deployer of Jekyll site to Github Pages
 Usage: jgd [options]
   EOS
   opt :url, 'Github URL', type: String, default: ''
+  opt :branch, 'Destination branch', type: String, default: 'gh-pages'
 end
 
+branch = opts[:branch]
+fail 'branch can\'t be empty' if branch.empty?
 url = opts[:url]
 url = `git config --get remote.origin.url` if url.empty?
 
@@ -18,4 +21,5 @@ spec = Gem::Specification.find_by_name('jgd')
 root = spec.gem_dir
 script = File.join(root, 'bash/deploy.sh')
 
-fail 'deployment failed, see log above' unless system("#{script} #{url}")
+fail 'deployment failed, see log above' \
+  unless system("#{script} #{url} #{branch}")

data/jgd.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.2.2'
   s.required_ruby_version = '>= 1.9.3'
   s.name = 'jgd'
-  s.version = '1.6.5'
+  s.version = '1.7'
   s.license = 'MIT'
   s.summary = 'Jekyll Github Deploy'
   s.description = 'Automated deployment of your Jekyll blog to Github Pages'

data/test.sh

@@ -14,7 +14,7 @@ git config user.name "Test"
 git commit -am 'initial commit'
 cd "${CWD}"
 
-./bash/deploy.sh "${TMP}"
+./bash/deploy.sh "${TMP}" gh-pages
 
 cd "${TMP}"
 git checkout gh-pages

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jgd
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: '1.7'
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -137,6 +137,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- PUZZLES.md
 - README.md
 - Rakefile
 - TEAM.md