chef-provisioning 0.17 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c37376aede638b149fb1aa359b47260e7dd532
-  data.tar.gz: c75da4c89e3b9cd12a5a97906f1cc708b4f42989
+  metadata.gz: 5c4cefaa41a622f8b28242c0d77384e123f88562
+  data.tar.gz: 354056ddabbf9c6010af17895a069c4ece6240f9
 SHA512:
-  metadata.gz: 27e6d46bbeb25ba1185014913f7c20c5a0adeb73ffe9c1bae191ec914fb3ccfc2ca795a657ab52333720643a80231ea2bead2b65bd899654dfcf7a3c08d313e9
-  data.tar.gz: 9a043f593fa6db7f7a8275fa2a21286bad930bb1be47249dfaa1b0331570d6defefcb51c57dc67b3158168d6ec24f454700245c590220c73f14b19b315eb1172
+  metadata.gz: c447345478be4935d4e55de75f197bb4f182d1cb153ddf6142eee50679bd99922438a63789c5c6cefe46261a7e6bda8d2929e9dc3d2bbec413d72b7b1532e81f
+  data.tar.gz: c2ebf41170f13d2d8537327393410b2f91756955c3d4b3c2bc59d1ab0a86e82cdf55694a0b2fa3bfa7025ced2bbf7be2df5832992c254d5dde8464a99537e6c0

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Chef Provisioning Changelog
 
+## 0.18 (1/27/2015)
+
+- Allow `ssl_verify_mode` to be overridden (@mivok)
+- Support `machine_options[:convergence_options][:bootstrap_proxy]` (@mivok)
+- Allow `machine_options[:ssh_gateway]` without username (no @) (@mivok)
+- Fix issue with net-ssh 2.9.2
+- Add `action :destroy` to `machine_image` (@miguelcnf)
+
 ## 0.17 (12/17/2014)
 
-- Make machine batch convergent 
+- Make machine batch convergent
 - Consolidate load balancer create and update
 - Update some URLs
 - SSL verification fix
@@ -194,7 +202,7 @@
 
 ## 0.8 (4/8/2014)
 
-- New machine_execute resource! (irving@getchef.com)
+- New machine_execute resource! (irving@chef.io)
 - Experimental "metal" command line: metal execute NODENAME COMMAND ARGS
 - Transport: Add ability to stream execute() for better nested chef-client debugging
 
@@ -209,14 +217,14 @@
 
 ## 0.5 (4/3/2014)
 
-* Provisioner interface changes designed to allow provisioners to be used outside of Chef (doubt@getchef.com)
+* Provisioner interface changes designed to allow provisioners to be used outside of Chef (doubt@chef.io)
   * All Provisioner and Machine methods now take "action_handler" instead of "driver."  It uses the ActionHandler interface described in action_handler.rb.  In short:
     - driver.run_context -> action_handler.recipe_context
     - driver.updated_by_last_action(true) -> action_handler.updated!
     - driver.converge_by -> action_handler.perform_action
     - driver.cookbook_name -> driver.debug_name
   * Convergence strategy: delete_chef_objects() -> cleanup_convergence()
-* Ability to get back to a machine from a node (another Provisioner interface change) (doubt@getchef.com):
+* Ability to get back to a machine from a node (another Provisioner interface change) (doubt@chef.io):
   * Provisioners must create a file named `chef_provisioning/provisioner_init/<scheme>_init.rb`.  It will be required when a node is encountered with that scheme.  It should call Chef::Provisioning.add_registered_provisioner_class(<scheme>, <provisioner class name>).  For the provisioner_url `fog:AWS:21348723432`, the scheme is "fog" and the file is `chef_provisioningprovisioner_init/fog_init.rb`.  It should call `Chef::Provisioning.add_registered_provisioner_class('fog', Chef::Provisioning::Provisioner::FogProvisioner)`.
   * Provisioner classes must implement the class method `inflate(node)`, which should create a Provisioner instance appropriate to the given `node` (generally by looking at `node['normal']['provisioner_output']`)
 * New `NoConverge` convergence strategy that creates a node but does not install Chef or converge.

data/README.md

@@ -1,7 +1,7 @@
-[![Stories in Ready](https://badge.waffle.io/opscode/chef-provisioning.png?label=ready&title=Ready)](https://waffle.io/opscode/chef-provisioning)
+[![Stories in Ready](https://badge.waffle.io/chef/chef-provisioning.png?label=ready&title=Ready)](https://waffle.io/chef/chef-provisioning)
 Chef Provisioning
 ==========
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/opscode/chef-provisioning?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/chef/chef-provisioning?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 This library solves the problem of repeatably creating machines and infrastructures in Chef.  It has a plugin model that lets you write bootstrappers for your favorite infrastructures, including VirtualBox, EC2, LXC, bare metal, and many more!
 
@@ -9,19 +9,22 @@ This library solves the problem of repeatably creating machines and infrastructu
 
 Date       | Blog
 -----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-6/3/2014   | [machine_batch and parallelization](https://github.com/opscode/chef-provisioning/blob/master/docs/blogs/2012-05-28-machine_batch.html.markdown#chef-provisioning-parallelization)
-6/3/2014   | [Chef Provisioning, Configuration and Drivers](https://github.com/opscode/chef-provisioning/blob/master/docs/blogs/2012-05-22-new-driver-interface.html.markdown#chef-provisioning-configuration-and-drivers)
-3/4/2014   | [Chef Metal 0.2: Overview](http://www.getchef.com/blog/2014/03/04/chef-metal-0-2-release/) - this is a pretty good overview (though dated).
-12/20/2013 | [Chef Metal Alpha](http://www.getchef.com/blog/2013/12/20/chef-metal-alpha/)
+2014-12-15 | [Using Chef Provisioning to Build Chef Server](https://www.chef.io/blog/2014/12/15/sysadvent-day-14-using-chef-provisioning-to-build-chef-server/)
+2014-11-12 | [Chef Launches Policy-Based Provisioning](https://www.chef.io/blog/2014/11/12/chef-launches-policy-based-provisioning/)
+2014-11-12 | [Chef Provisioning: Infrastructure As Code](https://www.chef.io/blog/2014/11/12/chef-provisioning-infrastructure-as-code/)
+2014-06-03 | [machine_batch and parallelization](https://github.com/chef/chef-provisioning/blob/master/docs/blogs/2012-05-28-machine_batch.html.markdown#chef-provisioning-parallelization)
+2014-06-03 | [Chef Provisioning, Configuration and Drivers](https://github.com/chef/chef-provisioning/blob/master/docs/blogs/2012-05-22-new-driver-interface.html.markdown#chef-provisioning-configuration-and-drivers)
+2014-03-04 | [Chef Metal 0.2: Overview](http://www.chef.io/blog/2014/03/04/chef-metal-0-2-release/) - this is a pretty good overview (though dated).
+2013-12-20 | [Chef Metal Alpha](http://www.chef.io/blog/2013/12/20/chef-metal-alpha/)
 
 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)
-* [Embedding](https://github.com/opscode/chef-provisioning/blob/master/docs/embedding.md)
-* [Providers](https://github.com/opscode/chef-provisioning/blob/master/docs/providers)
+* [Chef Docs](https://docs.chef.io/provisioning.html)
+* [Frequently Asked Questions](https://github.com/chef/chef-provisioning/blob/master/docs/faq.md)
+* [Configuration](https://github.com/chef/chef-provisioning/blob/master/docs/configuration.md#configuring-and-using-provisioning-drivers)
+* [Writing Drivers](https://github.com/chef/chef-provisioning/blob/master/docs/building_drivers.md#writing-drivers)
+* [Embedding](https://github.com/chef/chef-provisioning/blob/master/docs/embedding.md)
+* [Providers](https://github.com/chef/chef-provisioning/blob/master/docs/providers)
 
 Try It Out
 ----------
@@ -46,7 +49,7 @@ If you have an AWS account, you can spin up a machine there like this:
 
 ```
 gem install chef-provisioning chef-provisioning-fog
-export CHEF_DRIVER=fog:AWS
+export CHEF_DRIVER=aws
 chef-client -z simple.rb
 ```
 
@@ -83,7 +86,7 @@ Chef Provisioning has two major abstractions: the machine resource, and drivers.
 
 You declare what your machines do (recipes, tags, etc.) with the `machine` resource, the fundamental unit of Chef Provisioning.  You will typically declare `machine` resources in a separate, OS/provisioning-independent file that declares the *topology* of your app--your machines and the recipes that will run on them.
 
-The machine resources from the example [myapp::small](https://github.com/opscode/chef-provisioning/blob/master/cookbooks/myapp/recipes/small.rb) are pretty straightforward.  Here's a copy/paste:
+The machine resources from the example [myapp::small](https://github.com/chef/chef-provisioning/blob/master/cookbooks/myapp/recipes/small.rb) are pretty straightforward.  Here's a copy/paste:
 
 ```ruby
 machine 'mario' do
@@ -119,20 +122,20 @@ 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)
+- [AWS](https://github.com/chef/chef-provisioning-aws)
+- [Azure](https://github.com/chef/chef-provisioning-azure)
+- [FOG: EC2, DigitalOcean, OpenStack, etc.](https://github.com/chef/chef-provisioning-fog)
 
 **Virtualization:**
-- [Vagrant: VirtualBox, VMWare Fusion, etc.](https://github.com/opscode/chef-provisioning-vagrant)
+- [Vagrant: VirtualBox, VMWare Fusion, etc.](https://github.com/chef/chef-provisioning-vagrant)
 - [VSphere](https://github.com/RallySoftware-cookbooks/chef-metal-vsphere) (not yet up to date with 0.11)
 
 **Containers:**
-- [Docker](https://github.com/opscode/chef-provisioning-docker)
-- [LXC](https://github.com/opscode/chef-provisioning-lxc)
+- [Docker](https://github.com/chef/chef-provisioning-docker)
+- [LXC](https://github.com/chef/chef-provisioning-lxc)
 
 **Bare Metal:**
-- [Hanlon](https://github.com/opscode/chef-provisioning-hanlon)
+- [Hanlon](https://github.com/chef/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)
 
@@ -147,7 +150,7 @@ chef-client -z vagrant_linux.rb simple.rb
 
 This is a chef-client run, which runs multiple **recipes.** Chef Provisioning is nothing but resources you put in recipes.
 
-The driver is specified on the command line.  Drivers are URLs.  You could use `vagrant:~/vms` or `fog:AWS:default:us-east-1' as driver URLs.  More information [here.](https://github.com/opscode/chef-provisioning/blob/master/docs/configuration.md#setting-the-driver-with-a-driver-url)
+The driver is specified on the command line.  Drivers are URLs.  You could use `vagrant:~/vms` or `fog:AWS:default:us-east-1' as driver URLs.  More information [here.](https://github.com/chef/chef-provisioning/blob/master/docs/configuration.md#setting-the-driver-with-a-driver-url)
 
 The `vagrant_linux.rb` recipe handles the physical specification of the machines and Vagrant box:
 
@@ -260,6 +263,6 @@ Chef Provisioning also works with Test Kitchen, allowing you to test entire clus
 Bugs and The Plan
 -----------------
 
-Please submit bugs, gripes and feature requests at [https://github.com/opscode/chef-provisioning/issues](https://twitter.com/jkeiser2), contact jkeiser on Twitter at @jkeiser2, email at [jkeiser@getchef.com](mailto:jkeiser@getchef.com)
+Please submit bugs, gripes and feature requests at [https://github.com/chef/chef-provisioning/issues](https://github.com/chef/chef-provisioning/issues), contact John Keiser on Twitter at [@jkeiser2](https://twitter.com/jkeiser2), email at [jkeiser@chef.io](mailto:jkeiser@chef.io)
 
-To contribute, just make a PR in the appropriate repo--also, make sure you've [signed the Chef Contributor License Agreement](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L) (quick couple of minutes online), since this is going into core Chef eventually. It takes some time to process, so if you've just done it, let me know in the PR :)  If you already signed this for a Chef contribution, you don't need to do so again--if you're not sure, you can check for your name [here](https://wiki.opscode.com/display/chef/Approved+Contributors)!
+To contribute, just make a PR in the appropriate repo--also, make sure you've [signed the Chef Contributor License Agreement](https://supermarket.chef.io) (through your Chef Supermarket profile), since this is going into core Chef eventually. If you already signed this for a Chef contribution, you don't need to do so again--if you're not sure, you can check for your name [here](https://supermarket.chef.io/contributors) or if you signed up long ago check the [old list](https://github.com/chef/chef/blob/master/CLA_ARCHIVE.md)!

data/lib/chef/provider/machine_image.rb

@@ -36,6 +36,14 @@ class MachineImage < Chef::Provider::LWRPBase
   end
 
   action :destroy do
+    # Get the image mapping on the server (from name to image-id)
+    image_spec = Chef::Provisioning::ChefImageSpec.get(new_resource.name, new_resource.chef_server) ||
+        Chef::Provisioning::ChefImageSpec.empty(new_resource.name, new_resource.chef_server)
+
+    if image_spec.location
+      new_driver.destroy_image(action_handler, image_spec, new_resource.image_options)
+      image_spec.delete(action_handler)
+    end
   end
 
   def create_image(image_spec)

data/lib/chef/provisioning/action_handler.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Author:: Douglas Triggs (<doug@getchef.com>)
+# Author:: Douglas Triggs (<doug@chef.io>)
 #
 # Copyright (C) 2014, Chef, Inc.
 #

data/lib/chef/provisioning/chef_image_spec.rb

@@ -15,7 +15,7 @@ module Provisioning
     end
 
     #
-    # Get a ImageSpec from the chef server.  If the node does not exist on the
+    # Get a ImageSpec from the chef server.  If the image does not exist on the
     # server, it returns nil.
     #
     def self.get(name, chef_server = Cheffish.default_chef_server)
@@ -51,12 +51,12 @@ module Provisioning
     end
 
     #
-    # Save this node to the server.  If you have significant information that
+    # Save this image to the server.  If you have significant information that
     # could be lost, you should do this as quickly as possible.  Data will be
     # saved automatically for you after allocate_image and ready_image.
     #
     def save(action_handler)
-      # Save the node to the server.
+      # Save the image to the server.
       _self = self
       _chef_server = _self.chef_server
       Chef::Provisioning.inline_resource(action_handler) do
@@ -72,14 +72,14 @@ module Provisioning
     end
 
     def delete(action_handler)
-      # Save the node to the server.
+      # Delete the image from the server.
       _self = self
       _chef_server = _self.chef_server
       Chef::Provisioning.inline_resource(action_handler) do
         chef_data_bag_item _self.name do
           data_bag 'images'
           chef_server _chef_server
-          action :destroy
+          action :delete
         end
       end
     end

data/lib/chef/provisioning/chef_provider_action_handler.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Author:: Douglas Triggs (<doug@getchef.com>)
+# Author:: Douglas Triggs (<doug@chef.io>)
 #
 # Copyright (C) 2014, Chef, Inc.
 #

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

@@ -103,7 +103,7 @@ module Provisioning
         #
         # Figure out the URL to the metadata
         #
-        metadata_url="https://www.opscode.com/chef/metadata"
+        metadata_url="https://www.chef.io/chef/metadata"
         metadata_url << "?v=#{@chef_version}"
         metadata_url << "&prerelease=#{@prerelease ? 'true' : 'false'}"
         metadata_url << "&p=#{platform.strip}"

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

@@ -9,7 +9,7 @@ module Provisioning
 
       def initialize(convergence_options, config)
         super
-        @install_msi_url = convergence_options[:install_msi_url] || 'http://www.opscode.com/chef/install.msi'
+        @install_msi_url = convergence_options[:install_msi_url] || 'http://www.chef.io/chef/install.msi'
         @install_msi_path = convergence_options[:install_msi_path] || "$env:TEMP\\#{File.basename(@install_msi_url)}"
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
       end
@@ -42,10 +42,11 @@ module Provisioning
       def converge(action_handler, machine)
         super
 
-        # TODO For some reason I get a 500 back if I don't do -l debug
         action_handler.open_stream(machine.node['name']) do |stdout|
           action_handler.open_stream(machine.node['name']) do |stderr|
-            machine.execute(action_handler, "chef-client -l debug",
+            command_line = "chef-client"
+            command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
+            machine.execute(action_handler, command_line,
               :stream_stdout => stdout,
               :stream_stderr => stderr,
               :timeout => @chef_client_timeout)

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

@@ -13,7 +13,7 @@ module Provisioning
           :client_pem_path => '/etc/chef/client.pem'
         })
         super(convergence_options, config)
-        @install_sh_url = convergence_options[:install_sh_url] || 'http://www.opscode.com/chef/install.sh'
+        @install_sh_url = convergence_options[:install_sh_url] || 'http://www.chef.io/chef/install.sh'
         @install_sh_path = convergence_options[:install_sh_path] || '/tmp/chef-install.sh'
         @bootstrap_env = convergence_options[:bootstrap_proxy] ? "http_proxy=#{convergence_options[:bootstrap_proxy]}" : ""
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours

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

@@ -170,18 +170,26 @@ 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
+        ssl_verify_mode = convergence_options[:ssl_verify_mode]
+        ssl_verify_mode ||= if chef_server_url.downcase.start_with?("https")
+                              :verify_peer
+                            else
+                              :verify_none
+                            end
+
+        content = <<EOM
 chef_server_url #{chef_server_url.inspect}
 node_name #{node_name.inspect}
 client_key #{convergence_options[:client_pem_path].inspect}
-ssl_verify_mode #{ssl_verify_mode}
+ssl_verify_mode #{ssl_verify_mode.to_sym.inspect}
 EOM
+        unless convergence_options[:bootstrap_proxy].nil?
+          content << <<EOM
+http_proxy #{convergence_options[:bootstrap_proxy].inspect}
+https_proxy #{convergence_options[:bootstrap_proxy].inspect}
+EOM
+        end
+        content
       end
     end
   end

data/lib/chef/provisioning/machine.rb

@@ -103,7 +103,7 @@ module Provisioning
     # 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.chef.io/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/provisioning/transport/ssh.rb

@@ -24,7 +24,9 @@ module Provisioning
       #   - :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.
+      #     nil (the default) means no gateway. If the username is omitted,
+      #     then the default username is used instead (i.e. the user running
+      #     chef, or the username configured in .ssh/config).
       # - global_config: an options hash that looks suspiciously similar to
       #   Chef::Config, containing at least the key :log_level.
       #
@@ -280,8 +282,10 @@ module Provisioning
 
       def gateway
         gw_user, gw_host = options[:ssh_gateway].split('@')
+        # If we didn't have an '@' in the above, then the value is actually
+        # the hostname, not the username.
+        gw_host, gw_user = gw_user, gw_host if gw_host.nil?
         gw_host, gw_port = gw_host.split(':')
-        gw_user = ssh_options[:ssh_username] unless gw_user
 
         ssh_start_opts = { timeout:10 }.merge(ssh_options)
         ssh_start_opts[:port] = gw_port || 22
@@ -310,22 +314,34 @@ module Provisioning
       def forward_port(local_port, local_host, remote_port, remote_host)
         # This bit is from the documentation.
         if session.forward.respond_to?(:active_remote_destinations)
-          got_remote_port, remote_host = session.forward.active_remote_destinations[[local_port, local_host]]
-          if !got_remote_port
+          # active_remote_destinations tells us exactly what remotes the current
+          # ssh session is *actually* tracking.  If multiple people share this
+          # session and set up their own remotes, this will prevent us from
+          # overwriting them.
+
+          actual_remote_port, actual_remote_host = session.forward.active_remote_destinations[[local_port, local_host]]
+          if !actual_remote_port
             Chef::Log.debug("Forwarding local server #{local_host}:#{local_port} to #{username}@#{self.host}")
 
-            session.forward.remote(local_port, local_host, remote_port, remote_host) do |actual_remote_port|
-              got_remote_port = actual_remote_port || :error
+            session.forward.remote(local_port, local_host, remote_port, remote_host) do |new_remote_port, new_remote_host|
+							actual_remote_host = new_remote_host
+              actual_remote_port = new_remote_port || :error
               :no_exception # I'll take care of it myself, thanks
             end
             # Kick SSH until we get a response
-            session.loop { !got_remote_port }
-            if got_remote_port == :error
+            session.loop { !actual_remote_port }
+            if actual_remote_port == :error
               return nil
             end
           end
-          [ got_remote_port, remote_host ]
+          [ actual_remote_port, actual_remote_host ]
         else
+          # If active_remote_destinations isn't on net-ssh, we stash our own list
+          # of ports *we* have forwarded on the connection, and hope that we are
+          # right.
+          # TODO let's remove this when net-ssh 2.9.2 is old enough, and
+          # bump the required net-ssh version.
+
           @forwarded_ports ||= {}
           remote_port, remote_host = @forwarded_ports[[local_port, local_host]]
           if !remote_port

data/lib/chef/provisioning/version.rb

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

metadata

@@ -1,129 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: '0.17'
+  version: '0.18'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-27 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.
-email: jkeiser@opscode.com
+email: jkeiser@chef.io
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -135,8 +135,6 @@ 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
@@ -144,7 +142,6 @@ 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
@@ -179,7 +176,7 @@ files:
 - lib/chef/resource/machine_file.rb
 - lib/chef/resource/machine_image.rb
 - lib/chef_metal.rb
-homepage: http://wiki.opscode.com/display/chef
+homepage: http://github.com/chef/chef-provisioning/README.md
 licenses: []
 metadata: {}
 post_install_message: 
@@ -188,12 +185,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: []