cheffish 0.7.1 → 0.8

data/lib/cheffish/actor_provider_base.rb

@@ -14,9 +14,9 @@ class Cheffish::ActorProviderBase < Cheffish::ChefProviderBase
     if current_resource_exists?
       # Update the actor if it's different
       if differences.size > 0
-        description = [ "update #{actor_type} #{new_resource.name} at #{rest.url}" ] + differences
+        description = [ "update #{actor_type} #{new_resource.name} at #{actor_path}" ] + differences
         converge_by description do
-          result = rest.put("#{actor_type}s/#{new_resource.name}", normalize_for_put(new_json))
+          result = rest.put("#{actor_path}/#{new_resource.name}", normalize_for_put(new_json))
           current_public_key, current_public_key_format = Cheffish::KeyFormatter.decode(result['public_key']) if result['public_key']
         end
       end
@@ -25,9 +25,9 @@ class Cheffish::ActorProviderBase < Cheffish::ChefProviderBase
       if !new_public_key
         raise "You must specify a public key to create a #{actor_type}!  Use the private_key resource to create a key, and pass it in with source_key_path."
       end
-      description = [ "create #{actor_type} #{new_resource.name} at #{rest.url}" ] + differences
+      description = [ "create #{actor_type} #{new_resource.name} at #{actor_path}" ] + differences
       converge_by description do
-        result = rest.post("#{actor_type}s", normalize_for_post(new_json))
+        result = rest.post("#{actor_path}", normalize_for_post(new_json))
         current_public_key, current_public_key_format = Cheffish::KeyFormatter.decode(result['public_key']) if result['public_key']
       end
     end
@@ -58,8 +58,8 @@ class Cheffish::ActorProviderBase < Cheffish::ChefProviderBase
 
   def delete_actor
     if current_resource_exists?
-      converge_by "delete #{actor_type} #{new_resource.name} at #{rest.url}" do
-        rest.delete("#{actor_type}s/#{new_resource.name}")
+      converge_by "delete #{actor_type} #{new_resource.name} at #{actor_path}" do
+        rest.delete("#{actor_path}/#{new_resource.name}")
         Chef::Log.info("#{new_resource} deleted #{actor_type} #{new_resource.name} at #{rest.url}")
       end
     end
@@ -74,7 +74,13 @@ class Cheffish::ActorProviderBase < Cheffish::ChefProviderBase
     @new_public_key ||= begin
       if new_resource.source_key
         if new_resource.source_key.is_a?(String)
-          Cheffish::KeyFormatter.decode(new_resource.source_key)
+          key, key_format = Cheffish::KeyFormatter.decode(new_resource.source_key)
+
+          if key.private?
+            key.public_key
+          else
+            key
+          end
         elsif new_resource.source_key.private?
           new_resource.source_key.public_key
         else
@@ -108,7 +114,7 @@ class Cheffish::ActorProviderBase < Cheffish::ChefProviderBase
 
   def load_current_resource
     begin
-      json = rest.get("#{actor_type}s/#{new_resource.name}")
+      json = rest.get("#{actor_path}/#{new_resource.name}")
       @current_resource = json_to_resource(json)
     rescue Net::HTTPServerException => e
       if e.response.code == "404"
@@ -122,5 +128,4 @@ class Cheffish::ActorProviderBase < Cheffish::ChefProviderBase
       current_resource.output_key_path = new_resource.output_key_path
     end
   end
-
 end

data/lib/cheffish/basic_chef_client.rb

@@ -37,6 +37,11 @@ module Cheffish
     attr_accessor :recipe_name
     def_delegators :@run_context, :resource_collection, :immediate_notifications, :delayed_notifications
 
+    def add_resource(resource)
+      resource.run_context = run_context
+      run_context.resource_collection.insert(resource)
+    end
+
     def load_block(&block)
       @recipe_name = 'block'
       instance_eval(&block)
@@ -54,10 +59,21 @@ module Cheffish
       @event_catcher.updates.size > 0
     end
 
-    def self.inline_resource(provider, provider_action, &block)
+    # Builds a resource sans context, which can be later used in a new client's
+    # add_resource() method.
+    def self.build_resource(type, name, created_at=nil, &resource_attrs_block)
+      created_at ||= caller[0]
+      result = BasicChefClient.new.build_resource(type, name, created_at, &resource_attrs_block)
+      result
+    end
+
+    def self.inline_resource(provider, provider_action, *resources, &block)
       events = ProviderEventForwarder.new(provider, provider_action)
       client = BasicChefClient.new(provider.node, events)
-      client.load_block(&block)
+      resources.each do |resource|
+        client.add_resource(resource)
+      end
+      client.load_block(&block) if block
       client.converge
       client.updated?
     end

data/lib/cheffish/chef_provider_base.rb

@@ -215,10 +215,17 @@ module Cheffish
       def initialize(name, parent = nil)
         @name = name
         @parent = parent
+        @org = nil
       end
 
       attr_reader :name
       attr_reader :parent
+      attr_reader :org
     end
   end
+
+  # We are not interested in Chef's cloning behavior here.
+  def load_prior_resource
+    Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
+  end
 end

data/lib/cheffish/merged_config.rb

@@ -45,8 +45,12 @@ module Cheffish
       end
     end
 
-    def method_missing(name)
-      self[name]
+    def method_missing(name, *args)
+      if args.count > 0
+        raise NoMethodError, "Unexpected method #{name} for MergedConfig with arguments #{args}"
+      else
+        self[name]
+      end
     end
 
     def key?(name)
@@ -82,5 +86,9 @@ module Cheffish
       end
       result
     end
+
+    def to_s
+      to_hash.to_s
+    end
   end
 end

data/lib/cheffish/recipe_dsl.rb

@@ -1,5 +1,6 @@
 require 'cheffish'
 
+require 'chef/version'
 require 'chef_zero/server'
 require 'chef/chef_fs/chef_fs_data_store'
 require 'chef/chef_fs/config'
@@ -7,26 +8,38 @@ require 'cheffish/chef_run_data'
 require 'cheffish/chef_run_listener'
 require 'chef/client'
 require 'chef/config'
+require 'chef_zero/version'
 require 'cheffish/merged_config'
+require 'chef/resource/chef_acl'
 require 'chef/resource/chef_client'
+require 'chef/resource/chef_container'
 require 'chef/resource/chef_data_bag'
 require 'chef/resource/chef_data_bag_item'
 require 'chef/resource/chef_environment'
+require 'chef/resource/chef_group'
+require 'chef/resource/chef_mirror'
 require 'chef/resource/chef_node'
+require 'chef/resource/chef_organization'
 require 'chef/resource/chef_role'
 require 'chef/resource/chef_user'
 require 'chef/resource/private_key'
 require 'chef/resource/public_key'
+require 'chef/provider/chef_acl'
 require 'chef/provider/chef_client'
+require 'chef/provider/chef_container'
 require 'chef/provider/chef_data_bag'
 require 'chef/provider/chef_data_bag_item'
 require 'chef/provider/chef_environment'
+require 'chef/provider/chef_group'
+require 'chef/provider/chef_mirror'
 require 'chef/provider/chef_node'
+require 'chef/provider/chef_organization'
 require 'chef/provider/chef_role'
 require 'chef/provider/chef_user'
 require 'chef/provider/private_key'
 require 'chef/provider/public_key'
 
+
 class Chef
   module DSL
     module Recipe
@@ -49,7 +62,7 @@ class Chef
       def with_chef_local_server(options, &block)
         options[:host] ||= '127.0.0.1'
         options[:log_level] ||= Chef::Log.level
-        options[:port] ||= 8901.upto(9900)
+        options[:port] ||= ChefZero::VERSION.to_f >= 2.2 ? 8901.upto(9900) : 8901
 
         # Create the data store chef-zero will use
         options[:data_store] ||= begin
@@ -59,16 +72,13 @@ class Chef
 
           # 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
+            options["#{type}_path"] ||= begin
               if options[:chef_repo_path].kind_of?(String)
-                run_context.config.path_join(options[:chef_repo_path], "#{type}s")
+                Chef::Util::PathHelper.join(options[:chef_repo_path], "#{type}s")
               else
-                options[:chef_repo_path].map { |path| run_context.config.path_join(path, "#{type}s")}
+                options[:chef_repo_path].map { |path| Chef::Util::PathHelper.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
 
           chef_fs = Chef::ChefFS::Config.new(options).local_fs
@@ -95,7 +105,7 @@ class Chef
   class Config
     default(:profile) { ENV['CHEF_PROFILE'] || 'default' }
     configurable(:private_keys)
-    default(:private_key_paths) { [ path_join(config_dir, 'keys'), path_join(user_home, '.ssh') ] }
+    default(:private_key_paths) { [ Chef::Util::PathHelper.join(config_dir, 'keys'), Chef::Util::PathHelper.join(user_home, '.ssh') ] }
     default(:private_key_write_path) { private_key_paths.first }
   end
 
@@ -119,3 +129,19 @@ class Chef
   end
 
 end
+
+# Chef 12 moved Chef::Config.path_join to PathHelper.join
+if Chef::VERSION.to_i >= 12
+  require 'chef/util/path_helper'
+else
+  require 'chef/config'
+  class Chef
+    class Util
+      class PathHelper
+        def join(*args)
+          Chef::Config.path_join(*args)
+        end
+      end
+    end
+  end
+end

data/lib/cheffish/server_api.rb

@@ -16,13 +16,16 @@
 # limitations under the License.
 #
 
+require 'chef/version'
 require 'chef/http'
 require 'chef/http/authenticator'
 require 'chef/http/cookie_manager'
 require 'chef/http/decompressor'
 require 'chef/http/json_input'
 require 'chef/http/json_output'
-require 'chef/http/remote_request_id'
+if Gem::Version.new(Chef::VERSION) >= Gem::Version.new('11.12')
+  require 'chef/http/remote_request_id'
+end
 
 module Cheffish
   # Exactly like Chef::ServerAPI, but requires you to pass in what keys you want (no defaults)
@@ -30,13 +33,20 @@ module Cheffish
 
     def initialize(url, options = {})
       super(url, options)
+      root_url = URI.parse(url)
+      root_url.path = ''
+      @root_url = root_url.to_s
     end
 
+    attr_reader :root_url
+
     use Chef::HTTP::JSONInput
     use Chef::HTTP::JSONOutput
     use Chef::HTTP::CookieManager
     use Chef::HTTP::Decompressor
     use Chef::HTTP::Authenticator
-    use Chef::HTTP::RemoteRequestID
+    if Gem::Version.new(Chef::VERSION) >= Gem::Version.new('11.12')
+      use Chef::HTTP::RemoteRequestID
+    end
   end
 end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.7.1'
+  VERSION = '0.8'
 end

data/lib/cheffish.rb

@@ -9,8 +9,8 @@ require 'chef/application'
 module Cheffish
   NAME_REGEX = /^[.\-[:alnum:]_]+$/
 
-  def self.inline_resource(provider, provider_action, &block)
-    BasicChefClient.inline_resource(provider, provider_action, &block)
+  def self.inline_resource(provider, provider_action, *resources, &block)
+    BasicChefClient.inline_resource(provider, provider_action, *resources, &block)
   end
 
   def self.default_chef_server(config = profiled_config)

data/spec/functional/merged_config_spec.rb

@@ -0,0 +1,20 @@
+require 'cheffish/merged_config'
+
+describe "merged_config" do
+
+  let(:config) do
+  	Cheffish::MergedConfig.new({:test=>'val'})
+  end
+
+  it "returns value in config" do
+    expect(config.test).to eq('val')
+  end
+
+  it "raises a NoMethodError if calling an unknown method with arguments" do
+    expect{config.merge({:some => 'hash'})}.to raise_error(NoMethodError)
+  end
+
+  it "has an informative string representation" do
+  	expect("#{config}").to eq("{:test=>\"val\"}")
+  end
+end