opskeleton 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0cc5b42bae8a325f0dc39601081e56e4ffe78d
-  data.tar.gz: acd80a01463506ae34c11de387f612701d42b68b
+  metadata.gz: 23dd029f2dfd870048e84db9f1697b4e70345807
+  data.tar.gz: aad74fe64226e511e7f4e81510cee8a7daa4d120
 SHA512:
-  metadata.gz: b6e1fcb1c227fc69cc80522195605ec8e1f8f8a44ee51aba55bb29a81c974b6be69fa6357d67cd935564819fff58b05c28ec7365d4600b6d42fae90f9ad7105c
-  data.tar.gz: 0061f5575d2a0862f287d61a0072068ba2eb0b54a41f9cfec838f97e82fc5853f4ef6e7980253b264cd9f043f2e0fdfeb24285b38f219ff4864b97f57aec179e
+  metadata.gz: eba347ecad77000f8de4708550b9cb2f19db7fddc1bd36974d68c4b705b3e46c5c6a7a05b6314d69293c4aed69e1678d66bfba8771c9a515e18239beeebd320a
+  data.tar.gz: a275be5c7b3b534ebd522463a030d4ea8c2e1c16fe4aa265993486949873a7c2be8a467bf36a57d9cd4cd459e01ab008797196e6976ba8c55ea4f5dca36683bc

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.9.3)
+    opskeleton (0.9.4)
       aws-sdk (~> 2)
       bintray_deploy
       git
+      git_clone_url
       net-scp
       thor
 
@@ -22,12 +23,12 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     asciidoctor (1.5.2)
-    aws-sdk (2.1.3)
-      aws-sdk-resources (= 2.1.3)
-    aws-sdk-core (2.1.3)
+    aws-sdk (2.1.7)
+      aws-sdk-resources (= 2.1.7)
+    aws-sdk-core (2.1.7)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.1.3)
-      aws-sdk-core (= 2.1.3)
+    aws-sdk-resources (2.1.7)
+      aws-sdk-core (= 2.1.7)
     bintray_deploy (0.0.4)
       configuration
       rest-client
@@ -76,11 +77,13 @@ GEM
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
-    ffi-yajl (2.2.0)
+    ffi-yajl (2.2.2)
       libyajl2 (~> 1.2)
     formatador (0.2.5)
     git (1.2.9.1)
-    guard (2.12.8)
+    git_clone_url (0.1.0)
+      uri-ssh_git
+    guard (2.12.9)
       formatador (>= 0.2.4)
       listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
@@ -201,15 +204,15 @@ GEM
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.3.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-puppet (2.2.0)
@@ -219,15 +222,15 @@ GEM
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
     rsync (1.0.9)
-    serverspec (2.19.0)
+    serverspec (2.20.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.35)
+      specinfra (~> 2.38)
     sfl (2.2)
     shellany (0.0.1)
     slop (3.6.0)
-    specinfra (2.37.1)
+    specinfra (2.38.1)
       net-scp
       net-ssh (~> 2.7)
       net-telnet
@@ -241,6 +244,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
+    uri-ssh_git (0.1.1)
     uuidtools (2.1.5)
     wmi-lite (1.0.0)
     yajl-ruby (1.2.1)

data/docs/doc.adoc

@@ -33,7 +33,7 @@ Perquisites (on Ubuntu):
 
 * Vagrant 1.7.x
 * RVM
-* Ruby 2.1.x
+* Ruby >= 2.1.2
 
 ```bash 
  $ rvm use system
@@ -83,7 +83,7 @@ Opskelaton defines a module life cycle:
 
 1. Internal non reusable modules (usually specific to a client site) go under static-modules
 2. If we create a general reusable module which is ready for prime time we pull out to a new git repository.
-3. The extracted module is added back as a third party (using link:https://github.com/rodjek/librarian-puppet[librarian-puppet] module which resides under modules folder.
+3. The extracted module is added (using link:https://github.com/rodjek/librarian-puppet[librarian-puppet]) back as a third party module under modules folder.
 
 Life cycle scheme:
 
@@ -151,6 +151,20 @@ Commit message:
 This is a nice change
 ```
 
