cheffish 1.4.0 → 1.4.1

data/lib/cheffish/rspec.rb

@@ -1,8 +1,8 @@
-require 'cheffish/rspec/chef_run_support'
-require 'cheffish/rspec/repository_support'
-require 'cheffish/rspec/matchers'
-
-module Cheffish
-  module RSpec
-  end
-end
+require 'cheffish/rspec/chef_run_support'
+require 'cheffish/rspec/repository_support'
+require 'cheffish/rspec/matchers'
+
+module Cheffish
+  module RSpec
+  end
+end

data/lib/cheffish/rspec/chef_run_support.rb

@@ -1,83 +1,83 @@
-require 'chef_zero/rspec'
-require 'chef/server_api'
-require 'cheffish/rspec/repository_support'
-require 'uri'
-require 'cheffish/chef_run'
-require 'cheffish/rspec/recipe_run_wrapper'
-require 'cheffish/rspec/matchers'
-
-module Cheffish
-  module RSpec
-    module ChefRunSupport
-      include ChefZero::RSpec
-      include RepositorySupport
-
-      def self.extended(klass)
-        klass.class_eval do
-          include ChefRunSupportInstanceMethods
-        end
-      end
-
-      def when_the_chef_12_server(*args, **options, &block)
-        if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
-          when_the_chef_server(*args, :osc_compat => false, :single_org => false, **options, &block)
-        end
-      end
-
-      def with_converge(&recipe)
-        before :each do
-          r = recipe(&recipe)
-          r.converge
-        end
-      end
-
-      module ChefRunSupportInstanceMethods
-        def rest
-          ::Chef::ServerAPI.new
-        end
-
-        def get(path, *args)
-          if path[0] == '/'
-            path = URI.join(rest.url, path)
-          end
-          rest.get(path, *args)
-        end
-
-        def chef_config
-          {}
-        end
-
-        def expect_recipe(str=nil, file=nil, line=nil, &recipe)
-          r = recipe(str, file, line, &recipe)
-          r.converge
-          expect(r)
-        end
-
-        def expect_converge(str=nil, file=nil, line=nil, &recipe)
-          expect { converge(str, file, line, &recipe) }
-        end
-
-        def recipe(str=nil, file=nil, line=nil, &recipe)
-          if !recipe
-            if file && line
-              recipe = proc { eval(str, nil, file, line) }
-            else
-              recipe = proc { eval(str) }
-            end
-          end
-          RecipeRunWrapper.new(chef_config, &recipe)
-        end
-
-        def converge(str=nil, file=nil, line=nil, &recipe)
-          r = recipe(str, file, line, &recipe)
-          r.converge
-          r
-        end
-
-        def chef_client
-          @chef_client ||= ChefRun.new(chef_config)
-        end
-      end
-    end
-  end
-end
+require 'chef_zero/rspec'
+require 'chef/server_api'
+require 'cheffish/rspec/repository_support'
+require 'uri'
+require 'cheffish/chef_run'
+require 'cheffish/rspec/recipe_run_wrapper'
+require 'cheffish/rspec/matchers'
+
+module Cheffish
+  module RSpec
+    module ChefRunSupport
+      include ChefZero::RSpec
+      include RepositorySupport
+
+      def self.extended(klass)
+        klass.class_eval do
+          include ChefRunSupportInstanceMethods
+        end
+      end
+
+      def when_the_chef_12_server(*args, **options, &block)
+        if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
+          when_the_chef_server(*args, :osc_compat => false, :single_org => false, **options, &block)
+        end
+      end
+
+      def with_converge(&recipe)
+        before :each do
+          r = recipe(&recipe)
+          r.converge
+        end
+      end
+
+      module ChefRunSupportInstanceMethods
+        def rest
+          ::Chef::ServerAPI.new
+        end
+
+        def get(path, *args)
+          if path[0] == '/'
+            path = URI.join(rest.url, path)
+          end
+          rest.get(path, *args)
+        end
+
+        def chef_config
+          {}
+        end
+
+        def expect_recipe(str=nil, file=nil, line=nil, &recipe)
+          r = recipe(str, file, line, &recipe)
+          r.converge
+          expect(r)
+        end
+
+        def expect_converge(str=nil, file=nil, line=nil, &recipe)
+          expect { converge(str, file, line, &recipe) }
+        end
+
+        def recipe(str=nil, file=nil, line=nil, &recipe)
+          if !recipe
+            if file && line
+              recipe = proc { eval(str, nil, file, line) }
+            else
+              recipe = proc { eval(str) }
+            end
+          end
+          RecipeRunWrapper.new(chef_config, &recipe)
+        end
+
+        def converge(str=nil, file=nil, line=nil, &recipe)
+          r = recipe(str, file, line, &recipe)
+          r.converge
+          r
+        end
+
+        def chef_client
+          @chef_client ||= ChefRun.new(chef_config)
+        end
+      end
+    end
+  end
+end

data/lib/cheffish/rspec/matchers.rb

@@ -1,4 +1,4 @@
-require 'cheffish/rspec/matchers/have_updated'
-require 'cheffish/rspec/matchers/be_idempotent'
-require 'cheffish/rspec/matchers/partially_match'
-require 'cheffish/rspec/matchers/emit_no_warnings_or_errors'
+require 'cheffish/rspec/matchers/have_updated'
+require 'cheffish/rspec/matchers/be_idempotent'
+require 'cheffish/rspec/matchers/partially_match'
+require 'cheffish/rspec/matchers/emit_no_warnings_or_errors'

data/lib/cheffish/rspec/matchers/be_idempotent.rb

@@ -1,16 +1,16 @@
-require 'rspec/matchers'
-
-RSpec::Matchers.define :be_idempotent do
-  match do |recipe|
-    @recipe = recipe
-    recipe.reset
-    recipe.converge
-    recipe.up_to_date?
-  end
-
-  failure_message {
-    "#{@recipe} is not idempotent!  Converging it a second time caused updates.\n#{@recipe.output_for_failure_message}"
-  }
-
-  supports_block_expectations
-end
+require 'rspec/matchers'
+
+RSpec::Matchers.define :be_idempotent do
+  match do |recipe|
+    @recipe = recipe
+    recipe.reset
+    recipe.converge
+    recipe.up_to_date?
+  end
+
+  failure_message {
+    "#{@recipe} is not idempotent!  Converging it a second time caused updates.\n#{@recipe.output_for_failure_message}"
+  }
+
+  supports_block_expectations
+end

data/lib/cheffish/rspec/matchers/emit_no_warnings_or_errors.rb

@@ -1,15 +1,15 @@
-require 'rspec/matchers'
-
-RSpec::Matchers.define :emit_no_warnings_or_errors do
-  match do |recipe|
-    @recipe = recipe
-    @warn_err = recipe.logs.lines.select { |l| l =~ /warn|err/i }.join("\n")
-    @warn_err.empty?
-  end
-
-  failure_message {
-    "#{@recipe} emitted warnings and errors!\n#{@warn_err}"
-  }
-
-  supports_block_expectations
-end
+require 'rspec/matchers'
+
+RSpec::Matchers.define :emit_no_warnings_or_errors do
+  match do |recipe|
+    @recipe = recipe
+    @warn_err = recipe.logs.lines.select { |l| l =~ /warn|err/i }.join("\n")
+    @warn_err.empty?
+  end
+
+  failure_message {
+    "#{@recipe} emitted warnings and errors!\n#{@warn_err}"
+  }
+
+  supports_block_expectations
+end

data/lib/cheffish/rspec/matchers/have_updated.rb

@@ -1,37 +1,37 @@
-require 'rspec/matchers'
-
-RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
-  match do |recipe|
-    @recipe = recipe
-    actual = @recipe.event_sink.events
-    actual_actions = actual.select { |event, resource, action| event == :resource_updated && resource.to_s == resource_name }.
-                               map { |event, resource, action| action }
-    expect(actual_actions).to eq(expected_actions)
-  end
-
-  failure_message do
-    actual = @recipe.event_sink.events
-    updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
-    result = "expected that the chef_run would #{expected_actions.join(',')} #{resource_name}."
-    if updates.size > 0
-      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
-    else
-      result << " Nothing was updated."
-    end
-    result
-  end
-
-  failure_message_when_negated do
-    actual = @recipe.event_sink.events
-    updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
-    result = "expected that the chef_run would not #{expected_actions.join(',')} #{resource_name}."
-    if updates.size > 0
-      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
-    else
-      result << " Nothing was updated."
-    end
-    result
-  end
-end
-
-RSpec::Matchers.define_negated_matcher :not_have_updated, :have_updated
+require 'rspec/matchers'
+
+RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
+  match do |recipe|
+    @recipe = recipe
+    actual = @recipe.event_sink.events
+    actual_actions = actual.select { |event, resource, action| event == :resource_updated && resource.to_s == resource_name }.
+                               map { |event, resource, action| action }
+    expect(actual_actions).to eq(expected_actions)
+  end
+
+  failure_message do
+    actual = @recipe.event_sink.events
+    updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
+    result = "expected that the chef_run would #{expected_actions.join(',')} #{resource_name}."
+    if updates.size > 0
+      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
+    else
+      result << " Nothing was updated."
+    end
+    result
+  end
+
+  failure_message_when_negated do
+    actual = @recipe.event_sink.events
+    updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
+    result = "expected that the chef_run would not #{expected_actions.join(',')} #{resource_name}."
+    if updates.size > 0
+      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
+    else
+      result << " Nothing was updated."
+    end
+    result
+  end
+end
+
+RSpec::Matchers.define_negated_matcher :not_have_updated, :have_updated

data/lib/cheffish/rspec/matchers/partially_match.rb

@@ -1,63 +1,63 @@
-module Cheffish
-  module RSpec
-    module Matchers
-      class PartiallyMatch
-        include ::RSpec::Matchers::Composable
-
-        def initialize(example, expected)
-          @example = example
-          @expected = expected
-        end
-
-        def matches?(actual)
-          @actual = actual
-          partially_matches_values(@expected, actual)
-        end
-
-        def failure_message
-          "expected #{@actual} to match #{@expected}"
-        end
-
-        def failure_message_when_negated
-          "expected #{@actual} not to match #{@expected}"
-        end
-
-        protected
-
-        def partially_matches_values(expected, actual)
-          if Hash === actual
-            return partially_matches_hashes(expected, actual) if Hash === expected || Array === expected
-          elsif Array === expected && Enumerable === actual && !(Struct === actual)
-            return partially_matches_arrays(expected, actual)
-          end
-
-          return true if actual == expected
-
-          begin
-            expected === actual
-          rescue ArgumentError
-            # Some objects, like 0-arg lambdas on 1.9+, raise
-            # ArgumentError for `expected === actual`.
-            false
-          end
-        end
-
-        def partially_matches_hashes(expected, actual)
-          expected.all? { |key, value| partially_matches_values(value, actual[key]) }
-        end
-
-        def partially_matches_arrays(expected, actual)
-          expected.all? { |e| actual.any? { |a| partially_matches_values(e, a) } }
-        end
-      end
-    end
-  end
-end
-
-module RSpec
-  module Matchers
-    def partially_match(expected)
-      Cheffish::RSpec::Matchers::PartiallyMatch.new(self, expected)
-    end
-  end
-end
+module Cheffish
+  module RSpec
+    module Matchers
+      class PartiallyMatch
+        include ::RSpec::Matchers::Composable
+
+        def initialize(example, expected)
+          @example = example
+          @expected = expected
+        end
+
+        def matches?(actual)
+          @actual = actual
+          partially_matches_values(@expected, actual)
+        end
+
+        def failure_message
+          "expected #{@actual} to match #{@expected}"
+        end
+
+        def failure_message_when_negated
+          "expected #{@actual} not to match #{@expected}"
+        end
+
+        protected
+
+        def partially_matches_values(expected, actual)
+          if Hash === actual
+            return partially_matches_hashes(expected, actual) if Hash === expected || Array === expected
+          elsif Array === expected && Enumerable === actual && !(Struct === actual)
+            return partially_matches_arrays(expected, actual)
+          end
+
+          return true if actual == expected
+
+          begin
+            expected === actual
+          rescue ArgumentError
+            # Some objects, like 0-arg lambdas on 1.9+, raise
+            # ArgumentError for `expected === actual`.
+            false
+          end
+        end
+
+        def partially_matches_hashes(expected, actual)
+          expected.all? { |key, value| partially_matches_values(value, actual[key]) }
+        end
+
+        def partially_matches_arrays(expected, actual)
+          expected.all? { |e| actual.any? { |a| partially_matches_values(e, a) } }
+        end
+      end
+    end
+  end
+end
+
+module RSpec
+  module Matchers
+    def partially_match(expected)
+      Cheffish::RSpec::Matchers::PartiallyMatch.new(self, expected)
+    end
+  end
+end