opskeleton 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23dd029f2dfd870048e84db9f1697b4e70345807
-  data.tar.gz: aad74fe64226e511e7f4e81510cee8a7daa4d120
+  metadata.gz: a682d5b86347ac3071cf2c08eadf86a29616f52b
+  data.tar.gz: 10a8db6e1b3899892d40316f89baf1a2b6f23bb3
 SHA512:
-  metadata.gz: eba347ecad77000f8de4708550b9cb2f19db7fddc1bd36974d68c4b705b3e46c5c6a7a05b6314d69293c4aed69e1678d66bfba8771c9a515e18239beeebd320a
-  data.tar.gz: a275be5c7b3b534ebd522463a030d4ea8c2e1c16fe4aa265993486949873a7c2be8a467bf36a57d9cd4cd459e01ab008797196e6976ba8c55ea4f5dca36683bc
+  metadata.gz: 4e08fad418737ff4af9a1ef1e071a8ed97668144ad50119ff1a69c34f7f9ecd9b4e6c6d1c2704fcbcaed14df75ac6141198385b051eebba3f8bd3a5f759b03da
+  data.tar.gz: dd8f1d5e8d5dddb8033febd2cdc51d4d01c23ded91aa5fb77a03733222747034aa80a3d5f53bc1e67f5c1214ffd45f5710373c176e10064b9e0bc1108e8cb343

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.9.4)
+    opskeleton (0.9.5)
       aws-sdk (~> 2)
       bintray_deploy
       git
@@ -123,7 +123,7 @@ GEM
     librarianp (0.6.3)
       thor (~> 0.15)
     libyajl2 (1.2.0)
-    listen (3.0.2)
+    listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)

data/lib/opskeleton/commit.rb

@@ -1,41 +1,6 @@
 
 
 module  Opsk
-  class CommitGit
-    def initialize(d,options,thor)
-	@g = Git.init(d)
-	@options = options
-	@thor = thor
-    end
-
-    def changed?
-	@g.status.changed.keys.length > 0
-    end
-
-    def report
-	%i(changed added untracked).each do |state|
-	  @thor.say "#{state} files:\n\n"
-	  @g.status.send(state).each do |k,v|
-	    @thor.say "- #{k}"
-	  end
-	  @thor.say "\n"
-	end
-    end
-
-    def master_commit(d)
-	resp = @thor.yes? "Commit the changes under #{d}? (y/n)" unless @options['all']
-	if(@options['all'] or resp)
-	  @g.checkout('master')
-	  if @options['message']
-	    @g.commit_all(@options['message']) 
-	  else 
-	    @thor.say 'Commit message:'
-	    @g.commit_all(STDIN.gets.chomp) 
-	  end
-	end
-
-    end
-  end
 
   class Commit < Thor::Group
     include Thorable, Thor::Actions
@@ -47,16 +12,15 @@ module  Opsk
 	check_root
     end
 
-
     def commit
 	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
 	  if File.exists?("#{d}/.git")
 	    begin
-		cg = Opsk::CommitGit.new(d,options,self)
-		if cg.changed?
+		git = Opsk::Git.new(d,self)
+		if git.changed?
 		  say "Listing changes for #{d}:\n\n"
-		  cg.report
-		  cg.master_commit(d)
+		  git.report
+		  git.master_commit(d,options)
 		end
 	    rescue => e 
 		say "Failed to commit #{d} due to #{e}"

data/lib/opskeleton/git.rb

@@ -0,0 +1,66 @@
+require 'git_clone_url'
+
+module  Opsk
+  class Git
+    extend Forwardable
+
+
+    def initialize(d,thor)
+	@g = ::Git.open(d)
+	@thor = thor
+    end
+
+    def_delegator :@g, :push, :push
+    def_delegator :@g, :pull, :pull
+
+    def changed?
+	@g.status.changed.keys.length > 0
+    end
+
+    def report
+	%i(changed added untracked).each do |state|
+	  @thor.say "#{state} files:\n\n"
+	  @g.status.send(state).each do |k,v|
+	    @thor.say "- #{k}"
+	  end
+	  @thor.say "\n"
+	end
+    end
+
+    def master_commit(d,options)
+	resp = @thor.yes? "Commit the changes under #{d}? (y/n)" unless options['all']
+	if(options['all'] or resp)
+	  @g.checkout('master')
+	  if options['message']
+	    @g.commit_all(options['message']) 
+	  else 
+	    @thor.say 'Commit message:'
+	    @g.commit_all(STDIN.gets.chomp) 
+	  end
+	end
+
+    end
+
+    def normalize_url(readonly,options)
+	url = GitCloneUrl.parse(readonly)
+	proto = options['protocol'] || 'ssh'
+	port = options['port']? ":#{options['port']}" : ''
+	user = options['user']? "#{options['user']}@" : ''
+	"#{proto}://#{user}#{url.host}#{port}#{url.path}"
+    end
+
+    def add_writable(options)
+	readonly = @g.remotes.find{|r|r.name.eql?('origin')}.url
+	writable = normalize_url(readonly,options)
+	remote_exists = @g.remotes.map {|r| r.name}.include?('writable')
+	unless readonly.eql?(writable) or remote_exists
+	  @g.add_remote('writable',writable) 
+	end
+    end
+
+    # ruby-git cannot do this (lame)
+    def local_ahead?
+	%x{git --git-dir=#{@d}/.git --work-tree=#{@d}}.include?('ahead')
+    end
+  end
+end

data/lib/opskeleton/push.rb

@@ -1,27 +1,4 @@
 
-require 'git_clone_url'
-
-def normalize_url(readonly,options)
-  url = GitCloneUrl.parse(readonly)
-  proto = options['protocol'] || 'ssh'
-  port = options['port']? ":#{options['port']}" : ''
-  user = options['user']? "#{options['user']}@" : ''
-  "#{proto}://#{user}#{url.host}#{port}#{url.path}"
-end
-
-def add_writable(g,options)
-  readonly = g.remotes.find{|r|r.name.eql?('origin')}.url
-  writable = normalize_url(readonly,options)
-  remote_exists = g.remotes.map {|r| r.name}.include?('writable')
-  unless readonly.eql?(writable) or remote_exists
-    g.add_remote('writable',writable) 
-  end
-end
-
-# ruby-git cannot do this (lame)
-def local_ahead?(d)
-  %x{git --git-dir=#{d}/.git --work-tree=#{d}}.include?('ahead')
-end
 
 module  Opsk
   class Push < Thor::Group
@@ -42,14 +19,14 @@ module  Opsk
 	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
 	  begin
 	    if File.exists?("#{d}/.git")
-		g = Git.open(d)
-		add_writable(g,options)
-		if !options['dry'] and local_ahead?(d)
+		git = Opsk::Git.new(d,self)
+		git.add_writable(options)
+		if !options['dry'] and git.local_ahead?
 		  resp = yes?("Push #{d}? (y/n)") unless options['all']
 		  if(options['all'] or resp)
 		    say "pushing #{d} .."
-		    g.push('writable') 
-		    g.pull
+		    git.push('writable') 
+		    git.pull
 		  end
 		end
 	    end

data/lib/opskeleton/version.rb

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

data/lib/opskeleton.rb

@@ -18,4 +18,5 @@ require 'opskeleton/module'
 require 'opskeleton/commit'
 require 'opskeleton/uncommited'
 require 'opskeleton/push'
+require 'opskeleton/git'
 

data/test/git_test.rb

@@ -49,12 +49,13 @@ class GitTest < MiniTest::Unit::TestCase
   end
 
   def test_urls
+    git = Opsk::Git.new('.',nil)
     readonly = 'git://github.com/pulling-strings/puppet-jdk.git'
-    norm = normalize_url(readonly,{})
+    norm = git.normalize_url(readonly,{})
     assert norm == 'ssh://github.com/pulling-strings/puppet-jdk.git'
-    norm = normalize_url(readonly,{'protocol' => 'https','port' => '1234'})
+    norm = git.normalize_url(readonly,{'protocol' => 'https','port' => '1234'})
     assert norm == 'https://github.com:1234/pulling-strings/puppet-jdk.git' 
-    norm = normalize_url(readonly,{'user' => 'ronen', 'protocol' => 'ssh','port' => '1234'})
+    norm = git.normalize_url(readonly,{'user' => 'ronen', 'protocol' => 'ssh','port' => '1234'})
     assert norm == 'ssh://ronen@github.com:1234/pulling-strings/puppet-jdk.git' 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -289,6 +289,7 @@ files:
 - lib/opskeleton/dockerize.rb
 - lib/opskeleton/generate_chef.rb
 - lib/opskeleton/generate_puppet.rb
+- lib/opskeleton/git.rb
 - lib/opskeleton/module.rb
 - lib/opskeleton/package.rb
 - lib/opskeleton/push.rb