opskeleton 0.8.12 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b848a2b49c73f2d6aecda373d9c63b6427d543e9
-  data.tar.gz: d85182e5a25bb0cfd1f05d9db9033f8c614181bb
+  metadata.gz: 508174515b38f87c8e376b887939b4d15e6c5b7d
+  data.tar.gz: a06b48dcaf9022a15330ceb46aef1325a87f5fd4
 SHA512:
-  metadata.gz: e77123719efaba63d69afafe0fe4268e8be39f88ded9d5ca0fa7f26dab3a8f64f910742ed18924fb86c1b986575782810fe69c9daa77fe20281ed4cd8df28233
-  data.tar.gz: 3594893f6c1e027ac790b96870cadc18fb4da011299725f943727fa6ae152378eaf9d55b91ec728b49e8afad460057cacf98b8790f469e27c1772bb6fc1c36b1
+  metadata.gz: 52409252bfa751e825d48f429da25bcf868c65c896508781dc5e205ae0c33d9efe780373287e51d356e6b17665456de95905c99f95eb3bfd81bb6659231f26e3
+  data.tar.gz: 024cf29ff87a4773f384c47a887bdeb589d7642c1ca47c5f37572992b8de3026eb216a954ccbf5cf434b287d8863f0e3c74062b4e38a9bdda569de51ff26e010

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 rvm:
   - 2.1.2
 script:
+  - "git config --global user.email 'you@example.com'"
+  - "git config --global user.name 'Your Name'"
   - "touch ~/.configuration.rb"
   - "bundle install"
   - "bundle exec rake test"

data/CHANGES.md

@@ -1,3 +1,7 @@
+# Changes to opskeleton in version 0.9.0
+
+Adding support for puppet modules commit and push actions.
+
 # Changes to opskeleton in version 0.8.11
 
 exit 1 when package is missing on different deploy options.

data/bin/opsk

@@ -21,6 +21,7 @@ module Opsk
     register Opsk::Package, 'package', 'package', 'packages current module for celestial'
     register Opsk::Dockerize, 'dockerize', 'dockerize [from] [os_type]', 'Creates a docker image from the current sandbox'
     register Opsk::Commit, 'commit', 'commit [message]', 'commit each changed puppet module under modules folder'
+    register Opsk::Push, 'push', 'push', 'push each changed puppet module under modules folder'
     register Opsk::Clean, 'clean', 'clean', 'cleans up packaging products'
     register Opsk::Bump, 'bump', 'bump', 'bumps up version (clearing old version also)'
     register Opsk::DeployBintray, 'deploy_bintray', 'deploy_bintray [repo]', 'deploy packge into bintray.com'
@@ -37,5 +38,7 @@ end
 # not sure that this is the cleanest way
 Opsk::Root.tasks['generate_puppet'].options = Opsk::GeneratePuppet.class_options 
 Opsk::Root.tasks['generate_chef'].options = Opsk::GenerateChef.class_options 
+Opsk::Root.tasks['push'].options = Opsk::Push.class_options 
+Opsk::Root.tasks['commit'].options = Opsk::Commit.class_options 
 
 Opsk::Root.start ARGV

data/lib/opskeleton/commit.rb

@@ -1,31 +1,40 @@
+
 module  Opsk
   class Commit < Thor::Group
     include Thorable, Thor::Actions
 
     class_option :message, :type=> :string, :desc => 'optional commit message'
+    class_option :all, :type=> :boolean, :desc => 'commit all', :default => false
 
     def validate
 	check_root
     end
 
+
     def commit
 	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
 	  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) 
+		puts "Listing changes for #{d}:\n\n"
+		puts "#{g.show}\n\n"
+		puts "Commit the changes under #{d}? (y/n)\n\n" unless options['all']
+		if(options['all'] or STDIN.gets.chomp.eql?('y'))
+		  g.checkout('master')
+		  if options['message']
+		    g.commit_all(options['message']) 
+		  else 
+		    puts 'Please provide commit message:\n'
+		    g.commit_all(STDIN.gets.chomp) 
+		  end
 		end
+	    else
+		puts 'no changes detected'
 	    end
 	  end
 	end
     end
 
+
   end
 end

data/lib/opskeleton/push.rb

