cheffish 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd1d356ff0bdaa2531dbf85e2b390ed4396e6527
-  data.tar.gz: 0e7990d44ec9ac64be668886c2efd8973989339e
+  metadata.gz: 85b4f608f3cf8b32a827f1b538c2cf7ef9185c8c
+  data.tar.gz: 0c382ad53c007730730a591967628e507c8be51c
 SHA512:
-  metadata.gz: a3d065506dc7daf38dee52868720169f0018af70343a51375d8271eb3c783a4006ce82104a2133806797e5a7af20e98cb77f24fb12f0e863fe94b8fbcb1842e2
-  data.tar.gz: 48c43f52ae0e79a2951640128d4f9040b8f8905b4c702380fb3690fe43399c2929a2177a1661af04b4200bcc8b40dc2b3fc78b70a975f119b880d04fd2d0cee9
+  metadata.gz: 6bed951a0243067a3ada2a3f073d788a4569d17f08f01ac7f76c6c148dca626e6f1b468cad947848ec548bd1ad723e14469bb8261d4be84567c3eb633cc4dc9d
+  data.tar.gz: a8e7ac0b4ac306e32a9ccee854ef09ad71732b9ca8f87840246955b494a76e210c3a66b63f03e14d24881ab5d8a068486dd52b470c3c486314fac23707b83a91

data/lib/cheffish/rspec/chef_run_support.rb

@@ -47,23 +47,29 @@ module Cheffish
           {}
         end
 
-        def expect_recipe(&recipe)
-          r = recipe(&recipe)
+        def expect_recipe(str=nil, file=nil, line=nil, &recipe)
+          r = recipe(str, file, line, &recipe)
           r.converge
           expect(r)
         end
 
-        def expect_converge(&recipe)
-          r = recipe(&recipe)
-          expect { r.converge }
+        def expect_converge(str=nil, file=nil, line=nil, &recipe)
+          expect { converge(str, file, line, &recipe) }
         end
 
-        def recipe(&recipe)
+        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(&recipe)
-          r = RecipeRunWrapper.new(chef_config, &recipe)
+        def converge(str=nil, file=nil, line=nil, &recipe)
+          r = recipe(str, file, line, &recipe)
           r.converge
           r
         end

data/lib/cheffish/rspec/recipe_run_wrapper.rb

@@ -3,16 +3,41 @@ require 'cheffish/chef_run'
 module Cheffish
   module RSpec
     class RecipeRunWrapper < ChefRun
-      def initialize(chef_config, &recipe)
+      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

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/spec/integration/rspec/converge_spec.rb

@@ -0,0 +1,183 @@
+require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
+
+describe 'Cheffish::RSpec::ChefRunSupport' do
+  extend Cheffish::RSpec::ChefRunSupport
+
+  let(:tempfile) { Tempfile.new('test') }
+
+  context "#recipe" do
+    it "recipe { file ... } updates the file" do
+      result = recipe {
+        file tempfile.path do
+          content 'test'
+        end
+      }
+      expect(result.updated?).to be_falsey
+      expect(IO.read(tempfile.path)).to eq ''
+    end
+
+    it "recipe 'file ...' updates the file" do
+      result = recipe <<-EOM
+        file tempfile.path do
+          content 'test'
+        end
+      EOM
+      expect(result.updated?).to be_falsey
+      expect(IO.read(tempfile.path)).to eq ''
+    end
+
+    it "recipe 'file ...' with file and line number updates the file" do
+      result = recipe(<<-EOM, __FILE__, __LINE__+1)
+        file tempfile.path do
+          content 'test'
+        end
+      EOM
+      expect(result.updated?).to be_falsey
+      expect(IO.read(tempfile.path)).to eq ''
+    end
+  end
+
+  context "#converge" do
+    it "converge { file ... } updates the file" do
+      result = converge {
+        file tempfile.path do
+          content 'test'
+        end
+      }
+      expect(result.updated?).to be_truthy
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+
+    it "converge 'file ...' updates the file" do
+      result = converge <<-EOM
+        file tempfile.path do
+          content 'test'
+        end
+      EOM
+      expect(result.updated?).to be_truthy
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+
+    it "converge 'file ...' with file and line number updates the file" do
+      result = converge(<<-EOM, __FILE__, __LINE__+1)
+        file tempfile.path do
+          content 'test'
+        end
+      EOM
+      expect(result.updated?).to be_truthy
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+  end
+
+  context "#expect_recipe" do
+    it "expect_recipe { file ... }.to be_updated updates the file, and be_idempotent does not fail" do
+      expect_recipe {
+        file tempfile.path do
+          content 'test'
+        end
+      }.to be_updated.and be_idempotent
+
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+
+    it "expect_recipe 'file ...'.to be_updated updates the file, and be_idempotent does not fail" do
+      expect_recipe(<<-EOM).to be_updated.and be_idempotent
+        file tempfile.path do
+          content 'test'
+        end
+      EOM
+
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+
+    it "expect_recipe('file ...', file, line).to be_updated updates the file, and be_idempotent does not fail" do
+      expect_recipe(<<-EOM, __FILE__, __LINE__+1).to be_updated.and be_idempotent
+        file tempfile.path do
+          content 'test'
+        end
+      EOM
+
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+
+    it "expect_recipe { file ... }.to be_up_to_date fails" do
+      expect {
+        expect_recipe {
+          file tempfile.path do
+            content 'test'
+          end
+        }.to be_up_to_date
+      }.to raise_error
+    end
+
+    it "expect_recipe { }.to be_updated fails" do
+      expect {
+        expect_recipe { }.to be_updated
+      }.to raise_error
+    end
+
+    it "expect_recipe { }.to be_up_to_date succeeds" do
+      expect_recipe { }.to be_up_to_date
+    end
+
+    it "expect_recipe { }.to be_idempotent succeeds" do
+      expect_recipe { }.to be_idempotent
+    end
+  end
+
+  context "#expect_converge" do
+    it "expect_converge { file ... }.not_to raise_error updates the file" do
+      expect_converge {
+        file tempfile.path do
+          content 'test'
+        end
+      }.not_to raise_error
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+
+    it "expect_converge('file ...').not_to raise_error updates the file" do
+      expect_converge(<<-EOM).not_to raise_error
+        file tempfile.path do
+          content 'test'
+        end
+      EOM
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+
+    it "expect_converge('file ...', file, line).not_to raise_error updates the file" do
+      expect_converge(<<-EOM, __FILE__, __LINE__+1).not_to raise_error
+        file tempfile.path do
+          content 'test'
+        end
+      EOM
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+
+    it "expect_converge { raise 'oh no' }.to raise_error passes" do
+      expect_converge {
+        raise 'oh no'
+      }.to raise_error
+    end
+  end
+
+  context "when there is a let variable" do
+    let(:let_variable) { "test" }
+
+    it "converge { let_variable } accesses it" do
+      # Capture the variable outside
+      x = nil
+      converge { x = let_variable }
+      expect(x).to eq 'test'
+    end
+
+    it "converge with a file resource referencing let_variable accesses let_variable" do
+      converge {
+        file tempfile.path do
+          content let_variable
+        end
+      }
+      expect(IO.read(tempfile.path)).to eq 'test'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -141,6 +141,7 @@ files:
 - spec/integration/chef_user_spec.rb
 - spec/integration/private_key_spec.rb
 - spec/integration/recipe_dsl_spec.rb
+- spec/integration/rspec/converge_spec.rb
 - spec/support/key_support.rb
 - spec/support/spec_support.rb
 - spec/unit/get_private_key_spec.rb
@@ -163,8 +164,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A library to manipulate Chef in Chef.
 test_files: []
+has_rdoc: