mgd 0.1.0 → 0.2.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e07ee9214190715cf241c46d7d59291351f8ef8
-  data.tar.gz: f52fc093d099caf30e469fd4acc83fd3b40bbc08
+  metadata.gz: ab74714977ef15dbca386f39f5662be233e79181
+  data.tar.gz: 3deb86de499d4bdb566644706d01c0ac77908513
 SHA512:
-  metadata.gz: d9b922d23e945dfb661b70246b065cba2988b1ce5a6be1188050c97d6c523d3f7cfb6e017d4d83dd5ade7daa1a3c8a0c092dc8dc833a9eb2b109d98381f5bb40
-  data.tar.gz: 785181298dc6bdb66eab7ab06b8c7e5f3403420b231a6389937c2017726e5740311da0746515eb67de85ee7954e4e560b94477246cef12e878e9f7e6bd46c425
+  metadata.gz: 5c6ae3e5bcf00b5785dfb2168b8065e3f976f2b03cea0077d4667b4803c44c495b409676d8637c301f9c2005f08881e7a95b0958d1c15df519a896ac1b11c4dc
+  data.tar.gz: a56ee65f4c498447d363c87822841b4fd36746a09fe1ef2a52eb475cd27b7bcbfc576a4bedfd0d9ce2d79044dfceb4affb7212920bbc8bf5be66b393db6d932c

data/.travis.yml

@@ -1,15 +1,22 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1.0
+  - 2.2.0
+  - 2.3.0
+  - ruby-head
 branches:
   only:
     - master
 install:
   - bundle install
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
 script:
   - set -e
   - git config --global user.email "test@example.com"
   - git config --global user.name "Test"
   - rake
   - ./test.sh
-

data/README.md

@@ -1,16 +1,13 @@
-[![DevOps By Rultor.com](http://www.rultor.com/b/hovancik/middleman-github-deploy)](http://www.rultor.com/p/hovancik/middleman-github-deploy)
-
 [![Build Status](https://travis-ci.org/hovancik/middleman-github-deploy.svg)](https://travis-ci.org/hovancik/middleman-github-deploy)
 [![Gem Version](https://badge.fury.io/rb/mgd.svg)](http://badge.fury.io/rb/mgd)
 [![Dependency Status](https://gemnasium.com/hovancik/middleman-github-deploy.svg)](https://gemnasium.com/hovancik/middleman-github-deploy)
-[![Code Climate](http://img.shields.io/codeclimate/github/hovancik/middleman-github-deploy.svg)](https://codeclimate.com/github/hovancik/middleman-github-deploy)
 
 # What is mgd ?
 
 mgd stands for middleman-github-deploy and is a fork of [jgd](https://github.com/yegor256/jekyll-github-deploy).  
 
 mgd will automatically build your Middleman blog and push it to your gh-pages
-branch (or branch of your choice).
+branch (or any other branch of your choice).
 
 # Installation and Usage
 
@@ -33,6 +30,37 @@ Now your site is deployed to `gh-pages` branch of your repo. Done.
 PS. You can also specify target branch, with is `gh-pages` by default. Use
 `--branch` command line option.
 
+## Ruby ad rubygems versions
+Everything should work fine with ruby > 2.0.
+
+There is a bug with rubygems (https://github.com/rubygems/rubygems/issues/1420), so if you're getting error like this:
+
+```
+$ mgd
+/Users/user/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/rubygems/specification.rb:2158:in `method_missing': undefined method `this' for #<Gem::Specification:0x3fc9e849c75c trollop-2.1.2> (NoMethodError)
+        from /Users/user/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/rubygems/specification.rb:1057:in `find_active_stub_by_path'
+        from /Users/user/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/rubygems/core_ext/kernel_require.rb:64:in `require'
+        from /Users/user/.rvm/gems/ruby-2.3.1@gemset/gems/mgd-0.1.0/bin/mgd:4:in `<top (required)>'
+        from /Users/user/.rvm/gems/ruby-2.3.1@gemset/bin/mgd:23:in `load'
+        from /Users/user/.rvm/gems/ruby-2.3.1@gemset/bin/mgd:23:in `<main>'
+        from /Users/user/.rvm/gems/ruby-2.3.1@gemset/bin/ruby_executable_hooks:15:in `eval'
+        from /Users/user/.rvm/gems/ruby-2.3.1@gemset/bin/ruby_executable_hooks:15:in `<main>'
+
+```
+
+check what is your gem version, should be higher than 2.6.3:
+
+```
+$ gem --version
+```
+
+you can update it via:
+
+```
+$ gem update --system  # you might need to be an administrator or root
+```
+
+
 # Deploying with Travis
 
 This is how you might configure your blog

data/Rakefile

@@ -24,9 +24,6 @@
 require 'rubygems'
 require 'rake'
 require 'rdoc'
-require 'rake/clean'
-
-CLEAN = FileList['coverage', 'rdoc']
 
 def name
   @name ||= File.basename(Dir['*.gemspec'].first, '.*')
@@ -36,15 +33,7 @@ def version
   Gem::Specification.load(Dir['*.gemspec'].first).version
 end
 
-task default: [:clean, :test, :rubocop]
-
-require 'rake/testtask'
-desc 'Run all unit tests'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = false
-end
+task default: [:test, :rubocop]
 
 require 'rdoc/task'
 desc 'Build RDoc documentation'
@@ -55,6 +44,14 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+require 'rake/testtask'
+desc 'Run all unit tests'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = false
+end
+
 require 'rubocop/rake_task'
 desc 'Run RuboCop on all directories'
 RuboCop::RakeTask.new(:rubocop) do |task|

data/bash/deploy.sh

@@ -5,7 +5,7 @@ set -o pipefail
 
 URL=$1
 BRANCH=$2
-SRC=$(pwd)
+
 TEMP=$(mktemp -d -t mgd-XXX)
 trap 'rm -rf ${TEMP}' EXIT
 CLONE=${TEMP}/clone
@@ -43,6 +43,8 @@ fi
 echo -e "\nDeploying into ${BRANCH} branch:"
 rm -rf *
 cp -R ${TEMP}/build/* .
+rm -rf ./*glob*
+cp -R "${TEMP}"/build/* .
 rm -f README.md
 git add .
 git commit -am "new version $(date)" --allow-empty

data/bin/mgd

@@ -3,25 +3,24 @@ STDOUT.sync = true
 
 require 'trollop'
 opts = Trollop.options do
+  version 'mgd 0.2.0.alpha'
   banner <<-EOS
 mgd is an automated deployer of Middleman site to Github Pages
 
 Usage: mgd [options]
-  EOS
+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?
+Trollop.die(:branch, 'can\'t be empty') if opts[:branch].empty?
 url = opts[:url]
-url = `git config --get remote.origin.url` if url.empty?
-url.delete!("\n")
+url = `git config --get remote.origin.url`.strip if url.empty?
 
 spec = Gem::Specification.find_by_name('mgd')
 root = spec.gem_dir
 script = File.join(root, 'bash/deploy.sh')
 
-fail 'deployment failed, see log above' \
-  unless system("#{script} #{url} #{branch}")
+Trollop.die('deployment failed, see log above') \
+  unless system("#{script} #{url} #{opts[:branch]}")

data/mgd.gemspec

@@ -1,31 +1,24 @@
 # coding: utf-8
 require 'English'
 Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  if s.respond_to? :required_rubygems_version=
-    s.required_rubygems_version = Gem::Requirement.new('>= 0')
-  end
-  s.rubygems_version = '2.2.2'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
   s.name = 'mgd'
-  s.version = '0.1.0'
+  s.version = '0.2.0.alpha'
   s.license = 'MIT'
   s.summary = 'Middleman Github Deploy'
   s.description = 'Automated deployment of your Middleman blog to Github Pages'
-  s.authors = ['Yegor Bugayenko', 'Jan Hovancik']
+  s.author = 'Jan Hovancik'
   s.email = 'conta.srdr@gmail.com'
   s.homepage = 'http://github.com/hovancik/middleman-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')
-  s.add_runtime_dependency('middleman', '>=3.0.0')
-  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 'rspec-rails', '2.13'
+  s.add_runtime_dependency('middleman', '~> 3.0', '>= 3.0.0')
+  s.add_development_dependency 'rdoc', '4.2.2'
+  s.add_development_dependency 'minitest', '5.8.4'
+  s.add_development_dependency 'rubocop', '0.39.0'
+  s.add_development_dependency 'rubocop-rspec', '1.4.1'
 end

data/test.sh

@@ -3,7 +3,7 @@ set -e
 set -x
 
 TMP=$(mktemp -d -t mgd-XXXX)
-yes | middleman new mgd-XXXX
+no | middleman new mgd-XXXX
 mv mgd-XXXX/* "${TMP}"
 
 CWD=$(pwd)
@@ -17,7 +17,11 @@ git config user.name "Test"
 git commit -am 'initial commit'
 cd "${CWD}"
 
-./bash/deploy.sh "${TMP}" gh-pages
+gem build mgd.gemspec
+gem install ./mgd-0.2.0.alpha.gem
+
+cd "${TMP}"
+mgd --url "${TMP}" --branch gh-pages
 
 cd "${TMP}"
 git checkout gh-pages
@@ -25,5 +29,6 @@ ls -al
 cat test.html | grep "hello"
 cd "${CWD}"
 rm -rf "${TMP}"
+rm -rf "mgd-XXXX/"
 
 echo "success"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.alpha
 platform: ruby
 authors:
-- Yegor Bugayenko
 - Jan Hovancik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -29,6 +28,9 @@ dependencies:
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -36,93 +38,68 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: 4.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.8.4
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.13'
+        version: 1.4.1
 description: Automated deployment of your Middleman blog to Github Pages
 email: conta.srdr@gmail.com
 executables:
@@ -134,14 +111,11 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- ".rultor.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
-- PUZZLES.md
 - README.md
 - Rakefile
-- TEAM.md
 - bash/deploy.sh
 - bin/mgd
 - mgd.gemspec
@@ -160,16 +134,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: Middleman Github Deploy
 test_files: []

data/.rultor.yml

@@ -1,19 +0,0 @@
-decrypt:
-  rubygems.yml: repo/rubygems.yml.asc
-release:
-  script: |-
-    git config --global user.email "test@example.com"
-    git config --global user.name "Test"
-    ./test.sh
-    rm -rf *.gem
-    sed -i "s/1.0.snapshot/${tag}/g" mgd.gemspec
-    gem build mgd.gemspec
-    chmod 0600 ../rubygems.yml
-    gem push *.gem --config-file ../rubygems.yml
-  commanders:
-  - hovancik
-architect:
-- hovancik
-merge:
-  commanders: []
-deploy: {}

data/PUZZLES.md

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

data/TEAM.md

@@ -1,17 +0,0 @@
-## Team
-
-The following members are in the project team:
-
-Role | Members
----|---
-PM | hovancik
-CR |
-DEV |
-IMP |
-ARC |
-DES |
-PO | hovancik
-ITR |
-QA |
-SA |
-HLP |