chef-metal 0.11.beta.7 → 0.11.beta.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5295f868cdb91eb708ae603119f352c45d3ef5fe
-  data.tar.gz: fdfde295e6a4085a79052dd4546804263f29b23e
+  metadata.gz: 5b2a0b1eef15af3f384082c0f261aae828ea2153
+  data.tar.gz: a1a1f92a40f0dc38c82e809caf7c62daae466b00
 SHA512:
-  metadata.gz: b866ac1631345db40f2a8847e7a642dd25e71f6812e5e03c69fa2c24a11ded94cd2252593a2132ab512ca1e0366716809b94d02a94a9e819d077aa518761ff66
-  data.tar.gz: 5054683877ed189a7617d543e8aee69862ee19b8cb0fa7b3779da00a9281d3dfd92c31393f5d54a2d4ec066fe107b87bde48fdf303682179042d114cdeaf4365
+  metadata.gz: 0abf3f71bee93b7145efd6c0a0243b0d2a21f8dee731ef0f704426f3314456e7adb506d3be3028b6de8ba83e80da25fe5c26da756fd586c0fa17e16970bd74da
+  data.tar.gz: 05118c1aa639c6b89b10a3b5a43a53a1ce5ca78120f8f69ad5384c5a3847443798b4e5e1a4884a6db0e94b22e9d9ba4acdbb79802bcfcaedea8bd68562b696cc

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Chef Metal Changelog
+## 0.11.beta.9 (6/3/2014)
+
+- fix machine_batch error report to be less verbose
 
 ## 0.11.beta.7 (5/30/2014)
 
-- fix machine_batch error report to be less verbose
 - allow options to be set from with_driver
 - fail when machine is being moved from driver to driver
 - support knife.rb config for non-canonical URLs

data/lib/chef/provider/machine_batch.rb

@@ -12,33 +12,6 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
     @action_handler ||= ChefMetal::ChefProviderActionHandler.new(self)
   end
 
-  # We override this because we want to hide @from_recipe
-  def to_text
-    ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS - [ :@from_recipe, :@machines ]
-    text = "# Declared in #{@source_line}\n\n"
-    text << self.class.dsl_name + "(\"#{name}\") do\n"
-    ivars.each do |ivar|
-      if (value = instance_variable_get(ivar)) && !(value.respond_to?(:empty?) && value.empty?)
-        value_string = value.respond_to?(:to_text) ? value.to_text : value.inspect
-        text << "  #{ivar.to_s.sub(/^@/,'')} #{value_string}\n"
-      end
-    end
-    machine_names = @machines.map do |m|
-      if m.is_a?(ChefMetal::MachineSpec)
-        m.name
-      elsif m.is_a?(Chef::Resource::Machine)
-        m.name
-      else
-        m
-      end
-    end
-    text << "  machines #{machine_names.inspect}"
-    [@not_if, @only_if].flatten.each do |conditional|
-      text << "  #{conditional.to_text}\n"
-    end
-    text << "end\n"
-  end
-
   use_inline_resources
 
   def whyrun_supported?
@@ -52,7 +25,8 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
   action :allocate do
     by_new_driver.each do |driver, specs_and_options|
       driver.allocate_machines(action_handler, specs_and_options, parallelizer) do |machine_spec|
-        machine_spec.save(action_handler)
+        prefixed_handler = ChefMetal::AddPrefixActionHandler.new(action_handler, "[#{machine_spec.name}] ")
+        machine_spec.save(prefixed_handler)
       end
     end
   end
@@ -65,7 +39,7 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
     with_ready_machines do |m|
       prefixed_handler = ChefMetal::AddPrefixActionHandler.new(action_handler, "[#{m[:spec].name}] ")
       machine[:machine].setup_convergence(prefixed_handler)
-      m[:spec].save(action_handler)
+      m[:spec].save(prefixed_handler)
       Chef::Provider::Machine.upload_files(prefixed_handler, m[:machine], m[:files])
     end
   end
@@ -77,14 +51,15 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
       m[:spec].save(action_handler)
       Chef::Provider::Machine.upload_files(prefixed_handler, m[:machine], m[:files])
       m[:machine].converge(prefixed_handler)
-      m[:spec].save(action_handler)
+      m[:spec].save(prefixed_handler)
     end
   end
 
   action :converge_only do
     parallel_do(@machines) do |m|
+      prefixed_handler = ChefMetal::AddPrefixActionHandler.new(action_handler, "[#{m[:spec].name}] ")
       machine = run_context.chef_metal.connect_to_machine(m[:spec])
-      machine.converge(action_handler)
+      machine.converge(prefixed_handler)
     end
   end
 

data/lib/chef/resource/machine_batch.rb

@@ -41,4 +41,32 @@ class Chef::Resource::MachineBatch < Chef::Resource::LWRPBase
   def add_machine_options(options)
     @machine_options = Chef::Mixin::DeepMerge.hash_only_merge(@machine_options, options)
   end
+
+  # We override this because we want to hide @from_recipe and shorten @machines
+  # in error output.
+  def to_text
+    ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS - [ :@from_recipe, :@machines ]
+    text = "# Declared in #{@source_line}\n\n"
+    text << self.class.dsl_name + "(\"#{name}\") do\n"
+    ivars.each do |ivar|
+      if (value = instance_variable_get(ivar)) && !(value.respond_to?(:empty?) && value.empty?)
+        value_string = value.respond_to?(:to_text) ? value.to_text : value.inspect
+        text << "  #{ivar.to_s.sub(/^@/,'')} #{value_string}\n"
+      end
+    end
+    machine_names = @machines.map do |m|
+      if m.is_a?(ChefMetal::MachineSpec)
+        m.name
+      elsif m.is_a?(Chef::Resource::Machine)
+        m.name
+      else
+        m
+      end
+    end
+    text << "  machines #{machine_names.inspect}\n"
+    [@not_if, @only_if].flatten.each do |conditional|
+      text << "  #{conditional.to_text}\n"
+    end
+    text << "end\n"
+  end
 end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.11.beta.7'
+  VERSION = '0.11.beta.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.11.beta.7
+  version: 0.11.beta.8
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.beta.3
+        version: 0.5.beta.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.beta.3
+        version: 0.5.beta.4
 - !ruby/object:Gem::Dependency
   name: chef-metal-vagrant
   requirement: !ruby/object:Gem::Requirement