jgd 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355388fed4d6b51004514026d405b6e3f2f0da6f
-  data.tar.gz: 79e51ca0911129a320ae032bfc42f11256e24056
+  metadata.gz: a4643fbdccc90db3d7222715cb7c23d532a74d22
+  data.tar.gz: c1fb60f3f19e08de7aaff6433555508a34b886c6
 SHA512:
-  metadata.gz: 22166399484655857eac5ac2fe1e20fbd1506ccc0613203bd52d980d04fd648827d98b7c822efcf51b10d501f077fd20b77a89c666aa89db1cdc04ac44dfa1e3
-  data.tar.gz: ab3c3475bcae261e33710391edc6639f24cc863fa5c93f5061d46e2123bf0a591893a29d4624494332984129b0cfe3a84017cb0fe4e326427985ad90ff3c3ea0
+  metadata.gz: 6d2aa75f56626108af27c1f71e15dccfa7fd253fc32bc6f86c2dc87f0730f9b0d78ba6dda30dd6a4967ef5c0175f62d2591abeb79acccb04ecd18a59c194bd5a
+  data.tar.gz: 8a3f38cfb5bd7638b0f3328ec44d5a123ce4cb60e837b8bc1e1c398b1e7703ff03595735625729a2637c6e57c4706a7f2b5fc485e4d34e8a913ddc19682b6a48

data/README.md

@@ -27,5 +27,5 @@ env:
     - secure: ...
 install:
   - bundle
-script: jgd --url=http://yegor256:${PASSWORD}@github.com/yegor256/blog.git
+script: jgd -u http://yegor256:${PASSWORD}@github.com/yegor256/blog.git
 ```

data/bash/deploy.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+URL=$1
+SRC=$(pwd)
+TEMP=$(mktemp -d -t jgd-XXX)
+trap "rm -rf ${TEMP}" EXIT
+CLONE=${TEMP}/clone
+
+echo -e "Cloning Github repository:"
+git clone "${URL}" "${CLONE}"
+
+echo -e "\nBuilding Jekyll site:"
+cd "${CLONE}"
+rm -rf _site
+jekyll build
+cp -R _site ${TEMP}
+
+echo -e "\nPreparing gh-pages branch:"
+if [ -z "$(git branch -a | grep origin/gh-pages)" ]; then
+  git checkout --orphan gh-pages
+else
+  git checkout gh-pages
+fi
+
+echo -e "\nDeploying into gh-pages branch:"
+rm -rf *
+cp -R ${TEMP}/_site/* .
+rm README.md
+git add .
+git config user.email "jgd@teamed.io"
+git config user.name "jekyll-github-deploy"
+git commit -am "new site version deployed" --allow-empty
+git push origin gh-pages 2>&1 | sed 's|'$URL'|[skipped]|g'
+
+echo -e "\nCleaning up:"
+rm -rf "${CLONE}"
+rm -rf "${SITE}"

data/bin/jgd

@@ -1,8 +1,22 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
+require 'trollop'
+opts = Trollop::options do
+  banner <<-EOS
+jgd is an automated deployer of Jekyll site to Github Pages
+
+Usage: jgd [options]
+  EOS
+  opt :url, "Github URL", :type=>String, :default=>''
+end
+
+url = opts[:url]
+if url.empty?
+  url = `git config --get remote.origin.url`
+end
+
 spec = Gem::Specification.find_by_name("jgd")
 root = spec.gem_dir
 script = File.join(root, 'bash/deploy.sh')
-
-%x[ #{script} test ]
+system("#{script} #{url}")

data/jgd.gemspec

@@ -5,7 +5,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.0'
+  s.version = '1.1'
   s.license = 'MIT'
   s.summary = "Jekyll Github Deploy"
   s.description = "Automated deployment of your Jekyll blog to Github Pages"
@@ -17,5 +17,6 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE.txt]
-  s.add_runtime_dependency('jekyll')
+  s.add_runtime_dependency('trollop', '2.0')
+  s.add_runtime_dependency('jekyll', '1.5.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jgd
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -10,20 +10,34 @@ bindir: bin
 cert_chain: []
 date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 description: Automated deployment of your Jekyll blog to Github Pages
 email: yegor@tpc2.com
 executables:
@@ -37,6 +51,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- bash/deploy.sh
 - bin/jgd
 - jgd.gemspec
 homepage: http://github.com/yegor256/jekyll-github-deploy