clc-promote 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a793b7138b94ab2d704cd1f2137b620e93aee42
-  data.tar.gz: 7279804825c4e04c9eabccaebe70546ecb6ad6e3
+  metadata.gz: 9154527d572479db900219e14b964145fd8ca281
+  data.tar.gz: 81e513887c826b6fdd14b03b1df886282e7e0ab3
 SHA512:
-  metadata.gz: 5ad19f5b5798327867db5586b6ec9c134e49c9abfc92e5faa4fe540017de2b0be57b25cca3026dd83d449d1477fc03a8e37806ab2ab50f5e8a47edd3f29b1742
-  data.tar.gz: fdc0ffa1660e9cc119bdf6966fb7c8b40f822e33cb97708fb7f196a6dfa9f7f235a3d9caab0832fcc5ab3f258a8bbc652816cbceeb9e7e2ff21cb9f84956445d
+  metadata.gz: 68513c9814d177a27e9aa98ae265c1aa12ecc9b289226225295625cc992487f07cf1d1407418e153058ab8f0d8496b3c0d1557dd135c66c0ef1a7e466c6fe67f
+  data.tar.gz: 7156ac310dc558ac99e084ffe2cd94ac08a9e893d5414feb05f9e488082b95eb9dc6e0327f3b5b4400df47b725c3a34b357c8e4655224c9995a92df87cfb6614

data/README.md

@@ -36,7 +36,7 @@ Promote::RakeTasks.new(config)
 ```
 
 The `Config` class can receive the following settings:
-Setting                   | 
+Setting                   |
 :repo_root                | **mandatory**
 :cookbook_directory       | Defaults to `#{root}/cookbooks`
 :environment_directory    | Defaults to `#{root}/environments`
@@ -51,7 +51,7 @@ Setting                   |
 **Note:** See the [below section on versioning](/gems/clc-promote#How are version numbers generated) for details on how versin numbers are generated.
 
 ### Promote:version_cookbook
-Bumps the version of an individual cookbook. 
+Bumps the version of an individual cookbook.
 
 ### Promote:version_cookbooks
 Same as `Promote:version_cookbook` but iterates all cookbooks.
@@ -64,9 +64,11 @@ Same as `Promote:version_environment` but iterates all environment files.
 
 ### Promote:version_data_bag
 Bumps the version of an individual databag entry.
+DEPRECATED (breaks encrypted data bags and vaults).
 
 ### Promote:version_data_bags
 Bumps the versions of all databag entries.
+DEPRECATED (breaks encrypted data bags and vaults).
 
 ### Promote:sync_berksfiles
 Performs a berks install on all cookbooks in the chef repo.

data/lib/promote/rake_tasks.rb

@@ -16,8 +16,6 @@ module Promote
       define_version_cookbooks
       define_version_environment
       define_version_environments
-      define_version_data_bag
-      define_version_data_bags
       define_sync_berksfiles
       define_upload_cookbooks
       define_upload_environment
@@ -103,27 +101,6 @@ module Promote
       end
     end
 
-    def define_version_data_bag
-      namespace "Promote" do
-        desc "Version a data_bag"
-        task "version_data_bag", :data_bag do |task, args|
-          @versioner.version_data_bag(args.data_bag)
-        end
-      end
-    end
-
-    def define_version_data_bags
-      namespace "Promote" do
-        desc "Version all data_bags"
-        task "version_data_bags" do
-          puts "Version stamping changed data_bags..."
-          @versioner.version_data_bags.each do |result|
-            puts "Versioned data_bag: #{result[:artifact]} v#{result[:version]}"
-          end
-        end
-      end
-    end
-
     def define_upload_cookbooks
       namespace "Promote" do
         desc "Upload all cookbooks in an environment to the chef server"
@@ -144,15 +121,15 @@ module Promote
       end
     end
 
-    def define_upload_data_bags
-      namespace "Promote" do
-        desc "Upload data_bags to the chef server"
-        task "upload_data_bags" do
-          file_uploaded = @uploader.upload_data_bags
-          puts "Uploading #{file_uploaded} to #{@uploader.config.chef_server_url} as #{@uploader.config.node_name} using #{@uploader.config.client_key}"
-        end
-      end
-    end
+   def define_upload_data_bags
+     namespace "Promote" do
+       desc "Upload data_bags to the chef server"
+       task "upload_data_bags" do
+         file_uploaded = @uploader.upload_data_bags
+         puts "Uploading #{file_uploaded} to #{@uploader.config.chef_server_url} as #{@uploader.config.node_name} using #{@uploader.config.client_key}"
+       end
+     end
+   end
 
   end
 end

data/lib/promote/versioner.rb

@@ -5,21 +5,17 @@ module Promote
   class Versioner
     def initialize(config = Config.new)
       @config = config
-      @git = git_chef(config)
-      version_tags = @git.tags.select { |t| t.name[/^[0-9\.]+/] }
-      @current_tag = version_tags[-1]
-      @sha1 = @git.log(10000).between(current_tag.sha).first.sha
     end
 
     def version_cookbook(cookbook_name)
       dir = File.join(config.cookbook_directory, cookbook_name)
       cookbook_name = File.basename(dir)
-      version = version_number(current_tag, dir)
+      ct = current_tag
+      version = version_number(ct, dir)
       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}'")
@@ -49,23 +45,8 @@ module Promote
       Utils.sync_berksfiles(config.cookbook_directory)
     end
 
-    def version_data_bag(data_bag_path)
-      version_json File.dirname(data_bag_path), File.basename(data_bag_path, File.extname(data_bag_path))
-    end
-
-    def version_data_bags
-      results = []
-      Dir.glob(File.join(config.data_bag_directory, "**", "*.json")).each do |file|
-        result = version_data_bag(file)
-        if !result.nil?
-          results << result
-        end
-      end
-      results
-    end
-
     def version_environment(environment_name)
-      version_json config.environment_directory, environment_name do | content | 
+      version_json config.environment_directory, environment_name do | content |
         content['override_attributes']
       end
     end
@@ -144,9 +125,17 @@ module Promote
       end
     end
 
-    attr_accessor :git
-    attr_accessor :current_tag
-    attr_accessor :sha1
+    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
@@ -157,4 +146,4 @@ module Promote
 
     include Promote::GitHelper
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef