clc-promote 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5633c6eb35655f0e48f3ca0c541518a2f77ca04
-  data.tar.gz: 5175538852c4345a2b3d79c7fe91be9b89b57ab3
+  metadata.gz: ba0b9b13e41b7847ad771a60df668435e1f57535
+  data.tar.gz: 5a088cfa97247148ca799d5c9cd7716d916be6c4
 SHA512:
-  metadata.gz: 0270705d80833cda8010dbac523b1265a3e853a3fc8e4b59207362f9834a2471f74496df0d948ebbb8dd6497c3c9f39bde5b0786b9243674c1a0fe1d75707a40
-  data.tar.gz: 6e2a1384d06f75ef43b050ffa5540487e664bc4f68126b09345ace9017175cc4de06276a0416d35c51c9d58dc693daeef36c2900bd0298b67dacf672aa557a69
+  metadata.gz: 0812c0e3e59a7af1e456501e89aee87ec8851adaa9c02f4c5dea090002d19e6c63cf3712176c37b3d40fa9df6d8f94160bf4cbcd204f108778e6ec277e05a88c
+  data.tar.gz: b107b748207b37b47da4a9fc9881a9eee591bd15e9650450e450cbf37125cccdeb78a9f8aebad9bcaf1be35d5dd91577741947710235ad373ffdd0d5a8b3bc87

data/lib/promote.rb

@@ -1,3 +1,4 @@
+require 'promote/chef_server'
 require 'promote/config'
 require 'promote/cookbook'
 require 'promote/environment_file'

data/lib/promote/chef_server.rb

@@ -0,0 +1,27 @@
+module Promote
+  module ChefServer
+    # Accepts a code block to run in the context of a chef server and user
+    # and reverts the environment back to the previous settings when done
+    # @param [Promote::Config] config containing chef server properties
+    def with_chef_server(config, &block)
+      current_server_url = Chef::Config[:chef_server_url]
+      current_client_key = Chef::Config[:client_key]
+      current_node_name = Chef::Config[:node_name]
+      current_repo_root = Chef::Config[:chef_repo_path]
+      
+      Chef::Config.reset
+      Chef::Config[:chef_server_url] = config.chef_server_url
+      Chef::Config[:client_key] = config.client_key
+      Chef::Config[:node_name] = config.node_name
+      Chef::Config[:chef_repo_path] = config.repo_root
+
+      yield
+    ensure
+      Chef::Config.reset
+      Chef::Config[:chef_server_url] = current_server_url
+      Chef::Config[:client_key] = current_client_key
+      Chef::Config[:node_name] = current_node_name
+      Chef::Config[:chef_repo_path] = current_repo_root
+    end
+  end
+end

data/lib/promote/promoter.rb

@@ -21,8 +21,12 @@ module Promote
     end
 
     def monitor_promotion(source_environment, destination_environments, probe_interval, max_wait = 3600, ui = nil)
+      uploader = Uploader.new(config)
+
       destination_environments.each do |env|
+        ui.confirm "Promote #{source_environment} to #{env}" if ui
         promote_to(source_environment, env, ui)
+        uploader.upload_environment(env)
         start = Time.now.to_i
         finder = NodeFinder.new("chef_environment:#{env}", config)
         unconverged = nil
@@ -41,7 +45,7 @@ module Promote
           break if unconverged.count == 0
 
           ui.stdout.print "." if ui
-          
+
           sleep probe_interval
         end
 

data/lib/promote/rake_tasks.rb

@@ -111,7 +111,8 @@ module Promote
         desc "Promote a list of environments from another"
         task "promote_environments", :source_environment, :destination_environments do |task, args|
           puts "Promoting constraints in #{args.source_environment} to #{args.destination_environments}"
-          @promoter.monitor_promotion(args.source_environment, args.destination_environments, 60 * 5)
+          ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
+          @promoter.monitor_promotion(args.source_environment, args.destination_environments, 5, 3600, ui)
         end
       end
     end

data/lib/promote/uploader.rb

@@ -13,14 +13,12 @@ end
 
 module Promote
   class Uploader
+
+    include ChefServer
+
     def initialize(config)
       @config = config
       validate_config
