cheffish 1.4.1 → 1.4.2

data/spec/integration/recipe_dsl_spec.rb

@@ -1,28 +1,28 @@
-require 'support/spec_support'
-require 'cheffish/rspec/chef_run_support'
-require 'chef/resource/chef_node'
-require 'chef/provider/chef_node'
-require 'tmpdir'
-
-describe 'Cheffish Recipe DSL' do
-  extend Cheffish::RSpec::ChefRunSupport
-
-  context 'when we include with_chef_local_server' do
-    before :each do
-      @tmp_repo = tmp_repo = Dir.mktmpdir('chef_repo')
-    end
-
-    after :each do
-      FileUtils.remove_entry_secure @tmp_repo
-    end
-
-    it 'chef_nodes get put into said server' do
-      tmp_repo = @tmp_repo
-      expect_recipe {
-        with_chef_local_server :chef_repo_path => tmp_repo
-        chef_node 'blah'
-      }.to have_updated 'chef_node[blah]', :create
-      expect(File).to exist("#{@tmp_repo}/nodes/blah.json")
-    end
-  end
-end
+require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
+require 'chef/resource/chef_node'
+require 'chef/provider/chef_node'
+require 'tmpdir'
+
+describe 'Cheffish Recipe DSL' do
+  extend Cheffish::RSpec::ChefRunSupport
+
+  context 'when we include with_chef_local_server' do
+    before :each do
+      @tmp_repo = tmp_repo = Dir.mktmpdir('chef_repo')
+    end
+
+    after :each do
+      FileUtils.remove_entry_secure @tmp_repo
+    end
+
+    it 'chef_nodes get put into said server' do
+      tmp_repo = @tmp_repo
+      expect_recipe {
+        with_chef_local_server :chef_repo_path => tmp_repo
+        chef_node 'blah'
+      }.to have_updated 'chef_node[blah]', :create
+      expect(File).to exist("#{@tmp_repo}/nodes/blah.json")
+    end
+  end
+end

data/spec/integration/rspec/converge_spec.rb

@@ -1,183 +1,183 @@
-require 'support/spec_support'
-require 'cheffish/rspec/chef_run_support'
-
-describe 'Cheffish::RSpec::ChefRunSupport' do
-  extend Cheffish::RSpec::ChefRunSupport
-
-  let(:temp_file) { Tempfile.new('test') }
-
-  context "#recipe" do
-    it "recipe { file ... } updates the file" do
-      result = recipe {
-        file temp_file.path do
-          content 'test'
-        end
-      }
-      expect(result.updated?).to be_falsey
-      expect(IO.read(temp_file.path)).to eq ''
-    end
-
-    it "recipe 'file ...' does not update the file" do
-      result = recipe <<-EOM
-        file temp_file.path do
-          content 'test'
-        end
-      EOM
-      expect(result.updated?).to be_falsey
-      expect(IO.read(temp_file.path)).to eq ''
-    end
-
-    it "recipe 'file ...' with file and line number does not update the file" do
-      result = recipe(<<-EOM, __FILE__, __LINE__+1)
-        file temp_file.path do
-          content 'test'
-        end
-      EOM
-      expect(result.updated?).to be_falsey
-      expect(IO.read(temp_file.path)).to eq ''
-    end
-  end
-
-  context "#converge" do
-    it "converge { file ... } updates the file" do
-      result = converge {
-        file temp_file.path do
-          content 'test'
-        end
-      }
-      expect(result.updated?).to be_truthy
-      expect(IO.read(temp_file.path)).to eq 'test'
-    end
-
-    it "converge 'file ...' updates the file" do
-      result = converge <<-EOM
-        file temp_file.path do
-          content 'test'
-        end
-      EOM
-      expect(result.updated?).to be_truthy
-      expect(IO.read(temp_file.path)).to eq 'test'
-    end
-
-    it "converge 'file ...' with file and line number updates the file" do
-      result = converge(<<-EOM, __FILE__, __LINE__+1)
-        file temp_file.path do
-          content 'test'
-        end
-      EOM
-      expect(result.updated?).to be_truthy
-      expect(IO.read(temp_file.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 temp_file.path do
-          content 'test'
-        end
-      }.to be_updated.and be_idempotent
-
-      expect(IO.read(temp_file.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 temp_file.path do
-          content 'test'
-        end
-      EOM
-
-      expect(IO.read(temp_file.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 temp_file.path do
-          content 'test'
-        end
-      EOM
-
-      expect(IO.read(temp_file.path)).to eq 'test'
-    end
-
-    it "expect_recipe { file ... }.to be_up_to_date fails" do
-      expect {
-        expect_recipe {
-          file temp_file.path do
-            content 'test'
-          end
-        }.to be_up_to_date
-      }.to raise_error RSpec::Expectations::ExpectationNotMetError
-    end
-
-    it "expect_recipe { }.to be_updated fails" do
-      expect {
-        expect_recipe { }.to be_updated
-      }.to raise_error RSpec::Expectations::ExpectationNotMetError
-    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 temp_file.path do
-          content 'test'
-        end
-      }.not_to raise_error
-      expect(IO.read(temp_file.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 temp_file.path do
-          content 'test'
-        end
-      EOM
-      expect(IO.read(temp_file.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 temp_file.path do
-          content 'test'
-        end
-      EOM
-      expect(IO.read(temp_file.path)).to eq 'test'
-    end
-
-    it "expect_converge { raise 'oh no' }.to raise_error passes" do
-      expect_converge {
-        raise 'oh no'
-      }.to raise_error('oh no')
-    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 temp_file.path do
-          content let_variable
-        end
-      }
-      expect(IO.read(temp_file.path)).to eq 'test'
-    end
-  end
-end
+require 'support/spec_support'
+require 'cheffish/rspec/chef_run_support'
+
+describe 'Cheffish::RSpec::ChefRunSupport' do
+  extend Cheffish::RSpec::ChefRunSupport
+
+  let(:temp_file) { Tempfile.new('test') }
+
+  context "#recipe" do
+    it "recipe { file ... } updates the file" do
+      result = recipe {
+        file temp_file.path do
+          content 'test'
+        end
+      }
+      expect(result.updated?).to be_falsey
+      expect(IO.read(temp_file.path)).to eq ''
+    end
+
+    it "recipe 'file ...' does not update the file" do
+      result = recipe <<-EOM
+        file temp_file.path do
+          content 'test'
+        end
+      EOM
+      expect(result.updated?).to be_falsey
+      expect(IO.read(temp_file.path)).to eq ''
+    end
+
+    it "recipe 'file ...' with file and line number does not update the file" do
+      result = recipe(<<-EOM, __FILE__, __LINE__+1)
+        file temp_file.path do
+          content 'test'
+        end
+      EOM
+      expect(result.updated?).to be_falsey
+      expect(IO.read(temp_file.path)).to eq ''
+    end
+  end
+
+  context "#converge" do
+    it "converge { file ... } updates the file" do
+      result = converge {
+        file temp_file.path do
+          content 'test'
+        end
+      }
+      expect(result.updated?).to be_truthy
+      expect(IO.read(temp_file.path)).to eq 'test'
+    end
+
+    it "converge 'file ...' updates the file" do
+      result = converge <<-EOM
+        file temp_file.path do
+          content 'test'
+        end
+      EOM
+      expect(result.updated?).to be_truthy
+      expect(IO.read(temp_file.path)).to eq 'test'
+    end
+
+    it "converge 'file ...' with file and line number updates the file" do
+      result = converge(<<-EOM, __FILE__, __LINE__+1)
+        file temp_file.path do
+          content 'test'
+        end
+      EOM
+      expect(result.updated?).to be_truthy
+      expect(IO.read(temp_file.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 temp_file.path do
+          content 'test'
+        end
+      }.to be_updated.and be_idempotent
+
+      expect(IO.read(temp_file.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 temp_file.path do
+          content 'test'
+        end
+      EOM
+
+      expect(IO.read(temp_file.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 temp_file.path do
+          content 'test'
+        end
+      EOM
+
+      expect(IO.read(temp_file.path)).to eq 'test'
+    end
+
+    it "expect_recipe { file ... }.to be_up_to_date fails" do
+      expect {
+        expect_recipe {
+          file temp_file.path do
+            content 'test'
+          end
+        }.to be_up_to_date
+      }.to raise_error RSpec::Expectations::ExpectationNotMetError
+    end
+
+    it "expect_recipe { }.to be_updated fails" do
+      expect {
+        expect_recipe { }.to be_updated
+      }.to raise_error RSpec::Expectations::ExpectationNotMetError
+    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 temp_file.path do
+          content 'test'
+        end
+      }.not_to raise_error
+      expect(IO.read(temp_file.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 temp_file.path do
+          content 'test'
+        end
+      EOM
+      expect(IO.read(temp_file.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 temp_file.path do
+          content 'test'
+        end
+      EOM
+      expect(IO.read(temp_file.path)).to eq 'test'
+    end
+
+    it "expect_converge { raise 'oh no' }.to raise_error passes" do
+      expect_converge {
+        raise 'oh no'
+      }.to raise_error('oh no')
+    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 temp_file.path do
+          content let_variable
+        end
+      }
+      expect(IO.read(temp_file.path)).to eq 'test'
+    end
+  end
+end

data/spec/support/key_support.rb

@@ -1,29 +1,29 @@
-RSpec::Matchers.define :be_public_key_for do |private_key, pass_phrase|
-  match do |public_key|
-    if public_key.is_a?(String)
-      public_key, public_key_format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(public_key)), pass_phrase, public_key)
-    end
-    if private_key.is_a?(String)
-      private_key, private_key_format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(private_key)), pass_phrase, private_key)
-    end
-
-    encrypted = public_key.public_encrypt('hi there')
-    expect(private_key.private_decrypt(encrypted)).to eq('hi there')
-  end
-end
-
-RSpec::Matchers.define :match_private_key do |expected, pass_phrase|
-  match do |actual|
-    if expected.is_a?(String)
-      expected, format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(expected)), pass_phrase, expected)
-    end
-    if actual.is_a?(String)
-      actual, format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(actual)), pass_phrase, actual)
-    end
-
-    encrypted = actual.public_encrypt('hi there')
-    expect(expected.private_decrypt(encrypted)).to eq('hi there')
-    encrypted = expected.public_encrypt('hi there')
-    expect(actual.private_decrypt(encrypted)).to eq('hi there')
-  end
-end
+RSpec::Matchers.define :be_public_key_for do |private_key, pass_phrase|
+  match do |public_key|
+    if public_key.is_a?(String)
+      public_key, public_key_format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(public_key)), pass_phrase, public_key)
+    end
+    if private_key.is_a?(String)
+      private_key, private_key_format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(private_key)), pass_phrase, private_key)
+    end
+
+    encrypted = public_key.public_encrypt('hi there')
+    expect(private_key.private_decrypt(encrypted)).to eq('hi there')
+  end
+end
+
+RSpec::Matchers.define :match_private_key do |expected, pass_phrase|
+  match do |actual|
+    if expected.is_a?(String)
+      expected, format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(expected)), pass_phrase, expected)
+    end
+    if actual.is_a?(String)
+      actual, format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(actual)), pass_phrase, actual)
+    end
+
+    encrypted = actual.public_encrypt('hi there')
+    expect(expected.private_decrypt(encrypted)).to eq('hi there')
+    encrypted = expected.public_encrypt('hi there')
+    expect(actual.private_decrypt(encrypted)).to eq('hi there')
+  end
+end

data/spec/support/spec_support.rb

@@ -1,15 +1,15 @@
-require 'cheffish/rspec'
-
-require 'cheffish'
-require 'chef/provider/chef_acl'
-
-RSpec.configure do |config|
-  config.filter_run :focus => true
-  config.run_all_when_everything_filtered = true
-
-  config.before :each do
-    Chef::Config.reset
-  end
-end
-
-require 'chef/providers'
+require 'cheffish/rspec'
+
+require 'cheffish'
+require 'chef/provider/chef_acl'
+
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+
+  config.before :each do
+    Chef::Config.reset
+  end
+end
+
+require 'chef/providers'