clc-promote 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61b7e32270a0eda1b0651596eb6579606a3123a
-  data.tar.gz: 58444b14e50383fae206da3d2be4f2672b375f13
+  metadata.gz: be0a71a3fcad72dd64f5a17a5697ac0f9e2ad9d3
+  data.tar.gz: 21f7a69d62f5a17ac227d84a780eb926acfa7bcb
 SHA512:
-  metadata.gz: b1dfd786d11154b5841bfdb05f2b0f90beec3948cd6a889832bdec27dc17f46f231a3f8773348688946beeb427018b14f01987b55b964bc73d6a9b4484dd85b1
-  data.tar.gz: 3971dcc9f4f24fe6dbb3e05b97901f934ecbdd5d7d6b52e835860f1f0a9225c394920c5c3d87aeaa6d4f74e3f9418b0cacf2ce01912c4ab8705c671e4d7037d9
+  metadata.gz: a0223ecfd085ddfc069f88dfb3e8655a386866b0a108b1c122db9c9698e0620027ab6b49b35eb7bee5abf27716153297b4e4480a4145ce148758d56ce64e5300
+  data.tar.gz: f2b82702ca79dc2f05b34b51520b64991e7f706c12c17b4db1476c9fd118031083f6943437760c30d6983cfc2593f17aba48a5bda40f914224942d8d263aa7a5

data/lib/promote/rake_tasks.rb

@@ -32,10 +32,8 @@ module Promote
       namespace "Promote" do
         desc "Version all cookbooks"
         task "version_cookbooks" do
-          Dir.glob(File.join(@versioner.cookbook_directory, "*")) do |file|
-            cookbook = File.basename(file)
-            puts "versioning cookbook #{cookbook}"
-            @versioner.version_cookbook(cookbook)
+          @versioner.version_cookbooks.each do |result|
+            puts "Versioned cookbook: #{result[:cookbook]} v#{result[:version]}"
           end
         end
       end
@@ -54,10 +52,8 @@ module Promote
       namespace "Promote" do
         desc "Version all environments"
         task "version_environments" do
-          Dir.glob(File.join(@versioner.environment_directory, "*.json")) do |file|
-            environment = File.basename(file ,File.extname(file))
-            puts "versioning environment #{environment}"
-            @versioner.version_environment(environment)
+          @versioner.version_environments.each do |result|
+            puts "Versioned environment: #{result[:artifact]} v#{result[:version]}"
           end
         end
       end
@@ -76,10 +72,8 @@ module Promote
       namespace "Promote" do
         desc "Version all data_bags"
         task "version_data_bags" do
-          Dir.glob(File.join(@versioner.data_bag_directory, "*.json")) do |file|
-            data_bag = File.basename(file, File.extname(file))
-            puts "versioning data_bag #{data_bag}"
-            @versioner.version_data_bag(data_bag)
+          @versioner.version_data_bags.each do |result|
+            puts "Versioned data_bag: #{result[:artifact]} v#{result[:version]}"
           end
         end
       end

data/lib/promote/versioner.rb

@@ -30,22 +30,64 @@ module Promote
         File.open(metadata_file, 'w') do |out|
           out << outdata
         end
+        return { :cookbook => cookbook_name, :version => version, :sha1 => sha1}
+      end
+    end
 
-        berksfile = Berkshelf::Berksfile.from_file(File.join(dir, "Berksfile"))
-        berksfile.install
+    def version_cookbooks
+      cookbooks = Dir.glob(File.join(cookbook_directory, "*"))
+      results = []
+      cookbooks.each do |file|
+        cookbook = File.basename(file)
+        result = version_cookbook(cookbook)
+        if !result.nil?
+          results << result
+        end
       end
+      cookbooks.each do |cookbook|
+        berks_name = File.join(cookbook_directory, File.basename(cookbook), "Berksfile")
+        if File.exist?(berks_name)
+          berksfile = Berkshelf::Berksfile.from_file(berks_name)
+          berksfile.install
+        end
+      end
+      results
     end
 
     def version_data_bag(data_bag_name)
       version_json data_bag_directory, data_bag_name
     end
 
+    def version_data_bags
+      results = []
+      Dir.glob(File.join(data_bag_directory, "**", "*.json")).each do |file|
+        data_bag = File.basename(file, File.extname(file))
+        result = version_data_bag(data_bag)
+        if !result.nil?
+          results << result
+        end
+      end
+      results
+    end
+
     def version_environment(environment_name)
       version_json environment_directory, environment_name do | content | 
         content['override_attributes']
       end
     end
 
+    def version_environments
+      results = []
+      Dir.glob(File.join(environment_directory, "*.json")).each do |file|
+        environment = File.basename(file ,File.extname(file))
+        result = version_environment(environment)
+        if !result.nil?
+          results << result
+        end
+      end
+      results
+    end
+
     def cookbook_directory
       File.join(@repo_root, "cookbooks")
     end
@@ -83,6 +125,7 @@ module Promote
         File.open(file, 'w') do |out|
           out << JSON.pretty_generate(content)
         end
+        { :artifact => file_name, :version => version, :sha1 => sha1}
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-spork