clc-promote 0.4.0.dev.9 → 0.4.0.dev.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2934a8168bb2623f8e419c319e74f3245c987cbe
-  data.tar.gz: a9558f2c9e9edcc6a6a9ecf4b87f26ea4155fd47
+  metadata.gz: 7b8ab84ce0ba21d1a3b3f18d6b02abe59efa5a00
+  data.tar.gz: ee739681a924fe27a52e22f1a667614e51d4bc89
 SHA512:
-  metadata.gz: e35fb4338176e5b364fd38c414096412e914dcc4dd3a6c5077bd080400184fe541e1ea3e6b50d847de5fc84555bb1c01e37f629441f271654143ebee03b9dca2
-  data.tar.gz: ef0fe1e55d1ab7ec15b2fc7d75bfc0be0b645d1d1de87f249b1e766dfdc5154daa0ffcd71b760a1c8b9c700e2aad41eb9db0fdf7c0f0d65f6b95f51240582585
+  metadata.gz: 5b3a3be74b3fd8de3a9a45a8232422bbe1ef07a5dd744d869541c21405e577d283591971640152dc9d4b9b0c86f849a6b3da9396b3c7da234d5942da4c587a45
+  data.tar.gz: 6949e045d8623ea3266ca41a15ef85c5cc86021a2c08788aaec610acbf27552a455f1dd6be572fbc94e646fb3cef8cae41c647fd7e620383c6466e4852904994

data/lib/promote/rake_tasks.rb

@@ -19,6 +19,7 @@ module Promote
       define_sync_berksfile
       define_sync_berksfiles
       define_upload_cookbooks
+      define_upload_cookbook
       define_upload_environment
       define_upload_data_bags
       define_constrain_environment
@@ -122,6 +123,16 @@ module Promote
       end
     end
 
+    def define_upload_cookbook
+      namespace "Promote" do
+        desc "Upload a cookbooks and its dependencies to the chef server"
+        task "upload_cookbook", :cookbook do |task, args|
+          puts "Uploading cookbook #{args.cookbook}..."
+          @uploader.upload_cookbook(args.cookbook)
+        end
+      end
+    end
+
     def define_upload_environment
       namespace "Promote" do
         desc "Upload an environment to the chef server"

data/lib/promote/uploader.rb

@@ -22,7 +22,26 @@ module Promote
       Chef::Config[:chef_repo_path] = config.repo_root
     end
 
+    def upload_cookbook(cookbook_name)
+      vendor_path='/tmp/promote_vendor'
+      FileUtils.rm_rf(vendor_path) if Dir.exist?(vendor_path)
+
+      berksfile_path = File.join(config.cookbook_directory, cookbook_name, "Berksfile")
+      Berkshelf.set_format :null
+      berksfile = Berkshelf::Berksfile.from_file(berksfile_path)
+      berksfile.vendor(vendor_path)
+
+      upload_filtered_cookbooks([vendor_path])
+    end
+
     def upload_cookbooks(environment = nil)
+      dirs = (Dir.glob(File.expand_path("~/.berkshelf/cookbooks/*")) <<
+        Dir.glob(File.join(config.cookbook_directory, "*"))).flatten!
+
+      upload_filtered_cookbooks(dirs, environment)
+    end
+
+    def upload_filtered_cookbooks(dirs, environment = nil)
       anything_to_upload = false
       
       server_cookbooks = Utils.chef_server_cookbooks(config)
@@ -35,8 +54,7 @@ module Promote
       FileUtils.rm_rf(config.temp_directory) if Dir.exist?(config.temp_directory)
       Dir.mkdir(config.temp_directory)
 
-      (Dir.glob(File.expand_path("~/.berkshelf/cookbooks/*")) <<
-        Dir.glob(File.join(config.cookbook_directory, "*"))).flatten!.each do | dir |
+      dirs.each do | dir |
         anything_to_upload = cookbooks_copied?(dir, server_cookbooks, env_versions) || anything_to_upload
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.4.0.dev.9
+  version: 0.4.0.dev.10
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef