chef-provisioning 0.16 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23afd85ce662e97baf1a66a52c65791cac55177b
-  data.tar.gz: 49f246eccc49f87c330171b9bb4e0205ae64f23b
+  metadata.gz: e0c37376aede638b149fb1aa359b47260e7dd532
+  data.tar.gz: c75da4c89e3b9cd12a5a97906f1cc708b4f42989
 SHA512:
-  metadata.gz: 9ece1ec96f1ed60e46ec0e51f2d10127d2fd72ff9b0d5c97b1ca6d847c16512cbc30d935e9931c94303f6ac213d64a3f9c2f9c70f52e558d3d0a4cf2fba16bcb
-  data.tar.gz: 70becfd68e69d7e2f95d77ba60232efe89720ebb4c612ced09f446a906912dd98b8d082fa7d716cf051601261da20fd9c8cecf29cdd08bb9d2d5cf81602317f1
+  metadata.gz: 27e6d46bbeb25ba1185014913f7c20c5a0adeb73ffe9c1bae191ec914fb3ccfc2ca795a657ab52333720643a80231ea2bead2b65bd899654dfcf7a3c08d313e9
+  data.tar.gz: 9a043f593fa6db7f7a8275fa2a21286bad930bb1be47249dfaa1b0331570d6defefcb51c57dc67b3158168d6ec24f454700245c590220c73f14b19b315eb1172

data/CHANGELOG.md

@@ -1,4 +1,16 @@
 # Chef Provisioning Changelog
+
+## 0.17 (12/17/2014)
+
+- Make machine batch convergent 
+- Consolidate load balancer create and update
+- Update some URLs
+- SSL verification fix
+- Test suites
+- Auto-create image data bags
+- Remove some un-needed dependencies
+- Wipe out SSH keys in debug messages
+
 ## 0.16 (11/4/2014)
 
 - Make it work with Chef 12

data/README.md

@@ -16,6 +16,7 @@ Date       | Blog
 
 Documentation
 -------------
+* [Chef Docs](https://docs.getchef.com/provisioning.html)
 * [Frequently Asked Questions](https://github.com/opscode/chef-provisioning/blob/master/docs/faq.md)
 * [Configuration](https://github.com/opscode/chef-provisioning/blob/master/docs/configuration.md#configuring-and-using-provisioning-drivers)
 * [Writing Drivers](https://github.com/opscode/chef-provisioning/blob/master/docs/building_drivers.md#writing-drivers)
@@ -118,18 +119,22 @@ Drivers save their data in the Chef node itself, so that they will be accessible
 Drivers each have their own repository.  Current drivers:
 
 **Cloud:**
+- [AWS](https://github.com/opscode/chef-provisioning-aws)
+- [Azure](https://github.com/opscode/chef-provisioning-azure)
 - [FOG: EC2, DigitalOcean, OpenStack, etc.](https://github.com/opscode/chef-provisioning-fog)
 
 **Virtualization:**
 - [Vagrant: VirtualBox, VMWare Fusion, etc.](https://github.com/opscode/chef-provisioning-vagrant)
-- [VSphere](https://github.com/RallySoftware-cookbooks/chef-provisioning-vsphere) (not yet up to date with 0.11)
+- [VSphere](https://github.com/RallySoftware-cookbooks/chef-metal-vsphere) (not yet up to date with 0.11)
 
 **Containers:**
-- [LXC](https://github.com/opscode/chef-provisioning-lxc) (not yet up to date with 0.11)
 - [Docker](https://github.com/opscode/chef-provisioning-docker)
+- [LXC](https://github.com/opscode/chef-provisioning-lxc)
 
 **Bare Metal:**
-- [SSH (no PXE)](https://github.com/double-z/chef-provisioning-ssh) (not yet up to date with 0.11)
+- [Hanlon](https://github.com/opscode/chef-provisioning-hanlon)
+- [OpenCrowbar](https://github.com/newgoliath/chef-provisioning-crowbar) OpenCrowbar controls your real metal.  It discovers, inventories, configs RAID & BIOS and networks, and installs your OS.  [OpenCrowbar website](http://www.opencrowbar.org) [OpenCrowbar github](https://github.com/opencrowbar/core)
+- [SSH (no PXE)](https://github.com/double-z/chef-metal-ssh) (not yet up to date with 0.11)
 
 ### Anatomy of a Recipe
 
@@ -147,7 +152,7 @@ The driver is specified on the command line.  Drivers are URLs.  You could use `
 The `vagrant_linux.rb` recipe handles the physical specification of the machines and Vagrant box:
 
 ```ruby
-require 'chef/provisioning_vagrant'
+require 'chef/provisioning/vagrant_driver'
 
 vagrant_box 'precise64' do
   url 'http://files.vagrantup.com/precise64.box'
@@ -158,7 +163,7 @@ with_machine_options :vagrant_options => {
 }
 ```
 
-`require 'chef/provisioning_vagrant'` is how we bring in the `vagrant_box` resource.
+`require 'chef/provisioning/vagrant_driver'` is how we bring in the `vagrant_box` resource.
 
 `vagrant_box` makes sure a particular vagrant box exists, and lets you specify `machine_options` for things like port forwarding, OS definitions, and any other vagrant-isms.
 
@@ -190,7 +195,7 @@ Most Chef Provisioning drivers try hard to provide reasonable defaults so you ca
 You will usually want to create or input a custom key pair for bootstrap. To customize, specify keys and AMI and other options, you can make recipes like this:
 
 ```ruby
-require 'chef/provisioning_fog'
+require 'chef/provisioning/fog_driver'
 
 fog_key_pair 'my_bootstrap_key'
 

data/lib/chef/provider/load_balancer.rb

@@ -25,44 +25,16 @@ class Chef
                   Chef::Provisioning::ChefLoadBalancerSpec.empty(new_resource.name)
 
         Chef::Log.debug "Creating load balancer: #{new_resource.name}; loaded #{lb_spec.inspect}"
-        if lb_spec.load_balancer_options
-          # Updating
-          update_loadbalancer(lb_spec)
-        else
-          lb_spec.load_balancer_options = new_resource.load_balancer_options
-          lb_spec.machines = new_resource.machines
-          create_loadbalancer(lb_spec)
-        end
-      end
-
-      action :destroy do
-        lb_spec = Chef::Provisioning::ChefLoadBalancerSpec.get(new_resource.name)
-        new_driver.destroy_load_balancer(@action_handler, lb_spec, lb_options)
-      end
+        machine_specs = new_resource.machines ? new_resource.machines.map { |machine| get_machine_spec(machine) } : nil
 
-      attr_reader :lb_spec
-
-
-      def update_loadbalancer(lb_spec)
-        Chef::Log.debug "Updating load balancer: #{lb_spec.id}"
-        machines = Hash[
-            *(new_resource.machines).collect {
-                |machine_name| [machine_name, get_machine_spec(machine_name)]
-            }.flatten
-        ]
-        new_driver.update_load_balancer(action_handler, lb_spec, lb_options, {
-                  :machines => machines
-                }
-            )
-        lb_spec.load_balancer_options = new_resource.load_balancer_options
-        lb_spec.machines = new_resource.machines
+        new_driver.allocate_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
         lb_spec.save(action_handler)
+        new_driver.ready_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
       end
 
-      def create_loadbalancer(lb_spec)
-        new_driver.allocate_load_balancer(action_handler, lb_spec, lb_options)
-        lb_spec.save(action_handler)
-        new_driver.ready_load_balancer(action_handler, lb_spec, lb_options)
+      action :destroy do
+        lb_spec = Chef::Provisioning::ChefLoadBalancerSpec.get(new_resource.name)
+        new_driver.destroy_load_balancer(action_handler, lb_spec, lb_options)
       end
 
       private

data/lib/chef/provider/machine.rb

@@ -54,9 +54,17 @@ class Machine < Chef::Provider::LWRPBase
       machine_spec.save(action_handler)
       upload_files(machine)
       # If we were asked to converge, or anything changed, or if a converge has never succeeded, converge.
-      if new_resource.converge || (new_resource.converge.nil? && resource_updated?) ||
-         !machine_spec.node['automatic'] || machine_spec.node['automatic'].size == 0
+      if new_resource.converge
+        Chef::Log.info("Converging #{machine_spec.name} because 'converge true' is set ...")
         machine.converge(action_handler)
+      elsif new_resource.converge.nil? && resource_updated?
+        Chef::Log.info("Converging #{machine_spec.name} because the resource was updated ...")
+        machine.converge(action_handler)
+      elsif !machine_spec.node['automatic'] || machine_spec.node['automatic'].size == 0
+        Chef::Log.info("Converging #{machine_spec.name} because it has never been converged (automatic attributes are empty) ...")
+        machine.converge(action_handler)
+      elsif new_resource.converge == false
+        Chef::Log.debug("Not converging #{machine_spec.name} because 'converge false' is set.")
       end
     ensure
       machine.disconnect

data/lib/chef/provider/machine_batch.rb

@@ -11,7 +11,7 @@ class Provider
 class MachineBatch < Chef::Provider::LWRPBase
 
   def action_handler
-    @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
+    @action_handler ||= Provisioning::ChefProviderActionHandler.new(self)
   end
 
   use_inline_resources
@@ -27,8 +27,8 @@ class 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|
-        prefixed_handler = Chef::Provisioning::AddPrefixActionHandler.new(action_handler, "[#{machine_spec.name}] ")
-        machine_spec.save(prefixed_handler)
+        m = by_id[machine_spec.id]
+        machine_spec.save(m[:action_handler])
       end
     end
   end
@@ -39,30 +39,40 @@ class MachineBatch < Chef::Provider::LWRPBase
 
   action :setup do
     with_ready_machines do |m|
-      prefixed_handler = Chef::Provisioning::AddPrefixActionHandler.new(action_handler, "[#{m[:spec].name}] ")
-      m[:machine].setup_convergence(prefixed_handler)
-      m[:spec].save(prefixed_handler)
-      Chef::Provider::Machine.upload_files(prefixed_handler, m[:machine], m[:files])
+      m[:machine].setup_convergence(m[:action_handler])
+      m[:spec].save(m[:action_handler])
+      Chef::Provider::Machine.upload_files(m[:action_handler], m[:machine], m[:files])
     end
   end
 
   action :converge do
     with_ready_machines do |m|
-      prefixed_handler = Chef::Provisioning::AddPrefixActionHandler.new(action_handler, "[#{m[:spec].name}] ")
-      m[:machine].setup_convergence(prefixed_handler)
-      m[:spec].save(action_handler)
-      Chef::Provider::Machine.upload_files(prefixed_handler, m[:machine], m[:files])
-      # TODO only converge if machine was modified
-      m[:machine].converge(prefixed_handler)
-      m[:spec].save(prefixed_handler)
+      m[:machine].setup_convergence(m[:action_handler])
+      m[:spec].save(m[:action_handler])
+      Chef::Provider::Machine.upload_files(m[:action_handler], m[:machine], m[:files])
+
+      if m[:resource] && m[:resource].converge
+        Chef::Log.info("Converging #{m[:spec].name} because 'converge true' is set ...")
+        m[:machine].converge(m[:action_handler])
+        m[:spec].save(m[:action_handler])
+      elsif (!m[:resource] || m[:resource].converge.nil?) && m[:action_handler].locally_updated
+        Chef::Log.info("Converging #{m[:spec].name} because the resource was updated ...")
+        m[:machine].converge(m[:action_handler])
+        m[:spec].save(m[:action_handler])
+      elsif !m[:spec].node['automatic'] || m[:spec].node['automatic'].size == 0
+        Chef::Log.info("Converging #{m[:spec].name} because it has never been converged (automatic attributes are empty) ...")
+        m[:machine].converge(m[:action_handler])
+        m[:spec].save(m[:action_handler])
+      elsif m[:resource] && m[:resource].converge == false
+        Chef::Log.debug("Not converging #{m[:spec].name} because 'converge false' is set.")
+      end
     end
   end
 
   action :converge_only do
     parallel_do(@machines) do |m|
-      prefixed_handler = Chef::Provisioning::AddPrefixActionHandler.new(action_handler, "[#{m[:spec].name}] ")
       machine = run_context.chef_provisioning.connect_to_machine(m[:spec])
-      machine.converge(prefixed_handler)
+      machine.converge(m[:action_handler])
     end
   end
 
@@ -80,7 +90,6 @@ class MachineBatch < Chef::Provider::LWRPBase
 
   def with_ready_machines
     action_allocate
-    by_id = @machines.inject({}) { |hash,m| hash[m[:spec].id] = m; hash }
     parallel_do(by_new_driver) do |driver, specs_and_options|
       driver.ready_machines(action_handler, specs_and_options, parallelizer) do |machine|
         machine.machine_spec.save(action_handler)
@@ -97,6 +106,10 @@ class MachineBatch < Chef::Provider::LWRPBase
     end
   end
 
+  def by_id
+    @by_id ||= @machines.inject({}) { |hash,m| hash[m[:spec].id] = m; hash }
+  end
+
   # TODO in many of these cases, the order of the results only matters because you
   # want to match it up with the input.  Make a parallelize method that doesn't
   # care about order and spits back results as quickly as possible.
@@ -151,28 +164,32 @@ class MachineBatch < Chef::Provider::LWRPBase
         provider = Chef::Provider::Machine.new(machine_resource, machine_resource.run_context)
         provider.load_current_resource
         {
+          :resource => machine_resource,
           :spec => provider.machine_spec,
           :desired_driver => machine_resource.driver,
           :files => machine_resource.files,
-          :machine_options => proc { |driver| provider.machine_options(driver) }
+          :machine_options => proc { |driver| provider.machine_options(driver) },
+          :action_handler => Provisioning::AddPrefixActionHandler.new(action_handler, "[#{machine_resource.name}] ")
         }
-      elsif machine.is_a?(Chef::Provisioning::MachineSpec)
+      elsif machine.is_a?(Provisioning::MachineSpec)
         machine_spec = machine
         {
           :spec => machine_spec,
           :desired_driver => new_resource.driver,
           :files => new_resource.files,
-          :machine_options => proc { |driver| machine_options(driver) }
+          :machine_options => proc { |driver| machine_options(driver) },
+          :action_handler => Provisioning::AddPrefixActionHandler.new(action_handler, "[#{machine_spec.name}] ")
         }
       else
         name = machine
-        machine_spec = Chef::Provisioning::ChefMachineSpec.get(name, new_resource.chef_server) ||
-                       Chef::Provisioning::ChefMachineSpec.empty(name, new_resource.chef_server)
+        machine_spec = Provisioning::ChefMachineSpec.get(name, new_resource.chef_server) ||
+                       Provisioning::ChefMachineSpec.empty(name, new_resource.chef_server)
         {
           :spec => machine_spec,
           :desired_driver => new_resource.driver,
           :files => new_resource.files,
-          :machine_options => proc { |driver| machine_options(driver) }
+          :machine_options => proc { |driver| machine_options(driver) },
+          :action_handler => Provisioning::AddPrefixActionHandler.new(action_handler, "[#{name}] ")
         }
       end
     end.to_a

data/lib/chef/provisioning/add_prefix_action_handler.rb

@@ -12,18 +12,22 @@ module Provisioning
 
     attr_reader :action_handler
     attr_reader :prefix
+    attr_reader :locally_updated
 
     def_delegators :@action_handler, :should_perform_actions, :updated!, :open_stream, :host_node
 
     def report_progress(description)
+      @locally_updated = true
       action_handler.report_progress(Array(description).flatten.map { |d| "#{prefix}#{d}" })
     end
 
     def performed_action(description)
+      @locally_updated = true
       action_handler.performed_action(Array(description).flatten.map { |d| "#{prefix}#{d}" })
     end
 
     def perform_action(description, &block)
+      @locally_updated = true
       action_handler.perform_action(Array(description).flatten.map { |d| "#{prefix}#{d}" }, &block)
     end
   end

data/lib/chef/provisioning/chef_image_spec.rb

@@ -60,6 +60,9 @@ module Provisioning
       _self = self
       _chef_server = _self.chef_server
       Chef::Provisioning.inline_resource(action_handler) do
+        # Create the data bag if needed
+        chef_data_bag 'images'
+        # Save the image
         chef_data_bag_item _self.name do
           data_bag 'images'
           chef_server _chef_server

data/lib/chef/provisioning/chef_load_balancer_spec.rb

@@ -22,7 +22,6 @@ module Provisioning
       chef_api = Cheffish.chef_server_api(chef_server)
       begin
         data = chef_api.get("/data/loadbalancers/#{name}")
-        data['load_balancer_options'] = strings_to_symbols(data['load_balancer_options'])
         ChefLoadBalancerSpec.new(data, chef_server)
       rescue Net::HTTPServerException => e
         if e.response.code == '404'
@@ -60,6 +59,7 @@ module Provisioning
       _self = self
       _chef_server = _self.chef_server
       Chef::Provisioning.inline_resource(action_handler) do
+        chef_data_bag 'loadbalancers'
         chef_data_bag_item _self.name do
           data_bag 'loadbalancers'
           chef_server _chef_server

data/lib/chef/provisioning/chef_machine_spec.rb

@@ -1,4 +1,3 @@
-require 'pry'
 require 'chef/provisioning'
 require 'cheffish'
 require 'chef/provisioning/machine_spec'

data/lib/chef/provisioning/convergence_strategy/install_cached.rb

@@ -124,7 +124,7 @@ module Provisioning
         metadata = {}
         metadata_str.each_line do |line|
           key, value = line.split("\t", 2)
-          metadata[key] = value
+          metadata[key] = value.chomp
         end
         metadata
       end

data/lib/chef/provisioning/convergence_strategy/precreate_chef_objects.rb

@@ -170,11 +170,17 @@ module Provisioning
       end
 
       def client_rb_content(chef_server_url, node_name)
+        if chef_server_url.downcase.start_with?("https")
+          ssl_verify_mode = ':verify_peer'
+        else
+          ssl_verify_mode = ':verify_none'
+        end
+
         <<EOM
 chef_server_url #{chef_server_url.inspect}
 node_name #{node_name.inspect}
 client_key #{convergence_options[:client_pem_path].inspect}
-ssl_verify_mode :verify_peer
+ssl_verify_mode #{ssl_verify_mode}
 EOM
       end
     end

data/lib/chef/provisioning/driver.rb

@@ -270,14 +270,16 @@ module Provisioning
     # @param [ChefMetal::ActionHandler] action_handler The action handler
     # @param [ChefMetal::LoadBalancerSpec] lb_spec Frozen LB specification
     # @param [Hash] lb_options A hash of options to pass the LB
-    def allocate_load_balancer(action_handler, lb_spec, lb_options)
+    # @param [Array[ChefMetal::MachineSpec]] machine_specs An array of machine specs
+    #        the load balancer should have
+    def allocate_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
     end
 
     # Make the load balancer ready
     # @param [ChefMetal::ActionHandler] action_handler The action handler
     # @param [ChefMetal::LoadBalancerSpec] lb_spec Frozen LB specification
     # @param [Hash] lb_options A hash of options to pass the LB
-    def ready_load_balancer(action_handler, lb_spec, lb_options)
+    def ready_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
     end
 
     # Destroy the load balancer
@@ -287,9 +289,6 @@ module Provisioning
     def destroy_load_balancer(action_handler, lb_spec, lb_options)
     end
 
-    def update_load_balancer(action_handler, lb_spec, lb_options, opts = {})
-    end
-
     protected
 
     def add_prefix(machine_spec, action_handler)

data/lib/chef/provisioning/load_balancer_spec.rb

@@ -52,14 +52,6 @@ module Provisioning
       load_balancer_data['location'] =  value
     end
 
-    def load_balancer_options
-      load_balancer_data['load_balancer_options']
-    end
-
-    def load_balancer_options=(value)
-      load_balancer_data['load_balancer_options'] = value
-    end
-
     # URL to the driver.  Convenience for location['driver_url']
     def driver_url
       location ? location['driver_url'] : nil

data/lib/chef/provisioning/transport/ssh.rb

@@ -182,7 +182,8 @@ module Provisioning
       def session
         @session ||= begin
           ssh_start_opts = { timeout:10 }.merge(ssh_options)
-          Chef::Log.debug("Opening SSH connection to #{username}@#{host} with options #{ssh_start_opts.inspect}")
+          Chef::Log.debug("Opening SSH connection to #{username}@#{host} with options #{ssh_start_opts.dup.tap {
+                              |ssh| ssh.delete(:key_data) }.inspect}")
           # Small initial connection timeout (10s) to help us fail faster when server is just dead
           begin
             if gateway? then gateway.ssh(host, username, ssh_start_opts)
@@ -285,7 +286,8 @@ module Provisioning
         ssh_start_opts = { timeout:10 }.merge(ssh_options)
         ssh_start_opts[:port] = gw_port || 22
 
-        Chef::Log.debug("Opening SSH gateway to #{gw_user}@#{gw_host} with options #{ssh_start_opts.inspect}")
+        Chef::Log.debug("Opening SSH gateway to #{gw_user}@#{gw_host} with options #{ssh_start_opts.dup.tap {
+                            |ssh| ssh.delete(:key_data) }.inspect}")
         begin
           Net::SSH::Gateway.new(gw_host, gw_user, ssh_start_opts)
         rescue Errno::ETIMEDOUT

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '0.16'
+  VERSION = '0.17'
 end
 end

data/lib/chef/resource/chef_data_bag_resource.rb

@@ -36,10 +36,10 @@ class Chef::Resource::ChefDataBagResource < Chef::Resource::LWRPBase
   # and then delegating to {Chef::Resource::LWRPBase#attribute}
   # @param attr_name [Symbol] Name of the attribute as a symbol
   # @return [Void]
-  def self.stored_attribute(attr_name)
+  def self.stored_attribute(attr_name, *args)
     @stored_attributes ||= []
     @stored_attributes << attr_name
-    self.attribute attr_name
+    self.attribute attr_name, *args
   end
 
   # Load persisted data from the server's databag. If the databag does not exist on the
@@ -145,4 +145,3 @@ class Chef::Resource::ChefDataBagResource < Chef::Resource::LWRPBase
     end
   end
 end
-

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.17'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cheffish
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A library for creating machines and infrastructures idempotently in Chef.
@@ -135,6 +135,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/.DS_Store
+- lib/chef/.DS_Store
 - lib/chef/provider/load_balancer.rb
 - lib/chef/provider/machine.rb
 - lib/chef/provider/machine_batch.rb
@@ -142,6 +144,7 @@ files:
 - lib/chef/provider/machine_file.rb
 - lib/chef/provider/machine_image.rb
 - lib/chef/provisioning.rb
+- lib/chef/provisioning/.DS_Store
 - lib/chef/provisioning/action_handler.rb
 - lib/chef/provisioning/add_prefix_action_handler.rb
 - lib/chef/provisioning/chef_image_spec.rb
@@ -185,12 +188,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []