bin/jgd in jgd-1.7.1 vs bin/jgd in jgd-1.8
- old
+ new
@@ -8,18 +8,21 @@
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?
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} #{branch}")
+ unless system("#{script} #{url} #{branch} #{branch_from}")