opskeleton 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11548126aa84871418a9513bb4c90ae0f0146b6c
-  data.tar.gz: 20146f961bae6ace97a35df98b63a601f6778c3d
+  metadata.gz: b848a2b49c73f2d6aecda373d9c63b6427d543e9
+  data.tar.gz: d85182e5a25bb0cfd1f05d9db9033f8c614181bb
 SHA512:
-  metadata.gz: 6295c1b5e683c504bf703925e8c96ba282404e7ebbfece824e1a17b276182789e14998b88c53b9cda2490f656a4e457d232cc4886b42709f86a3bab77b9ed8da
-  data.tar.gz: 595e4de6a3cb247b2af1abb78ddf76fda808430f86cb5a8d98432f90694397d01e99a71b85fe22eaef78a75a2ce8174090b979b82689322a956ab3dc31b421f2
+  metadata.gz: e77123719efaba63d69afafe0fe4268e8be39f88ded9d5ca0fa7f26dab3a8f64f910742ed18924fb86c1b986575782810fe69c9daa77fe20281ed4cd8df28233
+  data.tar.gz: 3594893f6c1e027ac790b96870cadc18fb4da011299725f943727fa6ae152378eaf9d55b91ec728b49e8afad460057cacf98b8790f469e27c1772bb6fc1c36b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.8.11)
+    opskeleton (0.8.12)
       aws-sdk (~> 2)
       bintray_deploy
       git
@@ -21,19 +21,19 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    aws-sdk (2.1.2)
-      aws-sdk-resources (= 2.1.2)
-    aws-sdk-core (2.1.2)
+    aws-sdk (2.1.3)
+      aws-sdk-resources (= 2.1.3)
+    aws-sdk-core (2.1.3)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.1.2)
-      aws-sdk-core (= 2.1.2)
+    aws-sdk-resources (2.1.3)
+      aws-sdk-core (= 2.1.3)
     bintray_deploy (0.0.4)
       configuration
       rest-client
       thor
     builder (3.2.2)
-    chef (12.4.0)
-      chef-config (= 12.4.0)
+    chef (12.4.1)
+      chef-config (= 12.4.1)
       chef-zero (~> 4.2, >= 4.2.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -55,7 +55,7 @@ GEM
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-    chef-config (12.4.0)
+    chef-config (12.4.1)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-zero (4.2.3)
@@ -191,11 +191,13 @@ GEM
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.35)
+    sfl (2.2)
     slop (3.6.0)
-    specinfra (2.36.16)
+    specinfra (2.37.0)
       net-scp
       net-ssh
       net-telnet
+      sfl
     syslog-logger (1.6.8)
     systemu (2.6.5)
     thor (0.19.1)
@@ -219,3 +221,6 @@ DEPENDENCIES
   puppet (= 3.7.5)
   puppetlabs_spec_helper (>= 0.1.0)
   rspec-puppet
+
+BUNDLED WITH
+   1.10.5

data/lib/opskeleton/commit.rb

@@ -2,7 +2,7 @@ module  Opsk
   class Commit < Thor::Group
     include Thorable, Thor::Actions
 
-    argument :message, :type => :string, :desc => 'commit message'
+    class_option :message, :type=> :string, :desc => 'optional commit message'
 
     def validate
 	check_root
@@ -10,14 +10,19 @@ module  Opsk
 
     def commit
 	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
-	  g = Git.init(d)
-	  if g.status.changed.keys.length > 0
-	   if message
-	     g.commit_all(message) 
-	   else 
-	     puts 'please provide commit message'
-	     g.commit_all(gets) 
-	   end
+	  if File.exists?("#{d}/.git")
+	    g = Git.init(d)
+	    if g.status.changed.keys.length > 0
+		puts "Changes found for #{d}:\n\n"
+		puts "#{g.show}\n"
+		g.checkout('master')
+		if options['message']
+		  g.commit_all(options['message']) 
+		else 
+		  puts 'Please provide commit message:'
+		  g.commit_all(STDIN.gets.chomp) 
+		end
+	    end
 	  end
 	end
     end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.8.11'
+  VERSION = '0.8.12'
 end

data/test/commit_test.rb

@@ -13,6 +13,7 @@ class CommitTest < MiniTest::Unit::TestCase
   def setup
     Opsk::Root.start ['generate_puppet', 'commit', 'bar']
     mkdir_p(ROOT)
+    mkdir_p("#{SANDBOX}-sandbox/modules/non-git")
     g = Git.init(ROOT)
     touch("#{ROOT}/bla.txt")
     g.add('bla.txt')
@@ -32,7 +33,7 @@ class CommitTest < MiniTest::Unit::TestCase
 
   def test_commit
     with_cwd "#{SANDBOX}-sandbox" do
-	 Opsk::Root.start ['commit','some message']
+	 Opsk::Root.start ['commit', '--message', 'some message']
     end 	
     g = Git.init(ROOT)
     assert g.show.include? 'some message'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A generator for ops projects that include vagrant puppet and fpm