clc-promote 0.3.16 → 0.4.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9154527d572479db900219e14b964145fd8ca281
-  data.tar.gz: 81e513887c826b6fdd14b03b1df886282e7e0ab3
+  metadata.gz: b6f45fd73d1b227a41b7cdf7875e41e1ec64e631
+  data.tar.gz: 84006d5c54e5a894e07ff83564e07340d77fb1b8
 SHA512:
-  metadata.gz: 68513c9814d177a27e9aa98ae265c1aa12ecc9b289226225295625cc992487f07cf1d1407418e153058ab8f0d8496b3c0d1557dd135c66c0ef1a7e466c6fe67f
-  data.tar.gz: 7156ac310dc558ac99e084ffe2cd94ac08a9e893d5414feb05f9e488082b95eb9dc6e0327f3b5b4400df47b725c3a34b357c8e4655224c9995a92df87cfb6614
+  metadata.gz: e195cea57475fb4ed28d85710a6239b378f2e667fe8f0f6589a0ee007f4831f8f0b113acec082b2b7280f4575ebcd2f9a7b640825dd92fa981c9207398bebee8
+  data.tar.gz: 1257b31c2149d871291f20d2610d9e1697fccea81a060823c3532b726486a6be369fe7cbb1dd18787baa6113c9d696154f10880364f158cd0639128e1634338c

data/lib/chef/knife/promote.rb

@@ -3,9 +3,6 @@ require 'promote'
 
 module KnifePromote
   class PromoteEnvironment < Chef::Knife
-    deps do
-      require 'git'
-    end
 
     banner "knife promote environment SOURCE_ENVIRONMENT DESTINATION_ENVIRONMENT"
 
@@ -42,7 +39,9 @@ module KnifePromote
       promoter.promote_to(source_env, dest_env)
 
       ui.info "Commiting and pushing changes to #{dest_env} back to git"
-      commit(config, source_env, dest_env)
+      env_file = File.join(config.environment_directory, "#{dest_env}.json")
+      repo = Promote::GitRepo.new(env_file)
+      repo.commit("promoted new constraints from #{source_env} to #{dest_env}", true)
 
       ui.info "uploading #{dest_env} to #{config.chef_server_url}"
       uploader.upload_environment(dest_env)
@@ -52,19 +51,5 @@ module KnifePromote
 
       ui.info "promotion complete. Congratulations #{dest_env} on a well deserved promotion!!"
     end
-
-    private
-
-    include Promote::GitHelper
-
-    def commit(config, source_env, dest_env)
-      git = git_chef(config)
-      dest_path = File.join(config.environment_directory, "#{dest_env}.json")
-      git.add(dest_path)
-      if !(git.status.changed.select{|s| dest_path.end_with?(s)}).keys.empty?
-        git.commit("promoted new constraints from #{source_env} to #{dest_env}")
-        git.push
-      end
-    end
   end
 end

data/lib/promote.rb

@@ -1,6 +1,6 @@
 require 'promote/config'
 require 'promote/environment_file'
-require 'promote/git_helper'
+require 'promote/git_repo'
 require 'promote/uploader'
 require 'promote/versioner'
 require 'promote/promoter'

data/lib/promote/git_repo.rb

@@ -0,0 +1,44 @@
+module Promote
+  class GitRepo
+    def initialize(scope_path)
+      @scope_path = scope_path
+    end
+
+    def version_number
+      all_commit_count = git.log(10000).object(scope_path).between(current_tag.sha).size
+      bump_commit_count = git.log(10000).object(scope_path).between(current_tag.sha).grep("CI:versioning chef artifacts").size
+      commit_count = all_commit_count - bump_commit_count
+      "#{current_tag.name}.#{commit_count}"
+    end
+
+    def git
+      require 'git'
+      @git ||= Git.open(git_root(scope_path))
+    end
+
+    def current_tag
+      @current_tag ||= git.tags.select { |t| t.name[/^[0-9\.]+/] }[-1]
+    end
+
+    def sha1
+      @sha1 ||= git.log(10000).between(current_tag.sha).first.sha
+    end
+
+    def commit(msg, push = false)
+      git.add(scope_path)
+      if !(git.status.changed.select{|s| scope_path.end_with?(s)}).keys.empty?
+        git.commit(msg)
+        git.push if push
+      end
+    end
+
+    attr_accessor :scope_path
+
+    private
+
+    def git_root(start_leaf)
+      return start_leaf if File.exist?(File.join(start_leaf, '.git'))
+      git_root(File.expand_path('..', start_leaf))
+    end
+  end
+end

data/lib/promote/versioner.rb

@@ -9,23 +9,27 @@ module Promote
 
     def version_cookbook(cookbook_name)
       dir = File.join(config.cookbook_directory, cookbook_name)
+      repo = GitRepo.new(dir)
       cookbook_name = File.basename(dir)
-      ct = current_tag
-      version = version_number(ct, dir)
+      version = repo.version_number
       metadata_file = File.join(dir, "metadata.rb")
       metadata_content = File.read(metadata_file)
       version_line = metadata_content[/^\s*version\s.*$/]
       current_version = version_line[/('|").*("|')/].gsub(/('|")/,"")
       if current_version != version
         metadata_content = metadata_content.gsub(current_version, version)
-        outdata = metadata_content.gsub(/#sha1.*$/, "#sha1 '#{sha1}'")
+        outdata = metadata_content.gsub(/#sha1.*$/, "#sha1 '#{repo.sha1}'")
         if outdata[/#sha1.*$/].nil?
-          outdata += "#sha1 '#{sha1}'"
+          outdata += "#sha1 '#{repo.sha1}'"
         end
         File.open(metadata_file, 'w') do |out|
           out << outdata
         end
-        return { :cookbook => cookbook_name, :version => version, :sha1 => sha1}
+        return { 
+          :cookbook => cookbook_name, 
+          :version => version, 
+          :sha1 => repo.sha1
+        }
       end
     end
 
@@ -101,7 +105,8 @@ module Promote
     def version_json(parent_directory, file_name, &block)
       version_string = "version"
       file = "#{parent_directory}/#{file_name}.json"
-      version = version_number(current_tag, file)
+      repo = GitRepo.new(file)
+      version = repo.version_number
       content = JSON.parse(File.read(file))
       current_version = '0.0'
 
@@ -117,33 +122,16 @@ module Promote
 
       if current_version != version
         content_hash[version_string] = version
-        content_hash['sha1'] = sha1
+        content_hash['sha1'] = repo.sha1
         File.open(file, 'w') do |out|
           out << JSON.pretty_generate(content)
         end
-        { :artifact => file_name, :version => version, :sha1 => sha1}
+        { 
+          :artifact => file_name, 
+          :version => version, 
+          :sha1 => repo.sha1
+        }
       end
     end
-
-    def git
-      @git ||= git_chef(config)
-    end
-
-    def current_tag
-      @current_tag ||= git.tags.select { |t| t.name[/^[0-9\.]+/] }[-1]
-    end
-
-    def sha1
-      @sha1 ||= git.log(10000).between(current_tag.sha).first.sha
-    end
-
-    def version_number(current_tag, ref)
-      all_commit_count = git.log(10000).object(ref).between(current_tag.sha).size
-      bump_commit_count = git.log(10000).object(ref).between(current_tag.sha).grep("CI:versioning chef artifacts").size
-      commit_count = all_commit_count - bump_commit_count
-      "#{current_tag.name}.#{commit_count}"
-    end
-
-    include Promote::GitHelper
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.4.0.dev
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -116,7 +116,7 @@ files:
 - lib/promote.rb
 - lib/promote/config.rb
 - lib/promote/environment_file.rb
-- lib/promote/git_helper.rb
+- lib/promote/git_repo.rb
 - lib/promote/promoter.rb
 - lib/promote/rake_tasks.rb
 - lib/promote/uploader.rb
@@ -136,9 +136,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1

data/lib/promote/git_helper.rb

@@ -1,15 +0,0 @@
-module Promote
-  module GitHelper
-    
-    def git_chef(config)
-      require 'git'
-      Git.open(git_root(config.repo_root))
-    end
-
-    def git_root(start_leaf)
-      return start_leaf if File.exist?(File.join(start_leaf, '.git'))
-      git_root(File.expand_path('..', start_leaf))
-    end
-
-  end
-end