cheffish 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f6b8abbcddf03b097bc9380a4bad5367f760f2f
-  data.tar.gz: 3f17d2781c140a66a869ecbedfd4c0c74326f1f9
+  metadata.gz: 2c99e67f4f2af51e4be1bb7f4d127973b0060789
+  data.tar.gz: e8547a16bc4df37aa4d29b00f6f36af3ec57c381
 SHA512:
-  metadata.gz: 798aeb7bfd711164e71e613c2a3124aaf2cb2a8a344010aa6b97e17637802fc6ded341525677f97adc388f96360f7c28ce67145e519cf2ccc5b22fc199acd9b7
-  data.tar.gz: 0cbe97227f83d68327b8023f4ba23eaa81459f034fe31f5ee3e9a69bdb395cfdaaf7785b3dc1a458513312d32ff8a984ef10a6a210133d4462f3a77728f5433a
+  metadata.gz: 5ac67f69abb511dab697a2a6d77b058dcfb665864d0d647b332a7a820cb59e576406fbabb1fb22a417c2dbb4cb66b7683d537ebe1b97dfa1779a4e985577dcea
+  data.tar.gz: 85e3d63ac54c4b1665d2b4957be6982731f1a701cab9709537e545890c7415331773c47ff187cbf31a1b5328813cd6c8c6d361ad1aa9a4404f8a73a49c1b0f89

data/lib/chef/provider/private_key.rb

@@ -5,11 +5,11 @@ require 'cheffish/key_formatter'
 class Chef::Provider::PrivateKey < Chef::Provider::LWRPBase
 
   action :create do
-    create_key(false)
+    create_key(false, :create)
   end
 
   action :regenerate do
-    create_key(true)
+    create_key(true, :regenerate)
   end
 
   action :delete do
@@ -26,7 +26,7 @@ class Chef::Provider::PrivateKey < Chef::Provider::LWRPBase
     true
   end
 
-  def create_key(regenerate)
+  def create_key(regenerate, action)
     final_private_key = nil
     if new_source_key
       #
@@ -92,7 +92,7 @@ class Chef::Provider::PrivateKey < Chef::Provider::LWRPBase
     if new_resource.public_key_path
       public_key_path = new_resource.public_key_path
       public_key_format = new_resource.public_key_format
-      Cheffish.inline_resource(self) do
+      Cheffish.inline_resource(self, action) do
         public_key public_key_path do
           source_key final_private_key
           format public_key_format
@@ -139,7 +139,7 @@ class Chef::Provider::PrivateKey < Chef::Provider::LWRPBase
   attr_reader :current_private_key
 
   def load_current_resource
-    resource = Chef::Resource::PrivateKey.new(new_resource.name)
+    resource = Chef::Resource::PrivateKey.new(new_resource.name, run_context)
 
     if new_resource.path != :none && ::File.exist?(new_resource.path)
       resource.path new_resource.path

data/lib/chef/provider/public_key.rb

@@ -62,7 +62,7 @@ class Chef::Provider::PublicKey < Chef::Provider::LWRPBase
 
   def load_current_resource
     if ::File.exist?(new_resource.path)
-      resource = Chef::Resource::PublicKey.new(new_resource.path)
+      resource = Chef::Resource::PublicKey.new(new_resource.path, run_context)
       begin
         key, key_format = Cheffish::KeyFormatter.decode(IO.read(new_resource.path), nil, new_resource.path)
         if key

data/lib/chef/resource/chef_client.rb

@@ -9,7 +9,7 @@ class Chef::Resource::ChefClient < Chef::Resource::LWRPBase
 
   def initialize(*args)
     super
-    chef_server Cheffish.enclosing_chef_server
+    chef_server run_context.cheffish.current_chef_server
   end
 
   # Client attributes

data/lib/chef/resource/chef_data_bag.rb

@@ -9,7 +9,7 @@ class Chef::Resource::ChefDataBag < Chef::Resource::LWRPBase
 
   def initialize(*args)
     super
-    chef_server Cheffish.enclosing_chef_server
+    chef_server run_context.cheffish.current_chef_server
   end
 
   attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true

data/lib/chef/resource/chef_data_bag_item.rb

@@ -12,18 +12,18 @@ class Chef::Resource::ChefDataBagItem < Chef::Resource::LWRPBase
     super
     name @name
     if !data_bag
-      data_bag Cheffish.enclosing_data_bag
+      data_bag run_context.cheffish.current_data_bag
     end
-    if Cheffish.enclosing_data_bag_item_encryption
-      @encrypt = true if Cheffish.enclosing_data_bag_item_encryption[:encrypt_all]
-      @secret = Cheffish.enclosing_data_bag_item_encryption[:secret]
-      @secret_path = Cheffish.enclosing_data_bag_item_encryption[:secret_path] || Chef::Config[:encrypted_data_bag_secret]
-      @encryption_cipher = Cheffish.enclosing_data_bag_item_encryption[:encryption_cipher]
-      @encryption_version = Cheffish.enclosing_data_bag_item_encryption[:encryption_version]
-      @old_secret = Cheffish.enclosing_data_bag_item_encryption[:old_secret]
-      @old_secret_path = Cheffish.enclosing_data_bag_item_encryption[:old_secret_path]
+    if run_context.cheffish.current_data_bag_item_encryption
+      @encrypt = true if run_context.cheffish.current_data_bag_item_encryption[:encrypt_all]
+      @secret = run_context.cheffish.current_data_bag_item_encryption[:secret]
+      @secret_path = run_context.cheffish.current_data_bag_item_encryption[:secret_path] || Chef::Config[:encrypted_data_bag_secret]
+      @encryption_cipher = run_context.cheffish.current_data_bag_item_encryption[:encryption_cipher]
+      @encryption_version = run_context.cheffish.current_data_bag_item_encryption[:encryption_version]
+      @old_secret = run_context.cheffish.current_data_bag_item_encryption[:old_secret]
+      @old_secret_path = run_context.cheffish.current_data_bag_item_encryption[:old_secret_path]
     end
-    chef_server Cheffish.enclosing_chef_server
+    chef_server run_context.cheffish.current_chef_server
   end
 
   def name(*args)

data/lib/chef/resource/chef_environment.rb

@@ -10,7 +10,7 @@ class Chef::Resource::ChefEnvironment < Chef::Resource::LWRPBase
 
   def initialize(*args)
     super
-    chef_server Cheffish.enclosing_chef_server
+    chef_server run_context.cheffish.current_chef_server
   end
 
   attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
@@ -68,4 +68,4 @@ class Chef::Resource::ChefEnvironment < Chef::Resource::LWRPBase
 
   alias :attributes :default_attributes
   alias :attribute :default
-end
+end

data/lib/chef/resource/chef_node.rb

@@ -10,8 +10,8 @@ class Chef::Resource::ChefNode < Chef::Resource::LWRPBase
   # Grab environment from with_environment
   def initialize(*args)
     super
-    chef_environment Cheffish.enclosing_environment
-    chef_server Cheffish.enclosing_chef_server
+    chef_environment run_context.cheffish.current_environment
+    chef_server run_context.cheffish.current_chef_server
   end
 
   Cheffish.node_attributes(self)

data/lib/chef/resource/chef_role.rb

@@ -11,7 +11,7 @@ class Chef::Resource::ChefRole < Chef::Resource::LWRPBase
   # Grab environment from with_environment
   def initialize(*args)
     super
-    chef_server Cheffish.enclosing_chef_server
+    chef_server run_context.cheffish.current_chef_server
   end
 
   attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true

data/lib/chef/resource/chef_user.rb

@@ -10,7 +10,7 @@ class Chef::Resource::ChefUser < Chef::Resource::LWRPBase
   # Grab environment from with_environment
   def initialize(*args)
     super
-    chef_server Cheffish.enclosing_chef_server
+    chef_server run_context.cheffish.current_chef_server
   end
 
   # Client attributes

data/lib/cheffish.rb

@@ -1,56 +1,11 @@
 require 'chef/run_list/run_list_item'
-require 'cheffish/inline_resource'
+require 'cheffish/basic_chef_client'
 
 module Cheffish
   NAME_REGEX = /^[.\-[:alnum:]_]+$/
 
-  @@enclosing_data_bag = nil
-  def self.enclosing_data_bag
-    @@enclosing_data_bag
-  end
-  def self.enclosing_data_bag=(name)
-    @@enclosing_data_bag = name
-  end
-
-  @@enclosing_environment = nil
-  def self.enclosing_environment
-    @@enclosing_environment
-  end
-  def self.enclosing_environment=(name)
-    @@enclosing_environment = name
-  end
-
-  @@enclosing_data_bag_item_encryption = nil
-  def self.enclosing_data_bag_item_encryption
-    @@enclosing_data_bag_item_encryption
-  end
-  def self.enclosing_data_bag_item_encryption=(options)
-    @@enclosing_data_bag_item_encryption = options
-  end
-
-  def self.inline_resource(provider, &block)
-    InlineResource.new(provider).instance_eval(&block)
-  end
-
-  @@enclosing_chef_server = nil
-  def self.enclosing_chef_server
-    @@enclosing_chef_server || {
-      :chef_server_url => Chef::Config[:chef_server_url],
-      :options => {
-        :client_name => Chef::Config[:node_name],
-        :signing_key_filename => Chef::Config[:client_key]
-      }
-    }
-  end
-  def self.enclosing_chef_server=(chef_server)
-    @@enclosing_chef_server = chef_server
-  end
-
-  def self.reset
-    @@enclosing_data_bag = nil
-    @@enclosing_environment = nil
-    @@enclosing_data_bag_item_encryption = nil
-    @@enclosing_chef_server = nil
+  def self.inline_resource(provider, provider_action, &block)
+    BasicChefClient.inline_resource(provider, provider_action, &block)
   end
 
   NOT_PASSED=Object.new

data/lib/cheffish/basic_chef_client.rb

@@ -0,0 +1,96 @@
+require 'chef/dsl/recipe'
+require 'chef/event_dispatch/base'
+require 'chef/event_dispatch/dispatcher'
+require 'chef/node'
+require 'chef/run_context'
+require 'chef/runner'
+require 'forwardable'
+
+module Cheffish
+  class BasicChefClient
+    include Chef::DSL::Recipe
+
+    def initialize(node = nil, events = nil)
+      if !node
+        node = Chef::Node.new
+        node.name 'basic_client'
+        node.automatic[:platform] = 'test'
+        node.automatic[:platform_version] = 'test'
+      end
+
+      @event_catcher = BasicChefClientEvents.new
+      dispatcher = Chef::EventDispatch::Dispatcher.new(@event_catcher)
+      dispatcher.register(events) if events
+      @run_context = Chef::RunContext.new(node, {}, dispatcher)
+      @updated = []
+      @cookbook_name = 'basic_client'
+    end
+
+    extend Forwardable
+
+    # Stuff recipes need
+    attr_reader :run_context
+    attr_accessor :cookbook_name
+    attr_accessor :recipe_name
+    def_delegators :@run_context, :resource_collection, :immediate_notifications, :delayed_notifications
+
+    def load_block(&block)
+      @recipe_name = 'block'
+      instance_eval(&block)
+    end
+
+    def converge
+      Chef::Runner.new(self).converge
+    end
+
+    def updates
+      @event_catcher.updates
+    end
+
+    def updated?
+      @event_catcher.updates.size > 0
+    end
+
+    def self.inline_resource(provider, provider_action, &block)
+      events = ProviderEventForwarder.new(provider, provider_action)
+      client = BasicChefClient.new(provider.node)
+      client.load_block(&block)
+      client.converge
+      client.updated?
+    end
+
+    def self.converge_block(node = nil, events = nil, &block)
+      client = BasicChefClient.new(node, events)
+      client.load_block(&block)
+      client.converge
+      client.updated?
+    end
+
+    class BasicChefClientEvents < Chef::EventDispatch::Base
+      def initialize
+        @updates = []
+      end
+
+      attr_reader :updates
+
+      # Called after a resource has been completely converged.
+      def resource_updated(resource, action)
+        updates << [ resource, action ]
+      end
+    end
+
+    class ProviderEventForwarder < Chef::EventDispatch::Base
+      def initialize(provider, provider_action)
+        @provider = provider
+        @provider_action = provider_action
+      end
+
+      attr_reader :provider
+      attr_reader :provider_action
+
+      def resource_update_applied(resource, action, update)
+        provider.run_context.events.resource_update_applied(provider.new_resource, provider_action, update)
+      end
+    end
+  end
+end

data/lib/cheffish/chef_provider_base.rb

@@ -14,7 +14,7 @@ module Cheffish
     end
 
     def not_found_resource
-      resource = resource_class.new(new_resource.name)
+      resource = resource_class.new(new_resource.name, run_context)
       resource.action :delete
       resource
     end
@@ -67,7 +67,7 @@ module Cheffish
     end
 
     def json_to_resource(json)
-      resource = resource_class.new(new_resource.name)
+      resource = resource_class.new(new_resource.name, run_context)
       keys.each do |json_key, resource_key|
         resource.send(resource_key, json.delete(json_key))
       end

data/lib/cheffish/chef_run_data.rb

@@ -0,0 +1,25 @@
+require 'chef/config'
+require 'cheffish/with_pattern'
+
+module Cheffish
+  class ChefRunData
+    def initialize
+      @local_servers = []
+      @current_chef_server = {
+        :chef_server_url => Chef::Config[:chef_server_url],
+        :options => {
+          :client_name => Chef::Config[:node_name],
+          :signing_key_filename => Chef::Config[:client_key]
+        }
+      }
+    end
+
+    extend Cheffish::WithPattern
+    with :data_bag
+    with :environment
+    with :data_bag_item_encryption
+    with :chef_server
+
+    attr_reader :local_servers
+  end
+end

data/lib/cheffish/chef_run_listener.rb

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

data/lib/cheffish/key_formatter.rb

@@ -3,6 +3,8 @@ require 'net/ssh'
 require 'etc'
 require 'socket'
 require 'digest/md5'
+require 'base64'
+require 'openssl_pkcs8'
 
 module Cheffish
   class KeyFormatter
@@ -44,10 +46,21 @@ module Cheffish
         end
       when :der
         key.to_der
-      when :fingerprint
+      when :fingerprint, :pkcs1md5fingerprint
         hexes = Digest::MD5.hexdigest(key.to_der)
         # Put : between every pair of hexes
         hexes.scan(/../).join(':')
+      when :rfc4716md5fingerprint
+        type, base64_data, etc = encode_openssh_key(key).split
+        data = Base64.decode64(base64_data)
+        hexes = Digest::MD5.hexdigest(data)
+        hexes.scan(/../).join(':')
+      when :pkcs8sha1fingerprint
+        pkcs8_pem = key.to_pem_pkcs8
+        pkcs8_base64 = pkcs8_pem.split("\n").reject { |l| l =~ /^-----/ }
+        pkcs8_data = Base64.decode64(pkcs8_base64.join)
+        hexes = Digest::SHA1.hexdigest(pkcs8_data)
+        hexes.scan(/../).join(':')
       else
         raise "Unrecognized key format #{format}"
       end

data/lib/cheffish/recipe_dsl.rb

@@ -3,109 +3,84 @@ require 'cheffish'
 require 'chef_zero/server'
 require 'chef/chef_fs/chef_fs_data_store'
 require 'chef/chef_fs/config'
+require 'cheffish/chef_run_data'
+require 'cheffish/chef_run_listener'
+require 'chef/client'
 
 class Chef
-  class Recipe
-    def with_chef_data_bag(name)
-      old_enclosing_data_bag = Cheffish.enclosing_data_bag
-      Cheffish.enclosing_data_bag = name
-      if block_given?
-        begin
-          yield
-        ensure
-          Cheffish.enclosing_data_bag = old_enclosing_data_bag
-        end
+  module DSL
+    module Recipe
+      def with_chef_data_bag(name)
+        run_context.cheffish.with_data_bag(name, &block)
       end
-    end
 
-    def with_chef_environment(name)
-      old_enclosing_environment = Cheffish.enclosing_environment
-      Cheffish.enclosing_environment = name
-      if block_given?
-        begin
-          yield
-        ensure
-          Cheffish.enclosing_environment = old_enclosing_environment
-        end
+      def with_chef_environment(name, &block)
+        run_context.cheffish.with_environment(name, &block)
       end
-    end
 
-    def with_chef_data_bag_item_encryption(encryption_options)
-      old_enclosing_data_bag_item_encryption = Cheffish.enclosing_data_bag_item_encryption
-      Cheffish.enclosing_data_bag_item_encryption = encryption_options
-      if block_given?
-        begin
-          yield
-        ensure
-          Cheffish.enclosing_data_bag_item_encryption = old_enclosing_data_bag_item_encryption
-        end
+      def with_chef_data_bag_item_encryption(encryption_options, &block)
+        run_context.cheffish.with_data_bag_item_encryption(encryption_options, &block)
       end
-    end
 
-    def with_chef_server(server_url, options = {})
-      old_enclosing_chef_server = Cheffish.enclosing_chef_server
-      Cheffish.enclosing_chef_server = { :chef_server_url => server_url, :options => options }
-      if block_given?
-        begin
-          yield
-        ensure
-          Cheffish.enclosing_chef_server = old_enclosing_chef_server
-        end
+      def with_chef_server(server_url, options = {}, &block)
+        run_context.cheffish.with_chef_server({ :chef_server_url => server_url, :options => options }, &block)
       end
-    end
 
-    def with_chef_local_server(options, &block)
-      options[:host] ||= '127.0.0.1'
-      options[:log_level] ||= Chef::Log.level
-      options[:port] ||= 8900
+      def with_chef_local_server(options, &block)
+        options[:host] ||= '127.0.0.1'
+        options[:log_level] ||= Chef::Log.level
+        options[:port] ||= 8900
 
-      # Create the data store chef-zero will use
-      options[:data_store] ||= begin
-        if !options[:chef_repo_path]
-          raise "chef_repo_path must be specified to with_chef_local_server"
-        end
+        # Create the data store chef-zero will use
+        options[:data_store] ||= begin
+          if !options[:chef_repo_path]
+            raise "chef_repo_path must be specified to with_chef_local_server"
+          end
 
-        # Ensure all paths are given
-        %w(acl client cookbook container data_bag environment group node role).each do |type|
-          options["#{type}_path".to_sym] ||= begin
-            if options[:chef_repo_path].kind_of?(String)
-              Chef::Config.path_join(options[:chef_repo_path], "#{type}s")
-            else
-              options[:chef_repo_path].map { |path| Chef::Config.path_join(path, "#{type}s")}
+          # Ensure all paths are given
+          %w(acl client cookbook container data_bag environment group node role).each do |type|
+            options["#{type}_path".to_sym] ||= begin
+              if options[:chef_repo_path].kind_of?(String)
+                Chef::Config.path_join(options[:chef_repo_path], "#{type}s")
+              else
+                options[:chef_repo_path].map { |path| Chef::Config.path_join(path, "#{type}s")}
+              end
             end
+            # Work around issue in earlier versions of ChefFS where it expects strings for these
+            # instead of symbols
+            options["#{type}_path"] = options["#{type}_path".to_sym]
           end
-          # Work around issue in earlier versions of ChefFS where it expects strings for these
-          # instead of symbols
-          options["#{type}_path"] = options["#{type}_path".to_sym]
-        end
 
-        chef_fs = Chef::ChefFS::Config.new(options).local_fs
-        chef_fs.write_pretty_json = true
-        Chef::ChefFS::ChefFSDataStore.new(chef_fs)
-      end
+          chef_fs = Chef::ChefFS::Config.new(options).local_fs
+          chef_fs.write_pretty_json = true
+          Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+        end
 
-      # Start the chef-zero server
-      Chef::Log.info("Starting chef-zero on port #{options[:port]} with repository at #{options[:data_store].chef_fs.fs_description}")
-      chef_zero_server = ChefZero::Server.new(options)
-      chef_zero_server.start_background
+        # Start the chef-zero server
+        Chef::Log.info("Starting chef-zero on port #{options[:port]} with repository at #{options[:data_store].chef_fs.fs_description}")
+        chef_zero_server = ChefZero::Server.new(options)
+        chef_zero_server.start_background
 
-      @@local_servers ||= []
-      @@local_servers << chef_zero_server
+        run_context.cheffish.local_servers << chef_zero_server
 
-      with_chef_server(chef_zero_server.url, &block)
+        with_chef_server(chef_zero_server.url, &block)
+      end
     end
+  end
 
-    def self.stop_local_servers
-      # Just in case we're running this out of order:
-      @@local_servers ||= []
-
-      # Stop the servers
-      @@local_servers.each do |server|
-        server.stop
+  class RunContext
+    def cheffish
+      @cheffish ||= begin
+        run_data = Cheffish::ChefRunData.new
+        events.register(Cheffish::ChefRunListener.new(self))
+        run_data
       end
-
-      # Clean up after ourselves (don't want to stop a server twice)
-      @@local_servers = []
     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
+  end
+
 end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.3'
+  VERSION = '0.4'
 end

data/lib/cheffish/with_pattern.rb

@@ -0,0 +1,21 @@
+module Cheffish
+  module WithPattern
+    def with(symbol)
+      class_eval <<EOM
+        attr_accessor :current_#{symbol}
+
+        def with_#{symbol}(value)
+          old_value = self.current_#{symbol}
+          self.current_#{symbol} = value
+          if block_given?
+            begin
+              yield
+            ensure
+              self.current_#{symbol} = old_value
+            end
+          end
+        end
+EOM
+    end
+  end
+end

data/spec/functional/fingerprint_spec.rb

