opskeleton 0.8.11 → 0.8.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 11548126aa84871418a9513bb4c90ae0f0146b6c
4
- data.tar.gz: 20146f961bae6ace97a35df98b63a601f6778c3d
3
+ metadata.gz: b848a2b49c73f2d6aecda373d9c63b6427d543e9
4
+ data.tar.gz: d85182e5a25bb0cfd1f05d9db9033f8c614181bb
5
5
  SHA512:
6
- metadata.gz: 6295c1b5e683c504bf703925e8c96ba282404e7ebbfece824e1a17b276182789e14998b88c53b9cda2490f656a4e457d232cc4886b42709f86a3bab77b9ed8da
7
- data.tar.gz: 595e4de6a3cb247b2af1abb78ddf76fda808430f86cb5a8d98432f90694397d01e99a71b85fe22eaef78a75a2ce8174090b979b82689322a956ab3dc31b421f2
6
+ metadata.gz: e77123719efaba63d69afafe0fe4268e8be39f88ded9d5ca0fa7f26dab3a8f64f910742ed18924fb86c1b986575782810fe69c9daa77fe20281ed4cd8df28233
7
+ data.tar.gz: 3594893f6c1e027ac790b96870cadc18fb4da011299725f943727fa6ae152378eaf9d55b91ec728b49e8afad460057cacf98b8790f469e27c1772bb6fc1c36b1
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- opskeleton (0.8.11)
4
+ opskeleton (0.8.12)
5
5
  aws-sdk (~> 2)
6
6
  bintray_deploy
7
7
  git
@@ -21,19 +21,19 @@ GEM
21
21
  minitest (~> 5.1)
22
22
  thread_safe (~> 0.3, >= 0.3.4)
23
23
  tzinfo (~> 1.1)
24
- aws-sdk (2.1.2)
25
- aws-sdk-resources (= 2.1.2)
26
- aws-sdk-core (2.1.2)
24
+ aws-sdk (2.1.3)
25
+ aws-sdk-resources (= 2.1.3)
26
+ aws-sdk-core (2.1.3)
27
27
  jmespath (~> 1.0)
28
- aws-sdk-resources (2.1.2)
29
- aws-sdk-core (= 2.1.2)
28
+ aws-sdk-resources (2.1.3)
29
+ aws-sdk-core (= 2.1.3)
30
30
  bintray_deploy (0.0.4)
31
31
  configuration
32
32
  rest-client
33
33
  thor
34
34
  builder (3.2.2)
35
- chef (12.4.0)
36
- chef-config (= 12.4.0)
35
+ chef (12.4.1)
36
+ chef-config (= 12.4.1)
37
37
  chef-zero (~> 4.2, >= 4.2.2)
38
38
  diff-lcs (~> 1.2, >= 1.2.4)
39
39
  erubis (~> 2.7)
@@ -55,7 +55,7 @@ GEM
55
55
  serverspec (~> 2.7)
56
56
  specinfra (~> 2.10)
57
57
  syslog-logger (~> 1.6)
58
- chef-config (12.4.0)
58
+ chef-config (12.4.1)
59
59
  mixlib-config (~> 2.0)
60
60
  mixlib-shellout (~> 2.0)
61
61
  chef-zero (4.2.3)
@@ -191,11 +191,13 @@ GEM
191
191
  rspec (~> 3.0)
192
192
  rspec-its
193
193
  specinfra (~> 2.35)
194
+ sfl (2.2)
194
195
  slop (3.6.0)
195
- specinfra (2.36.16)
196
+ specinfra (2.37.0)
196
197
  net-scp
197
198
  net-ssh
198
199
  net-telnet
200
+ sfl
199
201
  syslog-logger (1.6.8)
200
202
  systemu (2.6.5)
201
203
  thor (0.19.1)
@@ -219,3 +221,6 @@ DEPENDENCIES
219
221
  puppet (= 3.7.5)
220
222
  puppetlabs_spec_helper (>= 0.1.0)
221
223
  rspec-puppet
224
+
225
+ BUNDLED WITH
226
+ 1.10.5
@@ -2,7 +2,7 @@ module Opsk
2
2
  class Commit < Thor::Group
3
3
  include Thorable, Thor::Actions
4
4
 
5
- argument :message, :type => :string, :desc => 'commit message'
5
+ class_option :message, :type=> :string, :desc => 'optional commit message'
6
6
 
7
7
  def validate
8
8
  check_root
@@ -10,14 +10,19 @@ module Opsk
10
10
 
11
11
  def commit
12
12
  Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
13
- g = Git.init(d)
14
- if g.status.changed.keys.length > 0
15
- if message
16
- g.commit_all(message)
17
- else
18
- puts 'please provide commit message'
19
- g.commit_all(gets)
20
- end
13
+ if File.exists?("#{d}/.git")
14
+ g = Git.init(d)
15
+ if g.status.changed.keys.length > 0
16
+ puts "Changes found for #{d}:\n\n"
17
+ puts "#{g.show}\n"
18
+ g.checkout('master')
19
+ if options['message']
20
+ g.commit_all(options['message'])
21
+ else
22
+ puts 'Please provide commit message:'
23
+ g.commit_all(STDIN.gets.chomp)
24
+ end
25
+ end
21
26
  end
22
27
  end
23
28
  end
@@ -1,3 +1,3 @@
1
1
  module Opskeleton
2
- VERSION = '0.8.11'
2
+ VERSION = '0.8.12'
3
3
  end
data/test/commit_test.rb CHANGED
@@ -13,6 +13,7 @@ class CommitTest < MiniTest::Unit::TestCase
13
13
  def setup
14
14
  Opsk::Root.start ['generate_puppet', 'commit', 'bar']
15
15
  mkdir_p(ROOT)
16
+ mkdir_p("#{SANDBOX}-sandbox/modules/non-git")
16
17
  g = Git.init(ROOT)
17
18
  touch("#{ROOT}/bla.txt")
18
19
  g.add('bla.txt')
@@ -32,7 +33,7 @@ class CommitTest < MiniTest::Unit::TestCase
32
33
 
33
34
  def test_commit
34
35
  with_cwd "#{SANDBOX}-sandbox" do
35
- Opsk::Root.start ['commit','some message']
36
+ Opsk::Root.start ['commit', '--message', 'some message']
36
37
  end
37
38
  g = Git.init(ROOT)
38
39
  assert g.show.include? 'some message'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opskeleton
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.11
4
+ version: 0.8.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - narkisr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-07 00:00:00.000000000 Z
11
+ date: 2015-07-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
271
271
  version: '0'
272
272
  requirements: []
273
273
  rubyforge_project:
274
- rubygems_version: 2.2.2
274
+ rubygems_version: 2.4.7
275
275
  signing_key:
276
276
  specification_version: 4
277
277
  summary: A generator for ops projects that include vagrant puppet and fpm