cheffish 0.8.4 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed4803169ba4ce8995e1b2750dca669ad39a8119
-  data.tar.gz: 5069fb4b7ffe1768ad8eae1f882576320016818b
+  metadata.gz: 280a15807486f3701531748ad3ecdbbac7db11f5
+  data.tar.gz: 6f9ea7c5d418ae9ef1c0cfb203edabc361d7d9ff
 SHA512:
-  metadata.gz: 75d5f527069714521e3c492ce2cdd570cd98bb79478facf5bd7f127cb3c60b476a7bf94cad3d41b7b52012dde563175dc4d38cca3fcb6df49336a7979a3e2c3b
-  data.tar.gz: 3b5665854ddd4ac6e578b0cc6517b275eccf60580a888c420b11b4d28e5d3a1accb48cfc295fc993598c3ec4f7a44017c69e77cffb7c4fbd05526cdfb552f91e
+  metadata.gz: fbf09a12550f4575261e8f301c5f05193da1cf81684a13c57677b9749a144816c8afae3c4a730d8aec77b90aea62ed1c3cb099706250671920e6213db9dcd462
+  data.tar.gz: bc9d77f57bfb8b29068b085ef6f07cc8d6280aa080cbdb312d3471ab54a859f6473c0a26e87b97d3a229ef835756110147b611a877c04156aa845028d9e9b7e2

data/lib/chef/resource/private_key.rb

@@ -38,7 +38,7 @@ class Chef::Resource::PrivateKey < Chef::Resource::LWRPBase
   end
 
   # We are not interested in Chef's cloning behavior here.
-  def load_prior_resource
+  def load_prior_resource(*args)
     Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
   end
 end

data/lib/chef/resource/public_key.rb

@@ -15,7 +15,7 @@ class Chef::Resource::PublicKey < Chef::Resource::LWRPBase
   attribute :source_key_pass_phrase
 
   # We are not interested in Chef's cloning behavior here.
-  def load_prior_resource
+  def load_prior_resource(*args)
     Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
   end
 end

data/lib/cheffish/chef_provider_base.rb

@@ -237,7 +237,7 @@ module Cheffish
   end
 
   # We are not interested in Chef's cloning behavior here.
-  def load_prior_resource
+  def load_prior_resource(*args)
     Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
   end
 end

data/lib/cheffish/chef_run_listener.rb

@@ -2,11 +2,11 @@ require 'chef/event_dispatch/base'
 
 module Cheffish
   class ChefRunListener < Chef::EventDispatch::Base
-    def initialize(run_context)
-      @run_context = run_context
+    def initialize(node)
+      @node = node
     end
 
-    attr_reader :run_context
+    attr_reader :node
 
     def run_complete(node)
       disconnect
@@ -20,7 +20,7 @@ module Cheffish
 
     def disconnect
       # Stop the servers
-      run_context.cheffish.local_servers.each do |server|
+      node.run_context.cheffish.local_servers.each do |server|
         server.stop
       end
     end

data/lib/cheffish/recipe_dsl.rb

@@ -87,7 +87,7 @@ class Chef
             # Copy over to string keys for things that use string keys (ChefFS)...
             # TODO: Fix ChefFS to take symbols or use something that is insensitive to the difference
             options[string_key] = options[symbol_key]
-          end 
+          end
 
           chef_fs = Chef::ChefFS::Config.new(options).local_fs
           chef_fs.write_pretty_json = true
@@ -119,21 +119,23 @@ class Chef
 
   class RunContext
     def cheffish
-      @cheffish ||= begin
+      node.run_state[:cheffish] ||= begin
         run_data = Cheffish::ChefRunData.new(config)
-        events.register(Cheffish::ChefRunListener.new(self))
+        events.register(Cheffish::ChefRunListener.new(node))
         run_data
       end
     end
 
     def config
-      @config ||= Cheffish.profiled_config(Chef::Config)
+      node.run_state[:chef_config] ||= Cheffish.profiled_config(Chef::Config)
     end
   end
 
   Chef::Client.when_run_starts do |run_status|
     # Pulling on cheffish_run_data makes it initialize right now
-    run_status.run_context.cheffish
+    run_status.node.run_state[:chef_config] = config = Cheffish.profiled_config(Chef::Config)
+    run_status.node.run_state[:cheffish] = run_data = Cheffish::ChefRunData.new(config)
+    run_status.events.register(Cheffish::ChefRunListener.new(run_status.node))
   end
 
 end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.8.4'
+  VERSION = '0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: '0.9'
 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: chef-zero