ecomdev-chefspec 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c58f9d004b789d825cc778750855a9aa2e71a661
-  data.tar.gz: 8fd41e808e4df754f1ca203d8cde61e03bf7b669
+  metadata.gz: 9855c65317cdbad908e4b3ce31121b2d92df1ccc
+  data.tar.gz: 506884fda82363e731a0042082bf658dc99a5fc7
 SHA512:
-  metadata.gz: 161d79a0c32946662eb7114c18b0fdbf0d90433da2a333c527130fc2139e3744ae0dcf8e83744649d3f975753629144f9d26e0ec6ad113aa5d31d917d4baacb3
-  data.tar.gz: 7ccf603f119bad18cbf7d04232b76724277358ac7873c6b8dbde822a24923a9e05c3cf4f866271ef9e86fa2e58c594a0cccc90bd3bc59ba41f70cb8c4909b7f2
+  metadata.gz: a091b003633864e953be4c4e8cafa4fb823c408e1ed1527bbf74783d19558bf24d1383b1d33359f2d711c8eb583241be76c3bb5e8c9fa9878c0a6cd07e9412df
+  data.tar.gz: d00fa8ba662a776846225bde8657ee92183be41c3f4525f023c44bdf739d3d3a46b4a0a4d21175f18d2965ef4f4c02effe48024c07ab62025a81d1899b2b34fc

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Rakefile

@@ -5,6 +5,7 @@ RSpec::Core::RakeTask.new(:unit) do |t|
   t.rspec_opts = [].tap do |a|
     a.push('--color')
     a.push('--format progress')
+    a.push('--require spec_helper')
   end.join(' ')
 end
 

data/lib/ecomdev/chefspec.rb

@@ -3,7 +3,4 @@ require 'chefspec' unless defined?(ChefSpec) # Require chef spec only if it is n
 require_relative 'chefspec/version'
 require_relative 'chefspec/configuration'
 require_relative 'chefspec/resource/matcher'
-require_relative 'chefspec/api'
-
-# Registers Resource Matchers callbacks for RSpec
-EcomDev::ChefSpec::Resource::Matcher.register
+require_relative 'chefspec/api'

data/lib/ecomdev/chefspec/configuration.rb

@@ -3,7 +3,7 @@ module EcomDev
     class Configuration
       class << self
         extend Forwardable
-        def_delegators :instance, :reset, :setup!, :teardown!, :cookbook_path, :callback
+        def_delegators :instance, :reset, :setup!, :teardown!, :before_example, :after_example, :cookbook_path, :callback
       end
 
       include Singleton
@@ -39,9 +39,17 @@ module EcomDev
         invoke_callbacks(__method__)
       end
 
+      def before_example(example)
+        invoke_callbacks(__method__, example)
+      end
+
+      def after_example(example)
+        invoke_callbacks(__method__, example)
+      end
+
       def reset
-         @cookbook_paths = []
-         @callbacks = []
+        @cookbook_paths = []
+        @callbacks = []
       end
 
       def cookbook_path(path)
@@ -64,23 +72,46 @@ module EcomDev
         if klass
           klass.class_exec do
             alias_method :old_setup!, :setup!
+            alias_method :old_teardown!, :teardown!
 
             def setup!
               old_setup!
               EcomDev::ChefSpec::Configuration.setup!
             end
+
+            def teardown!
+              old_teardown!
+              EcomDev::ChefSpec::Configuration.teardown!
+            end
           end
         else
-          RSpec.configure do
-            before(:suite) { EcomDev::ChefSpec::Configuration.setup! }
+          RSpec.configure do |config|
+            config.before(:suite) { EcomDev::ChefSpec::Configuration.setup! }
+            config.after(:suite) { EcomDev::ChefSpec::Configuration.teardown! }
           end
         end
+
+        RSpec.configure do |config|
+          config.before(:each) { EcomDev::ChefSpec::Configuration.before_example(self) }
+          config.after(:each) { EcomDev::ChefSpec::Configuration.after_example(self) }
+        end
       end
 
       private
-        def invoke_callbacks(method)
-          callbacks.select { |c| c.respond_to?(method) }.each { |c| c.send(method) }
+        def invoke_callbacks(method, *args)
+          callbacks.select { |c| c.respond_to?(method) }.each do |c|
+             method_instance = c.class.instance_method(method)
+             number_of_args = method_instance.arity < 0 ? (method_instance.arity + 1).abs : method_instance.arity
+             if args.length > number_of_args
+               pass_args = args.slice(0, number_of_args)
+             else
+               pass_args = args
+             end
+             c.send(method, *pass_args)
+          end
         end
     end
   end
-end
+end
+
+EcomDev::ChefSpec::Configuration.register

data/lib/ecomdev/chefspec/resource/matcher.rb

@@ -40,7 +40,7 @@ module EcomDev
         def extend_api
           matchers.each do |method, info|
             Helper.add(method) do |identity|
-              ChefSpec::Matchers::ResourceMatcher.new(info.resource, info.action, identity)
+              ::ChefSpec::Matchers::ResourceMatcher.new(info[:resource], info[:action], identity)
             end
           end
         end
@@ -75,7 +75,7 @@ module EcomDev
         end
 
         def load_matcher_file(file)
-           DSL.load(file)
+          DSL.load(file)
         end
 
         def search_patterns
@@ -105,22 +105,23 @@ module EcomDev
         end
 
         private
-          def add_matcher(resource, action)
-            resource_name = resource.to_s
-            action_name = action.to_s
-            matcher_name = action_name + '_' + resource_name
-            matcher = matcher_name.to_sym
-            unless @matchers.key?(matcher)
-              @matchers[matcher] = {action: action_name.to_sym, resource: resource_name.to_sym}
-            end
+        def add_matcher(resource, action)
+          resource_name = resource.to_s
+          action_name = action.to_s
+          matcher_name = action_name + '_' + resource_name
+          matcher = matcher_name.to_sym
+          unless @matchers.key?(matcher)
+            @matchers[matcher] = {action: action_name.to_sym, resource: resource_name.to_sym}
           end
+        end
 
-          def add_runner(resource_name)
-            resource = resource_name.to_sym
-            @runners << resource unless @runners.include?(resource)
-          end
+        def add_runner(resource_name)
+          resource = resource_name.to_sym
+          @runners << resource unless @runners.include?(resource)
+        end
       end
     end
   end
 end
 
+EcomDev::ChefSpec::Resource::Matcher.register

data/lib/ecomdev/chefspec/stub/file_system.rb

@@ -64,12 +64,4 @@ module EcomDev::ChefSpec::Stub
   end
 end
 
-RSpec.configure do |c|
-  c.before(:each) do
-    EcomDev::ChefSpec::Stub::FileSystem.instance.before_example(self)
-  end
-
-  c.after(:each) do
-    EcomDev::ChefSpec::Stub::FileSystem.instance.after_example
-  end
-end
+EcomDev::ChefSpec::Configuration.callback(EcomDev::ChefSpec::Stub::FileSystem.instance)

data/lib/ecomdev/chefspec/stub/include_recipe.rb

@@ -24,6 +24,10 @@ module EcomDev::ChefSpec::Stub
     end
 
     def before_example(object)
+      if object.respond_to?(:described_recipe) && object.described_recipe.match(/^[a-z_0-9]+::[a-z_0-9]+$/)
+        allow_recipe(object.described_recipe)
+      end
+
       stub_include(object) unless allowed_recipes.empty?
     end
 
@@ -57,15 +61,4 @@ module EcomDev::ChefSpec::Stub
   end
 end
 
-RSpec.configure do |c|
-  c.before(:each) do
-    if respond_to?(:described_recipe) && described_recipe.match(/^[a-z_0-9]+::[a-z_0-9]+$/)
-      EcomDev::ChefSpec::Stub::IncludeRecipe.allow_recipe described_recipe
-    end
-    EcomDev::ChefSpec::Stub::IncludeRecipe.instance.before_example(self)
-  end
-
-  c.after(:each) do
-    EcomDev::ChefSpec::Stub::IncludeRecipe.instance.after_example(self)
-  end
-end
+EcomDev::ChefSpec::Configuration.callback(EcomDev::ChefSpec::Stub::IncludeRecipe.instance)

data/lib/ecomdev/chefspec/version.rb

@@ -1,6 +1,6 @@
 
 module EcomDev
   module ChefSpec
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/unit/api/helpers/runner/proxy_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe ChefSpec::API::EcomDevHelpersRunner::RunnerProxy do
   it 'does not create any method unless method of runner is executed' do

data/spec/unit/api/helpers/runner_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe ChefSpec::API::EcomDevHelpersRunner do
   it 'returns a chef runner proxy class' do

data/spec/unit/api/matchers/multiline_string_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe ChefSpec::API::EcomDevMatcherMultilineString do
   it 'should allow match line starts with' do

data/spec/unit/api/stubs/file_system_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe ChefSpec::API::EcomDevStubsFileSystem do
   describe '#file_exists' do

data/spec/unit/api/stubs/include_recipe_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'test::test' do
   let (:instance) { EcomDev::ChefSpec::Stub::IncludeRecipe.instance }

data/spec/unit/configuration_spec.rb

@@ -1,10 +1,15 @@
-require 'spec_helper'
-
 describe EcomDev::ChefSpec::Configuration do
   before(:each) do
+    @_instance = described_class.instance
     Singleton.__init__(described_class)
   end
 
+  after(:each) do
+    described_class.instance_variable_set(:@singleton__instance__, @_instance)
+  end
+
+
+
   def callback_klass
     Class.new
   end
@@ -96,43 +101,104 @@ describe EcomDev::ChefSpec::Configuration do
     end
 
     it 'calls a callback method setup! if it exists' do
-      callback = double('callback')
+      callback = Class.new do
+        def setup!
+          'test'
+        end
+      end.new
 
-      allow(callback).to receive(:respond_to?).with(:setup!).and_return(true)
       expect(callback).to receive(:setup!)
       described_class.callback(callback)
       described_class.setup!
     end
-
-    it 'does not call a callback method setup! if it is not defined' do
-      callback = double('callback')
-
-      allow(callback).to receive(:respond_to?).with(:setup!).and_return(false)
-      expect(callback).not_to receive(:setup!)
-
-      described_class.callback(callback)
-      described_class.setup!
-    end
   end
 
   describe '#teardown!' do
     it 'calls a callback method teardown! if it exists' do
-      callback = double('callback')
+      callback = Class.new do
+        def teardown!
+          'test'
+        end
+      end.new
 
-      allow(callback).to receive(:respond_to?).with(:teardown!).and_return(true)
       expect(callback).to receive(:teardown!)
       described_class.callback(callback)
       described_class.teardown!
     end
+  end
 
-    it 'does not call a callback method teardown! if it is not defined' do
-      callback = double('callback')
+  describe '#before_example' do
+    it 'calls a callback method before_example if it exists with self as an argument' do
+      callback = Class.new do
+        def before_example(example)
+          example
+        end
+      end.new
 
-      allow(callback).to receive(:respond_to?).with(:teardown!).and_return(false)
-      expect(callback).not_to receive(:teardown!)
+      expect(callback).to receive(:before_example).with(self)
+      described_class.callback(callback)
+      described_class.before_example(self)
+    end
 
+    it 'calls a callback method before_example without arguments, if it does not take any' do
+      callback = Class.new do
+        def before_example
+          'test'
+        end
+      end.new
+
+      expect(callback).to receive(:before_example).with(no_args)
       described_class.callback(callback)
-      described_class.teardown!
+      described_class.before_example(self)
     end
+
+
   end
+
+  describe '#after_example' do
+    it 'calls a callback method before_example if it exists with self as an argument' do
+      callback = Class.new do
+        def after_example(example)
+          example
+        end
+      end.new
+
+      expect(callback).to receive(:after_example).with(self)
+      described_class.callback(callback)
+      described_class.after_example(self)
+    end
+
+    it 'calls a callback method before_example without arguments, if it does not take any' do
+      callback = Class.new do
+        def after_example
+          'test'
+        end
+      end.new
+
+      expect(callback).to receive(:after_example).with(no_args)
+      described_class.callback(callback)
+      described_class.after_example(self)
+    end
+  end
+
+  context 'when callbacks are not having defined methods' do
+    [:setup!, :teardown!, :before_example, :after_example].each do |method|
+      describe '#' + method.to_s do
+        it 'does not call a callback method '+ method.to_s + ' if it is not defined' do
+          callback = double('callback')
+
+          allow(callback).to receive(:respond_to?).with(anything).and_return(false)
+          expect(callback).not_to receive(method)
+
+          described_class.callback(callback)
+          if described_class.instance_method(method).arity == 1
+            described_class.send(method, self)
+          else
+            described_class.send(method)
+          end
+        end
+      end
+    end
+  end
+
 end

data/spec/unit/matcher/dsl_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe EcomDev::ChefSpec::Resource::Matcher::DSL do
   let(:instance) { described_class.new }
   let(:matcher) { EcomDev::ChefSpec::Resource::Matcher }

data/spec/unit/matcher/helper_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe EcomDev::ChefSpec::Resource::Matcher::Helper do
 
   def create_method_body

data/spec/unit/matcher_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe EcomDev::ChefSpec::Resource::Matcher do
   before(:each) do

data/spec/unit/stub/file_system_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe EcomDev::ChefSpec::Stub::FileSystem do
   describe '#before_example' do
     it 'sets current example before' do

data/spec/unit/stub/include_recipe_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe EcomDev::ChefSpec::Stub::IncludeRecipe do
   describe '#allow_recipe' do
     it 'should add recipe to the list of allowed' do
@@ -16,7 +14,7 @@ describe EcomDev::ChefSpec::Stub::IncludeRecipe do
       end
     end
 
-    context 'when there is a described recipe', :allow_recipe => true do
+    context 'when there is a described recipe' do
       let (:runner) { ChefSpec::Runner.new }
       let (:described_recipe) { 'test::test' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecomdev-chefspec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ivan Chepurnyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chefspec
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt