mgd 0.1.0 → 0.2.0.alpha

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +8 -1
  3. data/README.md +32 -4
  4. data/Rakefile +9 -12
  5. data/bash/deploy.sh +3 -1
  6. data/bin/mgd +7 -8
  7. data/mgd.gemspec +10 -17
  8. data/test.sh +7 -2
  9. metadata +21 -47
  10. data/.rultor.yml +0 -19
  11. data/PUZZLES.md +0 -4
  12. data/TEAM.md +0 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7e07ee9214190715cf241c46d7d59291351f8ef8
4
- data.tar.gz: f52fc093d099caf30e469fd4acc83fd3b40bbc08
3
+ metadata.gz: ab74714977ef15dbca386f39f5662be233e79181
4
+ data.tar.gz: 3deb86de499d4bdb566644706d01c0ac77908513
5
5
  SHA512:
6
- metadata.gz: d9b922d23e945dfb661b70246b065cba2988b1ce5a6be1188050c97d6c523d3f7cfb6e017d4d83dd5ade7daa1a3c8a0c092dc8dc833a9eb2b109d98381f5bb40
7
- data.tar.gz: 785181298dc6bdb66eab7ab06b8c7e5f3403420b231a6389937c2017726e5740311da0746515eb67de85ee7954e4e560b94477246cef12e878e9f7e6bd46c425
6
+ metadata.gz: 5c6ae3e5bcf00b5785dfb2168b8065e3f976f2b03cea0077d4667b4803c44c495b409676d8637c301f9c2005f08881e7a95b0958d1c15df519a896ac1b11c4dc
7
+ data.tar.gz: a56ee65f4c498447d363c87822841b4fd36746a09fe1ef2a52eb475cd27b7bcbfc576a4bedfd0d9ce2d79044dfceb4affb7212920bbc8bf5be66b393db6d932c
data/.travis.yml CHANGED
@@ -1,15 +1,22 @@
1
1
  language: ruby
2
2
  rvm:
3
3
  - 2.0.0
4
+ - 2.1.0
5
+ - 2.2.0
6
+ - 2.3.0
7
+ - ruby-head
4
8
  branches:
5
9
  only:
6
10
  - master
7
11
  install:
8
12
  - bundle install
13
+ matrix:
14
+ fast_finish: true
15
+ allow_failures:
16
+ - rvm: ruby-head
9
17
  script:
10
18
  - set -e
11
19
  - git config --global user.email "test@example.com"
12
20
  - git config --global user.name "Test"
13
21
  - rake
14
22
  - ./test.sh
15
-
data/README.md CHANGED
@@ -1,16 +1,13 @@
1
- [![DevOps By Rultor.com](http://www.rultor.com/b/hovancik/middleman-github-deploy)](http://www.rultor.com/p/hovancik/middleman-github-deploy)
2
-
3
1
  [![Build Status](https://travis-ci.org/hovancik/middleman-github-deploy.svg)](https://travis-ci.org/hovancik/middleman-github-deploy)
4
2
  [![Gem Version](https://badge.fury.io/rb/mgd.svg)](http://badge.fury.io/rb/mgd)
5
3
  [![Dependency Status](https://gemnasium.com/hovancik/middleman-github-deploy.svg)](https://gemnasium.com/hovancik/middleman-github-deploy)
6
- [![Code Climate](http://img.shields.io/codeclimate/github/hovancik/middleman-github-deploy.svg)](https://codeclimate.com/github/hovancik/middleman-github-deploy)
7
4
 
8
5
  # What is mgd ?
9
6
 
10
7
  mgd stands for middleman-github-deploy and is a fork of [jgd](https://github.com/yegor256/jekyll-github-deploy).
11
8
 
12
9
  mgd will automatically build your Middleman blog and push it to your gh-pages
13
- branch (or branch of your choice).
10
+ branch (or any other branch of your choice).
14
11
 
15
12
  # Installation and Usage
16
13
 
@@ -33,6 +30,37 @@ Now your site is deployed to `gh-pages` branch of your repo. Done.
33
30
  PS. You can also specify target branch, with is `gh-pages` by default. Use
34
31
  `--branch` command line option.
35
32
 
33
+ ## Ruby ad rubygems versions
34
+ Everything should work fine with ruby > 2.0.
35
+
36
+ There is a bug with rubygems (https://github.com/rubygems/rubygems/issues/1420), so if you're getting error like this:
37
+
38
+ ```
39
+ $ mgd
40
+ /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)
41
+ from /Users/user/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/rubygems/specification.rb:1057:in `find_active_stub_by_path'
42
+ from /Users/user/.rvm/rubies/ruby-2.3.1/lib/ruby/2.3.0/rubygems/core_ext/kernel_require.rb:64:in `require'
43
+ from /Users/user/.rvm/gems/ruby-2.3.1@gemset/gems/mgd-0.1.0/bin/mgd:4:in `<top (required)>'
44
+ from /Users/user/.rvm/gems/ruby-2.3.1@gemset/bin/mgd:23:in `load'
45
+ from /Users/user/.rvm/gems/ruby-2.3.1@gemset/bin/mgd:23:in `<main>'
46
+ from /Users/user/.rvm/gems/ruby-2.3.1@gemset/bin/ruby_executable_hooks:15:in `eval'
47
+ from /Users/user/.rvm/gems/ruby-2.3.1@gemset/bin/ruby_executable_hooks:15:in `<main>'
48
+
49
+ ```
50
+
51
+ check what is your gem version, should be higher than 2.6.3:
52
+
53
+ ```
54
+ $ gem --version
55
+ ```
56
+
57
+ you can update it via:
58
+
59
+ ```
60
+ $ gem update --system # you might need to be an administrator or root
61
+ ```
62
+
63
+
36
64
  # Deploying with Travis
37
65
 
38
66
  This is how you might configure your blog
data/Rakefile CHANGED
@@ -24,9 +24,6 @@
24
24
  require 'rubygems'
25
25
  require 'rake'
26
26
  require 'rdoc'
27
- require 'rake/clean'
28
-
29
- CLEAN = FileList['coverage', 'rdoc']
30
27
 
31
28
  def name
32
29
  @name ||= File.basename(Dir['*.gemspec'].first, '.*')
@@ -36,15 +33,7 @@ def version
36
33
  Gem::Specification.load(Dir['*.gemspec'].first).version
37
34
  end
38
35
 
39
- task default: [:clean, :test, :rubocop]
40
-
41
- require 'rake/testtask'
42
- desc 'Run all unit tests'
43
- Rake::TestTask.new(:test) do |test|
44
- test.libs << 'lib' << 'test'
45
- test.pattern = 'test/**/test_*.rb'
46
- test.verbose = false
47
- end
36
+ task default: [:test, :rubocop]
48
37
 
49
38
  require 'rdoc/task'
50
39
  desc 'Build RDoc documentation'
@@ -55,6 +44,14 @@ Rake::RDocTask.new do |rdoc|
55
44
  rdoc.rdoc_files.include('lib/**/*.rb')
56
45
  end
57
46
 
47
+ require 'rake/testtask'
48
+ desc 'Run all unit tests'
49
+ Rake::TestTask.new(:test) do |test|
50
+ test.libs << 'lib' << 'test'
51
+ test.pattern = 'test/**/test_*.rb'
52
+ test.verbose = false
53
+ end
54
+
58
55
  require 'rubocop/rake_task'
59
56
  desc 'Run RuboCop on all directories'
60
57
  RuboCop::RakeTask.new(:rubocop) do |task|
data/bash/deploy.sh CHANGED
@@ -5,7 +5,7 @@ set -o pipefail
5
5
 
6
6
  URL=$1
7
7
  BRANCH=$2
8
- SRC=$(pwd)
8
+
9
9
  TEMP=$(mktemp -d -t mgd-XXX)
10
10
  trap 'rm -rf ${TEMP}' EXIT
11
11
  CLONE=${TEMP}/clone
@@ -43,6 +43,8 @@ fi
43
43
  echo -e "\nDeploying into ${BRANCH} branch:"
44
44
  rm -rf *
45
45
  cp -R ${TEMP}/build/* .
46
+ rm -rf ./*glob*
47
+ cp -R "${TEMP}"/build/* .
46
48
  rm -f README.md
47
49
  git add .
48
50
  git commit -am "new version $(date)" --allow-empty
data/bin/mgd CHANGED
@@ -3,25 +3,24 @@ STDOUT.sync = true
3
3
 
4
4
  require 'trollop'
5
5
  opts = Trollop.options do
6
+ version 'mgd 0.2.0.alpha'
6
7
  banner <<-EOS
7
8
  mgd is an automated deployer of Middleman site to Github Pages
8
9
 
9
10
  Usage: mgd [options]
10
- EOS
11
+ EOS
12
+
11
13
  opt :url, 'Github URL', type: String, default: ''
12
14
  opt :branch, 'Destination branch', type: String, default: 'gh-pages'
13
15
  end
14
16
 
15
- branch = opts[:branch]
16
-
17
- fail 'branch can\'t be empty' if branch.empty?
17
+ Trollop.die(:branch, 'can\'t be empty') if opts[:branch].empty?
18
18
  url = opts[:url]
19
- url = `git config --get remote.origin.url` if url.empty?
20
- url.delete!("\n")
19
+ url = `git config --get remote.origin.url`.strip if url.empty?
21
20
 
22
21
  spec = Gem::Specification.find_by_name('mgd')
23
22
  root = spec.gem_dir
24
23
  script = File.join(root, 'bash/deploy.sh')
25
24
 
26
- fail 'deployment failed, see log above' \
27
- unless system("#{script} #{url} #{branch}")
25
+ Trollop.die('deployment failed, see log above') \
26
+ unless system("#{script} #{url} #{opts[:branch]}")
data/mgd.gemspec CHANGED
@@ -1,31 +1,24 @@
1
1
  # coding: utf-8
2
2
  require 'English'
3
3
  Gem::Specification.new do |s|
4
- s.specification_version = 2 if s.respond_to? :specification_version=
5
- if s.respond_to? :required_rubygems_version=
6
- s.required_rubygems_version = Gem::Requirement.new('>= 0')
7
- end
8
- s.rubygems_version = '2.2.2'
9
- s.required_ruby_version = '>= 1.9.3'
4
+ s.required_ruby_version = '>= 2.0.0'
10
5
  s.name = 'mgd'
11
- s.version = '0.1.0'
6
+ s.version = '0.2.0.alpha'
12
7
  s.license = 'MIT'
13
8
  s.summary = 'Middleman Github Deploy'
14
9
  s.description = 'Automated deployment of your Middleman blog to Github Pages'
15
- s.authors = ['Yegor Bugayenko', 'Jan Hovancik']
10
+ s.author = 'Jan Hovancik'
16
11
  s.email = 'conta.srdr@gmail.com'
17
12
  s.homepage = 'http://github.com/hovancik/middleman-github-deploy'
18
13
  s.files = `git ls-files`.split($RS)
19
- s.executables = s.files.grep(/^bin\//) { |f| File.basename(f) }
20
- s.test_files = s.files.grep(/^(test|spec|features)\//)
14
+ s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
15
+ s.test_files = s.files.grep(%r{/^(test|spec|features)\/})
21
16
  s.rdoc_options = ['--charset=UTF-8']
22
17
  s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
23
18
  s.add_runtime_dependency('trollop', '2.1.2')
24
- s.add_runtime_dependency('middleman', '>=3.0.0')
25
- s.add_development_dependency 'coveralls', '0.7.0'
26
- s.add_development_dependency 'rdoc', '3.11'
27
- s.add_development_dependency 'minitest', '5.4.0'
28
- s.add_development_dependency 'rubocop', '0.24.1'
29
- s.add_development_dependency 'rubocop-rspec', '1.1.0'
30
- s.add_development_dependency 'rspec-rails', '2.13'
19
+ s.add_runtime_dependency('middleman', '~> 3.0', '>= 3.0.0')
20
+ s.add_development_dependency 'rdoc', '4.2.2'
21
+ s.add_development_dependency 'minitest', '5.8.4'
22
+ s.add_development_dependency 'rubocop', '0.39.0'
23
+ s.add_development_dependency 'rubocop-rspec', '1.4.1'
31
24
  end
data/test.sh CHANGED
@@ -3,7 +3,7 @@ set -e
3
3
  set -x
4
4
 
5
5
  TMP=$(mktemp -d -t mgd-XXXX)
6
- yes | middleman new mgd-XXXX
6
+ no | middleman new mgd-XXXX
7
7
  mv mgd-XXXX/* "${TMP}"
8
8
 
9
9
  CWD=$(pwd)
@@ -17,7 +17,11 @@ git config user.name "Test"
17
17
  git commit -am 'initial commit'
18
18
  cd "${CWD}"
19
19
 
20
- ./bash/deploy.sh "${TMP}" gh-pages
20
+ gem build mgd.gemspec
21
+ gem install ./mgd-0.2.0.alpha.gem
22
+
23
+ cd "${TMP}"
24
+ mgd --url "${TMP}" --branch gh-pages
21
25
 
22
26
  cd "${TMP}"
23
27
  git checkout gh-pages
@@ -25,5 +29,6 @@ ls -al
25
29
  cat test.html | grep "hello"
26
30
  cd "${CWD}"
27
31
  rm -rf "${TMP}"
32
+ rm -rf "mgd-XXXX/"
28
33
 
29
34
  echo "success"
metadata CHANGED
@@ -1,15 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mgd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.2.0.alpha
5
5
  platform: ruby
6
6
  authors:
7
- - Yegor Bugayenko
8
7
  - Jan Hovancik
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2015-12-27 00:00:00.000000000 Z
11
+ date: 2016-10-09 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: trollop
@@ -29,6 +28,9 @@ dependencies:
29
28
  name: middleman
30
29
  requirement: !ruby/object:Gem::Requirement
31
30
  requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '3.0'
32
34
  - - ">="
33
35
  - !ruby/object:Gem::Version
34
36
  version: 3.0.0
@@ -36,93 +38,68 @@ dependencies:
36
38
  prerelease: false
37
39
  version_requirements: !ruby/object:Gem::Requirement
38
40
  requirements:
41
+ - - "~>"
42
+ - !ruby/object:Gem::Version
43
+ version: '3.0'
39
44
  - - ">="
40
45
  - !ruby/object:Gem::Version
41
46
  version: 3.0.0
42
- - !ruby/object:Gem::Dependency
43
- name: coveralls
44
- requirement: !ruby/object:Gem::Requirement
45
- requirements:
46
- - - '='
47
- - !ruby/object:Gem::Version
48
- version: 0.7.0
49
- type: :development
50
- prerelease: false
51
- version_requirements: !ruby/object:Gem::Requirement
52
- requirements:
53
- - - '='
54
- - !ruby/object:Gem::Version
55
- version: 0.7.0
56
47
  - !ruby/object:Gem::Dependency
57
48
  name: rdoc
58
49
  requirement: !ruby/object:Gem::Requirement
59
50
  requirements:
60
51
  - - '='
61
52
  - !ruby/object:Gem::Version
62
- version: '3.11'
53
+ version: 4.2.2
63
54
  type: :development
64
55
  prerelease: false
65
56
  version_requirements: !ruby/object:Gem::Requirement
66
57
  requirements:
67
58
  - - '='
68
59
  - !ruby/object:Gem::Version
69
- version: '3.11'
60
+ version: 4.2.2
70
61
  - !ruby/object:Gem::Dependency
71
62
  name: minitest
72
63
  requirement: !ruby/object:Gem::Requirement
73
64
  requirements:
74
65
  - - '='
75
66
  - !ruby/object:Gem::Version
76
- version: 5.4.0
67
+ version: 5.8.4
77
68
  type: :development
78
69
  prerelease: false
79
70
  version_requirements: !ruby/object:Gem::Requirement
80
71
  requirements:
81
72
  - - '='
82
73
  - !ruby/object:Gem::Version
83
- version: 5.4.0
74
+ version: 5.8.4
84
75
  - !ruby/object:Gem::Dependency
85
76
  name: rubocop
86
77
  requirement: !ruby/object:Gem::Requirement
87
78
  requirements:
88
79
  - - '='
89
80
  - !ruby/object:Gem::Version
90
- version: 0.24.1
81
+ version: 0.39.0
91
82
  type: :development
92
83
  prerelease: false
93
84
  version_requirements: !ruby/object:Gem::Requirement
94
85
  requirements:
95
86
  - - '='
96
87
  - !ruby/object:Gem::Version
97
- version: 0.24.1
88
+ version: 0.39.0
98
89
  - !ruby/object:Gem::Dependency
99
90
  name: rubocop-rspec
100
91
  requirement: !ruby/object:Gem::Requirement
101
92
  requirements:
102
93
  - - '='
103
94
  - !ruby/object:Gem::Version
104
- version: 1.1.0
95
+ version: 1.4.1
105
96
  type: :development
106
97
  prerelease: false
107
98
  version_requirements: !ruby/object:Gem::Requirement
108
99
  requirements:
109
100
  - - '='
110
101
  - !ruby/object:Gem::Version
111
- version: 1.1.0
112
- - !ruby/object:Gem::Dependency
113
- name: rspec-rails
114
- requirement: !ruby/object:Gem::Requirement
115
- requirements:
116
- - - '='
117
- - !ruby/object:Gem::Version
118
- version: '2.13'
119
- type: :development
120
- prerelease: false
121
- version_requirements: !ruby/object:Gem::Requirement
122
- requirements:
123
- - - '='
124
- - !ruby/object:Gem::Version
125
- version: '2.13'
102
+ version: 1.4.1
126
103
  description: Automated deployment of your Middleman blog to Github Pages
127
104
  email: conta.srdr@gmail.com
128
105
  executables:
@@ -134,14 +111,11 @@ extra_rdoc_files:
134
111
  files:
135
112
  - ".gitignore"
136
113
  - ".rubocop.yml"
137
- - ".rultor.yml"
138
114
  - ".travis.yml"
139
115
  - Gemfile
140
116
  - LICENSE.txt
141
- - PUZZLES.md
142
117
  - README.md
143
118
  - Rakefile
144
- - TEAM.md
145
119
  - bash/deploy.sh
146
120
  - bin/mgd
147
121
  - mgd.gemspec
@@ -160,16 +134,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
160
134
  requirements:
161
135
  - - ">="
162
136
  - !ruby/object:Gem::Version
163
- version: 1.9.3
137
+ version: 2.0.0
164
138
  required_rubygems_version: !ruby/object:Gem::Requirement
165
139
  requirements:
166
- - - ">="
140
+ - - ">"
167
141
  - !ruby/object:Gem::Version
168
- version: '0'
142
+ version: 1.3.1
169
143
  requirements: []
170
144
  rubyforge_project:
171
- rubygems_version: 2.4.8
145
+ rubygems_version: 2.6.3
172
146
  signing_key:
173
- specification_version: 2
147
+ specification_version: 4
174
148
  summary: Middleman Github Deploy
175
149
  test_files: []
data/.rultor.yml DELETED
@@ -1,19 +0,0 @@
1
- decrypt:
2
- rubygems.yml: repo/rubygems.yml.asc
3
- release:
4
- script: |-
5
- git config --global user.email "test@example.com"
6
- git config --global user.name "Test"
7
- ./test.sh
8
- rm -rf *.gem
9
- sed -i "s/1.0.snapshot/${tag}/g" mgd.gemspec
10
- gem build mgd.gemspec
11
- chmod 0600 ../rubygems.yml
12
- gem push *.gem --config-file ../rubygems.yml
13
- commanders:
14
- - hovancik
15
- architect:
16
- - hovancik
17
- merge:
18
- commanders: []
19
- deploy: {}
data/PUZZLES.md DELETED
@@ -1,4 +0,0 @@
1
- ## Puzzles
2
-
3
- There are 0 active puzzles (0 total):
4
-
data/TEAM.md DELETED
@@ -1,17 +0,0 @@
1
- ## Team
2
-
3
- The following members are in the project team:
4
-
5
- Role | Members
6
- ---|---
7
- PM | hovancik
8
- CR |
9
- DEV |
10
- IMP |
11
- ARC |
12
- DES |
13
- PO | hovancik
14
- ITR |
15
- QA |
16
- SA |
17
- HLP |