@@ -0,0 +1,64 @@
+require 'cheffish/key_formatter'
+require 'support/key_support'
+
+describe 'Cheffish fingerprint key formatter' do
+
+  # Sample key: 0x9a6fa4c43b328c3d04c1fbc0498539218b6728e41cd35f6d27d491ef705f0b2083dc1ac977da19f54ba82b044773f20667e9627c543abb3b41b6eb9e4318ca3c68f487bbd0f1c9eea9a3101b7d1d180983c5440ac4183e78e9e256fa687d8aac63b21617a4b02b35bf5e307a3b76961a16cd8493e923536b34cc2b2da8d45220d57ef2243b081b555b84f1da0ade0e896c2aa96911b41430b59eaf75dbffb7eaa7c5b3a686f2d47a24e3b7f1acb0844f84a2fedc63660ae366b800cd9448093d6b1d96503ebb7807b48257e16c3d8a7c9a8cc5dd63116aa673bd9e09754de09358486e743e34c6a3642eeb64b2208efc96df39151572557a75638bd059c21a55 = 0xd6e92677d4e1d2aa6d14f87b5f49ee6916c6b92411536254fae4a21e82eebb0a40600247c701c1c938b21ca9f25b7b330c35fded57b4de3a951e83329a80bdbf2ba138fe2f190bffce43967b5fa93b179367bcd15cb1db7f9e3ab62caca95dc9489b62bc0a10b53841b932455a43409f96eed90dc80abc8cce5593ead8f0a26d * 0xb7f68cd427045788d5e315375f71d3a416784ec2597776a60ed77c821294d9bd66e96658bdcb43072cee0c849d297bd9f94991738f1a0df313ceb51b093a9372f12a61987f40e7a03d773911deb270916a574962ae8ff4f2d8bfcedee1c885e9c3e54212471636a6330b05b78c3a7ddf96b013be389a08ab7971db2f68fb2689
+
+  sample_private_key = <<EOF
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAmm+kxDsyjD0EwfvASYU5IYtnKOQc019tJ9SR73BfCyCD3BrJd9oZ9UuoKwRH
+c/IGZ+lifFQ6uztBtuueQxjKPGj0h7vQ8cnuqaMQG30dGAmDxUQKxBg+eOniVvpofYqsY7IWF6Sw
+KzW/XjB6O3aWGhbNhJPpI1NrNMwrLajUUiDVfvIkOwgbVVuE8doK3g6JbCqpaRG0FDC1nq912/+3
+6qfFs6aG8tR6JOO38aywhE+Eov7cY2YK42a4AM2USAk9ax2WUD67eAe0glfhbD2KfJqMxd1jEWqm
+c72eCXVN4JNYSG50PjTGo2Qu62SyII78lt85FRVyVXp1Y4vQWcIaVQIDAQABAoIBABY+JC37FLGs
+DCZgOvab0HmrWUVDbX9oDBGjhQ1GUvoISdWGqiOv7vMsXWEssZnabt/CdmPPwdG7nCBbWSTyyhXf
+S/DMtTBN1CjsimJbJ7iRjj/4J9DMaRsDHI1IbYo/UcreGF55YsImcJSBSOmNj9rcE+eXYgmrdxJY
+oZNm8IWPaZ1/8KdPHSq6/HfTzRxXhcGOMGnf3lGfzkzIbV9Ee88Lv9sSV3bYrOsWMNabOe2TeTpC
+UTfFkC++0RkFjEDINSCnoCi+ybzHLUDnurANCwnRWLTVEAeffwNVmiDfgimuqFtzCInW5/5bOTPz
+rBmcC6QAFbyk2WKAlY8Zd4SBYqECgYEA1ukmd9Th0qptFPh7X0nuaRbGuSQRU2JU+uSiHoLuuwpA
+YAJHxwHByTiyHKnyW3szDDX97Ve03jqVHoMymoC9vyuhOP4vGQv/zkOWe1+pOxeTZ7zRXLHbf546
+tiysqV3JSJtivAoQtThBuTJFWkNAn5bu2Q3ICryMzlWT6tjwom0CgYEAt/aM1CcEV4jV4xU3X3HT
+pBZ4TsJZd3amDtd8ghKU2b1m6WZYvctDByzuDISdKXvZ+UmRc48aDfMTzrUbCTqTcvEqYZh/QOeg
+PXc5Ed6ycJFqV0liro/08ti/zt7hyIXpw+VCEkcWNqYzCwW3jDp935awE744mgireXHbL2j7JokC
+gYAOHErRTWHyYgw9dz8qd4E21y7/EvYsQmWP/5kBZdlk4HxvkVbDI0NlAdr39NSb2w/z+kuM3Nhc
+Sv5lfXnCGTfcKHIyesX+4AHQujFUMmi7H4YnJoecjXT7ARmbwn0ntae0o7cs34BPVb1C+qEBFy9U
+CyXtjHEY+15HYekPX2UVVQKBgBT8Nwxsdv5VSbDh1rM4lN//ADJb0UDjdAX1ZuqfnANKq9asKitc
+aIUFBxK+ff8hdbgOQF1iUaKNvBC0cCUZXYCbKi5/6uRIh+r7ErOLJ+fXbr4OTQeEvHiHaTn8Ct2J
+CSWjnWngWhRZ2TDEsi947Kr40ZUu+d34ZzcvWcWKwDuhAoGBAJzCRoGOu6YGy+rBPxaIg0vB+Grx
+rxs0NeNqGdrzmyAPN35OHXYclPwfp+DbtbJHgGMRc/9VFPqW9PeTKjIByeEsXyrcdreR35AR/fwR
+AUcSSKTvw+PobCpXhdkiw4TgJhFNuZnoC63FOjNqA5mu1ICZYBb4ZVlgUAgSmDQxSIgK
+-----END RSA PRIVATE KEY-----
+EOF
+  sample_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6TEOzKMPQTB+8BJhTkhi2co5BzTX20n1JHvcF8LIIPcGsl32hn1S6grBEdz8gZn6WJ8VDq7O0G2655DGMo8aPSHu9Dxye6poxAbfR0YCYPFRArEGD546eJW+mh9iqxjshYXpLArNb9eMHo7dpYaFs2Ek+kjU2s0zCstqNRSINV+8iQ7CBtVW4Tx2greDolsKqlpEbQUMLWer3Xb/7fqp8Wzpoby1Hok47fxrLCET4Si/txjZgrjZrgAzZRICT1rHZZQPrt4B7SCV+FsPYp8mozF3WMRaqZzvZ4JdU3gk1hIbnQ+NMajZC7rZLIgjvyW3zkVFXJVenVji9BZwhpV"
+
+  def key_to_format(key, format)
+    keyobj, f = Cheffish::KeyFormatter.decode(key)
+    Cheffish::KeyFormatter.encode(keyobj, {:format => format})
+  end
+
+  context 'when computing key fingperprints' do
+
+    it 'computes the PKCS#8 SHA1 private key fingerprint correctly' do
+      expect(key_to_format(sample_private_key, :pkcs8sha1fingerprint)).to eq(
+        '88:7e:3a:bd:26:9f:b5:c5:d8:ae:52:f9:df:0b:64:a4:5c:17:0a:87')
+    end
+
+    it 'computes the PKCS#1 MD5 public key fingerprint correctly' do
+      expect(key_to_format(sample_public_key, :pkcs1md5fingerprint)).to eq(
+        '1f:e8:da:c1:16:c3:72:7d:90:e2:b7:64:c4:b4:55:20')
+    end
+
+    it 'computes the RFC4716 MD5 public key fingerprint correctly' do
+      expect(key_to_format(sample_public_key, :rfc4716md5fingerprint)).to eq(
+        'b0:13:4f:da:cf:8c:dc:a7:4a:1f:d2:3a:51:92:cf:6b')
+    end
+
+    it 'defaults to the PKCS#1 MD5 public key fingerprint' do
+      expect(key_to_format(sample_public_key, :fingerprint)).to eq(
+        key_to_format(sample_public_key, :pkcs1md5fingerprint))
+    end
+
+  end
+
+end

data/spec/support/spec_support.rb

@@ -20,13 +20,21 @@ module SpecSupport
         @event_sink.events
       end
 
-      def run_recipe(&block)
-        node = Chef::Node.new
-        node.name 'test'
-        node.automatic[:platform] = 'test'
-        node.automatic[:platform_version] = 'test'
+      def run_context
+        @run_context ||= begin
+          node = Chef::Node.new
+          node.name 'test'
+          node.automatic[:platform] = 'test'
+          node.automatic[:platform_version] = 'test'
+          Chef::RunContext.new(node, {}, Chef::EventDispatch::Dispatcher.new(event_sink))
+        end
+      end
+
+      def event_sink
         @event_sink ||= EventSink.new
-        run_context = Chef::RunContext.new(node, {}, Chef::EventDispatch::Dispatcher.new(@event_sink))
+      end
+
+      def run_recipe(&block)
         recipe = Chef::Recipe.new('test', 'test', run_context)
         recipe.instance_eval(&block)
         Chef::Runner.new(run_context).converge
@@ -77,76 +85,7 @@ RSpec.configure do |config|
 
   config.before :each do
     Chef::Config.reset
-    Cheffish.reset
   end
 end
 
-# Stuff that should have been required in Chef, but wasn't (Chef will be fixed)
-require 'chef/platform'
-
-require 'chef/provider/service/simple'
-require 'chef/provider/service/init'
-
-require 'chef/provider/batch'
-require 'chef/provider/cron'
-require 'chef/provider/cron/aix'
-require 'chef/provider/cron/solaris'
-require 'chef/provider/directory'
-require 'chef/provider/env/windows'
-require 'chef/provider/erl_call'
-require 'chef/provider/execute'
-require 'chef/provider/file'
-require 'chef/provider/group/aix'
-require 'chef/provider/group/dscl'
-require 'chef/provider/group/gpasswd'
-require 'chef/provider/group/groupmod'
-require 'chef/provider/group/pw'
-require 'chef/provider/group/suse'
-require 'chef/provider/group/usermod'
-require 'chef/provider/group/windows'
-require 'chef/provider/http_request'
-require 'chef/provider/ifconfig'
-require 'chef/provider/ifconfig/aix'
-require 'chef/provider/ifconfig/debian'
-require 'chef/provider/ifconfig/redhat'
-require 'chef/provider/link'
-require 'chef/provider/log'
-require 'chef/provider/mdadm'
-require 'chef/provider/mount/aix'
-require 'chef/provider/mount/mount'
-require 'chef/provider/mount/windows'
-require 'chef/provider/package/aix'
-require 'chef/provider/package/apt'
-require 'chef/provider/package/freebsd'
-require 'chef/provider/package/ips'
-require 'chef/provider/package/macports'
-require 'chef/provider/package/pacman'
-require 'chef/provider/package/portage'
-require 'chef/provider/package/solaris'
-require 'chef/provider/package/smartos'
-require 'chef/provider/package/yum'
-require 'chef/provider/package/zypper'
-require 'chef/provider/powershell_script'
-require 'chef/provider/remote_directory'
-require 'chef/provider/route'
-require 'chef/provider/ruby_block'
-require 'chef/provider/script'
-require 'chef/provider/service/arch'
-require 'chef/provider/service/debian'
-require 'chef/provider/service/freebsd'
-require 'chef/provider/service/gentoo'
-require 'chef/provider/service/init'
-require 'chef/provider/service/insserv'
-require 'chef/provider/service/macosx'
-require 'chef/provider/service/redhat'
-require 'chef/provider/service/solaris'
-require 'chef/provider/service/systemd'
-require 'chef/provider/service/upstart'
-require 'chef/provider/service/windows'
-require 'chef/provider/template'
-require 'chef/provider/user/dscl'
-require 'chef/provider/user/pw'
-require 'chef/provider/user/useradd'
-require 'chef/provider/user/solaris'
-require 'chef/provider/user/windows'
-require 'chef/provider/whyrun_safe_ruby_block'
+require 'chef/providers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: openssl_pkcs8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -83,13 +97,17 @@ files:
 - lib/chef/resource/private_key.rb
 - lib/chef/resource/public_key.rb
 - lib/cheffish/actor_provider_base.rb
+- lib/cheffish/basic_chef_client.rb
 - lib/cheffish/chef_provider_base.rb
+- lib/cheffish/chef_run_data.rb
+- lib/cheffish/chef_run_listener.rb
 - lib/cheffish/cheffish_server_api.rb
-- lib/cheffish/inline_resource.rb
 - lib/cheffish/key_formatter.rb
 - lib/cheffish/recipe_dsl.rb
 - lib/cheffish/version.rb
+- lib/cheffish/with_pattern.rb
 - lib/cheffish.rb
+- spec/functional/fingerprint_spec.rb
 - spec/integration/chef_client_spec.rb
 - spec/integration/chef_node_spec.rb
 - spec/integration/chef_user_spec.rb

data/lib/cheffish/inline_resource.rb

@@ -1,88 +0,0 @@
-module Cheffish
-  class InlineResource
-    def initialize(provider)
-      @provider = provider
-    end
-
-    attr_reader :provider
-
-    def run_context
-      provider.run_context
-    end
-
-    def method_missing(method_symbol, *args, &block)
-      # Stolen ruthlessly from Chef's chef/dsl/recipe.rb
-
-      # Checks the new platform => short_name => resource mapping initially
-      # then fall back to the older approach (Chef::Resource.const_get) for
-      # backward compatibility
-      resource_class = Chef::Resource.resource_for_node(method_symbol, provider.run_context.node)
-
-      super unless resource_class
-      raise ArgumentError, "You must supply a name when declaring a #{method_symbol} resource" unless args.size > 0
-
-      # If we have a resource like this one, we want to steal its state
-      args << run_context
-      resource = resource_class.new(*args)
-      resource.source_line = caller[0]
-      resource.load_prior_resource
-      resource.cookbook_name = provider.cookbook_name
-      resource.recipe_name = @recipe_name
-      resource.params = @params
-      # Determine whether this resource is being created in the context of an enclosing Provider
-      resource.enclosing_provider = provider.is_a?(Chef::Provider) ? provider : nil
-      # Evaluate resource attribute DSL
-      resource.instance_eval(&block) if block
-
-      # Run optional resource hook
-      resource.after_created
-
-      # Do NOT put this in the resource collection.
-      #run_context.resource_collection.insert(resource)
-
-      # Instead, run the action directly.
-      Array(resource.action).each do |action|
-        resource.updated_by_last_action(false)
-        run_provider_action(resource.provider_for_action(action))
-        provider.new_resource.updated_by_last_action(true) if resource.updated_by_last_action?
-      end
-      resource
-    end
-
-    # Do Chef::Provider.run_action, but without events
-    def run_provider_action(inline_provider)
-      if !inline_provider.whyrun_supported?
-        raise "#{inline_provider} is not why-run-safe.  Only why-run-safe resources are supported in inline_resource."
-      end
-
-      # Blatantly ripped off from chef/provider run_action
-
-      # TODO: it would be preferable to get the action to be executed in the
-      # constructor...
-
-      # user-defined LWRPs may include unsafe load_current_resource methods that cannot be run in whyrun mode
-      inline_provider.load_current_resource
-      inline_provider.define_resource_requirements
-      inline_provider.process_resource_requirements
-
-      # user-defined providers including LWRPs may
-      # not include whyrun support - if they don't support it
-      # we can't execute any actions while we're running in
-      # whyrun mode. Instead we 'fake' whyrun by documenting that
-      # we can't execute the action.
-      # in non-whyrun mode, this will still cause the action to be
-      # executed normally.
-      if inline_provider.whyrun_supported? && !inline_provider.requirements.action_blocked?(@action)
-        inline_provider.send("action_#{inline_provider.action}")
-      elsif !inline_provider.whyrun_mode?
-        inline_provider.send("action_#{inline_provider.action}")
-      end
-
-      if inline_provider.resource_updated?
-        inline_provider.new_resource.updated_by_last_action(true)
-      end
-
-      inline_provider.cleanup_after_converge
-    end
-  end
-end