@@ -0,0 +1,52 @@
+
+GIT_PROTO = { ssh:'git@', https: 'https://' }
+
+def add_pre(url)
+  res = url.split('/')	
+  res[0] = "#{res[0]}:"
+  res.join('/')
+end
+
+def add_writable(g,proto)
+  readonly = g.remotes.find{|r|r.name.eql?('origin')}.url
+  writable = readonly.gsub(/git\:\/\//,GIT_PROTO[proto])
+  writable = add_pre(writable) if proto.eql?(:ssh)
+  remote_exists = g.remotes.map {|r| r.name}.include?('writable')
+  unless readonly.eql?(writable) or remote_exists
+    g.add_remote('writable',writable) 
+  end
+end
+
+module  Opsk
+  class Push < Thor::Group
+    include Thorable, Thor::Actions
+
+    class_option :protocol, :type=> :string, :desc => 'remote ssh protocol (https or ssh)', :default => 'ssh'
+    class_option :dry, :type=> :boolean, :desc => 'dry mode', :default => false
+    class_option :all, :type=> :boolean, :desc => 'push all without asking', :default => false
+
+    def validate
+	check_root
+    end
+
+
+    def push
+	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
+	  if File.exists?("#{d}/.git")
+	    g = Git.init(d)
+	    add_writable(g,options['protocol'].to_sym)
+	    if !options['dry'] and g.diff('origin').stats[:files].keys.length > 0
+		puts "push #{d}? (y/n)" unless options['all']
+		if(options['all'] or STDIN.gets.chomp.eql?('y'))
+		  puts "Pushing #{d} .."
+		  g.push('writable') 
+		  g.pull
+		end
+	    end
+	  end
+	end
+    end
+
+
+  end
+end

data/lib/opskeleton/version.rb

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

data/lib/opskeleton.rb

@@ -16,4 +16,5 @@ require 'opskeleton/deploy_s3'
 require 'opskeleton/deploy_scp'
 require 'opskeleton/module'
 require 'opskeleton/commit'
+require 'opskeleton/push'
 

data/test/{commit_test.rb → git_test.rb}

@@ -7,7 +7,7 @@ require 'git'
 
 SANDBOX = 'commit'
 ROOT = "#{SANDBOX}-sandbox/modules/foo"
-class CommitTest < MiniTest::Unit::TestCase
+class GitTest < MiniTest::Unit::TestCase
   include FileUtils
 
   def setup
@@ -15,6 +15,7 @@ class CommitTest < MiniTest::Unit::TestCase
     mkdir_p(ROOT)
     mkdir_p("#{SANDBOX}-sandbox/modules/non-git")
     g = Git.init(ROOT)
+    g.add_remote('origin','git://github.com/foo/bar.git') 
     touch("#{ROOT}/bla.txt")
     g.add('bla.txt')
     g.commit_all('message')
@@ -33,9 +34,17 @@ class CommitTest < MiniTest::Unit::TestCase
 
   def test_commit
     with_cwd "#{SANDBOX}-sandbox" do
-	 Opsk::Root.start ['commit', '--message', 'some message']
+	 Opsk::Root.start ['commit', '--message', 'some message', '--all', 'true']
     end 	
     g = Git.init(ROOT)
     assert g.show.include? 'some message'
   end
+
+  def test_writeable
+    with_cwd "#{SANDBOX}-sandbox" do
+	 Opsk::Root.start ['push', '--dry', 'true']
+    end 	
+    g = Git.init(ROOT)
+    assert g.remotes.length == 2
+  end
 end

data/test/test_helper.rb

@@ -10,6 +10,7 @@ module Opsk
     register Opsk::GenerateChef, 'generate_chef', 'generate_chef [name] [box]', 'generates opskelaton project structure'
     register Opsk::Package, 'package', 'package', 'packages current module for celestial'
     register Opsk::Commit, 'commit', 'commit', 'commits current module for celestial'
+    register Opsk::Push, 'push', 'push', 'push changed repos'
 
   end 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.9.0
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -204,6 +204,7 @@ files:
 - lib/opskeleton/generate_puppet.rb
 - lib/opskeleton/module.rb
 - lib/opskeleton/package.rb
+- lib/opskeleton/push.rb
 - lib/opskeleton/thorable.rb
 - lib/opskeleton/version.rb
 - opskeleton.gemspec
@@ -249,7 +250,7 @@ files:
 - templates/ruby-version.erb
 - templates/spec.erb
 - test/chef_package_test.rb
-- test/commit_test.rb
+- test/git_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb
 homepage: https://github.com/narkisr/opskeleton
@@ -271,12 +272,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A generator for ops projects that include vagrant puppet and fpm
 test_files:
 - test/chef_package_test.rb
-- test/commit_test.rb
+- test/git_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb