cheffish 14.0.1 → 14.0.4

data/spec/integration/chef_node_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Resource::ChefNode do
 
       context "and another chef server is running on port 8899" do
         before :each do
-          @server = ChefZero::Server.new(:port => 8899)
+          @server = ChefZero::Server.new(port: 8899)
           @server.start_background
         end
 
@@ -50,7 +50,7 @@ describe Chef::Resource::ChefNode do
           it "the node is created on the second chef server but not the first" do
             expect_recipe do
               chef_node "blah" do
-                chef_server({ :chef_server_url => "http://127.0.0.1:8899" })
+                chef_server({ chef_server_url: "http://127.0.0.1:8899" })
               end
             end.to have_updated "chef_node[blah]", :create
             expect { get("nodes/blah") }.to raise_error(Net::HTTPServerException)
@@ -394,7 +394,7 @@ describe Chef::Resource::ChefNode do
                   attribute %w{a b}, "x"
                 end
               end
-            end.to raise_error /Attempt to set \["a", "b"\] to x when \["a"\] is not a hash/
+            end.to raise_error(/Attempt to set \["a", "b"\] to x when \["a"\] is not a hash/)
           end
 
           it "chef_node with attribute [ a, b, c ], x raises an error" do
@@ -404,7 +404,7 @@ describe Chef::Resource::ChefNode do
                   attribute %w{a b c}, "x"
                 end
               end
-            end.to raise_error /Attempt to set \["a", "b", "c"\] to x when \["a"\] is not a hash/
+            end.to raise_error(/Attempt to set \["a", "b", "c"\] to x when \["a"\] is not a hash/)
           end
 
           it "chef_node with attribute [ x, y ], z adds a new attribute" do

data/spec/integration/chef_role_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Resource::ChefRole do
 
       context "and another chef server is running on port 8899" do
         before :each do
-          @server = ChefZero::Server.new(:port => 8899)
+          @server = ChefZero::Server.new(port: 8899)
           @server.start_background
         end
 
@@ -50,7 +50,7 @@ describe Chef::Resource::ChefRole do
           it "the role is created on the second chef server but not the first" do
             expect_recipe do
               chef_role "blah" do
-                chef_server({ :chef_server_url => "http://127.0.0.1:8899" })
+                chef_server({ chef_server_url: "http://127.0.0.1:8899" })
               end
             end.to have_updated "chef_role[blah]", :create
             expect { get("roles/blah") }.to raise_error(Net::HTTPServerException)

data/spec/integration/chef_user_spec.rb

@@ -21,7 +21,7 @@ describe Chef::Resource::ChefUser do
         end.to have_updated "chef_user[blah]", :create
         user = get("/users/blah")
         expect(user["name"]).to eq("blah")
-        key, format = Cheffish::KeyFormatter.decode(user["public_key"])
+        key, _format = Cheffish::KeyFormatter.decode(user["public_key"])
         expect(key).to be_public_key_for("#{repo_path}/blah.pem")
       end
     end
@@ -52,7 +52,7 @@ describe Chef::Resource::ChefUser do
           end.to have_updated "chef_user[blah]", :create
           user = get("/users/blah")
           expect(user["name"]).to eq("blah")
-          key, format = Cheffish::KeyFormatter.decode(user["public_key"])
+          key, _format = Cheffish::KeyFormatter.decode(user["public_key"])
           expect(key).to be_public_key_for("#{repo_path}/blah.pem")
         end
       end
@@ -74,7 +74,7 @@ describe Chef::Resource::ChefUser do
           end.to have_updated "chef_user[blah]", :create
           user = get("/users/blah")
           expect(user["name"]).to eq("blah")
-          key, format = Cheffish::KeyFormatter.decode(user["public_key"])
+          key, _format = Cheffish::KeyFormatter.decode(user["public_key"])
           expect(key).to be_public_key_for("#{repo_path}/blah.pem")
         end
       end

data/spec/integration/private_key_spec.rb

@@ -150,7 +150,7 @@ describe Chef::Resource::PrivateKey do
       end
 
       it "and another public_key based off the first public_key in-memory in a key, the second public_key is created" do
-        key, format = Cheffish::KeyFormatter.decode(IO.read("#{repo_path}/blah.pub"))
+        key, _format = Cheffish::KeyFormatter.decode(IO.read("#{repo_path}/blah.pub"))
 
         expect_recipe do
           public_key "#{repo_path}/blah.pub2" do
@@ -293,7 +293,7 @@ describe Chef::Resource::PrivateKey do
           converge do
             private_key "#{repo_path}/blah"
           end
-        end.to raise_error /missing pass phrase?/
+        end.to raise_error(/missing pass phrase?/)
       end
     end
 

data/spec/integration/recipe_dsl_spec.rb

@@ -7,7 +7,7 @@ describe "Cheffish Recipe DSL" do
 
   context "when we include with_chef_local_server" do
     before :each do
-      @tmp_repo = tmp_repo = Dir.mktmpdir("chef_repo")
+      @tmp_repo = Dir.mktmpdir("chef_repo")
     end
 
     after :each do
@@ -17,7 +17,7 @@ describe "Cheffish Recipe DSL" do
     it "chef_nodes get put into said server" do
       tmp_repo = @tmp_repo
       expect_recipe do
-        with_chef_local_server :chef_repo_path => tmp_repo
+        with_chef_local_server chef_repo_path: tmp_repo
         chef_node "blah"
       end.to have_updated "chef_node[blah]", :create
       expect(File).to exist("#{@tmp_repo}/nodes/blah.json")

data/spec/support/key_support.rb

@@ -1,10 +1,10 @@
 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)
+      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)
+      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")
@@ -15,10 +15,10 @@ 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)
+      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)
+      actual, _format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(actual)), pass_phrase, actual)
     end
 
     encrypted = actual.public_encrypt("hi there")

data/spec/support/spec_support.rb

@@ -3,7 +3,7 @@ require "cheffish/rspec"
 require "cheffish"
 
 RSpec.configure do |config|
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 
   config.before :each do

data/spec/unit/get_private_key_spec.rb

@@ -81,7 +81,7 @@ describe Cheffish do
   describe "#get_private_key" do
     context "when private_key_paths has a directory which is empty" do
       let(:config) do
-        { :private_key_paths => [ directory_that_exists ] }
+        { private_key_paths: [ directory_that_exists ] }
       end
 
       it_behaves_like "returning the contents of the key file if it finds one"
@@ -101,7 +101,7 @@ describe Cheffish do
 
     context "when private_key_paths leads with a directory that does not exist and then an empty directory" do
       let(:config) do
-        { :private_key_paths => [ directory_that_does_not_exist, directory_that_exists ] }
+        { 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"
@@ -109,7 +109,7 @@ describe Cheffish do
 
     context "when private_keys is empty" do
       let(:config) do
-        { :private_keys => {} }
+        { private_keys: {} }
       end
 
       it "returns nil" do
@@ -120,7 +120,7 @@ describe Cheffish do
     context "when private_keys contains the path to a key" do
       let(:name) { "ned_stark" }
       let(:config) do
-        { :private_keys => { name => setup_key } }
+        { private_keys: { name => setup_key } }
       end
 
       it "returns the contents of the key file" do
@@ -131,9 +131,9 @@ 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(:key) { double("key", to_pem: private_key_contents) }
       let(:config) do
-        { :private_keys => { name => key } }
+        { private_keys: { name => key } }
       end
 
       it "returns the contents of the key file" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 14.0.1
+  version: 14.0.4
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -42,13 +42,10 @@ description: A library to manipulate Chef in Chef.
 email: jkeiser@chef.io
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE
+extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
-- README.md
 - Rakefile
 - cheffish.gemspec
 - lib/chef/resource/chef_acl.rb
@@ -111,8 +108,9 @@ files:
 - spec/support/spec_support.rb
 - spec/unit/get_private_key_spec.rb
 - spec/unit/recipe_run_wrapper_spec.rb
-homepage: http://github.com/chef/cheffish
-licenses: []
+homepage: https://github.com/chef/cheffish
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/README.md

@@ -1,120 +0,0 @@
-# Cheffish
-
-[![Status](https://travis-ci.org/chef/cheffish.svg?branch=master)](https://travis-ci.org/chef/cheffish)
-[![Gem Version](https://badge.fury.io/rb/cheffish.svg)](http://badge.fury.io/rb/cheffish)
-
-This library provides a variety of convergent resources for interacting with the Chef Server; along the way, it happens to provide some very useful and sophisticated ways of running Chef resources as recipes in RSpec examples.
-
-**This document may have errors, but it should have enough pointers to get you oriented.**
-
-There are essentially 3 collections here:
-
-## Resource/Provider Pairs for Manipulating Chef Servers
-
-You'd use these in recipes/cookbooks. They are documented on the [main Chef docs site](https://docs.chef.io).
-
-- [chef_acl](https://docs.chef.io/resource_chef_acl.html)
-- [chef_client](https://docs.chef.io/resource_chef_client.html)
-- [chef_container](https://docs.chef.io/resource_chef_container.html)
-- [chef_data_bag](https://docs.chef.io/resource_chef_data_bag.html)
-- [chef_data_bag_item](https://docs.chef.io/resource_chef_data_bag_item.html)
-- [chef_environment](https://docs.chef.io/resource_chef_environment.html)
-- [chef_group](https://docs.chef.io/resource_chef_group.html)
-- [chef_mirror](https://docs.chef.io/resource_chef_mirror.html)
-- [chef_node](https://docs.chef.io/resource_chef_node.html)
-- [chef_organization](https://docs.chef.io/resource_chef_organization.html)
-- [chef_resolved_cookbooks](https://docs.chef.io/resource_chef_resolved_cookbooks.html)
-- [chef_role](https://docs.chef.io/resource_chef_role.html)
-- [chef_user](https://docs.chef.io/resource_chef_user.html)
-- [private_key](https://docs.chef.io/resource_private_key.html)
-- [public_key](https://docs.chef.io/resource_public_key.html)
-
-## Base/Helper Classes
-
-To support the resource/provider pairs.
-
-
-## RSpec Support
-
-Most of these RSpec...things were developed for testing the resource/provider pairs above; *however*, you can also `require cheffish/rspec/chef_run_support` for any RSpec `expect`s you'd like, as we do for `chef-provisioning` and its drivers (especially `chef-provisioning-aws`).
-
-The awesomeness here is that instead of instantiating a `run_context` and a `node` and a `resource` as Ruby objects, you can test your resources in an actual recipe:
-
-```ruby
-when_the_chef_12_server "exists", organization: 'some-org', server_scope: :context, port: 8900..9000 do
-  file "/tmp/something_important.json" do
-    content "A resource in its native environment."
-  end
-end
-```
-
-An enclosing context that spins up `chef-zero` (local mode) Chef servers as dictated by `server_scope`. `Chef::Config` will be set up with the appropriate server URLs (see the `with_*` operators below).
-
-`server_scope`:
-- `:context`
-- `:example` *[default?]*
-- ?
-
-`port`:
-- port number (8900 is the default)
-- port range (server will continue trying up this range until it finds a free port)
-
-```ruby
-expect_recipe {
-  # unquoted recipe DSL here.
-}.to be_truthy    # or write your own matchers.
-```
-
-Converges the recipe using `expect()` (parentheses), which tests for a value and **cannot** be used with `raise_error`.
-
-```ruby
-expect_converge {
-  # unquoted recipe DSL here.
-}.to raise_error(ArgumentException)
-```
-
-Converges the recipe using `expect{ }` (curly brackets), which wraps the block in a `begin..rescue..end` to detect when the block raises an exception; hence, this is **only** for `raise_error`.
-
-The blocks for the following appear to be mostly optional: what they actually do is set the `Chef::Config` variable in the name to the given value, and if you provide a block, the change is scoped to that block. Probably this would be clearer if it were aliased to (and preferring) `using` rather than `with`.
-
-- with_chef_server(server_url, options = {}, &block)
-- with_chef_local_server(options, &block)
-- with_chef_environment(name, &block)
-- with_chef_data_bag_item_encryption(encryption_options, &block)
-- with_chef_data_bag(name)
-  - Takes a block, though this is not noted in the method signature.
-
-
-
-get_private_key(name)
-
-
-### RSpec matchers
-
-These are used with `expect_recipe` or `expect_converge`:
-
-```ruby
-expect_recipe {
-  file "/tmp/a_file.json" do
-    content "Very important content."
-  end
-}.to be_idempotent.and emit_no_warnings_or_errors
-```
-
-`be_idempotent`
-
-- Runs the provided recipe *again* (`expect_(recipe|converge)` ran it the first time) and asks the Chef run if it updated anything (using `updated?`, which appears to be defined on `Chef::Resource` instead of `Chef::Client`, so there's some clarification to be done there); the matcher is satisfied if the answer is "no."
-
-
-`emit_no_warnings_or_errors`
-
-- Greps the Chef client run's log output for WARN/ERROR lines; matcher is satisfied if there aren't any.
-
-`have_updated`
-
-- Sifts the recipe's event stream(!) to determine if any resources were updated; matcher is satisfied is the answer is "yes."
-- This is *not* the opposite of `be_idempotent`.
-
-`partially_match`
-
-- TBD