clc-promote 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1648dc80e86e5091475fbfd5a3f37af2d205650
-  data.tar.gz: 517af2fb1dfc639eb0c7ee913b06203b8e54f10d
+  metadata.gz: 602f553a778d7101ac52edf230810a29cf238235
+  data.tar.gz: 99b38236925df3acc02278aeb5ca17f4b958e55e
 SHA512:
-  metadata.gz: f3707c1103ab6bab1a1e1e5279af57858274073a16b4240212b9ebc2ba611369505785fd2b3d547afa683d5091888dd811b8d6fbba4088946ef2353f8291436b
-  data.tar.gz: 044f7283e1ba7275c6f29ee1a0d5a77897741d0b9fff09486398af22e33ca35484b65d6afd8d2200c29c6886abaf7e84e18a9cc116a746030e6fb7fdd73e4c10
+  metadata.gz: 2502cd2f02475e4db17af01f4ce40a52b00235424e543ffeaaaac815fd5fe3072b5ffaea9bed3dd8ca034073e41e10a8acfcf4ecd28f27398513b76dc9c5320a
+  data.tar.gz: f52ef0d6e040118f95e4a8025d61af02c0df6320058173516ce7d56d2807ebf93d1fd5d57cb5bdac61df001d05139235b93f1a70f4da8b87a9a295e3a533d483

data/lib/promote/uploader.rb

@@ -24,23 +24,16 @@ module Promote
 
     def upload_cookbooks(environment)
       anything_to_upload = false
+      
       server_cookbooks = Utils.chef_server_cookbooks(config)
+      env_versions = EnvironmentFile.new(environment, config).cookbook_versions
+      
       FileUtils.rm_rf(config.temp_directory) if Dir.exist?(config.temp_directory)
       Dir.mkdir(config.temp_directory)
 
-      env_versions = EnvironmentFile.new(environment, config).cookbook_versions
-      Dir.glob(File.expand_path("~/.berkshelf/cookbooks/*")).each do | dir |
-        cp_name = File.basename(dir)
-        idx = cp_name.rindex('-')
-        cb_name = cp_name[0,idx]
-        cb_version = cp_name[idx+1,cp_name.length-idx]
-        anything_to_upload = cookbooks_copied?(cb_name, cb_version, dir, server_cookbooks, env_versions)
-      end
-
-      Dir.glob(File.join(config.cookbook_directory, "*")).each do | dir |
-        metadata = Chef::Cookbook::Metadata.new
-        metadata.from_file(File.join(dir, "metadata.rb"))
-        anything_to_upload = cookbooks_copied?(metadata.name, metadata.version, dir, server_cookbooks, env_versions) || anything_to_upload
+      (Dir.glob(File.expand_path("~/.berkshelf/cookbooks/*")) <<
+        Dir.glob(File.join(config.cookbook_directory, "*"))).flatten!.each do | dir |
+        anything_to_upload = cookbooks_copied?(dir, server_cookbooks, env_versions) || anything_to_upload
       end
 
       if anything_to_upload
@@ -71,10 +64,12 @@ module Promote
     private
 
     #only include versions in environment but exclude whats on the server
-    def cookbooks_copied?(name, version, dir, server_cookbooks, environment_cookbooks)
-      if !server_cookbooks.has_key?(name) || (server_cookbooks[name]["versions"].select {|v| v['version'] == version}).empty?
-        if environment_cookbooks.has_key?(name) && environment_cookbooks[name] == version
-          FileUtils.copy_entry(dir, File.join(config.temp_directory, name))
+    def cookbooks_copied?(dir, server_cookbooks, environment_cookbooks)
+      metadata = Chef::Cookbook::Metadata.new
+      metadata.from_file(File.join(dir, "metadata.rb"))
+      if !server_cookbooks.has_key?(metadata.name) || (server_cookbooks[metadata.name]["versions"].select {|v| v['version'] == metadata.version}).empty?
+        if environment_cookbooks.has_key?(metadata.name) && environment_cookbooks[metadata.name] == metadata.version
+          FileUtils.copy_entry(dir, File.join(config.temp_directory, metadata.name))
           true
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - CenturyLink Cloud