clc-fork-chef-metal 0.14.alpha.3 → 0.14.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463b696be54f5c633a09a341dff4ac59c9e4b1ce
-  data.tar.gz: 6a8a78fddaecdf692b4bc497a117119ff09fff67
+  metadata.gz: c08de5313597e7139143246a94138fee6fca9a84
+  data.tar.gz: 6de6e645deaa776b7aab8a46ef8306b16046e3fb
 SHA512:
-  metadata.gz: dc004647dead731f50c3e4ddfb310afb1b5599ca4fd8931786fcbfbe1a26a1c1bfbd1b96df3296bd45eb83e1b29a6b7b617297538d88fbe25f89dfa67fbeb528
-  data.tar.gz: 161ed94aa16b10eccc916602c6fdd8593a5a088600e5845913c175f0ead6f502dff9a6a0ad071b0002191ed465a642e1fb74a4c004b0ccd559e3354b0f71a839
+  metadata.gz: 4d17679c6572756d466c8cfa14c7a07256c9e58d058b086800f4f18f23057f851e721de28af47e2e207cd46ab27f3c5d58a15bdc47fa2762b420be8921c7b12d
+  data.tar.gz: d86b7d85497dfe688385af9418e41438fd6a66b9ab18a4773122452dc438e45a2505b9fbde5d134798ffa0a570f886d9967ceab951b98da903c3f2d89526a4c1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Chef Metal Changelog
 
+## 0.14.2 (9/2/2014)
+
+- Disable auto batching
+- Fix for with_machine_options context hash 
+- Pass timeout from execution_options to winrm set_timeout
+- Add better error message when driver does not specify driver_url
+- Add info that location.driver_url is required
+- Remove Chef 11.14 alpha note in readme
+- Gracefully handle Host Down and Network Unreachable
+
 ## 0.14.1 (8/18/2014)
 
 - Fix "metal execute mario ls" to work again

data/README.md

@@ -15,6 +15,7 @@ Date       | Blog
 
 Documentation
 -------------
+* [Frequently Asked Questions](https://github.com/opscode/chef-metal/blog/master/docs/faq.md)
 * [Configuration](https://github.com/opscode/chef-metal/blob/master/docs/configuration.md#configuring-and-using-metal-drivers)
 * [Writing Drivers](https://github.com/opscode/chef-metal/blob/master/docs/building_drivers.md#writing-drivers)
 * [Embedding](https://github.com/opscode/chef-metal/blob/master/docs/embedding.md)
@@ -124,7 +125,7 @@ Drivers each have their own repository.  Current drivers:
 
 **Containers:**
 - [LXC](https://github.com/opscode/chef-metal-lxc) (not yet up to date with 0.11)
-- [Docker](https://github.com/opscode/chef-metal-docker) (not yet up to date with 0.11)
+- [Docker](https://github.com/opscode/chef-metal-docker)
 
 **Bare Metal:**
 - [SSH (no PXE)](https://github.com/double-z/chef-metal-ssh) (not yet up to date with 0.11)

data/lib/chef/provider/machine.rb

@@ -4,7 +4,9 @@ require 'openssl'
 require 'chef_metal/chef_provider_action_handler'
 require 'chef_metal/chef_machine_spec'
 
-class Chef::Provider::Machine < Chef::Provider::LWRPBase
+class Chef
+class Provider
+class Machine < Chef::Provider::LWRPBase
 
   def action_handler
     @action_handler ||= ChefMetal::ChefProviderActionHandler.new(self)
@@ -133,6 +135,7 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
           result
         end
     }
+
     configs << new_resource.machine_options if new_resource.machine_options
     configs << driver.config[:machine_options] if driver.config[:machine_options]
     Cheffish::MergedConfig.new(*configs)
@@ -167,4 +170,7 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
   def upload_files(machine)
     Machine.upload_files(action_handler, machine, new_resource.files)
   end
+
+end
+end
 end

data/lib/chef/provider/machine_batch.rb

@@ -6,7 +6,9 @@ require 'chef_metal/add_prefix_action_handler'
 require 'chef_metal/machine_spec'
 require 'chef_metal/chef_machine_spec'
 
-class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
+class Chef
+class Provider
+class MachineBatch < Chef::Provider::LWRPBase
 
   def action_handler
     @action_handler ||= ChefMetal::ChefProviderActionHandler.new(self)
@@ -183,4 +185,7 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
     result = Chef::Mixin::DeepMerge.hash_only_merge(result, new_resource.machine_options)
     result
   end
+
+end
+end
 end

data/lib/chef/provider/machine_execute.rb

@@ -2,7 +2,9 @@ require 'chef/provider/lwrp_base'
 require 'chef_metal/chef_provider_action_handler'
 require 'chef_metal/machine'
 
-class Chef::Provider::MachineExecute < Chef::Provider::LWRPBase
+class Chef
+class Provider
+class MachineExecute < Chef::Provider::LWRPBase
 
   def action_handler
     @action_handler ||= ChefMetal::ChefProviderActionHandler.new(self)
@@ -27,4 +29,7 @@ class Chef::Provider::MachineExecute < Chef::Provider::LWRPBase
   action :run do
     machine.execute(action_handler, new_resource.command)
   end
+
+end
+end
 end

data/lib/chef/provider/machine_file.rb

@@ -2,7 +2,9 @@ require 'chef/provider/lwrp_base'
 require 'chef_metal/chef_provider_action_handler'
 require 'chef_metal/machine'
 
-class Chef::Provider::MachineFile < Chef::Provider::LWRPBase
+class Chef
+class Provider
+class MachineFile < Chef::Provider::LWRPBase
 
   def action_handler
     @action_handler ||= ChefMetal::ChefProviderActionHandler.new(self)
@@ -46,4 +48,7 @@ class Chef::Provider::MachineFile < Chef::Provider::LWRPBase
   action :delete do
     machine.delete_file(action_handler, new_resource.path)
   end
+
+end
+end
 end

data/lib/chef/provider/machine_image.rb

@@ -4,7 +4,10 @@ require 'openssl'
 require 'chef_metal/chef_provider_action_handler'
 require 'chef_metal/chef_image_spec'
 
-class Chef::Provider::MachineImage < Chef::Provider::LWRPBase
+class Chef
+class Provider
+class MachineImage < Chef::Provider::LWRPBase
+
   def action_handler
     @action_handler ||= ChefMetal::ChefProviderActionHandler.new(self)
   end
@@ -51,4 +54,7 @@ class Chef::Provider::MachineImage < Chef::Provider::LWRPBase
     # 4. Wait for image to be ready
     new_driver.ready_image(action_handler, image_spec, new_resource.image_options)
   end
+
+end
 end
+end

data/lib/chef/resource/machine.rb

@@ -3,7 +3,10 @@ require 'cheffish'
 require 'chef_metal'
 require 'cheffish/merged_config'
 
-class Chef::Resource::Machine < Chef::Resource::LWRPBase
+class Chef
+class Resource
+class Machine < Chef::Resource::LWRPBase
+
   self.resource_name = 'machine'
 
   def initialize(*args)
@@ -19,8 +22,10 @@ class Chef::Resource::Machine < Chef::Resource::LWRPBase
 
   # Driver attributes
   attribute :driver
-  attribute :machine_options
 
+  # Machine options
+  attribute :machine_options
+  
   # Node attributes
   Cheffish.node_attributes(self)
 
@@ -92,8 +97,28 @@ class Chef::Resource::Machine < Chef::Resource::LWRPBase
     @machine_options = Cheffish::MergedConfig.new(options, @machine_options)
   end
 
+
+  # This is here because metal users will probably want to do things like:
+  # machine "foo"
+  #   action :destroy
+  # end
+  #
+  # @example
+  #   with_machine_options :bootstrap_options => { ... }
+  #   machine "foo"
+  #     converge true
+  #   end
+  #
+  # Without this, the first resource's machine options will obliterate the second
+  # resource's machine options, and then unexpected (and undesired) things happen.
+  def load_prior_resource
+    Chef::Log.debug "Overloading #{self.resource_name} load_prior_resource with NOOP"
+  end
+
   # chef client version and omnibus
   # chef-zero boot method?
   # chef-client -z boot method?
   # pushy boot method?
 end
+end
+end

data/lib/chef/resource/machine_batch.rb

@@ -1,7 +1,10 @@
 require 'chef/resource/lwrp_base'
 require 'chef/mixin/deep_merge'
 
-class Chef::Resource::MachineBatch < Chef::Resource::LWRPBase
+class Chef
+class Resource
+class MachineBatch < Chef::Resource::LWRPBase
+
   self.resource_name = 'machine_batch'
 
   def initialize(*args)
@@ -69,4 +72,7 @@ class Chef::Resource::MachineBatch < Chef::Resource::LWRPBase
     end
     text << "end\n"
   end
+
+end
+end
 end

data/lib/chef/resource/machine_execute.rb

@@ -3,7 +3,10 @@ require 'chef_metal'
 require 'chef_metal/machine'
 require 'chef_metal/driver'
 
-class Chef::Resource::MachineExecute < Chef::Resource::LWRPBase
+class Chef
+class Resource
+class MachineExecute < Chef::Resource::LWRPBase
+
   self.resource_name = 'machine_execute'
 
   def initialize(*args)
@@ -19,4 +22,7 @@ class Chef::Resource::MachineExecute < Chef::Resource::LWRPBase
 
   attribute :chef_server, :kind_of => Hash
   attribute :driver, :kind_of => ChefMetal::Driver
+
+end
 end
+end

data/lib/chef/resource/machine_file.rb

@@ -3,7 +3,10 @@ require 'chef_metal'
 require 'chef_metal/machine'
 require 'chef_metal/driver'
 
-class Chef::Resource::MachineFile < Chef::Resource::LWRPBase
+class Chef
+class Resource
+class MachineFile < Chef::Resource::LWRPBase
+
   self.resource_name = 'machine_file'
 
   def initialize(*args)
@@ -25,4 +28,7 @@ class Chef::Resource::MachineFile < Chef::Resource::LWRPBase
 
   attribute :chef_server, :kind_of => Hash
   attribute :driver, :kind_of => ChefMetal::Driver
+
+end
 end
+end

data/lib/chef/resource/machine_image.rb

@@ -3,7 +3,10 @@ require 'cheffish'
 require 'chef_metal'
 require 'cheffish/merged_config'
 
-class Chef::Resource::MachineImage < Chef::Resource::Machine
+class Chef
+class Resource
+class MachineImage < Chef::Resource::Machine
+
   self.resource_name = 'machine_image'
 
   def initialize(*args)
@@ -26,4 +29,7 @@ class Chef::Resource::MachineImage < Chef::Resource::Machine
   # - ability to rebuild new image based on the previous image
   # - ability to specify whether and how to keep the image-building machine around
   # - ability to specify whether to leave the chef config around or not
+
+end
+end
 end

data/lib/chef_metal/chef_run_data.rb

@@ -1,11 +1,10 @@
 require 'chef/mixin/deep_merge'
-require 'cheffish/with_pattern'
 require 'cheffish/merged_config'
 require 'chef_metal/chef_machine_spec'
 
 module ChefMetal
   class ChefRunData
-    extend Cheffish::WithPattern
+
     def initialize(config)
       @config = config
       @drivers = {}
@@ -14,9 +13,32 @@ module ChefMetal
     attr_reader :config
     attr_reader :drivers
     attr_reader :current_driver
+    attr_accessor :current_machine_options
+    attr_accessor :current_image_options
 
-    with :machine_options
-    with :image_options
+    def with_machine_options(value)
+      old_value = self.current_machine_options
+      self.current_machine_options = value
+      if block_given?
+        begin
+          yield
+        ensure
+          self.current_machine_options = old_value
+        end
+      end
+    end
+
+    def with_image_options(value)
+      old_value = self.current_image_options
+      self.current_image_options = value
+      if block_given?
+        begin
+          yield
+        ensure
+          self.current_image_options = old_value
+        end
+      end
+    end
 
     def with_driver(driver, options = nil, &block)
       if drivers[driver] && options
@@ -26,18 +48,6 @@ module ChefMetal
       @current_driver_options = options
     end
 
-    def auto_batch_machines
-      if !@auto_batch_machines.nil?
-        @auto_batch_machines
-      else
-        config[:auto_batch_machines]
-      end
-    end
-
-    def auto_batch_machines=(value)
-      @auto_batch_machines = value
-    end
-
     def current_driver
       @current_driver || config[:driver]
     end

data/lib/chef_metal/convergence_strategy/install_cached.rb

@@ -3,6 +3,7 @@ require 'pathname'
 require 'fileutils'
 require 'digest/md5'
 require 'thread'
+require 'chef/http/simple'
 
 module ChefMetal
   class ConvergenceStrategy
@@ -118,11 +119,7 @@ module ChefMetal
         # Download and parse the metadata
         Chef::Log.debug("Getting metadata for machine #{machine.node['name']}: #{metadata_url}")
         uri = URI(metadata_url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = use_ssl
-        request = Net::HTTP::Get.new(uri.request_uri)
-        response = http.request(request)
-        metadata_str = response.body
+        metadata_str = Chef::HTTP::Simple.new(uri).get(uri)
         metadata = {}
         metadata_str.each_line do |line|
           key, value = line.split("\t", 2)

data/lib/chef_metal/convergence_strategy/precreate_chef_objects.rb

@@ -173,7 +173,7 @@ module ChefMetal
 chef_server_url #{chef_server_url.inspect}
 node_name #{node_name.inspect}
 client_key #{convergence_options[:client_pem_path].inspect}
-ssl_verify_mode :verify_none
+ssl_verify_mode :verify_peer
 EOM
       end
     end

data/lib/chef_metal/driver.rb

@@ -6,25 +6,23 @@ module ChefMetal
   # For AWS, a Driver instance corresponds to a single account.
   # For Vagrant, it is a directory where VM files are found.
   #
-  # == How to Make a Driver
+  # = How to Make a Driver
   #
   # To implement a Driver, you must implement the following methods:
   #
-  # - initialize(driver_url) - create a new driver with the given URL
-  # - driver_url - a URL representing everything unique about your driver.
-  #                But NOT credentials.
-  # - allocate_machine - ask the driver to allocate a machine to you.
-  # - ready_machine - get the machine "ready" - wait for it to be booted and
-  #                   accessible (for example, accessible via SSH transport).
-  # - stop_machine - stop the machine.
-  # - destroy_machine - delete the machine.
-  # - connect_to_machine - connect to the given machine.
+  # * initialize(driver_url) - create a new driver with the given URL
+  # * driver_url - a URL representing everything unique about your driver. (NOT credentials)
+  # * allocate_machine - ask the driver to allocate a machine to you.
+  # * ready_machine - get the machine "ready" - wait for it to be booted and accessible (for example, accessible via SSH transport).
+  # * stop_machine - stop the machine.
+  # * destroy_machine - delete the machine.
+  # * connect_to_machine - connect to the given machine.
   #
   # Optionally, you can also implement:
-  # - allocate_machines - allocate an entire group of machines.
-  # - ready_machines - get a group of machines warm and booted.
-  # - stop_machines - stop a group of machines.
-  # - destroy_machines - delete a group of machines.
+  # * allocate_machines - allocate an entire group of machines.
+  # * ready_machines - get a group of machines warm and booted.
+  # * stop_machines - stop a group of machines.
+  # * destroy_machines - delete a group of machines.
   #
   # Additionally, you must create a file named `chef_metal/driver_init/<scheme>.rb`,
   # where <scheme> is the name of the scheme you chose for your driver_url. This
@@ -39,8 +37,8 @@ module ChefMetal
     #
     # Inflate a driver from a driver URL.
     #
-    # == Parameters
-    # driver_url - the URL to inflate the driver
+    #
+    # @param [String] driver_url  the URL to inflate the driver
     # config - a configuration hash.  See "config" for a list of known keys.
     #
     # == Returns
@@ -61,7 +59,7 @@ module ChefMetal
     #
     # A URL representing the driver and the place where machines come from.
     # This will be stuffed in machine_spec.location['driver_url'] so that the
-    # machine can be reinflated.  URLs must have a unique scheme identifying the
+    # machine can be re-inflated.  URLs must have a unique scheme identifying the
     # driver class, and enough information to identify the place where created
     # machines can be found.  For AWS, this is the account number; for lxc and
     # vagrant, it is the directory in which VMs and containers are.
@@ -92,8 +90,8 @@ module ChefMetal
       config[:driver_options] || {}
     end
 
-    #
-    # Allocate a machine from the PXE/cloud/VM/container driver.  This method
+
+    # Allocate a machine from the underlying service.  This method
     # does not need to wait for the machine to boot or have an IP, but it must
     # store enough information in machine_spec.location to find the machine
     # later in ready_machine.
@@ -102,103 +100,91 @@ module ChefMetal
     # it, but does not need to wait until it is started.  The idea is to get the
     # gears moving, but the job doesn't need to be done :)
     #
-    # ## Parameters
-    # action_handler - the action_handler object that is calling this method; this
-    #        is generally a driver, but could be anything that can support the
-    #        interface (i.e., in the case of the test kitchen metal driver for
-    #        acquiring and destroying VMs).
-    #
-    # existing_machine - a MachineSpec representing the existing machine (if any).
-    #
-    # machine_options - a set of options representing the desired provisioning
-    #                   state of the machine (image name, bootstrap ssh credentials,
-    #                   etc.). This will NOT be stored in the machine_spec, and is
-    #                   ephemeral.
+    # @param [ChefMetal::ActionHandler] action_handler The action_handler object that is calling this method
+    # @param [ChefMetal::MachineSpec] machine_spec A machine specification representing this machine.
+    # @param [Hash] machine_options A set of options representing the desired options when
+    # constructing the machine
     #
-    # ## Returns
-    #
-    # Modifies the passed-in machine_spec.  Anything in here will be saved
+    # @return [ChefMetal::MachineSpec] Modifies the passed-in machine_spec.  Anything in here will be saved
     # back after allocate_machine completes.
     #
     def allocate_machine(action_handler, machine_spec, machine_options)
       raise "#{self.class} does not implement allocate_machine"
     end
 
-    #
     # Ready a machine, to the point where it is running and accessible via a
     # transport. This will NOT allocate a machine, but may kick it if it is down.
     # This method waits for the machine to be usable, returning a Machine object
     # pointing at the machine, allowing useful actions like setup, converge,
     # execute, file and directory.
     #
-    # ## Parameters
-    # action_handler - the action_handler object that is calling this method; this
-    #        is generally a driver, but could be anything that can support the
-    #        interface (i.e., in the case of the test kitchen metal driver for
-    #        acquiring and destroying VMs).
-    # machine_spec - MachineSpec representing this machine.
-    # machine_options - a set of options representing the desired provisioning
-    #                   state of the machine (image name, bootstrap ssh credentials,
-    #                   etc.). This will NOT be stored in the machine_spec, and is
-    #                   ephemeral.
     #
-    # ## Returns
+    # @param [ChefMetal::ActionHandler] action_handler The action_handler object that is calling this method
+    # @param [ChefMetal::MachineSpec] machine_spec A machine specification representing this machine.
+    # @param [Hash] machine_options A set of options representing the desired state of the machine
     #
-    # Machine object pointing at the machine, allowing useful actions like setup,
+    # @return [Machine] A machine object pointing at the machine, allowing useful actions like setup,
     # converge, execute, file and directory.
     #
     def ready_machine(action_handler, machine_spec, machine_options)
       raise "#{self.class} does not implement ready_machine"
     end
 
-    #
     # Connect to a machine without allocating or readying it.  This method will
     # NOT make any changes to anything, or attempt to wait.
     #
-    # ## Parameters
-    # machine_spec - MachineSpec representing this machine.
-    #
-    # ## Returns
-    #
-    # Machine object pointing at the machine, allowing useful actions like setup,
+    # @param [ChefMetal::MachineSpec] machine_spec MachineSpec representing this machine.
+    # @param [Hash] machine_options
+    # @return [Machine] A machine object pointing at the machine, allowing useful actions like setup,
     # converge, execute, file and directory.
     #
     def connect_to_machine(machine_spec, machine_options)
       raise "#{self.class} does not implement connect_to_machine"
     end
 
-    #
-    # Delete the given machine (idempotent).  Should destroy the machine,
+
+    # Delete the given machine --  destroy the machine,
     # returning things to the state before allocate_machine was called.
     #
+    # @param [ChefMetal::ActionHandler] action_handler The action_handler object that is calling this method
+    # @param [ChefMetal::MachineSpec] machine_spec A machine specification representing this machine.
+    # @param [Hash] machine_options A set of options representing the desired state of the machine
     def destroy_machine(action_handler, machine_spec, machine_options)
       raise "#{self.class} does not implement destroy_machine"
     end
 
-    #
     # Stop the given machine.
     #
+    # @param [ChefMetal::ActionHandler] action_handler The action_handler object that is calling this method
+    # @param [ChefMetal::MachineSpec] machine_spec A machine specification representing this machine.
+    # @param [Hash] machine_options A set of options representing the desired state of the machine
     def stop_machine(action_handler, machine_spec, machine_options)
       raise "#{self.class} does not implement stop_machine"
     end
 
-    #
     # Allocate an image. Returns quickly with an ID that tracks the image.
     #
+    # @param [ChefMetal::ActionHandler] action_handler The action_handler object that is calling this method
+    # @param [ChefMetal::ImageSpec] image_spec A machine specification representing this machine.
+    # @param [Hash] image_options A set of options representing the desired state of the machine
     def allocate_image(action_handler, image_spec, image_options, machine_spec)
       raise "#{self.class} does not implement create_image"
     end
 
-    #
     # Ready an image, waiting till the point where it is ready to be used.
     #
+    # @param [ChefMetal::ActionHandler] action_handler The action_handler object that is calling this method
+    # @param [ChefMetal::ImageSpec] image_spec A machine specification representing this machine.
+    # @param [Hash] image_options A set of options representing the desired state of the machine
     def ready_image(action_handler, image_spec, image_options)
       raise "#{self.class} does not implement ready_image"
     end
 
+    # Destroy an image using this service.
     #
-    # Destroy an image.
-    #
+    # @param [ChefMetal::ActionHandler] action_handler The action_handler object that is calling this method
+    # @param [ChefMetal::ImageSpec] image_spec A machine specification representing this machine.
+    # @param [Hash] image_options A set of options representing the desired state of the machine
     def destroy_image(action_handler, image_spec, image_options)
       raise "#{self.class} does not implement destroy_image"
     end
@@ -214,15 +200,10 @@ module ChefMetal
     # Drivers do not need to implement this; the default implementation
     # calls acquire_machine in parallel.
     #
-    # ## Parameters
-    # action_handler - the action_handler object that is calling this method; this
-    #        is generally a driver, but could be anything that can support the
-    #        interface (i.e., in the case of the test kitchen metal driver for
-    #        acquiring and destroying VMs).
-    # specs_and_options - a hash of machine_spec -> machine_options representing the
-    #                 machines to allocate.
-    # parallelizer - an object with a parallelize() method that works like this:
+    # == Parallelizing
     #
+    # The parallelizer must implement #parallelize
+    # @example Example parallelizer
     #   parallelizer.parallelize(specs_and_options) do |machine_spec|
     #     allocate_machine(action_handler, machine_spec)
     #   end.to_a
@@ -232,16 +213,25 @@ module ChefMetal
     # not go over parallelization limits set by the user.  Use of the parallelizer
     # to parallelizer machines is not required.
     #
-    # ## Block
+    # == Passing a block
     #
     # If you pass a block to this function, each machine will be yielded to you
     # as it completes, and then the function will return when all machines are
     # yielded.
     #
+    # @example Passing a block
     #   allocate_machines(action_handler, specs_and_options, parallelizer) do |machine_spec|
     #     ...
     #   end
     #
+    # @param [ChefMetal::ActionHandler] action_handler The action_handler object that is calling this method; this
+    #        is generally a driver, but could be anything that can support the
+    #        interface (i.e., in the case of the test kitchen metal driver for
+    #        acquiring and destroying VMs).
+    # @param [Hash] specs_and_options A hash of machine_spec -> machine_options representing the
+    #                 machines to allocate.
+    # @param [Parallelizer] parallelizer an object with a parallelize() method that works like this:
+    # @return [Array<Machine>] An array of machine objects created
     def allocate_machines(action_handler, specs_and_options, parallelizer)
       parallelizer.parallelize(specs_and_options) do |machine_spec, machine_options|
         allocate_machine(add_prefix(machine_spec, action_handler), machine_spec, machine_options)
@@ -275,6 +265,7 @@ module ChefMetal
       end.to_a
     end
 
+
     protected
 
     def add_prefix(machine_spec, action_handler)

data/lib/chef_metal/machine.rb

@@ -102,7 +102,7 @@ module ChefMetal
     # Returns a triplet:
     #   platform, platform_version, machine_architecture = machine.detect_os(action_handler)
     # This triplet is suitable for passing to the Chef metadata API:
-    # https://www.opscode.com/chef/metadata?p=#{platform}&pv=#{platform_version}&m=#{machine_architecture}
+    # https://www.opscode.com/chef/metadata?p=PLATFORM&pv=PLATFORM_VERSION&m=MACHINE_ARCHITECTURE
     def detect_os(action_handler)
       raise "detect_os not overridden on #{self.class}"
     end

data/lib/chef_metal/recipe_dsl.rb

@@ -15,6 +15,7 @@ require 'chef/provider/machine_image'
 class Chef
   module DSL
     module Recipe
+
       def with_driver(driver, options = nil, &block)
         run_context.chef_metal.with_driver(driver, options, &block)
       end
@@ -41,14 +42,6 @@ class Chef
 
       NOT_PASSED = Object.new
 
-      def auto_batch_machines(value = NOT_PASSED)
-        if value == NOT_PASSED
-          run_context.chef_metal.auto_batch_machines
-        else
-          run_context.chef_metal.auto_batch_machines = value
-        end
-      end
-
       @@next_machine_batch_index = 0
 
       def machine_batch_default_name
@@ -69,47 +62,11 @@ class Chef
         end
       end
 
-      # When the machine resource is first declared, create a machine_batch (if there
-      # isn't one already)
-      def machine(name, &block)
-        resource = build_resource(:machine, name, caller[0], &block)
-
-        # Grab the previous resource so we can decide whether to batch this or make it its own resource.
-        previous_index = run_context.resource_collection.previous_index
-        previous = previous_index >= 0 ? run_context.resource_collection[previous_index] : nil
-        if run_context.chef_metal.auto_batch_machines &&
-           previous &&
-           Array(resource.action).size == 1 &&
-           Array(previous.action) == Array(resource.action)
-
-          # Handle batching similar machines (with similar actions)
-          if previous.is_a?(Chef::Resource::MachineBatch)
-            # If we see a machine declared after a previous machine_batch with the same action, add it to the batch.
-            previous.machines << resource
-          elsif previous.is_a?(Chef::Resource::Machine)
-            # If we see two machines in a row with the same action, batch them.
-            _self = self
-            batch = build_resource(:machine_batch, machine_batch_default_name) do
-              action resource.action
-              machines [ previous, resource ]
-            end
-            batch.from_recipe self
-            run_context.resource_collection[previous_index] = batch
-          else
-            run_context.resource_collection.insert(resource)
-          end
-
-        else
-          run_context.resource_collection.insert(resource)
-        end
-        resource
-      end
     end
   end
 
   class Config
     default(:driver) { ENV['CHEF_DRIVER'] }
-    default(:auto_batch_machines) { true }
   #   config_context :drivers do
   #     # each key is a driver_url, and each value can have driver, driver_options and machine_options
   #     config_strict_mode false

data/lib/chef_metal/transport/ssh.rb

@@ -10,6 +10,26 @@ require 'net/ssh/gateway'
 module ChefMetal
   class Transport
     class SSH < ChefMetal::Transport
+      #
+      # Create a new SSH transport.
+      #
+      # == Arguments
+      #
+      # - host: the host to connect to, e.g. '145.14.51.45'
+      # - username: the username to connect with
+      # - ssh_options: a list of options to Net::SSH.start
+      # - options: a hash of options for the transport itself, including:
+      #   - :prefix: a prefix to send before each command (e.g. "sudo ")
+      #   - :ssh_pty_enable: set to false to disable pty (some instances don't
+      #     support this, most do)
+      #   - :ssh_gateway: the gateway to use, e.g. "jkeiser@145.14.51.45:222".
+      #     nil (the default) means no gateway.
+      # - global_config: an options hash that looks suspiciously similar to
+      #   Chef::Config, containing at least the key :log_level.
+      #
+      # The options are used in
+      #   Net::SSH.start(host, username, ssh_options)
+
       def initialize(host, username, ssh_options, options, global_config)
         @host = host
         @username = username
@@ -224,7 +244,7 @@ module ChefMetal
       end
 
       def gateway
-        gw_host, gw_user = options[:ssh_gateway].split('@').reverse
+        gw_user, gw_host = options[:ssh_gateway].split('@')
         gw_host, gw_port = gw_host.split(':')
         gw_user = ssh_options[:ssh_username] unless gw_user
 

data/lib/chef_metal/transport/winrm.rb

@@ -4,7 +4,22 @@ require 'timeout'
 
 module ChefMetal
   class Transport
+    # Transport to handle the WinRM connection protocol.
     class WinRM < ChefMetal::Transport
+      #
+      # Create a new WinRM transport.
+      #
+      # == Arguments
+      # - endpoint: the WinRM endpoint, e.g. http://145.14.51.45:5985/wsman.
+      # - type: the connection type, e.g. :plaintext.
+      # - options: options hash, including both WinRM options and transport options.
+      #   For transport options, see the Transport.options definition.  WinRM
+      #   options include :user, :pass, :disable_sspi => true, among others.
+      # - global_config: an options hash that looks suspiciously similar to
+      #   Chef::Config, containing at least the key :log_level.
+      #
+      # The actual connection is made as ::WinRM::WinRMWebService.new(endpoint, type, options)
+      #
       def initialize(endpoint, type, options, global_config)
         @endpoint = endpoint
         @type = type

data/lib/chef_metal/transport.rb

@@ -7,14 +7,19 @@ module ChefMetal
     # Execute a program on the remote host.
     #
     # == Arguments
-    # command: command to run.  May be a shell-escaped string or a pre-split array containing [PROGRAM, ARG1, ARG2, ...].
+    # command: command to run.  May be a shell-escaped string or a pre-split
+    #          array containing [PROGRAM, ARG1, ARG2, ...].
     # options: hash of options, including but not limited to:
-    #          :timeout => NUM_SECONDS - time to wait before program finishes (throws an exception otherwise).  Set to nil or 0 to run with no timeout.  Defaults to 15 minutes.
+    #          :timeout => NUM_SECONDS - time to wait before program finishes
+    #                      (throws an exception otherwise).  Set to nil or 0 to
+    #                      run with no timeout.  Defaults to 15 minutes.
     #          :stream => BOOLEAN - true to stream stdout and stderr to the console.
-    #          :stream => BLOCK - block to stream stdout and stderr to (block.call(stdout_chunk, stderr_chunk))
+    #          :stream => BLOCK - block to stream stdout and stderr to
+    #                     (block.call(stdout_chunk, stderr_chunk))
     #          :stream_stdout => FD - FD to stream stdout to (defaults to IO.stdout)
     #          :stream_stderr => FD - FD to stream stderr to (defaults to IO.stderr)
-    #          :read_only => BOOLEAN - true if command is guaranteed not to change system state (useful for Docker)
+    #          :read_only => BOOLEAN - true if command is guaranteed not to
+    #                        change system state (useful for Docker)
     def execute(command, options = {})
       raise "execute not overridden on #{self.class}"
     end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.14.alpha.3'
+  VERSION = '0.14.alpha.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-fork-chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.14.alpha.3
+  version: 0.14.alpha.4
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: clc-cheffish
+  name: cheffish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.clc
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.clc
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement