chef-provisioning 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03e83e4f20ff02af375d7503eb293704311fb372
-  data.tar.gz: ff6cb7c0d6fc91b1789c778a01373215fbfe60a7
+  metadata.gz: 028eba9bf5dc6c670cf8f4273bc6442970bc12c8
+  data.tar.gz: 7b0ed9771bbd83bc75286dc019b72634bc4bf3b3
 SHA512:
-  metadata.gz: 106cd2fb4ec6f4018c6d86fe80625b759ab4c2462e48c742eb5800cb81b073cf1909b61b530448660a3957af9e9d1b047ab061c47b88fa3ad267f45821227962
-  data.tar.gz: 9e6508184546da1c3bd093445f81173e20fa43afa3c266a29f979efd696b5aeaafc886a84504388eafda6ac66d7b8a582ca9e1c7a4f1635edd05734997368e7d
+  metadata.gz: 48b12bc4c0825276dcc4da3da0ca6de79a422d934313c974b3b133b4c7f10814576858580a22e4addae2b1465a3cfd4dd98fdcc47c482ca982c34ad50edc83d2
+  data.tar.gz: ef7fe52f5e22e4dcfcfad842c7b97db089799d47264e948bd4e4661f66c97e1cb9742efdd285e441498c1594c8f669fcb467d1bfb6e66661c3f3672886fdf48c

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 # Chef Provisioning Changelog
+## 0.16 (11/4/2014)
+
+- Make it work with Chef 12
+
 ## 0.15.2 (11/4/2014)
 
 - Remove Chef as a dependency so that it can be a dep of Chef

data/lib/chef/provisioning.rb

@@ -45,8 +45,12 @@ module Provisioning
     scheme = driver_url.split(':', 2)[0]
     begin
       require "chef/provisioning/driver_init/#{scheme}"
-    rescue LoadError => e
-      require "chef_metal/driver_init/#{scheme}"
+    rescue LoadError
+      begin
+        require "chef_metal/driver_init/#{scheme}"
+      rescue LoadError
+        require "chef/provisioning/driver_init/#{scheme}"
+      end
     end
     driver_class = @@registered_driver_classes[scheme]
 

data/lib/chef/provisioning/recipe_dsl.rb

@@ -90,7 +90,7 @@ class Chef
 
   class RunContext
     def chef_provisioning
-      @chef_provisioning ||= Chef::Provisioning::ChefRunData.new(config)
+      node.run_state[:chef_provisioning] ||= Chef::Provisioning::ChefRunData.new(config)
     end
     alias :chef_metal :chef_provisioning
   end

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '0.15.2'
+  VERSION = '0.15.3'
 end
 end

data/lib/chef/resource/load_balancer.rb

@@ -43,7 +43,7 @@ class Chef
       #
       # 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
+      def load_prior_resource(*args)
         Chef::Log.debug "Overloading #{self.resource_name} load_prior_resource with NOOP"
       end
 
@@ -54,4 +54,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/resource/machine.rb

@@ -111,7 +111,7 @@ class Machine < Chef::Resource::LWRPBase
   #
   # 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
+  def load_prior_resource(*args)
     Chef::Log.debug "Overloading #{self.resource_name} load_prior_resource with NOOP"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh