cheffish 1.3.1 → 1.4.0

data/lib/cheffish/rspec/recipe_run_wrapper.rb

@@ -1,47 +1,59 @@
-require 'cheffish/chef_run'
-
-module Cheffish
-  module RSpec
-    class RecipeRunWrapper < ChefRun
-      def initialize(chef_config, example: nil, &recipe)
-        super(chef_config)
-        @recipe = recipe
-        @example = example || recipe.binding.eval('self')
-      end
-
-      attr_reader :recipe
-      attr_reader :example
-
-      def client
-        if !@client
-          super
-          example = self.example
-
-          # Call into the rspec example's let variables and other methods
-          @client.define_singleton_method(:method_missing) do |name, *args, &block|
-            if example.respond_to?(name)
-              example.public_send(name, *args, &block)
-            else
-              super(name, *args, &block)
-            end
-          end
-          # This is called by respond_to?, and is required to make sure the
-          # resource knows that we will in fact call the given method.
-          @client.define_singleton_method(:respond_to_missing?) do |name, include_private = false|
-            example.respond_to?(name)
-          end
-          # Respond true to is_a?(Chef::Provider) so that Chef::Recipe::DSL.build_resource
-          # will hook resources up to the example let variables as well (via
-          # enclosing_provider).
-          # Please don't hurt me
-          @client.define_singleton_method(:is_a?) do |klass|
-            klass == Chef::Provider || super
-          end
-
-          @client.load_block(&recipe)
-        end
-        @client
-      end
-    end
-  end
-end
+require 'cheffish/chef_run'
+
+module Cheffish
+  module RSpec
+    class RecipeRunWrapper < ChefRun
+      def initialize(chef_config, example: nil, &recipe)
+        super(chef_config)
+        @recipe = recipe
+        @example = example || recipe.binding.eval('self')
+      end
+
+      attr_reader :recipe
+      attr_reader :example
+
+      def client
+        if !@client
+          super
+          example = self.example
+
+          # Call into the rspec example's let variables and other methods
+          @client.define_singleton_method(:method_missing) do |name, *args, &block|
+            # the elimination of a bunch of metaprogramming in 12.4 changed how Chef DSL is defined in code,
+            # requiring a slight contortion for earlier versions.
+            if Gem::Version.new(Chef::VERSION) >= Gem::Version.new('12.4')    # incompatibility introduced at 2b364df
+              if example.respond_to?(name)
+                example.public_send(name, *args, &block)
+              end
+            else
+              begin
+                super(name, *args, &block)
+              rescue NameError
+                if example.respond_to?(name)
+                  example.public_send(name, *args, &block)
+                else
+                  raise
+                end
+              end
+            end
+          end
+          # This is called by respond_to?, and is required to make sure the
+          # resource knows that we will in fact call the given method.
+          @client.define_singleton_method(:respond_to_missing?) do |name, include_private = false|
+            example.respond_to?(name) || super(name, include_private)
+          end
+          # Respond true to is_a?(Chef::Provider) so that Chef::Recipe::DSL.build_resource
+          # will hook resources up to the example let variables as well (via
+          # enclosing_provider).
+          # Please don't hurt me
+          @client.define_singleton_method(:is_a?) do |klass|
+            klass == Chef::Provider || super(klass)
+          end
+
+          @client.load_block(&recipe)
+        end
+        @client
+      end
+    end
+  end
+end

data/lib/cheffish/rspec/repository_support.rb

@@ -1,108 +1,108 @@
-module Cheffish
-  module RSpec
-    module RepositorySupport
-      def when_the_repository(desc, *tags, &block)
-        context("when the chef repo #{desc}", *tags) do
-          include_context "with a chef repo"
-          extend WhenTheRepositoryClassMethods
-          module_eval(&block)
-        end
-      end
-
-      ::RSpec.shared_context "with a chef repo" do
-        before :each do
-          raise "Can only create one directory per test" if @repository_dir
-          @repository_dir = Dir.mktmpdir('chef_repo')
-          Chef::Config.chef_repo_path = @repository_dir
-          %w(client cookbook data_bag environment node role user).each do |object_name|
-            Chef::Config.delete("#{object_name}_path".to_sym)
-          end
-        end
-
-        after :each do
-          if @repository_dir
-            begin
-              %w(client cookbook data_bag environment node role user).each do |object_name|
-                Chef::Config.delete("#{object_name}_path".to_sym)
-              end
-              Chef::Config.delete(:chef_repo_path)
-              FileUtils.remove_entry_secure(@repository_dir)
-            ensure
-              @repository_dir = nil
-            end
-          end
-          Dir.chdir(@old_cwd) if @old_cwd
-        end
-
-        def directory(relative_path, &block)
-          old_parent_path = @parent_path
-          @parent_path = path_to(relative_path)
-          FileUtils.mkdir_p(@parent_path)
-          instance_eval(&block) if block
-          @parent_path = old_parent_path
-        end
-
-        def file(relative_path, contents)
-          filename = path_to(relative_path)
-          dir = File.dirname(filename)
-          FileUtils.mkdir_p(dir) unless dir == '.'
-          File.open(filename, 'w') do |file|
-            raw = case contents
-                  when Hash
-                    JSON.pretty_generate(contents)
-                  when Array
-                    contents.join("\n")
-                  else
-                    contents
-                  end
-            file.write(raw)
-          end
-        end
-
-        def symlink(relative_path, relative_dest)
-          filename = path_to(relative_path)
-          dir = File.dirname(filename)
-          FileUtils.mkdir_p(dir) unless dir == '.'
-          dest_filename = path_to(relative_dest)
-          File.symlink(dest_filename, filename)
-        end
-
-        def path_to(relative_path)
-          File.expand_path(relative_path, (@parent_path || @repository_dir))
-        end
-
-        def cwd(relative_path)
-          @old_cwd = Dir.pwd
-          Dir.chdir(path_to(relative_path))
-        end
-
-        module WhenTheRepositoryClassMethods
-          def directory(*args, &block)
-            before :each do
-              directory(*args, &block)
-            end
-          end
-
-          def file(*args, &block)
-            before :each do
-              file(*args, &block)
-            end
-          end
-
-          def symlink(*args, &block)
-            before :each do
-              symlink(*args, &block)
-            end
-          end
-
-          def path_to(*args, &block)
-            before :each do
-              file(*args, &block)
-            end
-          end
-        end
-      end
-    end
-
-  end
-end
+module Cheffish
+  module RSpec
+    module RepositorySupport
+      def when_the_repository(desc, *tags, &block)
+        context("when the chef repo #{desc}", *tags) do
+          include_context "with a chef repo"
+          extend WhenTheRepositoryClassMethods
+          module_eval(&block)
+        end
+      end
+
+      ::RSpec.shared_context "with a chef repo" do
+        before :each do
+          raise "Can only create one directory per test" if @repository_dir
+          @repository_dir = Dir.mktmpdir('chef_repo')
+          Chef::Config.chef_repo_path = @repository_dir
+          %w(client cookbook data_bag environment node role user).each do |object_name|
+            Chef::Config.delete("#{object_name}_path".to_sym)
+          end
+        end
+
+        after :each do
+          if @repository_dir
+            begin
+              %w(client cookbook data_bag environment node role user).each do |object_name|
+                Chef::Config.delete("#{object_name}_path".to_sym)
+              end
+              Chef::Config.delete(:chef_repo_path)
+              FileUtils.remove_entry_secure(@repository_dir)
+            ensure
+              @repository_dir = nil
+            end
+          end
+          Dir.chdir(@old_cwd) if @old_cwd
+        end
+
+        def directory(relative_path, &block)
+          old_parent_path = @parent_path
+          @parent_path = path_to(relative_path)
+          FileUtils.mkdir_p(@parent_path)
+          instance_eval(&block) if block
+          @parent_path = old_parent_path
+        end
+
+        def file(relative_path, contents)
+          filename = path_to(relative_path)
+          dir = File.dirname(filename)
+          FileUtils.mkdir_p(dir) unless dir == '.'
+          File.open(filename, 'w') do |file|
+            raw = case contents
+                  when Hash
+                    JSON.pretty_generate(contents)
+                  when Array
+                    contents.join("\n")
+                  else
+                    contents
+                  end
+            file.write(raw)
+          end
+        end
+
+        def symlink(relative_path, relative_dest)
+          filename = path_to(relative_path)
+          dir = File.dirname(filename)
+          FileUtils.mkdir_p(dir) unless dir == '.'
+          dest_filename = path_to(relative_dest)
+          File.symlink(dest_filename, filename)
+        end
+
+        def path_to(relative_path)
+          File.expand_path(relative_path, (@parent_path || @repository_dir))
+        end
+
+        def cwd(relative_path)
+          @old_cwd = Dir.pwd
+          Dir.chdir(path_to(relative_path))
+        end
+
+        module WhenTheRepositoryClassMethods
+          def directory(*args, &block)
+            before :each do
+              directory(*args, &block)
+            end
+          end
+
+          def file(*args, &block)
+            before :each do
+              file(*args, &block)
+            end
+          end
+
+          def symlink(*args, &block)
+            before :each do
+              symlink(*args, &block)
+            end
+          end
+
+          def path_to(*args, &block)
+            before :each do
+              file(*args, &block)
+            end
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/cheffish/server_api.rb

@@ -1,52 +1,52 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# 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'
-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)
-  class ServerAPI < Chef::HTTP
-
-    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
-    if Gem::Version.new(Chef::VERSION) >= Gem::Version.new('11.12')
-      use Chef::HTTP::RemoteRequestID
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# 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'
+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)
+  class ServerAPI < Chef::HTTP
+
+    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
+    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 = '1.3.1'
-end
+module Cheffish
+  VERSION = '1.4.0'
+end

data/lib/cheffish/with_pattern.rb

@@ -1,21 +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
+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