+For more commit options:
+
+```bash
+$ opsk help commit
+
+Usage:
+  opsk commit [message]
+
+Options:
+  [--message=MESSAGE]  # optional commit message
+  [--all], [--no-all]  # commit all
+
+commit each changed puppet module under modules folder
+```
 
 Once commits are made we can push the changes:
 
@@ -160,7 +174,24 @@ Push modules/artifactory? (y/n) y
 pushing modules/artifactory ..
 ```
 
+Opsk will add a remote writable repository for each submodule substituting the readonly protocol with a write enabled one, the default protocol is ssh (customizable by using --protocol).
 
+For more options: 
+
+```bash 
+$ opsk help push
+
+Usage:
+  opsk push
+
+Options:
+  [--protocol=PROTOCOL]  # remote ssh protocol (https or ssh)
+                         # Default: ssh
+  [--dry], [--no-dry]    # dry mode
+  [--all], [--no-all]    # push all without asking
+
+push each changed puppet module under modules folder
+```
 === Testing
 
 Opskelaton supports two levels of testing:
@@ -292,7 +323,7 @@ Opskelaton defines a simple cookbook life cycle:
 
  1. Internal non reusable cookbooks (usually specific to a client site) go under static-cookbooks
  2. If we create a general reusable cookbook which is ready for prime time we pull out to a new git repository.
- 3. The extracted cookbook is added back as a third party (using [librarian-chef](https://github.com/applicationsonline/librarian-chef) thatd will place them under cookbooks folder).
+ 3. The extracted cookbook is added back as a third party (using link:https://github.com/applicationsonline/librarian-chef[librarian-chef]) cookbook under cookbooks folder).
 
 Life cycle scheme:
 

data/lib/opskeleton/push.rb

@@ -1,28 +1,36 @@
 
-GIT_PROTO = { ssh:'git@', https: 'https://' }
+require 'git_clone_url'
 
-def add_pre(url)
-  res = url.split('/')	
-  res[0] = "#{res[0]}:"
-  res.join('/')
+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,proto)
+def add_writable(g,options)
   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)
+  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
     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 :user, :type=> :string, :desc => 'ssh protocol user'
+    class_option :port, :type=> :string, :desc => 'remote repo port'
     class_option :all, :type=> :boolean, :desc => 'push all without asking', :default => false
 
     def validate
@@ -34,9 +42,9 @@ module  Opsk
 	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
 	  begin
 	    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
+		g = Git.open(d)
+		add_writable(g,options)
+		if !options['dry'] and local_ahead?(d)
 		  resp = yes?("Push #{d}? (y/n)") unless options['all']
 		  if(options['all'] or resp)
 		    say "pushing #{d} .."

data/lib/opskeleton/version.rb

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

data/opskeleton.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('aws-sdk', '~> 2')
   gem.add_dependency('net-scp')
   gem.add_dependency('git')
+  gem.add_dependency('git_clone_url')
   gem.add_development_dependency('puppet','=3.7.5')
   gem.add_development_dependency('chef')
   gem.add_development_dependency('rspec-puppet')

data/test/git_test.rb

@@ -47,4 +47,14 @@ class GitTest < MiniTest::Unit::TestCase
     g = Git.init(ROOT)
     assert g.remotes.length == 2
   end
+
+  def test_urls
+    readonly = 'git://github.com/pulling-strings/puppet-jdk.git'
+    norm = normalize_url(readonly,{})
+    assert norm == 'ssh://github.com/pulling-strings/puppet-jdk.git'
+    norm = 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'})
+    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.3
+  version: 0.9.4
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git_clone_url
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement