cheffish 4.0.0 → 4.1.0

data/spec/integration/recipe_dsl_spec.rb

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

data/spec/integration/rspec/converge_spec.rb

@@ -1,20 +1,20 @@
-require 'support/spec_support'
-require 'cheffish/rspec/chef_run_support'
+require "support/spec_support"
+require "cheffish/rspec/chef_run_support"
 
-describe 'Cheffish::RSpec::ChefRunSupport' do
+describe "Cheffish::RSpec::ChefRunSupport" do
   extend Cheffish::RSpec::ChefRunSupport
 
-  let(:temp_file) { Tempfile.new('test') }
+  let(:temp_file) { Tempfile.new("test") }
 
   context "#recipe" do
     it "recipe { file ... } updates the file" do
-      result = recipe {
+      result = recipe do
         file temp_file.path do
-          content 'test'
+          content "test"
         end
-      }
+      end
       expect(result.updated?).to be_falsey
-      expect(IO.read(temp_file.path)).to eq ''
+      expect(IO.read(temp_file.path)).to eq ""
     end
 
     it "recipe 'file ...' does not update the file" do
@@ -24,29 +24,29 @@ describe 'Cheffish::RSpec::ChefRunSupport' do
         end
       EOM
       expect(result.updated?).to be_falsey
-      expect(IO.read(temp_file.path)).to eq ''
+      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)
+      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 ''
+      expect(IO.read(temp_file.path)).to eq ""
     end
   end
 
   context "#converge" do
     it "converge { file ... } updates the file" do
-      result = converge {
+      result = converge do
         file temp_file.path do
-          content 'test'
+          content "test"
         end
-      }
+      end
       expect(result.updated?).to be_truthy
-      expect(IO.read(temp_file.path)).to eq 'test'
+      expect(IO.read(temp_file.path)).to eq "test"
     end
 
     it "converge 'file ...' updates the file" do
@@ -56,29 +56,29 @@ describe 'Cheffish::RSpec::ChefRunSupport' do
         end
       EOM
       expect(result.updated?).to be_truthy
-      expect(IO.read(temp_file.path)).to eq 'test'
+      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)
+      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'
+      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 {
+      expect_recipe do
         file temp_file.path do
-          content 'test'
+          content "test"
         end
-      }.to be_updated.and be_idempotent
+      end.to be_updated.and be_idempotent
 
-      expect(IO.read(temp_file.path)).to eq 'test'
+      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
@@ -88,52 +88,52 @@ describe 'Cheffish::RSpec::ChefRunSupport' do
         end
       EOM
 
-      expect(IO.read(temp_file.path)).to eq 'test'
+      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
+      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'
+      expect(IO.read(temp_file.path)).to eq "test"
     end
 
     it "expect_recipe { file ... }.to be_up_to_date fails" do
-      expect {
-        expect_recipe {
+      expect do
+        expect_recipe do
           file temp_file.path do
-            content 'test'
+            content "test"
           end
-        }.to be_up_to_date
-      }.to raise_error RSpec::Expectations::ExpectationNotMetError
+        end.to be_up_to_date
+      end.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
+      expect do
+        expect_recipe {}.to be_updated
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
     end
 
     it "expect_recipe { }.to be_up_to_date succeeds" do
-      expect_recipe { }.to be_up_to_date
+      expect_recipe {}.to be_up_to_date
     end
 
     it "expect_recipe { }.to be_idempotent succeeds" do
-      expect_recipe { }.to be_idempotent
+      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 {
+      expect_converge do
         file temp_file.path do
-          content 'test'
+          content "test"
         end
-      }.not_to raise_error
-      expect(IO.read(temp_file.path)).to eq '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
@@ -142,22 +142,22 @@ describe 'Cheffish::RSpec::ChefRunSupport' do
           content 'test'
         end
       EOM
-      expect(IO.read(temp_file.path)).to eq 'test'
+      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
+      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'
+      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')
+      expect_converge do
+        raise "oh no"
+      end.to raise_error("oh no")
     end
   end
 
@@ -168,16 +168,16 @@ describe 'Cheffish::RSpec::ChefRunSupport' do
       # Capture the variable outside
       x = nil
       converge { x = let_variable }
-      expect(x).to eq 'test'
+      expect(x).to eq "test"
     end
 
     it "converge with a file resource referencing let_variable accesses let_variable" do
-      converge {
+      converge do
         file temp_file.path do
           content let_variable
         end
-      }
-      expect(IO.read(temp_file.path)).to eq 'test'
+      end
+      expect(IO.read(temp_file.path)).to eq "test"
     end
   end
 end

data/spec/support/key_support.rb

@@ -7,8 +7,8 @@ RSpec::Matchers.define :be_public_key_for do |private_key, pass_phrase|
       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')
+    encrypted = public_key.public_encrypt("hi there")
+    expect(private_key.private_decrypt(encrypted)).to eq("hi there")
   end
 end
 
@@ -21,9 +21,9 @@ RSpec::Matchers.define :match_private_key do |expected, pass_phrase|
       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')
+    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,6 +1,6 @@
-require 'cheffish/rspec'
+require "cheffish/rspec"
 
-require 'cheffish'
+require "cheffish"
 
 RSpec.configure do |config|
   config.filter_run :focus => true
@@ -11,4 +11,4 @@ RSpec.configure do |config|
   end
 end
 
-require 'chef/providers'
+require "chef/providers"

data/spec/unit/get_private_key_spec.rb

@@ -1,16 +1,16 @@
-require 'support/spec_support'
-require 'cheffish/rspec/chef_run_support'
+require "support/spec_support"
+require "cheffish/rspec/chef_run_support"
 
 describe Cheffish do
-  let(:directory_that_exists) {
+  let(:directory_that_exists) do
     Dir.mktmpdir("cheffish-rspec")
-  }
+  end
 
-  let(:directory_that_does_not_exist) {
+  let(:directory_that_does_not_exist) do
     dir = Dir.mktmpdir("cheffish-rspec")
     FileUtils.remove_entry dir
     dir
-  }
+  end
 
   let(:private_key_contents) { "contents of private key" }
 
@@ -80,9 +80,9 @@ describe Cheffish do
 
   describe "#get_private_key" do
     context "when private_key_paths has a directory which is empty" do
-      let(:config) {
+      let(:config) do
         { :private_key_paths => [ directory_that_exists ] }
-      }
+      end
 
       it_behaves_like "returning the contents of the key file if it finds one"
 
@@ -100,17 +100,17 @@ describe Cheffish do
     end
 
     context "when private_key_paths leads with a directory that does not exist and then an empty directory" do
-      let(:config) {
+      let(:config) do
         { :private_key_paths => [ directory_that_does_not_exist, directory_that_exists ] }
-      }
+      end
 
       it_behaves_like "returning the contents of the key file if it finds one"
     end
 
     context "when private_keys is empty" do
-      let(:config) {
+      let(:config) do
         { :private_keys => {} }
-      }
+      end
 
       it "returns nil" do
         expect(Cheffish.get_private_key("ned_stark", config)).to be_nil
@@ -119,9 +119,9 @@ describe Cheffish do
 
     context "when private_keys contains the path to a key" do
       let(:name) { "ned_stark" }
-      let(:config) {
-        { :private_keys => {name => setup_key} }
-      }
+      let(:config) do
+        { :private_keys => { name => setup_key } }
+      end
 
       it "returns the contents of the key file" do
         setup_key
@@ -131,10 +131,10 @@ describe Cheffish do
 
     context "when private_keys contains the path to a key" do
       let(:name) { "ned_stark" }
-      let(:key) {double("key", :to_pem => private_key_contents)}
-      let(:config) {
-        { :private_keys => {name => key} }
-      }
+      let(:key) { double("key", :to_pem => private_key_contents) }
+      let(:config) do
+        { :private_keys => { name => key } }
+      end
 
       it "returns the contents of the key file" do
         expect(Cheffish.get_private_key(name, config)).to eq(private_key_contents)

data/spec/unit/recipe_run_wrapper_spec.rb

@@ -1,5 +1,5 @@
-require 'support/spec_support'
-require 'cheffish/rspec/chef_run_support'
+require "support/spec_support"
+require "cheffish/rspec/chef_run_support"
 # require 'cheffish/rspec/recipe_run_wrapper'
 
 module MyModule
@@ -15,11 +15,11 @@ end
 describe Cheffish::RSpec::RecipeRunWrapper do
   extend Cheffish::RSpec::ChefRunSupport
 
-  let(:run_wrapper) {
+  let(:run_wrapper) do
     Cheffish::RSpec::RecipeRunWrapper.new(chef_config) do
       log "test recipe in specs"
     end
-  }
+  end
 
   context "defines #respond_to_missing? on the client" do
     it "calls the new super.respond_to_missing" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library to manipulate Chef in Chef.