clc-promote 0.7.11 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba0b9b13e41b7847ad771a60df668435e1f57535
-  data.tar.gz: 5a088cfa97247148ca799d5c9cd7716d916be6c4
+  metadata.gz: 51ac1711f235f79d4b72524866f866a3102fe775
+  data.tar.gz: 1b58e49d41e138be59c1740bead020ae83cdd8f5
 SHA512:
-  metadata.gz: 0812c0e3e59a7af1e456501e89aee87ec8851adaa9c02f4c5dea090002d19e6c63cf3712176c37b3d40fa9df6d8f94160bf4cbcd204f108778e6ec277e05a88c
-  data.tar.gz: b107b748207b37b47da4a9fc9881a9eee591bd15e9650450e450cbf37125cccdeb78a9f8aebad9bcaf1be35d5dd91577741947710235ad373ffdd0d5a8b3bc87
+  metadata.gz: 63359bcc4e3bb5347c9ecf0476bed57784b1da22c92a80bca824d66987cd127148ffcc917357989c105e2b3cac9666bea564f5257349486817f02c6d9df59879
+  data.tar.gz: 80827f613f6d462f7421ca8eb4e8520c9ff66c1a6fedd8389178b192b504b472cbd717730361c2057beaaf8235e029eb00eff0644bcd1f9703b4db7c7a861be3

data/lib/promote/promoter.rb

@@ -21,37 +21,17 @@ module Promote
     end
 
     def monitor_promotion(source_environment, destination_environments, probe_interval, max_wait = 3600, ui = nil)
+      ui.info "Waiting for #{source_environment} to finish" if ui
+      check_promotion(source_environment, probe_interval, max_wait, ui)
+
       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
-        converged = []
-        until Time.now.to_i - start > max_wait
-          result = finder.search
-          unconverged = []
-          result.each do |node|
-            if node['ohai_time'].to_i < start
-              unconverged << node
-            elsif converged.grep(/#{node.name}/).empty?
-              converged << node.name
-              ui.info "#{node.name} has converged" if ui
-            end
-          end
-          break if unconverged.count == 0
-
-          ui.stdout.print "." if ui
-
-          sleep probe_interval
-        end
+        uploader.upload_environment(env, ui)
 
-        if unconverged.count > 0
-          raise "Stopping promotion! Nodes (#{unconverged}) are not converging in #{env}"
-        end
+        check_promotion(env, probe_interval, max_wait, ui)
       end
     end
 
@@ -116,5 +96,33 @@ module Promote
       )
       Chef::ChefFS::FileSystem.copy_to(pattern, fs_config.chef_fs, local, nil, Chef::Config)
     end
+
+    def check_promotion(environment_to_check, probe_interval, max_wait, ui)
+      start = Time.now.to_i
+      finder = NodeFinder.new("chef_environment:#{environment_to_check}", config)
+      unconverged = nil
+      converged = []
+      until Time.now.to_i - start > max_wait
+        result = finder.search
+        unconverged = []
+        result.each do |node|
+          if node['ohai_time'].to_i < start
+            unconverged << node
+          elsif converged.grep(/#{node.name}/).empty?
+            converged << node.name
+            ui.info "#{node.name} has converged" if ui
+          end
+        end
+        break if unconverged.count == 0
+
+        ui.stdout.print "." if ui
+
+        sleep probe_interval
+      end
+
+      if unconverged.count > 0
+        raise "Stopping promotion! Nodes (#{unconverged}) are not converging in #{environment_to_check}"
+      end
+    end
   end
 end

data/lib/promote/rake_tasks.rb

@@ -112,7 +112,7 @@ module Promote
         task "promote_environments", :source_environment, :destination_environments do |task, args|
           puts "Promoting constraints in #{args.source_environment} to #{args.destination_environments}"
           ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
-          @promoter.monitor_promotion(args.source_environment, args.destination_environments, 5, 3600, ui)
+          @promoter.monitor_promotion(args.source_environment, args.destination_environments.split(' '), 5, 3600, ui)
         end
       end
     end

data/lib/promote/uploader.rb

@@ -59,8 +59,8 @@ module Promote
       end
     end
 
-    def upload_environment(environment_name)
-      upload_file("/environments/#{environment_name}.json")
+    def upload_environment(environment_name, ui = nil)
+      upload_file("/environments/#{environment_name}.json", nil, ui)
     end
 
     def upload_environments
@@ -73,11 +73,15 @@ module Promote
 
     def upload_data_bags
       data_bag_directory = File.join(config.temp_directory, "data_bags")
-      chef_fs_directory = Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(
-        {
-          'data_bags' => [data_bag_directory]
-        }
-      )
+      
+      chef_fs_directory = nil
+      with_chef_server(config) do
+        chef_fs_directory = Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(
+          {
+            'data_bags' => [data_bag_directory]
+          }
+        )
+      end
 
       config.reset_temp_dir
 
@@ -135,16 +139,22 @@ module Promote
       end
     end
 
-    def upload_file(file_path, src = Chef::ChefFS::Config.new.local_fs)
+    def upload_file(file_path, src = nil, ui = nil)
+      ui.info "Uploading #{file_path} to #{config.chef_server_url}" if ui
       pattern = Chef::ChefFS::FilePattern.new(file_path)
 
       with_chef_server(config) do
+        fs_config = Chef::ChefFS::Config.new
+        src ||= fs_config.local_fs
+
         Chef::ChefFS::FileSystem.copy_to(
           pattern,
           src,
-          Chef::ChefFS::Config.new.chef_fs,
+          fs_config.chef_fs,
           nil,
-          Chef::Config
+          Chef::Config,
+          ui,
+          proc { |entry| fs_config.format_path(entry) }
         )
       end
 

data/lib/promote/version.rb

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

data/spec/unit/kitchen/provisioner/environment_spec.rb

@@ -11,11 +11,14 @@ describe Kitchen::Provisioner::Environment do
   let(:suite) do
     double('suite', :name => "fries")
   end
+  let(:platform) do
+    double('platform', :os_type => "shake")
+  end
   let(:transport) do
     double('transport', :sudo => config[:sudo], :shell => "bourne")
   end
   let(:instance) do
-    double('instance', :name => "coolbeans", :logger => logger, :suite => suite, :transport => transport, :verifier => {:test_base_path => 'base_path'})
+    double('instance', :name => "coolbeans", :logger => logger, :suite => suite, :platform => platform, :transport => transport, :verifier => {:test_base_path => 'base_path'})
   end
   let(:downloader) { double('downloader') }
   let(:fake_berks) { double('berksfile', :install => nil, :update => nil, :list => [

data/spec/unit/promote/promoter_spec.rb

@@ -87,12 +87,25 @@ describe Promote::Promoter do
       it "promotes all nodes" do
         %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)
+          expect(uploader).to receive(:upload_environment).with(env, ui)
         end
         subject.monitor_promotion("env1", ["env2", "env3", "env4"], 0.25, 1, ui)
       end
     end
 
+    context "source environment does not fully converge" do
+      before {
+        allow(Promote::NodeFinder).to receive(:new).with("chef_environment:env1", config).and_return(finder_bad)
+      }
+
+      it "promotes no nodes" do
+        expect(subject).not_to receive(:promote_to)
+        expect(uploader).not_to receive(:upload_environment)
+
+        expect{ subject.monitor_promotion("env1", ["env2", "env3", "env4"], 0.25, 1, ui) }.to raise_error(/env1$/)
+      end
+    end
+
     context "stops promotion when promotion fails" do
       before {
         allow(Promote::NodeFinder).to receive(:new).with("chef_environment:env3", config).and_return(finder_bad)
@@ -101,7 +114,7 @@ describe Promote::Promoter do
       it "stops on failure" do
         %w{env2 env3}.each do |env|
           expect(subject).to receive(:promote_to).with("env1", env, ui)
-          expect(uploader).to receive(:upload_environment).with(env)
+          expect(uploader).to receive(:upload_environment).with(env, ui)
         end
         expect(subject).not_to receive(:promote_to).with("env1", "env4", ui)
         expect(uploader).not_to receive(:upload_environment).with("env4")

data/spec/unit/promote/uploader_spec.rb

@@ -14,6 +14,7 @@ describe Promote::Uploader do
 	subject { Promote::Uploader.new(config) }
 
 	before {
+		Chef::Config[:chef_repo_path] = config.repo_root
 		allow(Chef::ChefFS::FileSystem).to receive(:copy_to)
 	}
 
@@ -186,7 +187,7 @@ describe Promote::Uploader do
 			let(:env_name) { "my_test" }
 
 			it "uploads the environment" do
-				expect(Chef::ChefFS::FileSystem).to receive(:copy_to).with(an_instance_of(Chef::ChefFS::FilePattern), anything(), anything(), anything(), anything()) do |arg|
+				expect(Chef::ChefFS::FileSystem).to receive(:copy_to).with(an_instance_of(Chef::ChefFS::FilePattern), anything(), anything(), anything(), anything(), anything(), anything()) do |arg|
 					expect(arg.pattern).to eq(File.join("/environments", "#{env_name}.json"))
 				end
 				subject.upload_environment(env_name)
@@ -202,7 +203,9 @@ describe Promote::Uploader do
 					an_instance_of(Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir),
 					anything(),
 					anything(),
-					anything()
+					anything(),
+					anything(),
+					anything()					
 				) do |file_pattern, source|
 					expect(file_pattern.pattern).to eq(File.join("/environments/*.json"))
 					expect(source.child_paths["environments"]).to eq(local_environments)
@@ -220,6 +223,8 @@ describe Promote::Uploader do
 				an_instance_of(Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir),
 				anything(),
 				anything(),
+				anything(),
+				anything(),
 				anything()
 				) do |file_pattern, source|
 					expect(file_pattern.pattern).to eq(File.join("/roles/*.json"))
@@ -270,6 +275,8 @@ describe Promote::Uploader do
 					an_instance_of(Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir),
 					anything(),
 					anything(),
+					anything(),
+					anything(),
 					anything()
 				) do |file_pattern, source|
 					expect(file_pattern.pattern).to eq("/data_bags/**/*.json")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.8.0
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clc-git