jgd 1.7.1 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd582148b463a9b2ad0e9d91a9f3a299d3cf7df7
-  data.tar.gz: 6decec82ff46f3f73eb266102975c5653010a95f
+  metadata.gz: 25ecdbd1fc492987dce8c1e9cce64ebbb8707816
+  data.tar.gz: 3570c8ea77131d5ee99cd47ab0a271eef2b09a3a
 SHA512:
-  metadata.gz: 522636877e60e3eaddaf9acc6439be7b97cd606fcd5f5cf37dc81b7e8f95b346985ccd288233cd8fe847783632c5a7cce19055849c3ac7457e732d4aa09ef8da
-  data.tar.gz: 51e2b7f119d4f6cb700567ccad183ad4e9b4360b5f06640afb79c632099cbc42f1a0ec5472acbe5846ecbdf1c08f506a86af18e384fc29d21ad22edc273c2edf
+  metadata.gz: 3dae444e96bdc5d6def375285f042fe29a0e82a07ea1b2fe1f61cbb3ec02c2fd8bc0ed559ca71156c1403d37ea3e5a45a69d7006b5fc865dbd5759f61b44fde3
+  data.tar.gz: 4f6aa60be75659643f8c69162e5ceda556fc532032396ea26feb4d6c413f1b731f4abadd6a54aa1a384476823e2b6bd5bab24a1182ce89b4e35bbb0d09880235

data/.rultor.yml

@@ -18,6 +18,5 @@ architect:
 - davvd
 merge:
   commanders: []
-  script: |-
-    ./test.sh
-deploy: {}
+  script: ./test.sh
+deploy: {}

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.2.2
 branches:
   only:
     - master

data/README.md

@@ -1,5 +1,6 @@
 [![Made By Teamed.io](http://img.teamed.io/btn.svg)](http://www.teamed.io)
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/jekyll-github-deploy)](http://www.rultor.com/p/yegor256/jekyll-github-deploy)
+[![We recommend RubyMine](http://img.teamed.io/rubymine-recommend.svg)](https://www.jetbrains.com/ruby/)
 
 [![Build Status](https://travis-ci.org/yegor256/jekyll-github-deploy.svg)](https://travis-ci.org/yegor256/jekyll-github-deploy)
 [![Gem Version](https://badge.fury.io/rb/jgd.svg)](http://badge.fury.io/rb/jgd)
@@ -79,7 +80,7 @@ script:
   - jgd -u git@github.com:yegor256/blog.git
 ```
 
-Read also [this article](http://www.yegor256.com/2014/06/22/jekyll-github-deploy.html).
+Read also [this article](http://www.yegor256.com/2014/06/24/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

@@ -5,6 +5,7 @@ set -o pipefail
 
 URL=$1
 BRANCH=$2
+BRANCH_FROM=$3
 SRC=$(pwd)
 TEMP=$(mktemp -d -t jgd-XXX)
 trap "rm -rf ${TEMP}" EXIT
@@ -12,7 +13,7 @@ CLONE=${TEMP}/clone
 COPY=${TEMP}/copy
 
 echo -e "Cloning Github repository:"
-git clone "${URL}" "${CLONE}"
+git clone -b "${BRANCH_FROM}" "${URL}" "${CLONE}"
 cp -R ${CLONE} ${COPY}
 
 cd "${CLONE}"

data/bin/jgd

@@ -10,10 +10,13 @@ Usage: jgd [options]
   EOS
   opt :url, 'Github URL', type: String, default: ''
   opt :branch, 'Destination branch', type: String, default: 'gh-pages'
+  opt :branch_from, 'Source branch', type: String, default: 'master'
 end
 
 branch = opts[:branch]
+branch_from = opts[:branch_from]
 fail 'branch can\'t be empty' if branch.empty?
+fail 'branch-from can\'t be empty' if branch_from.empty?
 url = opts[:url]
 url = `git config --get remote.origin.url`.strip if url.empty?
 
@@ -22,4 +25,4 @@ root = spec.gem_dir
 script = File.join(root, 'bash/deploy.sh')
 
 fail 'deployment failed, see log above' \
-  unless system("#{script} #{url} #{branch}")
+  unless system("#{script} #{url} #{branch} #{branch_from}")

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.7.1'
+  s.version = '1.8'
   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}" gh-pages
+./bash/deploy.sh "${TMP}" gh-pages master
 
 cd "${TMP}"
 git checkout gh-pages

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jgd
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: '1.8'
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop