clc-promote 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e9170633de8bee495d02b19c331d06aebea58c9
-  data.tar.gz: ab36653932ac5788cd400f208dd9019fbc39eae5
+  metadata.gz: 0a793b7138b94ab2d704cd1f2137b620e93aee42
+  data.tar.gz: 7279804825c4e04c9eabccaebe70546ecb6ad6e3
 SHA512:
-  metadata.gz: df4a77c53b5de91ce1c939c732c4e7a58e879151ac17e2f89940dfb08c153c483e0a85efbaff25edcaaf0a5cdd896abb3fe5c4f7c1074807c743232fd6788fab
-  data.tar.gz: 5ecff0a01f8c50a8a293dc02b9185428a001da4af3efc94597682bec0cf2f6bc890299b7e63d935612ec042fa78193705c37169fb81485abcb4d71d3b5b262d8
+  metadata.gz: 5ad19f5b5798327867db5586b6ec9c134e49c9abfc92e5faa4fe540017de2b0be57b25cca3026dd83d449d1477fc03a8e37806ab2ab50f5e8a47edd3f29b1742
+  data.tar.gz: fdc0ffa1660e9cc119bdf6966fb7c8b40f822e33cb97708fb7f196a6dfa9f7f235a3d9caab0832fcc5ab3f258a8bbc652816cbceeb9e7e2ff21cb9f84956445d

data/lib/promote/uploader.rb

@@ -60,7 +60,7 @@ module Promote
     end
 
     def upload_environments
-      upload_file("/environments/**/*.json")
+      upload_file("/environments/*.json")
     end
 
     def upload_data_bags

data/lib/promote/utils.rb

@@ -6,5 +6,17 @@ module Promote
       rest = Chef::REST.new(config.chef_server_url, config.node_name, config.client_key)
       rest.get_rest("/cookbooks?num_versions=all")
     end
+
+    def self.sync_berksfiles(cookbook_directory)
+      repo_cookbooks = Dir.glob(File.join(cookbook_directory, "*"))
+      repo_cookbooks.each do |cookbook|
+        berks_name = File.join(cookbook_directory, File.basename(cookbook), "Berksfile")
+        if File.exist?(berks_name)
+          Berkshelf.set_format :null
+          berksfile = Berkshelf::Berksfile.from_file(berks_name)
+          berksfile.install
+        end
+      end
+    end
   end
 end

data/lib/promote/versioner.rb

@@ -35,7 +35,7 @@ module Promote
 
     def version_cookbooks
       results = []
-      repo_cookbooks.each do |file|
+      Dir.glob(File.join(config.cookbook_directory, "*")).each do |file|
         cookbook = File.basename(file)
         result = version_cookbook(cookbook)
         if !result.nil?
@@ -46,14 +46,7 @@ module Promote
     end
 
     def sync_berksfiles
-      repo_cookbooks.each do |cookbook|
-        berks_name = File.join(config.cookbook_directory, File.basename(cookbook), "Berksfile")
-        if File.exist?(berks_name)
-          Berkshelf.set_format :null
-          berksfile = Berkshelf::Berksfile.from_file(berks_name)
-          berksfile.install
-        end
-      end
+      Utils.sync_berksfiles(config.cookbook_directory)
     end
 
     def version_data_bag(data_bag_path)
@@ -124,10 +117,6 @@ module Promote
       berksfile.list
     end
 
-    def repo_cookbooks
-      Dir.glob(File.join(config.cookbook_directory, "*"))
-    end
-
     def version_json(parent_directory, file_name, &block)
       version_string = "version"
       file = "#{parent_directory}/#{file_name}.json"

metadata

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