jgd 1.8 → 1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ecdbd1fc492987dce8c1e9cce64ebbb8707816
-  data.tar.gz: 3570c8ea77131d5ee99cd47ab0a271eef2b09a3a
+  metadata.gz: cdfbd8bf3bcd5ea7fe4294ad94ecc2bd2ab30163
+  data.tar.gz: '0583594d8379d7cb8b1d1d5d9d6daa8ce78c1e72'
 SHA512:
-  metadata.gz: 3dae444e96bdc5d6def375285f042fe29a0e82a07ea1b2fe1f61cbb3ec02c2fd8bc0ed559ca71156c1403d37ea3e5a45a69d7006b5fc865dbd5759f61b44fde3
-  data.tar.gz: 4f6aa60be75659643f8c69162e5ceda556fc532032396ea26feb4d6c413f1b731f4abadd6a54aa1a384476823e2b6bd5bab24a1182ce89b4e35bbb0d09880235
+  metadata.gz: f2f2664ef647cb684fbd3c75777b51cda28323ae8dd1b6e03ad2d518b47285a0524cd6be905e274a1aca29b612debe925abf903b18fcc4f99a1c2839b7d52839
+  data.tar.gz: 18367a46d06590099f3d5e80e205c81862fa9e6d52b56d160a6d6608c5956dbe009ec44605aea204b7ad14d8097dbaefe89dd8c9c6d271b430c2eb5ce02cfe62

data/.0pdd.yml

@@ -0,0 +1,5 @@
+errors:
+  - yegor256@gmail.com
+# alerts:
+#   github:
+#     - yegor256

data/.pdd

@@ -0,0 +1,7 @@
+--source=.
+--verbose
+--exclude target/**/*
+--exclude src/main/resources/images/**/*
+--rule min-words:20
+--rule min-estimate:15
+--rule max-estimate:90

data/.rubocop.yml

@@ -1,2 +1,18 @@
-MethodLength:
-  Max: 30
+AllCops:
+  Exclude:
+    - 'bin/**/*'
+    - 'assets/**/*'
+  DisplayCopNames: true
+
+Lint/RescueException:
+  Enabled: false
+Metrics/MethodLength:
+  Max: 50
+Metrics/ClassLength:
+  Max: 150
+Metrics/AbcSize:
+  Max: 60
+Metrics/BlockLength:
+  Max: 50
+Style/MultilineMethodCallIndentation:
+  Enabled: false

data/README.md

@@ -7,7 +7,7 @@
 [![Dependency Status](https://gemnasium.com/yegor256/jekyll-github-deploy.svg)](https://gemnasium.com/yegor256/jekyll-github-deploy)
 [![Code Climate](http://img.shields.io/codeclimate/github/yegor256/jekyll-github-deploy.svg)](https://codeclimate.com/github/yegor256/jekyll-github-deploy)
 
-# What is jgd ?
+## What is jgd ?
 
 If you use some plugins with your Jekyll blog, chances are you can not
 have your blog generated by GitHub.
@@ -16,7 +16,7 @@ This is where jekyll-github-deploy (a.k.a. jgd) comes in: it will
 automatically build your Jekyll blog and push it to your gh-pages
 branch.
 
-# Installing
+## Installing
 
 It is assumed that your blog is in the home directory of your repo.
 
@@ -34,7 +34,19 @@ jgd
 
 Now your site is deployed to `gh-pages` branch of your repo. Done.
 
-# Production variables
+## Comand Line Options
+
+Below is a list of all command line options.
+
+| Option | Description |
+| -------- | ----------- |
+| `-u` or `--url` | The GitHub URL. Defaults to th URL of your current project. |
+| `-b` or `--branch` | The branch to push your site to. Defaults to `gh-pages`. If the branch does not exist, it will be created. |
+| `-r` or `--branch-from` | The source branch. Defaults to `master`. |
+| `-c` or `--config` | Name of the optional deploy config file. See [Production variables](#production-variables) below for more information. |
+| `-h` or `--help` | Displays a list of all options. |
+
+## Production variables
 
 If you need to have different values for your deployed blog, just add a
 `_config-deploy.yml` file in your project's root and you're set. Values
@@ -44,7 +56,15 @@ re-defined in `_config-deploy.yml` will override those defined in
 Typical usage includes changing site `url`, disable disqus or ga in
 development...., you name it.
 
-# Deploying with Travis
+While `_config-deploy.yml` is the default, you may specify any config
+file by using the `--config` command line option.
+
+For example:
+```sh
+$ jgd -c _config-deploy-develop.yml -r develop -b gh-pages-develop
+```
+
+## Deploying with Travis
 
 This is how I configure [my Jekyll blog](https://github.com/yegor256/blog)
 to be deployed automatically by [travis-ci](http://www.travis-ci.org):
@@ -81,6 +101,3 @@ script:
 ```
 
 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

@@ -6,6 +6,7 @@ set -o pipefail
 URL=$1
 BRANCH=$2
 BRANCH_FROM=$3
+DEPLOY_CONFIG=$4
 SRC=$(pwd)
 TEMP=$(mktemp -d -t jgd-XXX)
 trap "rm -rf ${TEMP}" EXIT
@@ -21,8 +22,8 @@ cd "${CLONE}"
 echo -e "\nBuilding Jekyll site:"
 rm -rf _site
 
-if [ -r _config-deploy.yml ]; then
-  jekyll build --config _config.yml,_config-deploy.yml
+if [ -r ${DEPLOY_CONFIG} ]; then
+  jekyll build --config _config.yml,${DEPLOY_CONFIG}
 else
   jekyll build
 fi

data/bin/jgd

@@ -11,12 +11,15 @@ Usage: jgd [options]
   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'
+  opt :config, 'Deploy Config File', type: String, default: '_config-deploy.yml'
 end
 
 branch = opts[:branch]
 branch_from = opts[:branch_from]
+config = opts[:config]
 fail 'branch can\'t be empty' if branch.empty?
 fail 'branch-from can\'t be empty' if branch_from.empty?
+fail 'config can\'t be empty' if config.empty?
 url = opts[:url]
 url = `git config --get remote.origin.url`.strip if url.empty?
 
@@ -25,4 +28,4 @@ root = spec.gem_dir
 script = File.join(root, 'bash/deploy.sh')
 
 fail 'deployment failed, see log above' \
-  unless system("#{script} #{url} #{branch} #{branch_from}")
+  unless system("#{script} #{url} #{branch} #{branch_from} #{config}")

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.8'
+  s.version = '1.9'
   s.license = 'MIT'
   s.summary = 'Jekyll Github Deploy'
   s.description = 'Automated deployment of your Jekyll blog to Github Pages'
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.email = 'yegor@tpc2.com'
   s.homepage = 'http://github.com/yegor256/jekyll-github-deploy'
   s.files = `git ls-files`.split($RS)
-  s.executables = s.files.grep(/^bin\//) { |f| File.basename(f) }
-  s.test_files = s.files.grep(/^(test|spec|features)\//)
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency('trollop', '2.1.2')
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coveralls', '0.7.0'
   s.add_development_dependency 'rdoc', '3.11'
   s.add_development_dependency 'minitest', '5.4.0'
-  s.add_development_dependency 'rubocop', '0.24.1'
-  s.add_development_dependency 'rubocop-rspec', '1.1.0'
+  s.add_development_dependency 'rubocop', '0.46.0'
+  s.add_development_dependency 'rubocop-rspec', '1.8.0'
   s.add_development_dependency 'rspec-rails', '2.13'
 end

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 master
+./bash/deploy.sh "${TMP}" gh-pages master _some-other-config.yml
 
 cd "${TMP}"
 git checkout gh-pages

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jgd
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: '1.9'
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -131,13 +131,14 @@ extra_rdoc_files:
 - README.md
 - LICENSE.txt
 files:
+- ".0pdd.yml"
 - ".gitignore"
+- ".pdd"
 - ".rubocop.yml"
 - ".rultor.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
-- PUZZLES.md
 - README.md
 - Rakefile
 - TEAM.md
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 2
 summary: Jekyll Github Deploy

data/PUZZLES.md

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