opskeleton 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a682d5b86347ac3071cf2c08eadf86a29616f52b
-  data.tar.gz: 10a8db6e1b3899892d40316f89baf1a2b6f23bb3
+  metadata.gz: 424df0cdc77d6a9388a5d9f8e1460e5c54afafaf
+  data.tar.gz: de491b6eb2668a2d18ed5f5a038b20aeccfbab91
 SHA512:
-  metadata.gz: 4e08fad418737ff4af9a1ef1e071a8ed97668144ad50119ff1a69c34f7f9ecd9b4e6c6d1c2704fcbcaed14df75ac6141198385b051eebba3f8bd3a5f759b03da
-  data.tar.gz: dd8f1d5e8d5dddb8033febd2cdc51d4d01c23ded91aa5fb77a03733222747034aa80a3d5f53bc1e67f5c1214ffd45f5710373c176e10064b9e0bc1108e8cb343
+  metadata.gz: 1defa9db7c05c5185458a25f276dba8a2bfc19edb03e0ede6932e569398124f3767c4e2e992f120624f2dfeef59f7738c5b7f31f89af9f826a55bae9e57d92c7
+  data.tar.gz: c966937aefc055e34587ab426a7022a1b99b72941871e62dc8aa9a261c7540b27b5ce0195165072a409aa50bd0ced8d1fb65856db147eb5043bfb1f599ef3f92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.9.5)
+    opskeleton (0.9.6)
       aws-sdk (~> 2)
       bintray_deploy
       git

data/lib/opskeleton/commit.rb

@@ -20,7 +20,7 @@ module  Opsk
 		if git.changed?
 		  say "Listing changes for #{d}:\n\n"
 		  git.report
-		  git.master_commit(d,options)
+		  git.master_commit(options)
 		end
 	    rescue => e 
 		say "Failed to commit #{d} due to #{e}"

data/lib/opskeleton/generate_puppet.rb

@@ -85,9 +85,9 @@ module Opsk
 	if(!File.exists?("#{path}/.git"))
 	  copy_file('templates/gitignore', "#{path}/.gitignore")
 	  inside(path) do
-	    run('git init .')
-	    run('git add -A')
-	    run("git commit -m 'initial sandbox import'")
+	    run('git init .', :verbose => false, :catpure => true)
+	    run('git add -A',  :verbose => false, :catpure => true)
+	    run("git commit -m 'initial sandbox import'", :verbose => false, :catpure => true)
 	  end
 	end
     end

data/lib/opskeleton/git.rb

@@ -2,10 +2,11 @@ require 'git_clone_url'
 
 module  Opsk
   class Git
-    extend Forwardable
+    extend ::Forwardable
 
 
     def initialize(d,thor)
+	@d = d
 	@g = ::Git.open(d)
 	@thor = thor
     end
@@ -14,7 +15,7 @@ module  Opsk
     def_delegator :@g, :pull, :pull
 
     def changed?
-	@g.status.changed.keys.length > 0
+	git_run('status').include?('modified')
     end
 
     def report
@@ -27,10 +28,18 @@ module  Opsk
 	end
     end
 
-    def master_commit(d,options)
-	resp = @thor.yes? "Commit the changes under #{d}? (y/n)" unless options['all']
+    def remaster
+	Dir.chdir @d do
+	  git_run('stash','.')
+	  git_run('checkout master','.')
+	  git_run('stash apply stash@\{0\}','.')
+	end
+    end
+
+    def master_commit(options)
+	resp = @thor.yes? "Commit the changes under #{@d}? (y/n)" unless options['all']
 	if(options['all'] or resp)
-	  @g.checkout('master')
+	  remaster
 	  if options['message']
 	    @g.commit_all(options['message']) 
 	  else 
@@ -60,7 +69,16 @@ module  Opsk
 
     # ruby-git cannot do this (lame)
     def local_ahead?
-	%x{git --git-dir=#{@d}/.git --work-tree=#{@d}}.include?('ahead')
+	git_run('status').include?('ahead')
+    end
+
+    def git_run(cmd,parent=nil)
+	dir = parent || @d
+	res = %x{git --git-dir=#{dir}/.git --work-tree=#{dir} #{cmd}}
+	if $? != 0	
+	  raise Exception.new("Failed to run #{cmd} due to #{res}")
+	end
+	res
     end
   end
 end

data/lib/opskeleton/uncommited.rb

@@ -49,7 +49,7 @@ module  Opsk
 	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
 	  if File.exists?("#{d}/.git")
 	    begin
-		cg = Opsk::CommitGit.new(d,options,self)
+		cg = Opsk::Git.new(d,self)
 		if cg.changed?
 		  say "Listing changes for #{d}:\n\n"
 		  cg.report

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor