cheffish 4.0.0 → 4.1.0

data/lib/cheffish/merged_config.rb

@@ -1,8 +1,10 @@
+require "chef/mash"
+
 module Cheffish
   class MergedConfig
     def initialize(*configs)
-      @configs = configs
-      @merge_arrays = {}
+      @configs = configs.map { |config| Chef::Mash.from_hash config }
+      @merge_arrays = Chef::Mash.new
     end
 
     include Enumerable
@@ -60,7 +62,7 @@ module Cheffish
     alias_method :has_key?, :key?
 
     def keys
-      configs.map { |c| c.keys }.flatten(1).uniq
+      configs.flat_map { |c| c.keys }.uniq
     end
 
     def values

data/lib/cheffish/node_properties.rb

@@ -1,4 +1,4 @@
-require 'cheffish/base_properties'
+require "cheffish/base_properties"
 
 module Cheffish
   module NodeProperties
@@ -10,7 +10,7 @@ module Cheffish
       chef_environment run_context.cheffish.current_environment
     end
 
-    property :name, Cheffish::NAME_REGEX, name_property: true
+    property :node_properties_name, Cheffish::NAME_REGEX, name_property: true
     property :chef_environment, Cheffish::NAME_REGEX
     property :run_list, Array # We should let them specify it as a series of parameters too
     property :attributes, Hash
@@ -22,7 +22,7 @@ module Cheffish
     # end
     # attribute 'ip_address', :delete
     attr_accessor :attribute_modifiers
-    def attribute(attribute_path, value=Chef::NOT_PASSED, &block)
+    def attribute(attribute_path, value = Chef::NOT_PASSED, &block)
       @attribute_modifiers ||= []
       if value != Chef::NOT_PASSED
         @attribute_modifiers << [ attribute_path, value ]
@@ -36,7 +36,7 @@ module Cheffish
     # Patchy tags
     # tag 'webserver', 'apache', 'myenvironment'
     def tag(*tags)
-      attribute 'tags' do |existing_tags|
+      attribute "tags" do |existing_tags|
         existing_tags ||= []
         tags.each do |tag|
           if !existing_tags.include?(tag.to_s)
@@ -46,8 +46,9 @@ module Cheffish
         existing_tags
       end
     end
+
     def remove_tag(*tags)
-      attribute 'tags' do |existing_tags|
+      attribute "tags" do |existing_tags|
         if existing_tags
           tags.each do |tag|
             existing_tags.delete(tag.to_s)
@@ -61,10 +62,10 @@ module Cheffish
     # tags :a, :b, :c # removes all other tags
     def tags(*tags)
       if tags.size == 0
-        attribute('tags')
+        attribute("tags")
       else
         tags = tags[0] if tags.size == 1 && tags[0].kind_of?(Array)
-        attribute 'tags', tags.map { |tag| tag.to_s }
+        attribute "tags", tags.map { |tag| tag.to_s }
       end
     end
 
@@ -82,6 +83,7 @@ module Cheffish
       @run_list_modifiers ||= []
       @run_list_modifiers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
     end
+
     def role(*roles)
       if roles.size == 0
         raise ArgumentError, "At least one role must be specified"
@@ -89,6 +91,7 @@ module Cheffish
       @run_list_modifiers ||= []
       @run_list_modifiers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
     end
+
     def remove_recipe(*recipes)
       if recipes.size == 0
         raise ArgumentError, "At least one recipe must be specified"
@@ -96,6 +99,7 @@ module Cheffish
       @run_list_removers ||= []
       @run_list_removers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
     end
+
     def remove_role(*roles)
       if roles.size == 0
         raise ArgumentError, "At least one role must be specified"

data/lib/cheffish/recipe_dsl.rb

@@ -1,30 +1,29 @@
-require 'cheffish'
-
-require 'chef/version'
-require 'chef_zero/server'
-require 'chef/chef_fs/chef_fs_data_store'
-require 'chef/chef_fs/config'
-require 'cheffish/chef_run_data'
-require 'cheffish/chef_run_listener'
-require 'chef/client'
-require 'chef/config'
-require 'chef_zero/version'
-require 'cheffish/merged_config'
-require 'chef/resource/chef_acl'
-require 'chef/resource/chef_client'
-require 'chef/resource/chef_container'
-require 'chef/resource/chef_data_bag'
-require 'chef/resource/chef_data_bag_item'
-require 'chef/resource/chef_environment'
-require 'chef/resource/chef_group'
-require 'chef/resource/chef_mirror'
-require 'chef/resource/chef_node'
-require 'chef/resource/chef_organization'
-require 'chef/resource/chef_role'
-require 'chef/resource/chef_user'
-require 'chef/resource/private_key'
-require 'chef/resource/public_key'
-
+require "cheffish"
+
+require "chef/version"
+require "chef_zero/server"
+require "chef/chef_fs/chef_fs_data_store"
+require "chef/chef_fs/config"
+require "cheffish/chef_run_data"
+require "cheffish/chef_run_listener"
+require "chef/client"
+require "chef/config"
+require "chef_zero/version"
+require "cheffish/merged_config"
+require "chef/resource/chef_acl"
+require "chef/resource/chef_client"
+require "chef/resource/chef_container"
+require "chef/resource/chef_data_bag"
+require "chef/resource/chef_data_bag_item"
+require "chef/resource/chef_environment"
+require "chef/resource/chef_group"
+require "chef/resource/chef_mirror"
+require "chef/resource/chef_node"
+require "chef/resource/chef_organization"
+require "chef/resource/chef_role"
+require "chef/resource/chef_user"
+require "chef/resource/private_key"
+require "chef/resource/public_key"
 
 class Chef
   module DSL
@@ -46,7 +45,7 @@ class Chef
       end
 
       def with_chef_local_server(options, &block)
-        options[:host] ||= '127.0.0.1'
+        options[:host] ||= "127.0.0.1"
         options[:log_level] ||= Chef::Log.level
         options[:port] ||= ChefZero::VERSION.to_f >= 2.2 ? 8901.upto(9900) : 8901
 
@@ -57,7 +56,7 @@ class Chef
           end
 
           # Ensure all paths are given
-          %w(acl client cookbook container data_bag environment group node role).each do |type|
+          %w{acl client cookbook container data_bag environment group node role}.each do |type|
             # Set the options as symbol keys and then copy to string keys
             string_key = "#{type}_path"
             symbol_key = "#{type}_path".to_sym
@@ -66,7 +65,7 @@ class Chef
               if options[:chef_repo_path].kind_of?(String)
                 Chef::Util::PathHelper.join(options[:chef_repo_path], "#{type}s")
               else
-                options[:chef_repo_path].map { |path| Chef::Util::PathHelper.join(path, "#{type}s")}
+                options[:chef_repo_path].map { |path| Chef::Util::PathHelper.join(path, "#{type}s") }
               end
             end
 
@@ -97,9 +96,9 @@ class Chef
   end
 
   class Config
-    default(:profile) { ENV['CHEF_PROFILE'] || 'default' }
+    default(:profile) { ENV["CHEF_PROFILE"] || "default" }
     configurable(:private_keys)
-    default(:private_key_paths) { [ Chef::Util::PathHelper.join(config_dir, 'keys'), Chef::Util::PathHelper.join(user_home, '.ssh') ] }
+    default(:private_key_paths) { [ Chef::Util::PathHelper.join(config_dir, "keys"), Chef::Util::PathHelper.join(user_home, ".ssh") ] }
     default(:private_key_write_path) { private_key_paths.first }
   end
 
@@ -128,9 +127,9 @@ end
 
 # Chef 12 moved Chef::Config.path_join to PathHelper.join
 if Chef::VERSION.to_i >= 12
-  require 'chef/util/path_helper'
+  require "chef/util/path_helper"
 else
-  require 'chef/config'
+  require "chef/config"
   class Chef
     class Util
       class PathHelper

data/lib/cheffish/rspec.rb

@@ -1,6 +1,6 @@
-require 'cheffish/rspec/chef_run_support'
-require 'cheffish/rspec/repository_support'
-require 'cheffish/rspec/matchers'
+require "cheffish/rspec/chef_run_support"
+require "cheffish/rspec/repository_support"
+require "cheffish/rspec/matchers"
 
 module Cheffish
   module RSpec

data/lib/cheffish/rspec/chef_run_support.rb

@@ -1,10 +1,10 @@
-require 'chef_zero/rspec'
-require 'chef/server_api'
-require 'cheffish/rspec/repository_support'
-require 'uri'
-require 'cheffish/chef_run'
-require 'cheffish/rspec/recipe_run_wrapper'
-require 'cheffish/rspec/matchers'
+require "chef_zero/rspec"
+require "chef/server_api"
+require "cheffish/rspec/repository_support"
+require "uri"
+require "cheffish/chef_run"
+require "cheffish/rspec/recipe_run_wrapper"
+require "cheffish/rspec/matchers"
 
 module Cheffish
   module RSpec
@@ -19,7 +19,7 @@ module Cheffish
       end
 
       def when_the_chef_12_server(*args, **options, &block)
-        if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
+        if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
           when_the_chef_server(*args, :osc_compat => false, :single_org => false, **options, &block)
         end
       end
@@ -37,7 +37,7 @@ module Cheffish
         end
 
         def get(path, *args)
-          if path[0] == '/'
+          if path[0] == "/"
             path = URI.join(rest.url, path)
           end
           rest.get(path, *args)
@@ -47,17 +47,17 @@ module Cheffish
           {}
         end
 
-        def expect_recipe(str=nil, file=nil, line=nil, &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(str=nil, file=nil, line=nil, &recipe)
+        def expect_converge(str = nil, file = nil, line = nil, &recipe)
           expect { converge(str, file, line, &recipe) }
         end
 
-        def recipe(str=nil, file=nil, line=nil, &recipe)
+        def recipe(str = nil, file = nil, line = nil, &recipe)
           if !recipe
             if file && line
               recipe = proc { eval(str, nil, file, line) }
@@ -68,7 +68,7 @@ module Cheffish
           RecipeRunWrapper.new(chef_config, &recipe)
         end
 
-        def converge(str=nil, file=nil, line=nil, &recipe)
+        def converge(str = nil, file = nil, line = nil, &recipe)
           r = recipe(str, file, line, &recipe)
           r.converge
           r

data/lib/cheffish/rspec/matchers.rb

@@ -1,4 +1,4 @@
-require 'cheffish/rspec/matchers/have_updated'
-require 'cheffish/rspec/matchers/be_idempotent'
-require 'cheffish/rspec/matchers/partially_match'
-require 'cheffish/rspec/matchers/emit_no_warnings_or_errors'
+require "cheffish/rspec/matchers/have_updated"
+require "cheffish/rspec/matchers/be_idempotent"
+require "cheffish/rspec/matchers/partially_match"
+require "cheffish/rspec/matchers/emit_no_warnings_or_errors"

data/lib/cheffish/rspec/matchers/be_idempotent.rb

@@ -1,4 +1,4 @@
-require 'rspec/matchers'
+require "rspec/matchers"
 
 RSpec::Matchers.define :be_idempotent do
   match do |recipe|
@@ -8,9 +8,9 @@ RSpec::Matchers.define :be_idempotent do
     recipe.up_to_date?
   end
 
-  failure_message {
+  failure_message do
     "#{@recipe} is not idempotent!  Converging it a second time caused updates.\n#{@recipe.output_for_failure_message}"
-  }
+  end
 
   supports_block_expectations
 end

data/lib/cheffish/rspec/matchers/emit_no_warnings_or_errors.rb

@@ -1,4 +1,4 @@
-require 'rspec/matchers'
+require "rspec/matchers"
 
 RSpec::Matchers.define :emit_no_warnings_or_errors do
   match do |recipe|
@@ -7,9 +7,9 @@ RSpec::Matchers.define :emit_no_warnings_or_errors do
     @warn_err.empty?
   end
 
-  failure_message {
+  failure_message do
     "#{@recipe} emitted warnings and errors!\n#{@warn_err}"
-  }
+  end
 
   supports_block_expectations
 end

data/lib/cheffish/rspec/matchers/have_updated.rb

@@ -1,4 +1,4 @@
-require 'rspec/matchers'
+require "rspec/matchers"
 
 RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
   match do |recipe|
@@ -14,7 +14,7 @@ RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
     updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
     result = "expected that the chef_run would #{expected_actions.join(',')} #{resource_name}."
     if updates.size > 0
-      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
+      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource} => #{action.inspect}" }.join(', ')}"
     else
       result << " Nothing was updated."
     end
@@ -26,7 +26,7 @@ RSpec::Matchers.define :have_updated do |resource_name, *expected_actions|
     updates = actual.select { |event, resource, action| event == :resource_updated }.to_a
     result = "expected that the chef_run would not #{expected_actions.join(',')} #{resource_name}."
     if updates.size > 0
-      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource.to_s} => #{action.inspect}" }.join(', ')}"
+      result << " Actual updates were #{updates.map { |event, resource, action| "#{resource} => #{action.inspect}" }.join(', ')}"
     else
       result << " Nothing was updated."
     end

data/lib/cheffish/rspec/recipe_run_wrapper.rb

@@ -1,5 +1,5 @@
-require 'cheffish/chef_run'
-require 'forwardable'
+require "cheffish/chef_run"
+require "forwardable"
 
 module Cheffish
   module RSpec
@@ -7,7 +7,7 @@ module Cheffish
       def initialize(chef_config, example: nil, &recipe)
         super(chef_config)
         @recipe = recipe
-        @example = example || recipe.binding.eval('self')
+        @example = example || recipe.binding.eval("self")
       end
 
       attr_reader :recipe
@@ -29,14 +29,14 @@ module Cheffish
           # 12.3-ish resource or we want to call a `let` variable.
           #
           @client.instance_eval { @rspec_example = example }
-          def @client.method_missing(name, *args, &block)
+          def @client.method_missing(name, *args, &block) # rubocop:disable Lint/NestedMethodDefinition
             # If there is a let variable, call it. This is because in 12.4,
             # the parent class is going to call respond_to?(name) to find out
             # if someone was doing weird things, and then call send(). This
             # would result in an infinite loop, coming right. Back. Here.
             # A fix to chef is incoming, but we still need this if we want to
             # work with Chef 12.4.
-            if Gem::Version.new(Chef::VERSION) >= Gem::Version.new('12.4')
+            if Gem::Version.new(Chef::VERSION) >= Gem::Version.new("12.4")
               if @rspec_example.respond_to?(name)
                 return @rspec_example.public_send(name, *args, &block)
               end
@@ -55,9 +55,10 @@ module Cheffish
               end
             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.
-          def @client.respond_to_missing?(name, include_private = false)
+          def @client.respond_to_missing?(name, include_private = false) # rubocop:disable Lint/NestedMethodDefinition
             @rspec_example.respond_to?(name, include_private) || super
           end
 
@@ -65,7 +66,7 @@ module Cheffish
           # will hook resources up to the example let variables as well (via
           # enclosing_provider).
           # Please don't hurt me
-          def @client.is_a?(klass)
+          def @client.is_a?(klass) # rubocop:disable Lint/NestedMethodDefinition
             klass == Chef::Provider || super(klass)
           end
 

data/lib/cheffish/rspec/repository_support.rb

@@ -12,9 +12,9 @@ module Cheffish
       ::RSpec.shared_context "with a chef repo" do
         before :each do
           raise "Can only create one directory per test" if @repository_dir
-          @repository_dir = Dir.mktmpdir('chef_repo')
+          @repository_dir = Dir.mktmpdir("chef_repo")
           Chef::Config.chef_repo_path = @repository_dir
-          %w(client cookbook data_bag environment node role user).each do |object_name|
+          %w{client cookbook data_bag environment node role user}.each do |object_name|
             Chef::Config.delete("#{object_name}_path".to_sym)
           end
         end
@@ -22,7 +22,7 @@ module Cheffish
         after :each do
           if @repository_dir
             begin
-              %w(client cookbook data_bag environment node role user).each do |object_name|
+              %w{client cookbook data_bag environment node role user}.each do |object_name|
                 Chef::Config.delete("#{object_name}_path".to_sym)
               end
               Chef::Config.delete(:chef_repo_path)
@@ -45,8 +45,8 @@ module Cheffish
         def file(relative_path, contents)
           filename = path_to(relative_path)
           dir = File.dirname(filename)
-          FileUtils.mkdir_p(dir) unless dir == '.'
-          File.open(filename, 'w') do |file|
+          FileUtils.mkdir_p(dir) unless dir == "."
+          File.open(filename, "w") do |file|
             raw = case contents
                   when Hash, Array
                     JSON.pretty_generate(contents)
@@ -60,7 +60,7 @@ module Cheffish
         def symlink(relative_path, relative_dest)
           filename = path_to(relative_path)
           dir = File.dirname(filename)
-          FileUtils.mkdir_p(dir) unless dir == '.'
+          FileUtils.mkdir_p(dir) unless dir == "."
           dest_filename = path_to(relative_dest)
           File.symlink(dest_filename, filename)
         end