-      Chef::Config.reset
-      Chef::Config[:client_key] = config.client_key
-      Chef::Config[:chef_server_url] = config.chef_server_url
-      Chef::Config[:node_name] = config.node_name
-      Chef::Config[:chef_repo_path] = config.repo_root
     end
 
     def upload_cookbook(cookbook_name)
@@ -46,13 +44,16 @@ module Promote
     def upload_cookbook_directory(directory, ui = nil)
       if !Dir.glob(File.join(directory, "*")).empty?
         if ui
-          ui.info "Uploading cookbooks from #{directory} to #{Chef::Config[:chef_server_url]}"
+          ui.info "Uploading cookbooks from #{directory} to #{config.chef_server_url}"
         end
-        knife = Chef::Knife::CookbookUpload.new()
-        knife.config[:all] = true
-        knife.config[:freeze] = true
-        knife.config[:cookbook_path] = directory
-        knife.run
+        with_chef_server(@config) do
+          knife = Chef::Knife::CookbookUpload.new()
+          knife.config[:all] = true
+          knife.config[:freeze] = true
+          knife.config[:cookbook_path] = directory
+          knife.run
+        end
+
       elsif ui
         ui.info "No cookbooks found in #{directory}"
       end
@@ -137,13 +138,16 @@ module Promote
     def upload_file(file_path, src = Chef::ChefFS::Config.new.local_fs)
       pattern = Chef::ChefFS::FilePattern.new(file_path)
 
-      Chef::ChefFS::FileSystem.copy_to(
-        pattern,
-        src,
-        Chef::ChefFS::Config.new.chef_fs,
-        nil,
-        Chef::Config
-      )
+      with_chef_server(config) do
+        Chef::ChefFS::FileSystem.copy_to(
+          pattern,
+          src,
+          Chef::ChefFS::Config.new.chef_fs,
+          nil,
+          Chef::Config
+        )
+      end
+
       file_path
     end
 

data/lib/promote/version.rb

@@ -1,3 +1,3 @@
 module Promote
-  VERSION = '0.7.10'
+  VERSION = '0.7.11'
 end

data/spec/unit/promote/promoter_spec.rb

@@ -75,17 +75,20 @@ describe Promote::Promoter do
       node.default["ohai_time"] = Time.now.to_i - 3600
       node
     }
+    let(:uploader) { double('uploader') }
     let(:ui) { nil }
 
     before {
       allow(Promote::NodeFinder).to receive(:new).and_return(finder_good)
+      allow(Promote::Uploader).to receive(:new).and_return(uploader)
     }
 
     context "all environments succeed" do
       it "promotes all nodes" do
-        expect(subject).to receive(:promote_to).with("env1", "env2", ui)
-        expect(subject).to receive(:promote_to).with("env1", "env3", ui)
-        expect(subject).to receive(:promote_to).with("env1", "env4", ui)
+        %w{env2 env3 env4}.each do |env|
+          expect(subject).to receive(:promote_to).with("env1", env, ui)
+          expect(uploader).to receive(:upload_environment).with(env)
+        end
         subject.monitor_promotion("env1", ["env2", "env3", "env4"], 0.25, 1, ui)
       end
     end
@@ -96,9 +99,12 @@ describe Promote::Promoter do
       }
 
       it "stops on failure" do
-        expect(subject).to receive(:promote_to).with("env1", "env2", ui)
-        expect(subject).to receive(:promote_to).with("env1", "env3", ui)
+        %w{env2 env3}.each do |env|
+          expect(subject).to receive(:promote_to).with("env1", env, ui)
+          expect(uploader).to receive(:upload_environment).with(env)
+        end
         expect(subject).not_to receive(:promote_to).with("env1", "env4", ui)
+        expect(uploader).not_to receive(:upload_environment).with("env4")
         expect{ subject.monitor_promotion("env1", ["env2", "env3", "env4"], 0.25, 1, ui) }.to raise_error(/env3$/)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clc-git
@@ -124,6 +124,7 @@ files:
 - lib/chef/knife/promote.rb
 - lib/kitchen/provisioner/environment.rb
 - lib/promote.rb
+- lib/promote/chef_server.rb
 - lib/promote/config.rb
 - lib/promote/cookbook.rb
 - lib/promote/environment_file.rb