diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-19 09:28:33 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-19 09:28:33 -0800 |
| commit | 92bec4bb96d857f027068fc56af46c76c484fd50 (patch) | |
| tree | 2cffea3fc9466d0c5e2baa7cc7630abb0ed7aecb | |
| parent | 6077b99f6ad1bc9a082f575f3818e69f05d8c8dc (diff) | |
| download | chef-92bec4bb96d857f027068fc56af46c76c484fd50.tar.gz | |
flip multiline function arguments aroundlcg/rubocop-0.37.2
no enforced trailing comma on arguments...
139 files changed, 588 insertions, 588 deletions
diff --git a/ext/win32-eventlog/Rakefile b/ext/win32-eventlog/Rakefile index 4788d73cae..5b1186cf13 100644 --- a/ext/win32-eventlog/Rakefile +++ b/ext/win32-eventlog/Rakefile @@ -45,7 +45,7 @@ task :register => EVT_SHARED_OBJECT do :source => "Application", :key_name => "Chef", :event_message_file => dll_file, - :category_message_file => dll_file, + :category_message_file => dll_file ) rescue Errno::EIO => e puts "Skipping event log registration due to missing privileges: #{e}" diff --git a/lib/chef/api_client.rb b/lib/chef/api_client.rb index 27701c6b68..3c1ef7a2b6 100644 --- a/lib/chef/api_client.rb +++ b/lib/chef/api_client.rb @@ -53,7 +53,7 @@ class Chef set_or_return( :name, arg, - :regex => /^[\-[:alnum:]_\.]+$/, + :regex => /^[\-[:alnum:]_\.]+$/ ) end @@ -65,7 +65,7 @@ class Chef set_or_return( :admin, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -77,7 +77,7 @@ class Chef set_or_return( :public_key, arg, - :kind_of => String, + :kind_of => String ) end @@ -90,7 +90,7 @@ class Chef set_or_return( :validator, arg, - :kind_of => [TrueClass, FalseClass], + :kind_of => [TrueClass, FalseClass] ) end @@ -102,7 +102,7 @@ class Chef set_or_return( :private_key, arg, - :kind_of => [String, FalseClass], + :kind_of => [String, FalseClass] ) end diff --git a/lib/chef/api_client/registration.rb b/lib/chef/api_client/registration.rb index 8547b4afa4..b05bdcac31 100644 --- a/lib/chef/api_client/registration.rb +++ b/lib/chef/api_client/registration.rb @@ -152,7 +152,7 @@ class Chef :api_version => "0", :client_name => Chef::Config[:validation_client_name], :signing_key_filename => Chef::Config[:validation_key], - }, + } ) end diff --git a/lib/chef/api_client_v1.rb b/lib/chef/api_client_v1.rb index ce624ad671..47b0cd1c53 100644 --- a/lib/chef/api_client_v1.rb +++ b/lib/chef/api_client_v1.rb @@ -76,7 +76,7 @@ class Chef set_or_return( :name, arg, - :regex => /^[\-[:alnum:]_\.]+$/, + :regex => /^[\-[:alnum:]_\.]+$/ ) end @@ -88,7 +88,7 @@ class Chef set_or_return( :admin, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -100,7 +100,7 @@ class Chef set_or_return( :public_key, arg, - :kind_of => String, + :kind_of => String ) end @@ -113,7 +113,7 @@ class Chef set_or_return( :validator, arg, - :kind_of => [TrueClass, FalseClass], + :kind_of => [TrueClass, FalseClass] ) end @@ -126,7 +126,7 @@ class Chef set_or_return( :private_key, arg, - :kind_of => [String, TrueClass, FalseClass], + :kind_of => [String, TrueClass, FalseClass] ) end @@ -138,7 +138,7 @@ class Chef set_or_return( :create_key, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end diff --git a/lib/chef/application.rb b/lib/chef/application.rb index c2adcda524..cd3e7f8c24 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -215,7 +215,7 @@ class Chef @chef_client_json, override_runlist: override_runlist, specific_recipes: specific_recipes, - runlist: config[:runlist], + runlist: config[:runlist] ) @chef_client_json = nil diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index a9f7664e4f..0328a65487 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -198,7 +198,7 @@ class Chef result = shell_out( "chef-client.bat #{config_params}", :timeout => Chef::Config[:windows_service][:watchdog_timeout], - :logger => Chef::Log, + :logger => Chef::Log ) Chef::Log.debug "#{result.stdout}" Chef::Log.debug "#{result.stderr}" diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb index 74ee395139..6f81dccc67 100644 --- a/lib/chef/application/windows_service_manager.rb +++ b/lib/chef/application/windows_service_manager.rb @@ -124,11 +124,11 @@ class Chef :binary_path_name => cmd, :service_start_name => @service_start_name, :password => @password, - :dependencies => @dependencies, + :dependencies => @dependencies ) ::Win32::Service.configure( :service_name => @service_name, - :delayed_start => @delayed_start, + :delayed_start => @delayed_start ) unless @delayed_start.nil? puts "Service '#{@service_name}' has successfully been installed." end diff --git a/lib/chef/chef_fs/data_handler/acl_data_handler.rb b/lib/chef/chef_fs/data_handler/acl_data_handler.rb index 91e48101c4..6c8833004a 100644 --- a/lib/chef/chef_fs/data_handler/acl_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/acl_data_handler.rb @@ -12,7 +12,7 @@ class Chef "update" => {}, "delete" => {}, "grant" => {}, - },) + }) result.keys.each do |key| result[key] = normalize_hash(result[key], { "actors" => [], "groups" => [] }) result[key]["actors"] = result[key]["actors"].sort diff --git a/lib/chef/chef_fs/data_handler/container_data_handler.rb b/lib/chef/chef_fs/data_handler/container_data_handler.rb index d1e8d2f3af..a2e277fc7a 100644 --- a/lib/chef/chef_fs/data_handler/container_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/container_data_handler.rb @@ -8,7 +8,7 @@ class Chef normalize_hash(container, { "containername" => remove_dot_json(entry.name), "containerpath" => remove_dot_json(entry.name), - },) + }) end def preserve_key?(key) diff --git a/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb b/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb index f75f96f773..156c1eef4e 100644 --- a/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb @@ -16,11 +16,11 @@ class Chef "chef_type" => "cookbook_version", "frozen?" => false, "metadata" => {}, - },) + }) result["metadata"] = normalize_hash(result["metadata"], { "version" => version, "name" => name, - },) + }) end def preserve_key?(key) diff --git a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb index 260666b65f..8ac9a520a4 100644 --- a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb @@ -14,7 +14,7 @@ class Chef # use those in knife-essentials. normalize_hash(data_bag_item, { "id" => remove_dot_json(entry.name), - },) + }) end def normalize_for_post(data_bag_item, entry) diff --git a/lib/chef/chef_fs/data_handler/environment_data_handler.rb b/lib/chef/chef_fs/data_handler/environment_data_handler.rb index 3b9d5b4ec7..8d066764be 100644 --- a/lib/chef/chef_fs/data_handler/environment_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/environment_data_handler.rb @@ -14,7 +14,7 @@ class Chef "override_attributes" => {}, "json_class" => "Chef::Environment", "chef_type" => "environment", - },) + }) end def preserve_key?(key) diff --git a/lib/chef/chef_fs/data_handler/node_data_handler.rb b/lib/chef/chef_fs/data_handler/node_data_handler.rb index fcec74d2fb..36a7bf545b 100644 --- a/lib/chef/chef_fs/data_handler/node_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/node_data_handler.rb @@ -16,7 +16,7 @@ class Chef "default" => {}, "automatic" => {}, "run_list" => [], - },) + }) result["run_list"] = normalize_run_list(result["run_list"]) result end diff --git a/lib/chef/chef_fs/data_handler/organization_data_handler.rb b/lib/chef/chef_fs/data_handler/organization_data_handler.rb index d9f97b29ac..3e5528cc49 100644 --- a/lib/chef/chef_fs/data_handler/organization_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/organization_data_handler.rb @@ -11,7 +11,7 @@ class Chef "org_type" => "Business", "clientname" => "#{entry.org}-validator", "billing_plan" => "platform-free", - },) + }) result end diff --git a/lib/chef/chef_fs/data_handler/role_data_handler.rb b/lib/chef/chef_fs/data_handler/role_data_handler.rb index eb10f7bb4a..74533cff05 100644 --- a/lib/chef/chef_fs/data_handler/role_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/role_data_handler.rb @@ -15,7 +15,7 @@ class Chef "override_attributes" => {}, "run_list" => [], "env_run_lists" => {}, - },) + }) result["run_list"] = normalize_run_list(result["run_list"]) result["env_run_lists"].each_pair do |env, run_list| result["env_run_lists"][env] = normalize_run_list(run_list) diff --git a/lib/chef/chef_fs/data_handler/user_data_handler.rb b/lib/chef/chef_fs/data_handler/user_data_handler.rb index 392e67f822..c2df4db49d 100644 --- a/lib/chef/chef_fs/data_handler/user_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/user_data_handler.rb @@ -15,7 +15,7 @@ class Chef "salt" => nil, "password" => nil, "openid" => nil, - },) + }) end def preserve_key?(key) diff --git a/lib/chef/cookbook/metadata.rb b/lib/chef/cookbook/metadata.rb index 7d14cea44f..1cad526b65 100644 --- a/lib/chef/cookbook/metadata.rb +++ b/lib/chef/cookbook/metadata.rb @@ -177,7 +177,7 @@ class Chef set_or_return( :maintainer, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -192,7 +192,7 @@ class Chef set_or_return( :maintainer_email, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -207,7 +207,7 @@ class Chef set_or_return( :license, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -222,7 +222,7 @@ class Chef set_or_return( :description, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -237,7 +237,7 @@ class Chef set_or_return( :long_description, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -268,7 +268,7 @@ class Chef set_or_return( :name, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -492,7 +492,7 @@ class Chef :source_url => { :kind_of => String }, :issues_url => { :kind_of => String }, :privacy => { :kind_of => [ TrueClass, FalseClass ] }, - }, + } ) options[:required] = remap_required_attribute(options[:required]) unless options[:required].nil? validate_choice_array(options) @@ -509,7 +509,7 @@ class Chef { :title => { :kind_of => String }, :description => { :kind_of => String }, - }, + } ) @groupings[name] = options @groupings[name] @@ -648,7 +648,7 @@ class Chef set_or_return( :source_url, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -663,7 +663,7 @@ class Chef set_or_return( :issues_url, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -680,7 +680,7 @@ class Chef set_or_return( :privacy, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end diff --git a/lib/chef/cookbook_manifest.rb b/lib/chef/cookbook_manifest.rb index 6e7458aa28..d6de9dd029 100644 --- a/lib/chef/cookbook_manifest.rb +++ b/lib/chef/cookbook_manifest.rb @@ -195,7 +195,7 @@ class Chef :resources => Array.new, :providers => Array.new, :root_files => Array.new, - },) + }) @checksums = {} if !root_paths || root_paths.size == 0 @@ -217,7 +217,7 @@ class Chef :path => path, :checksum => csum, :specificity => specificity, - },) + }) manifest[segment] << rs end diff --git a/lib/chef/data_bag.rb b/lib/chef/data_bag.rb index fb6615d741..0444e2abbe 100644 --- a/lib/chef/data_bag.rb +++ b/lib/chef/data_bag.rb @@ -52,7 +52,7 @@ class Chef set_or_return( :name, arg, - :regex => VALID_NAME, + :regex => VALID_NAME ) end diff --git a/lib/chef/data_bag_item.rb b/lib/chef/data_bag_item.rb index facaf6815b..0e3fa48e68 100644 --- a/lib/chef/data_bag_item.rb +++ b/lib/chef/data_bag_item.rb @@ -86,7 +86,7 @@ class Chef set_or_return( :data_bag, arg, - :regex => /^[\-[:alnum:]_]+$/, + :regex => /^[\-[:alnum:]_]+$/ ) end diff --git a/lib/chef/dsl/declare_resource.rb b/lib/chef/dsl/declare_resource.rb index 2e7dc934dc..9a59859d5a 100644 --- a/lib/chef/dsl/declare_resource.rb +++ b/lib/chef/dsl/declare_resource.rb @@ -100,7 +100,7 @@ class Chef run_context: run_context, cookbook_name: cookbook_name, recipe_name: recipe_name, - enclosing_provider: self.is_a?(Chef::Provider) ? self : nil, + enclosing_provider: self.is_a?(Chef::Provider) ? self : nil ).build(&resource_attrs_block) end end diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb index cd3bbd96ff..f6d22843d4 100644 --- a/lib/chef/environment.rb +++ b/lib/chef/environment.rb @@ -59,7 +59,7 @@ class Chef set_or_return( :name, arg, - { :regex => /^[\-[:alnum:]_]+$/, :kind_of => String }, + { :regex => /^[\-[:alnum:]_]+$/, :kind_of => String } ) end @@ -67,7 +67,7 @@ class Chef set_or_return( :description, arg, - :kind_of => String, + :kind_of => String ) end @@ -75,7 +75,7 @@ class Chef set_or_return( :default_attributes, arg, - :kind_of => Hash, + :kind_of => Hash ) end @@ -87,7 +87,7 @@ class Chef set_or_return( :override_attributes, arg, - :kind_of => Hash, + :kind_of => Hash ) end @@ -104,7 +104,7 @@ class Chef :callbacks => { "should be a valid set of cookbook version requirements" => lambda { |cv| Chef::Environment.validate_cookbook_versions(cv) }, }, - }, + } ) end @@ -115,7 +115,7 @@ class Chef :version => { :callbacks => { "should be a valid version requirement" => lambda { |v| Chef::Environment.validate_cookbook_version(v) } }, }, - },) + }) @cookbook_versions[cookbook] = version end diff --git a/lib/chef/event_loggers/windows_eventlog.rb b/lib/chef/event_loggers/windows_eventlog.rb index 84aa906dc7..f8c3d346c5 100644 --- a/lib/chef/event_loggers/windows_eventlog.rb +++ b/lib/chef/event_loggers/windows_eventlog.rb @@ -50,7 +50,7 @@ class Chef :event_type => ::Win32::EventLog::INFO_TYPE, :source => SOURCE, :event_id => RUN_START_EVENT_ID, - :data => [version], + :data => [version] ) end @@ -60,7 +60,7 @@ class Chef :event_type => ::Win32::EventLog::INFO_TYPE, :source => SOURCE, :event_id => RUN_STARTED_EVENT_ID, - :data => [run_status.run_id], + :data => [run_status.run_id] ) end @@ -69,7 +69,7 @@ class Chef :event_type => ::Win32::EventLog::INFO_TYPE, :source => SOURCE, :event_id => RUN_COMPLETED_EVENT_ID, - :data => [@run_status.run_id, @run_status.elapsed_time.to_s], + :data => [@run_status.run_id, @run_status.elapsed_time.to_s] ) end @@ -92,7 +92,7 @@ class Chef :event_id => RUN_FAILED_EVENT_ID, :data => data + [e.class.name, e.message, - e.backtrace.join("\n")], + e.backtrace.join("\n")] ) end diff --git a/lib/chef/file_cache.rb b/lib/chef/file_cache.rb index b4f3de236a..b4beee4a66 100644 --- a/lib/chef/file_cache.rb +++ b/lib/chef/file_cache.rb @@ -48,7 +48,7 @@ class Chef { :path => { :kind_of => String }, :contents => { :kind_of => String }, - }, + } ) file_path_array = File.split(path) @@ -74,7 +74,7 @@ class Chef { :file => { :kind_of => String }, :path => { :kind_of => String }, - }, + } ) file_path_array = File.split(path) @@ -82,7 +82,7 @@ class Chef if File.exists?(file) && File.writable?(file) FileUtils.mv( file, - File.join(create_cache_path(File.join(file_path_array), true), file_name), + File.join(create_cache_path(File.join(file_path_array), true), file_name) ) else raise RuntimeError, "Cannot move #{file} to #{path}!" @@ -109,7 +109,7 @@ class Chef }, { :path => { :kind_of => String }, - }, + } ) cache_path = create_cache_path(path, false) raise Chef::Exceptions::FileNotFound, "Cannot find #{cache_path} for #{path}!" unless File.exists?(cache_path) @@ -135,7 +135,7 @@ class Chef }, { :path => { :kind_of => String }, - }, + } ) cache_path = create_cache_path(path, false) if File.exists?(cache_path) @@ -182,7 +182,7 @@ class Chef }, { :path => { :kind_of => String }, - }, + } ) full_path = create_cache_path(path, false) if File.exists?(full_path) diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 280960f3c6..52fa177159 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -255,11 +255,11 @@ class Chef @client_builder = Chef::Knife::Bootstrap::ClientBuilder.new( chef_config: Chef::Config, knife_config: config, - ui: ui, + ui: ui ) @chef_vault_handler = Chef::Knife::Bootstrap::ChefVaultHandler.new( knife_config: config, - ui: ui, + ui: ui ) end @@ -340,7 +340,7 @@ class Chef config, config[:run_list], Chef::Config, - secret, + secret ) end diff --git a/lib/chef/knife/data_bag_create.rb b/lib/chef/knife/data_bag_create.rb index 3576ec7379..196278bb80 100644 --- a/lib/chef/knife/data_bag_create.rb +++ b/lib/chef/knife/data_bag_create.rb @@ -66,7 +66,7 @@ class Chef Chef::EncryptedDataBagItem.encrypt_data_bag_item(output, read_secret) else output - end, + end ) item.data_bag(@data_bag_name) rest.post("data/#{@data_bag_name}", item) diff --git a/lib/chef/log/winevt.rb b/lib/chef/log/winevt.rb index 8411ad8af0..506d4c9a6c 100644 --- a/lib/chef/log/winevt.rb +++ b/lib/chef/log/winevt.rb @@ -54,7 +54,7 @@ class Chef :event_type => ::Win32::EventLog::INFO_TYPE, :source => SOURCE, :event_id => INFO_EVENT_ID, - :data => [msg], + :data => [msg] ) end @@ -63,7 +63,7 @@ class Chef :event_type => ::Win32::EventLog::WARN_TYPE, :source => SOURCE, :event_id => WARN_EVENT_ID, - :data => [msg], + :data => [msg] ) end @@ -72,7 +72,7 @@ class Chef :event_type => ::Win32::EventLog::INFO_TYPE, :source => SOURCE, :event_id => DEBUG_EVENT_ID, - :data => [msg], + :data => [msg] ) end @@ -81,7 +81,7 @@ class Chef :event_type => ::Win32::EventLog::ERROR_TYPE, :source => SOURCE, :event_id => ERROR_EVENT_ID, - :data => [msg], + :data => [msg] ) end @@ -90,7 +90,7 @@ class Chef :event_type => ::Win32::EventLog::ERROR_TYPE, :source => SOURCE, :event_id => FATAL_EVENT_ID, - :data => [msg], + :data => [msg] ) end diff --git a/lib/chef/mixin/powershell_out.rb b/lib/chef/mixin/powershell_out.rb index 7fff958b78..74de85f86f 100644 --- a/lib/chef/mixin/powershell_out.rb +++ b/lib/chef/mixin/powershell_out.rb @@ -66,7 +66,7 @@ class Chef with_os_architecture(nil, architecture: arch) do shell_out( build_powershell_command(script), - options, + options ) end end diff --git a/lib/chef/mixin/securable.rb b/lib/chef/mixin/securable.rb index 9cde53d66f..a88d534b37 100644 --- a/lib/chef/mixin/securable.rb +++ b/lib/chef/mixin/securable.rb @@ -24,7 +24,7 @@ class Chef set_or_return( :owner, arg, - :regex => Chef::Config[:user_valid_regex], + :regex => Chef::Config[:user_valid_regex] ) end @@ -34,7 +34,7 @@ class Chef set_or_return( :group, arg, - :regex => Chef::Config[:group_valid_regex], + :regex => Chef::Config[:group_valid_regex] ) end @@ -55,7 +55,7 @@ class Chef Integer(m) <= 07777 && Integer(m) >= 0 end }, - }, + } ) end @@ -156,7 +156,7 @@ class Chef set_or_return( name, rights, - {}, + {} ) end end @@ -171,7 +171,7 @@ class Chef set_or_return( :inherits, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end end diff --git a/lib/chef/mixin/windows_env_helper.rb b/lib/chef/mixin/windows_env_helper.rb index 47f1aeb865..65b4b33cf0 100644 --- a/lib/chef/mixin/windows_env_helper.rb +++ b/lib/chef/mixin/windows_env_helper.rb @@ -47,7 +47,7 @@ class Chef Chef::ReservedNames::Win32::Error.raise! end if SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, 0, FFI::MemoryPointer.from_string( - utf8_to_wide("Environment"), + utf8_to_wide("Environment") ).address, flags, 5000, nil) == 0 Chef::ReservedNames::Win32::Error.raise! end diff --git a/lib/chef/monologger.rb b/lib/chef/monologger.rb index a1dd594c7a..49f744e314 100644 --- a/lib/chef/monologger.rb +++ b/lib/chef/monologger.rb @@ -79,7 +79,7 @@ class MonoLogger < Logger def add_log_header(file) file.write( - "# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName], + "# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName] ) end diff --git a/lib/chef/node.rb b/lib/chef/node.rb index c7813eb2aa..294358f405 100644 --- a/lib/chef/node.rb +++ b/lib/chef/node.rb @@ -103,7 +103,7 @@ class Chef Chef::Config[:chef_server_url], client_name: Chef::Config[:node_name], signing_key_filename: Chef::Config[:client_key], - validate_utf8: false, + validate_utf8: false ) end @@ -115,7 +115,7 @@ class Chef { :name => { :kind_of => String, :cannot_be => :blank, :regex => /^[\-[:alnum:]_:.]+$/ }, - },) + }) @name = arg else @name @@ -126,7 +126,7 @@ class Chef set_or_return( :chef_environment, arg, - { :regex => /^[\-[:alnum:]_]+$/, :kind_of => String }, + { :regex => /^[\-[:alnum:]_]+$/, :kind_of => String } ) end diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb index 1a5da902ef..3e90797802 100644 --- a/lib/chef/platform/provider_mapping.rb +++ b/lib/chef/platform/provider_mapping.rb @@ -124,7 +124,7 @@ class Chef :provider => { :kind_of => [ String, Symbol, Class ], }, - }, + } ) if args.has_key?(:platform) if args.has_key?(:version) diff --git a/lib/chef/platform/service_helpers.rb b/lib/chef/platform/service_helpers.rb index 28c4c5ec59..87b87d4c72 100644 --- a/lib/chef/platform/service_helpers.rb +++ b/lib/chef/platform/service_helpers.rb @@ -105,7 +105,7 @@ class Chef def has_systemd_service_unit?(svc_name) %w{ /etc /usr/lib /lib /run }.any? do |load_path| ::File.exist?( - Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, '@')}.service"), + Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, '@')}.service") ) end end diff --git a/lib/chef/provider/dsc_resource.rb b/lib/chef/provider/dsc_resource.rb index eac8a829bd..be752f269f 100644 --- a/lib/chef/provider/dsc_resource.rb +++ b/lib/chef/provider/dsc_resource.rb @@ -72,7 +72,7 @@ class Chef def local_configuration_manager @local_configuration_manager ||= Chef::Util::DSC::LocalConfigurationManager.new( node, - nil, + nil ) end @@ -158,7 +158,7 @@ class Chef cmdlet = Chef::Util::Powershell::Cmdlet.new( node, "Invoke-DscResource #{switches}", - output_format, + output_format ) cmdlet.run!({}, { :timeout => new_resource.timeout }) end @@ -176,7 +176,7 @@ class Chef def create_reboot_resource @reboot_resource = Chef::Resource::Reboot.new( "Reboot for #{@new_resource.name}", - run_context, + run_context ).tap do |r| r.reason("Reboot for #{@new_resource.resource}.") end diff --git a/lib/chef/provider/execute.rb b/lib/chef/provider/execute.rb index 4e7d8e1454..45f0ad5488 100644 --- a/lib/chef/provider/execute.rb +++ b/lib/chef/provider/execute.rb @@ -117,7 +117,7 @@ class Chef def sentinel_file Pathname.new(Chef::Util::PathHelper.cleanpath( - ( cwd && creates_relative? ) ? ::File.join(cwd, creates) : creates, + ( cwd && creates_relative? ) ? ::File.join(cwd, creates) : creates )) end end diff --git a/lib/chef/provider/http_request.rb b/lib/chef/provider/http_request.rb index b52368f472..e1ee01d9b4 100644 --- a/lib/chef/provider/http_request.rb +++ b/lib/chef/provider/http_request.rb @@ -42,7 +42,7 @@ class Chef # and false for a "304 Not Modified" response modified = @http.head( "#{@new_resource.url}", - @new_resource.headers, + @new_resource.headers ) Chef::Log.info("#{@new_resource} HEAD to #{@new_resource.url} successful") Chef::Log.debug("#{@new_resource} HEAD request response: #{modified}") @@ -59,7 +59,7 @@ class Chef message = check_message(@new_resource.message) body = @http.get( "#{@new_resource.url}", - @new_resource.headers, + @new_resource.headers ) Chef::Log.info("#{@new_resource} GET to #{@new_resource.url} successful") Chef::Log.debug("#{@new_resource} GET request response: #{body}") @@ -73,7 +73,7 @@ class Chef body = @http.put( "#{@new_resource.url}", message, - @new_resource.headers, + @new_resource.headers ) Chef::Log.info("#{@new_resource} PUT to #{@new_resource.url} successful") Chef::Log.debug("#{@new_resource} PUT request response: #{body}") @@ -87,7 +87,7 @@ class Chef body = @http.post( "#{@new_resource.url}", message, - @new_resource.headers, + @new_resource.headers ) Chef::Log.info("#{@new_resource} POST to #{@new_resource.url} message: #{message.inspect} successful") Chef::Log.debug("#{@new_resource} POST request response: #{body}") @@ -99,7 +99,7 @@ class Chef converge_by("#{@new_resource} DELETE to #{@new_resource.url}") do body = @http.delete( "#{@new_resource.url}", - @new_resource.headers, + @new_resource.headers ) @new_resource.updated_by_last_action(true) Chef::Log.info("#{@new_resource} DELETE to #{@new_resource.url} successful") diff --git a/lib/chef/provider/ifconfig.rb b/lib/chef/provider/ifconfig.rb index d00d5cd155..e73869d829 100644 --- a/lib/chef/provider/ifconfig.rb +++ b/lib/chef/provider/ifconfig.rb @@ -109,7 +109,7 @@ class Chef command = add_command converge_by ("run #{command} to add #{@new_resource}") do run_command( - :command => command, + :command => command ) Chef::Log.info("#{@new_resource} added") end @@ -127,7 +127,7 @@ class Chef command = enable_command converge_by ("run #{command} to enable #{@new_resource}") do run_command( - :command => command, + :command => command ) Chef::Log.info("#{@new_resource} enabled") end @@ -141,7 +141,7 @@ class Chef command = delete_command converge_by ("run #{command} to delete #{@new_resource}") do run_command( - :command => command, + :command => command ) Chef::Log.info("#{@new_resource} deleted") end @@ -158,7 +158,7 @@ class Chef command = disable_command converge_by ("run #{command} to disable #{@new_resource}") do run_command( - :command => command, + :command => command ) Chef::Log.info("#{@new_resource} disabled") end diff --git a/lib/chef/provider/link.rb b/lib/chef/provider/link.rb index 85c46ada98..d184094bbb 100644 --- a/lib/chef/provider/link.rb +++ b/lib/chef/provider/link.rb @@ -52,7 +52,7 @@ class Chef if file_class.symlink?(@current_resource.target_file) @current_resource.link_type(:symbolic) @current_resource.to( - canonicalize(file_class.readlink(@current_resource.target_file)), + canonicalize(file_class.readlink(@current_resource.target_file)) ) else @current_resource.link_type(:hard) diff --git a/lib/chef/provider/osx_profile.rb b/lib/chef/provider/osx_profile.rb index f232dede83..3e37cbc9a5 100644 --- a/lib/chef/provider/osx_profile.rb +++ b/lib/chef/provider/osx_profile.rb @@ -40,7 +40,7 @@ class Chef all_profiles = get_installed_profiles @new_resource.profile( @new_resource.profile || - @new_resource.profile_name, + @new_resource.profile_name ) @new_profile_hash = get_profile_hash(@new_resource.profile) @@ -141,7 +141,7 @@ class Chef def get_cache_dir cache_dir = Chef::FileCache.create_cache_path( - "profiles/#{@new_resource.cookbook_name}", + "profiles/#{@new_resource.cookbook_name}" ) end @@ -150,15 +150,15 @@ class Chef ::File.join( "profiles", @new_resource.cookbook_name, - ::File.dirname(cookbook_file), - ), + ::File.dirname(cookbook_file) + ) ) remote_file = Chef::Resource::CookbookFile.new( ::File.join( get_cache_dir, - "#{cookbook_file}.remote", + "#{cookbook_file}.remote" ), - run_context, + run_context ) remote_file.cookbook_name = @new_resource.cookbook_name remote_file.source(cookbook_file) @@ -179,7 +179,7 @@ class Chef # Make a UUID of the profile contents and return as string UUIDTools::UUID.sha1_create( UUIDTools::UUID_DNS_NAMESPACE, - profile.to_s, + profile.to_s ).to_s end diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb index ad4db0c4e6..6804e99a13 100644 --- a/lib/chef/provider/package/chocolatey.rb +++ b/lib/chef/provider/package/chocolatey.rb @@ -155,14 +155,14 @@ EOS @choco_exe ||= ::File.join( choco_install_path, "bin", - "choco.exe", + "choco.exe" ) end # lets us mock out an incorrect value for testing. def choco_install_path @choco_install_path ||= powershell_out!( - PATHFINDING_POWERSHELL_COMMAND, + PATHFINDING_POWERSHELL_COMMAND ).stdout.chomp end diff --git a/lib/chef/provider/reboot.rb b/lib/chef/provider/reboot.rb index 11039f8701..34eee9236d 100644 --- a/lib/chef/provider/reboot.rb +++ b/lib/chef/provider/reboot.rb @@ -40,7 +40,7 @@ class Chef :delay_mins => @new_resource.delay_mins, :reason => @new_resource.reason, :timestamp => Time.now, - :requested_by => @new_resource.name, + :requested_by => @new_resource.name ) end diff --git a/lib/chef/provider/service/gentoo.rb b/lib/chef/provider/service/gentoo.rb index 1bfd46ef14..66f2f10f23 100644 --- a/lib/chef/provider/service/gentoo.rb +++ b/lib/chef/provider/service/gentoo.rb @@ -39,7 +39,7 @@ class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init readable = ::File.readable? file Chef::Log.debug "#{@new_resource} exists: #{exists}, readable: #{readable}" exists and readable - end, + end ) Chef::Log.debug "#{@new_resource} enabled: #{@current_resource.enabled}" diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb index cdd5d934ff..63485903c3 100644 --- a/lib/chef/provider/service/macosx.rb +++ b/lib/chef/provider/service/macosx.rb @@ -224,7 +224,7 @@ class Chef # plist files can come in XML or Binary formats. this command # will make sure we get XML every time. plist_xml = shell_out_with_systems_locale!( - "plutil -convert xml1 -o - #{@plist}", + "plutil -convert xml1 -o - #{@plist}" ).stdout plist_doc = REXML::Document.new(plist_xml) @@ -236,7 +236,7 @@ class Chef plists = PLIST_DIRS.inject([]) do |results, dir| edir = ::File.expand_path(dir) entries = Dir.glob( - "#{edir}/*#{Chef::Util::PathHelper.escape_glob(@current_resource.service_name)}*.plist", + "#{edir}/*#{Chef::Util::PathHelper.escape_glob(@current_resource.service_name)}*.plist" ) entries.any? ? results << entries : results end diff --git a/lib/chef/provider/service/windows.rb b/lib/chef/provider/service/windows.rb index 2705aa5c02..9bfd9238cd 100644 --- a/lib/chef/provider/service/windows.rb +++ b/lib/chef/provider/service/windows.rb @@ -306,7 +306,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service Chef::Log.debug "#{@new_resource.name} setting start_type to #{type}" Win32::Service.configure( :service_name => @new_resource.service_name, - :start_type => allowed_types[type], + :start_type => allowed_types[type] ) @new_resource.updated_by_last_action(true) end diff --git a/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb index 1659e324c0..fecfb73e2d 100644 --- a/lib/chef/provider/user/dscl.rb +++ b/lib/chef/provider/user/dscl.rb @@ -415,7 +415,7 @@ user password using shadow hash.") salt, iterations, 128, - OpenSSL::Digest::SHA512.new, + OpenSSL::Digest::SHA512.new ) end @@ -700,7 +700,7 @@ user password using shadow hash.") salt, current_resource.iterations, 128, - OpenSSL::Digest::SHA512.new, + OpenSSL::Digest::SHA512.new ).unpack("H*").first == current_resource.password end diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index 032effe4db..21b2308688 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -173,7 +173,7 @@ class Chef arg.each do |action| validate( { action: action }, - { action: { kind_of: Symbol, equal_to: allowed_actions } }, + { action: { kind_of: Symbol, equal_to: allowed_actions } } ) end @action = arg diff --git a/lib/chef/resource/cron.rb b/lib/chef/resource/cron.rb index 74fa6685f1..a76d454bf0 100644 --- a/lib/chef/resource/cron.rb +++ b/lib/chef/resource/cron.rb @@ -60,7 +60,7 @@ class Chef set_or_return( :minute, converted_arg, - :kind_of => String, + :kind_of => String ) end @@ -77,7 +77,7 @@ class Chef set_or_return( :hour, converted_arg, - :kind_of => String, + :kind_of => String ) end @@ -94,7 +94,7 @@ class Chef set_or_return( :day, converted_arg, - :kind_of => String, + :kind_of => String ) end @@ -111,7 +111,7 @@ class Chef set_or_return( :month, converted_arg, - :kind_of => String, + :kind_of => String ) end @@ -135,7 +135,7 @@ class Chef set_or_return( :weekday, converted_arg, - :kind_of => [String, Symbol], + :kind_of => [String, Symbol] ) end @@ -143,7 +143,7 @@ class Chef set_or_return( :time, arg, - :equal_to => Chef::Provider::Cron::SPECIAL_TIME_VALUES, + :equal_to => Chef::Provider::Cron::SPECIAL_TIME_VALUES ) end @@ -151,7 +151,7 @@ class Chef set_or_return( :mailto, arg, - :kind_of => String, + :kind_of => String ) end @@ -159,7 +159,7 @@ class Chef set_or_return( :path, arg, - :kind_of => String, + :kind_of => String ) end @@ -167,7 +167,7 @@ class Chef set_or_return( :home, arg, - :kind_of => String, + :kind_of => String ) end @@ -175,7 +175,7 @@ class Chef set_or_return( :shell, arg, - :kind_of => String, + :kind_of => String ) end @@ -183,7 +183,7 @@ class Chef set_or_return( :command, arg, - :kind_of => String, + :kind_of => String ) end @@ -191,7 +191,7 @@ class Chef set_or_return( :user, arg, - :kind_of => String, + :kind_of => String ) end @@ -199,7 +199,7 @@ class Chef set_or_return( :environment, arg, - :kind_of => Hash, + :kind_of => Hash ) end diff --git a/lib/chef/resource/deploy.rb b/lib/chef/resource/deploy.rb index df301dd024..b8e6a26f97 100644 --- a/lib/chef/resource/deploy.rb +++ b/lib/chef/resource/deploy.rb @@ -103,7 +103,7 @@ class Chef set_or_return( :depth, arg, - :kind_of => [ Integer ], + :kind_of => [ Integer ] ) end @@ -112,7 +112,7 @@ class Chef set_or_return( :deploy_to, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -120,7 +120,7 @@ class Chef set_or_return( :repo, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end alias :repository :repo @@ -129,7 +129,7 @@ class Chef set_or_return( :remote, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -137,7 +137,7 @@ class Chef set_or_return( :role, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -146,7 +146,7 @@ class Chef set_or_return( :restart_command, arg, - :kind_of => [ String, Proc ], + :kind_of => [ String, Proc ] ) end alias :restart :restart_command @@ -155,7 +155,7 @@ class Chef set_or_return( :migrate, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -163,7 +163,7 @@ class Chef set_or_return( :migration_command, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -171,7 +171,7 @@ class Chef set_or_return( :rollback_on_error, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -179,7 +179,7 @@ class Chef set_or_return( :user, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -187,7 +187,7 @@ class Chef set_or_return( :group, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -195,7 +195,7 @@ class Chef set_or_return( :enable_submodules, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -203,7 +203,7 @@ class Chef set_or_return( :shallow_clone, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -211,7 +211,7 @@ class Chef set_or_return( :repository_cache, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -219,7 +219,7 @@ class Chef set_or_return( :copy_exclude, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -227,7 +227,7 @@ class Chef set_or_return( :revision, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end alias :branch :revision @@ -236,7 +236,7 @@ class Chef set_or_return( :git_ssh_wrapper, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end alias :ssh_wrapper :git_ssh_wrapper @@ -245,7 +245,7 @@ class Chef set_or_return( :svn_username, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -253,7 +253,7 @@ class Chef set_or_return( :svn_password, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -261,7 +261,7 @@ class Chef set_or_return( :svn_arguments, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -281,7 +281,7 @@ class Chef set_or_return( :scm_provider, klass, - :kind_of => [ Class ], + :kind_of => [ Class ] ) end @@ -295,7 +295,7 @@ class Chef set_or_return( :svn_force_export, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -308,7 +308,7 @@ class Chef set_or_return( :environment, arg, - :kind_of => [ Hash ], + :kind_of => [ Hash ] ) end @@ -328,7 +328,7 @@ class Chef set_or_return( :purge_before_symlink, arg, - :kind_of => Array, + :kind_of => Array ) end @@ -344,7 +344,7 @@ class Chef set_or_return( :create_dirs_before_symlink, arg, - :kind_of => Array, + :kind_of => Array ) end @@ -358,7 +358,7 @@ class Chef set_or_return( :symlinks, arg, - :kind_of => Hash, + :kind_of => Hash ) end @@ -373,7 +373,7 @@ class Chef set_or_return( :symlink_before_migrate, arg, - :kind_of => Hash, + :kind_of => Hash ) end @@ -405,7 +405,7 @@ class Chef set_or_return( :additional_remotes, arg, - :kind_of => Hash, + :kind_of => Hash ) end @@ -413,7 +413,7 @@ class Chef set_or_return( :enable_checkout, arg, - :kind_of => [TrueClass, FalseClass], + :kind_of => [TrueClass, FalseClass] ) end @@ -421,7 +421,7 @@ class Chef set_or_return( :checkout_branch, arg, - :kind_of => String, + :kind_of => String ) end @@ -434,7 +434,7 @@ class Chef set_or_return( :timeout, arg, - :kind_of => Integer, + :kind_of => Integer ) end diff --git a/lib/chef/resource/directory.rb b/lib/chef/resource/directory.rb index 07c29b48a6..faad659668 100644 --- a/lib/chef/resource/directory.rb +++ b/lib/chef/resource/directory.rb @@ -45,7 +45,7 @@ class Chef set_or_return( :recursive, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -53,7 +53,7 @@ class Chef set_or_return( :path, arg, - :kind_of => String, + :kind_of => String ) end diff --git a/lib/chef/resource/dsc_resource.rb b/lib/chef/resource/dsc_resource.rb index 4a55ce1d70..58594cce7b 100644 --- a/lib/chef/resource/dsc_resource.rb +++ b/lib/chef/resource/dsc_resource.rb @@ -103,7 +103,7 @@ class Chef set_or_return( :timeout, arg, - :kind_of => [ Integer ], + :kind_of => [ Integer ] ) end diff --git a/lib/chef/resource/dsc_script.rb b/lib/chef/resource/dsc_script.rb index a8eeeb1d4f..7da29a651a 100644 --- a/lib/chef/resource/dsc_script.rb +++ b/lib/chef/resource/dsc_script.rb @@ -43,7 +43,7 @@ class Chef set_or_return( :code, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -54,7 +54,7 @@ class Chef set_or_return( :configuration_name, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -65,7 +65,7 @@ class Chef set_or_return( :command, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -76,7 +76,7 @@ class Chef set_or_return( :configuration_data, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -87,7 +87,7 @@ class Chef set_or_return( :configuration_data_script, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -108,7 +108,7 @@ class Chef set_or_return( :flags, arg, - :kind_of => [ Hash ], + :kind_of => [ Hash ] ) end @@ -116,7 +116,7 @@ class Chef set_or_return( :cwd, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -124,7 +124,7 @@ class Chef set_or_return( :environment, arg, - :kind_of => [ Hash ], + :kind_of => [ Hash ] ) end @@ -132,7 +132,7 @@ class Chef set_or_return( :timeout, arg, - :kind_of => [ Integer ], + :kind_of => [ Integer ] ) end end diff --git a/lib/chef/resource/env.rb b/lib/chef/resource/env.rb index a483b69ee5..7fac8af40b 100644 --- a/lib/chef/resource/env.rb +++ b/lib/chef/resource/env.rb @@ -41,7 +41,7 @@ class Chef set_or_return( :key_name, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -49,7 +49,7 @@ class Chef set_or_return( :value, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -57,7 +57,7 @@ class Chef set_or_return( :delim, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end end diff --git a/lib/chef/resource/erl_call.rb b/lib/chef/resource/erl_call.rb index 5b5273d31d..3e317676a5 100644 --- a/lib/chef/resource/erl_call.rb +++ b/lib/chef/resource/erl_call.rb @@ -44,7 +44,7 @@ class Chef set_or_return( :code, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -52,7 +52,7 @@ class Chef set_or_return( :cookie, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -60,7 +60,7 @@ class Chef set_or_return( :distributed, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -68,7 +68,7 @@ class Chef set_or_return( :name_type, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -76,7 +76,7 @@ class Chef set_or_return( :node_name, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb index b30cc245bd..1a56607267 100644 --- a/lib/chef/resource/execute.rb +++ b/lib/chef/resource/execute.rb @@ -56,7 +56,7 @@ class Chef set_or_return( :umask, arg, - :kind_of => [ String, Integer ], + :kind_of => [ String, Integer ] ) end @@ -64,7 +64,7 @@ class Chef set_or_return( :command, arg, - :kind_of => [ String, Array ], + :kind_of => [ String, Array ] ) end @@ -72,7 +72,7 @@ class Chef set_or_return( :creates, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -80,7 +80,7 @@ class Chef set_or_return( :cwd, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -88,7 +88,7 @@ class Chef set_or_return( :environment, arg, - :kind_of => [ Hash ], + :kind_of => [ Hash ] ) end @@ -98,7 +98,7 @@ class Chef set_or_return( :group, arg, - :kind_of => [ String, Integer ], + :kind_of => [ String, Integer ] ) end @@ -115,7 +115,7 @@ class Chef set_or_return( :path, arg, - :kind_of => [ Array ], + :kind_of => [ Array ] ) end @@ -123,7 +123,7 @@ class Chef set_or_return( :returns, arg, - :kind_of => [ Integer, Array ], + :kind_of => [ Integer, Array ] ) end @@ -131,7 +131,7 @@ class Chef set_or_return( :timeout, arg, - :kind_of => [ Integer, Float ], + :kind_of => [ Integer, Float ] ) end @@ -139,7 +139,7 @@ class Chef set_or_return( :user, arg, - :kind_of => [ String, Integer ], + :kind_of => [ String, Integer ] ) end @@ -164,7 +164,7 @@ class Chef :environment, :group, :user, - :umask, + :umask ) end diff --git a/lib/chef/resource/file/verification.rb b/lib/chef/resource/file/verification.rb index 15ed27347f..e11035d33f 100644 --- a/lib/chef/resource/file/verification.rb +++ b/lib/chef/resource/file/verification.rb @@ -110,7 +110,7 @@ class Chef # is interpolated. Until `file` can be deprecated, interpolate both. Chef.log_deprecation( "%{file} is deprecated in verify command and will not be "\ - "supported in Chef 13. Please use %{path} instead.", + "supported in Chef 13. Please use %{path} instead." ) if @command.include?("%{file}") command = @command % { :file => path, :path => path } interpreter = Chef::GuardInterpreter.for_resource(@parent_resource, command, @command_opts) diff --git a/lib/chef/resource/git.rb b/lib/chef/resource/git.rb index 0d3b1438bf..4799b54d3d 100644 --- a/lib/chef/resource/git.rb +++ b/lib/chef/resource/git.rb @@ -31,7 +31,7 @@ class Chef set_or_return( :additional_remotes, arg, - :kind_of => Hash, + :kind_of => Hash ) end diff --git a/lib/chef/resource/group.rb b/lib/chef/resource/group.rb index aee4727baf..d3a4a1ce89 100644 --- a/lib/chef/resource/group.rb +++ b/lib/chef/resource/group.rb @@ -42,7 +42,7 @@ class Chef set_or_return( :group_name, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -50,7 +50,7 @@ class Chef set_or_return( :gid, arg, - :kind_of => [ String, Integer ], + :kind_of => [ String, Integer ] ) end @@ -59,7 +59,7 @@ class Chef set_or_return( :members, converted_members, - :kind_of => [ Array ], + :kind_of => [ Array ] ) end @@ -70,7 +70,7 @@ class Chef set_or_return( :excluded_members, converted_members, - :kind_of => [ Array ], + :kind_of => [ Array ] ) end @@ -78,7 +78,7 @@ class Chef set_or_return( :append, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -86,7 +86,7 @@ class Chef set_or_return( :system, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -94,7 +94,7 @@ class Chef set_or_return( :non_unique, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end end diff --git a/lib/chef/resource/http_request.rb b/lib/chef/resource/http_request.rb index be69e2f1df..fcc48470bc 100644 --- a/lib/chef/resource/http_request.rb +++ b/lib/chef/resource/http_request.rb @@ -40,7 +40,7 @@ class Chef set_or_return( :url, args, - :kind_of => String, + :kind_of => String ) end @@ -49,7 +49,7 @@ class Chef set_or_return( :message, args, - :kind_of => Object, + :kind_of => Object ) end @@ -57,7 +57,7 @@ class Chef set_or_return( :headers, args, - :kind_of => Hash, + :kind_of => Hash ) end diff --git a/lib/chef/resource/ifconfig.rb b/lib/chef/resource/ifconfig.rb index 94362b1c73..fd523d9580 100644 --- a/lib/chef/resource/ifconfig.rb +++ b/lib/chef/resource/ifconfig.rb @@ -50,7 +50,7 @@ class Chef set_or_return( :target, arg, - :kind_of => String, + :kind_of => String ) end @@ -58,7 +58,7 @@ class Chef set_or_return( :device, arg, - :kind_of => String, + :kind_of => String ) end @@ -66,7 +66,7 @@ class Chef set_or_return( :hwaddr, arg, - :kind_of => String, + :kind_of => String ) end @@ -74,7 +74,7 @@ class Chef set_or_return( :inet_addr, arg, - :kind_of => String, + :kind_of => String ) end @@ -82,7 +82,7 @@ class Chef set_or_return( :bcast, arg, - :kind_of => String, + :kind_of => String ) end @@ -90,7 +90,7 @@ class Chef set_or_return( :mask, arg, - :kind_of => String, + :kind_of => String ) end @@ -98,7 +98,7 @@ class Chef set_or_return( :mtu, arg, - :kind_of => String, + :kind_of => String ) end @@ -106,7 +106,7 @@ class Chef set_or_return( :metric, arg, - :kind_of => String, + :kind_of => String ) end @@ -114,7 +114,7 @@ class Chef set_or_return( :onboot, arg, - :kind_of => String, + :kind_of => String ) end @@ -122,7 +122,7 @@ class Chef set_or_return( :network, arg, - :kind_of => String, + :kind_of => String ) end @@ -130,7 +130,7 @@ class Chef set_or_return( :bootproto, arg, - :kind_of => String, + :kind_of => String ) end @@ -138,7 +138,7 @@ class Chef set_or_return( :onparent, arg, - :kind_of => String, + :kind_of => String ) end end diff --git a/lib/chef/resource/link.rb b/lib/chef/resource/link.rb index a85e9eb058..5717ec7bad 100644 --- a/lib/chef/resource/link.rb +++ b/lib/chef/resource/link.rb @@ -44,7 +44,7 @@ class Chef set_or_return( :to, arg, - :kind_of => String, + :kind_of => String ) end @@ -52,7 +52,7 @@ class Chef set_or_return( :target_file, arg, - :kind_of => String, + :kind_of => String ) end @@ -61,7 +61,7 @@ class Chef set_or_return( :link_type, real_arg, - :equal_to => [ :symbolic, :hard ], + :equal_to => [ :symbolic, :hard ] ) end @@ -69,7 +69,7 @@ class Chef set_or_return( :group, arg, - :regex => Chef::Config[:group_valid_regex], + :regex => Chef::Config[:group_valid_regex] ) end @@ -77,7 +77,7 @@ class Chef set_or_return( :owner, arg, - :regex => Chef::Config[:user_valid_regex], + :regex => Chef::Config[:user_valid_regex] ) end diff --git a/lib/chef/resource/log.rb b/lib/chef/resource/log.rb index a9b288a210..8f7879872f 100644 --- a/lib/chef/resource/log.rb +++ b/lib/chef/resource/log.rb @@ -58,7 +58,7 @@ class Chef set_or_return( :message, arg, - :kind_of => String, + :kind_of => String ) end @@ -67,7 +67,7 @@ class Chef set_or_return( :level, arg, - :equal_to => [ :debug, :info, :warn, :error, :fatal ], + :equal_to => [ :debug, :info, :warn, :error, :fatal ] ) end diff --git a/lib/chef/resource/macosx_service.rb b/lib/chef/resource/macosx_service.rb index c2d05e5991..08c748bead 100644 --- a/lib/chef/resource/macosx_service.rb +++ b/lib/chef/resource/macosx_service.rb @@ -41,7 +41,7 @@ class Chef set_or_return( :plist, arg, - :kind_of => String, + :kind_of => String ) end @@ -49,7 +49,7 @@ class Chef set_or_return( :session_type, arg, - :kind_of => String, + :kind_of => String ) end diff --git a/lib/chef/resource/mdadm.rb b/lib/chef/resource/mdadm.rb index efdd448101..061a0ef73e 100644 --- a/lib/chef/resource/mdadm.rb +++ b/lib/chef/resource/mdadm.rb @@ -46,7 +46,7 @@ class Chef set_or_return( :chunk, arg, - :kind_of => [ Integer ], + :kind_of => [ Integer ] ) end @@ -54,7 +54,7 @@ class Chef set_or_return( :devices, arg, - :kind_of => [ Array ], + :kind_of => [ Array ] ) end @@ -62,7 +62,7 @@ class Chef set_or_return( :exists, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -70,7 +70,7 @@ class Chef set_or_return( :level, arg, - :kind_of => [ Integer ], + :kind_of => [ Integer ] ) end @@ -78,7 +78,7 @@ class Chef set_or_return( :metadata, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -86,7 +86,7 @@ class Chef set_or_return( :bitmap, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -94,7 +94,7 @@ class Chef set_or_return( :raid_device, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb index 7bbff57f50..44143d583c 100644 --- a/lib/chef/resource/mount.rb +++ b/lib/chef/resource/mount.rb @@ -52,7 +52,7 @@ class Chef set_or_return( :mount_point, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -60,7 +60,7 @@ class Chef set_or_return( :device, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -74,7 +74,7 @@ class Chef set_or_return( :device_type, real_arg, - :equal_to => valid_devices, + :equal_to => valid_devices ) end @@ -82,7 +82,7 @@ class Chef set_or_return( :fsck_device, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -90,7 +90,7 @@ class Chef set_or_return( :fstype, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -98,7 +98,7 @@ class Chef ret = set_or_return( :options, arg, - :kind_of => [ Array, String ], + :kind_of => [ Array, String ] ) if ret.is_a? String @@ -112,7 +112,7 @@ class Chef set_or_return( :dump, arg, - :kind_of => [ Integer, FalseClass ], + :kind_of => [ Integer, FalseClass ] ) end @@ -120,7 +120,7 @@ class Chef set_or_return( :pass, arg, - :kind_of => [ Integer, FalseClass ], + :kind_of => [ Integer, FalseClass ] ) end @@ -128,7 +128,7 @@ class Chef set_or_return( :mounted, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -136,7 +136,7 @@ class Chef set_or_return( :enabled, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -154,7 +154,7 @@ class Chef set_or_return( :username, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -162,7 +162,7 @@ class Chef set_or_return( :password, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -170,7 +170,7 @@ class Chef set_or_return( :domain, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end diff --git a/lib/chef/resource/ohai.rb b/lib/chef/resource/ohai.rb index 5211e2f3bc..09cd22efc5 100644 --- a/lib/chef/resource/ohai.rb +++ b/lib/chef/resource/ohai.rb @@ -37,7 +37,7 @@ class Chef set_or_return( :plugin, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -45,7 +45,7 @@ class Chef set_or_return( :name, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end end diff --git a/lib/chef/resource/osx_profile.rb b/lib/chef/resource/osx_profile.rb index 920d09a83a..8142e1fd96 100644 --- a/lib/chef/resource/osx_profile.rb +++ b/lib/chef/resource/osx_profile.rb @@ -41,7 +41,7 @@ class Chef set_or_return( :profile_name, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -49,7 +49,7 @@ class Chef set_or_return( :profile, arg, - :kind_of => [ String, Hash ], + :kind_of => [ String, Hash ] ) end @@ -57,7 +57,7 @@ class Chef set_or_return( :identifier, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -65,7 +65,7 @@ class Chef set_or_return( :path, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end diff --git a/lib/chef/resource/powershell_script.rb b/lib/chef/resource/powershell_script.rb index e66db9fa55..a530a9116c 100644 --- a/lib/chef/resource/powershell_script.rb +++ b/lib/chef/resource/powershell_script.rb @@ -31,7 +31,7 @@ class Chef set_or_return( :convert_boolean_return, arg, - :kind_of => [ FalseClass, TrueClass ], + :kind_of => [ FalseClass, TrueClass ] ) end diff --git a/lib/chef/resource/registry_key.rb b/lib/chef/resource/registry_key.rb index 135e63d959..d11f826c38 100644 --- a/lib/chef/resource/registry_key.rb +++ b/lib/chef/resource/registry_key.rb @@ -71,7 +71,7 @@ class Chef set_or_return( :key, arg, - :kind_of => String, + :kind_of => String ) end @@ -105,7 +105,7 @@ class Chef set_or_return( :recursive, arg, - :kind_of => [TrueClass, FalseClass], + :kind_of => [TrueClass, FalseClass] ) end @@ -113,7 +113,7 @@ class Chef set_or_return( :architecture, arg, - :kind_of => Symbol, + :kind_of => Symbol ) end diff --git a/lib/chef/resource/remote_directory.rb b/lib/chef/resource/remote_directory.rb index 600ee5138e..6e2928f3eb 100644 --- a/lib/chef/resource/remote_directory.rb +++ b/lib/chef/resource/remote_directory.rb @@ -57,7 +57,7 @@ class Chef set_or_return( :source, args, - :kind_of => String, + :kind_of => String ) end @@ -65,7 +65,7 @@ class Chef set_or_return( :files_backup, arg, - :kind_of => [ Integer, FalseClass ], + :kind_of => [ Integer, FalseClass ] ) end @@ -73,7 +73,7 @@ class Chef set_or_return( :purge, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -81,7 +81,7 @@ class Chef set_or_return( :files_group, arg, - :regex => Chef::Config[:group_valid_regex], + :regex => Chef::Config[:group_valid_regex] ) end @@ -89,7 +89,7 @@ class Chef set_or_return( :files_mode, arg, - :regex => /^\d{3,4}$/, + :regex => /^\d{3,4}$/ ) end @@ -97,7 +97,7 @@ class Chef set_or_return( :files_owner, arg, - :regex => Chef::Config[:user_valid_regex], + :regex => Chef::Config[:user_valid_regex] ) end @@ -105,7 +105,7 @@ class Chef set_or_return( :overwrite, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -113,7 +113,7 @@ class Chef set_or_return( :cookbook, args, - :kind_of => String, + :kind_of => String ) end diff --git a/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb index 933092ec82..b42cf4ba5f 100644 --- a/lib/chef/resource/remote_file.rb +++ b/lib/chef/resource/remote_file.rb @@ -76,7 +76,7 @@ class Chef set_or_return( :checksum, args, - :kind_of => String, + :kind_of => String ) end @@ -92,7 +92,7 @@ class Chef set_or_return( :use_etag, args, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -102,7 +102,7 @@ class Chef set_or_return( :use_last_modified, args, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -110,7 +110,7 @@ class Chef set_or_return( :ftp_active_mode, args, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -118,7 +118,7 @@ class Chef set_or_return( :headers, args, - :kind_of => Hash, + :kind_of => Hash ) end diff --git a/lib/chef/resource/route.rb b/lib/chef/resource/route.rb index bbfbada674..0117a8bfc0 100644 --- a/lib/chef/resource/route.rb +++ b/lib/chef/resource/route.rb @@ -48,7 +48,7 @@ class Chef set_or_return( :networking, arg, - :kind_of => String, + :kind_of => String ) end @@ -56,7 +56,7 @@ class Chef set_or_return( :networking_ipv6, arg, - :kind_of => String, + :kind_of => String ) end @@ -64,7 +64,7 @@ class Chef set_or_return( :hostname, arg, - :kind_of => String, + :kind_of => String ) end @@ -72,7 +72,7 @@ class Chef set_or_return( :domainname, arg, - :kind_of => String, + :kind_of => String ) end @@ -80,7 +80,7 @@ class Chef set_or_return( :domain, arg, - :kind_of => String, + :kind_of => String ) end @@ -88,7 +88,7 @@ class Chef set_or_return( :target, arg, - :kind_of => String, + :kind_of => String ) end @@ -96,7 +96,7 @@ class Chef set_or_return( :netmask, arg, - :kind_of => String, + :kind_of => String ) end @@ -104,7 +104,7 @@ class Chef set_or_return( :gateway, arg, - :kind_of => String, + :kind_of => String ) end @@ -112,7 +112,7 @@ class Chef set_or_return( :metric, arg, - :kind_of => Integer, + :kind_of => Integer ) end @@ -120,7 +120,7 @@ class Chef set_or_return( :device, arg, - :kind_of => String, + :kind_of => String ) end @@ -129,7 +129,7 @@ class Chef set_or_return( :route_type, real_arg, - :equal_to => [ :host, :net ], + :equal_to => [ :host, :net ] ) end end diff --git a/lib/chef/resource/ruby_block.rb b/lib/chef/resource/ruby_block.rb index 7bb433b330..0e3a980b11 100644 --- a/lib/chef/resource/ruby_block.rb +++ b/lib/chef/resource/ruby_block.rb @@ -45,7 +45,7 @@ class Chef set_or_return( :block_name, arg, - :kind_of => String, + :kind_of => String ) end end diff --git a/lib/chef/resource/scm.rb b/lib/chef/resource/scm.rb index 4ba31cd31b..1e8c71e59d 100644 --- a/lib/chef/resource/scm.rb +++ b/lib/chef/resource/scm.rb @@ -45,7 +45,7 @@ class Chef set_or_return( :destination, arg, - :kind_of => String, + :kind_of => String ) end @@ -53,7 +53,7 @@ class Chef set_or_return( :repository, arg, - :kind_of => String, + :kind_of => String ) end @@ -61,7 +61,7 @@ class Chef set_or_return( :revision, arg, - :kind_of => String, + :kind_of => String ) end @@ -69,7 +69,7 @@ class Chef set_or_return( :user, arg, - :kind_of => [String, Integer], + :kind_of => [String, Integer] ) end @@ -77,7 +77,7 @@ class Chef set_or_return( :group, arg, - :kind_of => [String, Integer], + :kind_of => [String, Integer] ) end @@ -85,7 +85,7 @@ class Chef set_or_return( :svn_username, arg, - :kind_of => String, + :kind_of => String ) end @@ -93,7 +93,7 @@ class Chef set_or_return( :svn_password, arg, - :kind_of => String, + :kind_of => String ) end @@ -102,7 +102,7 @@ class Chef set_or_return( :svn_arguments, arg, - :kind_of => String, + :kind_of => String ) end @@ -119,7 +119,7 @@ class Chef set_or_return( :depth, arg, - :kind_of => Integer, + :kind_of => Integer ) end @@ -127,7 +127,7 @@ class Chef set_or_return( :enable_submodules, arg, - :kind_of => [TrueClass, FalseClass], + :kind_of => [TrueClass, FalseClass] ) end @@ -135,7 +135,7 @@ class Chef set_or_return( :enable_checkout, arg, - :kind_of => [TrueClass, FalseClass], + :kind_of => [TrueClass, FalseClass] ) end @@ -143,7 +143,7 @@ class Chef set_or_return( :remote, arg, - :kind_of => String, + :kind_of => String ) end @@ -151,7 +151,7 @@ class Chef set_or_return( :ssh_wrapper, arg, - :kind_of => String, + :kind_of => String ) end @@ -159,7 +159,7 @@ class Chef set_or_return( :timeout, arg, - :kind_of => Integer, + :kind_of => Integer ) end @@ -167,7 +167,7 @@ class Chef set_or_return( :checkout_branch, arg, - :kind_of => String, + :kind_of => String ) end @@ -175,7 +175,7 @@ class Chef set_or_return( :environment, arg, - :kind_of => [ Hash ], + :kind_of => [ Hash ] ) end diff --git a/lib/chef/resource/script.rb b/lib/chef/resource/script.rb index d80effbf67..5173a76542 100644 --- a/lib/chef/resource/script.rb +++ b/lib/chef/resource/script.rb @@ -49,7 +49,7 @@ class Chef set_or_return( :code, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -57,7 +57,7 @@ class Chef set_or_return( :interpreter, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -65,7 +65,7 @@ class Chef set_or_return( :flags, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb index 5288e1b2be..849afebad0 100644 --- a/lib/chef/resource/service.rb +++ b/lib/chef/resource/service.rb @@ -52,7 +52,7 @@ class Chef set_or_return( :service_name, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -61,7 +61,7 @@ class Chef set_or_return( :pattern, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -70,7 +70,7 @@ class Chef set_or_return( :start_command, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -79,7 +79,7 @@ class Chef set_or_return( :stop_command, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -88,7 +88,7 @@ class Chef set_or_return( :status_command, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -97,7 +97,7 @@ class Chef set_or_return( :restart_command, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -105,7 +105,7 @@ class Chef set_or_return( :reload_command, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -118,7 +118,7 @@ class Chef set_or_return( :init_command, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -127,7 +127,7 @@ class Chef set_or_return( :enabled, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -136,7 +136,7 @@ class Chef set_or_return( :running, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -154,7 +154,7 @@ class Chef set_or_return( :priority, arg, - :kind_of => [ Integer, String, Hash ], + :kind_of => [ Integer, String, Hash ] ) end @@ -163,7 +163,7 @@ class Chef set_or_return( :timeout, arg, - :kind_of => Integer, + :kind_of => Integer ) end @@ -171,7 +171,7 @@ class Chef set_or_return( :parameters, arg, - :kind_of => [ Hash ], + :kind_of => [ Hash ] ) end diff --git a/lib/chef/resource/template.rb b/lib/chef/resource/template.rb index 0b9d86f242..e33af3174b 100644 --- a/lib/chef/resource/template.rb +++ b/lib/chef/resource/template.rb @@ -45,7 +45,7 @@ class Chef set_or_return( :source, file, - :kind_of => [ String, Array ], + :kind_of => [ String, Array ] ) end @@ -53,7 +53,7 @@ class Chef set_or_return( :variables, args, - :kind_of => [ Hash ], + :kind_of => [ Hash ] ) end @@ -61,7 +61,7 @@ class Chef set_or_return( :cookbook, args, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -69,7 +69,7 @@ class Chef set_or_return( :local, args, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end diff --git a/lib/chef/resource/user.rb b/lib/chef/resource/user.rb index 5aa94ae49e..012fa278f1 100644 --- a/lib/chef/resource/user.rb +++ b/lib/chef/resource/user.rb @@ -53,7 +53,7 @@ class Chef set_or_return( :username, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -61,7 +61,7 @@ class Chef set_or_return( :comment, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -69,7 +69,7 @@ class Chef set_or_return( :uid, arg, - :kind_of => [ String, Integer ], + :kind_of => [ String, Integer ] ) end @@ -77,7 +77,7 @@ class Chef set_or_return( :gid, arg, - :kind_of => [ String, Integer ], + :kind_of => [ String, Integer ] ) end @@ -87,7 +87,7 @@ class Chef set_or_return( :home, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -95,7 +95,7 @@ class Chef set_or_return( :shell, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -103,7 +103,7 @@ class Chef set_or_return( :password, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -111,7 +111,7 @@ class Chef set_or_return( :salt, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -119,7 +119,7 @@ class Chef set_or_return( :iterations, arg, - :kind_of => [ Integer ], + :kind_of => [ Integer ] ) end @@ -127,7 +127,7 @@ class Chef set_or_return( :system, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -135,7 +135,7 @@ class Chef set_or_return( :manage_home, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -143,7 +143,7 @@ class Chef set_or_return( :force, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end @@ -151,7 +151,7 @@ class Chef set_or_return( :non_unique, arg, - :kind_of => [ TrueClass, FalseClass ], + :kind_of => [ TrueClass, FalseClass ] ) end diff --git a/lib/chef/resource/windows_script.rb b/lib/chef/resource/windows_script.rb index 44f1d8d652..7c39d9fba0 100644 --- a/lib/chef/resource/windows_script.rb +++ b/lib/chef/resource/windows_script.rb @@ -45,7 +45,7 @@ class Chef result = set_or_return( :architecture, arg, - :kind_of => Symbol, + :kind_of => Symbol ) end diff --git a/lib/chef/resource/windows_service.rb b/lib/chef/resource/windows_service.rb index 635edbb389..405f7f6dbe 100644 --- a/lib/chef/resource/windows_service.rb +++ b/lib/chef/resource/windows_service.rb @@ -47,7 +47,7 @@ class Chef set_or_return( :startup_type, arg, - :equal_to => [ :automatic, :manual, :disabled ], + :equal_to => [ :automatic, :manual, :disabled ] ) end @@ -55,7 +55,7 @@ class Chef set_or_return( :run_as_user, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end @@ -63,7 +63,7 @@ class Chef set_or_return( :run_as_password, arg, - :kind_of => [ String ], + :kind_of => [ String ] ) end end diff --git a/lib/chef/role.rb b/lib/chef/role.rb index bac054143e..ed22bc87e4 100644 --- a/lib/chef/role.rb +++ b/lib/chef/role.rb @@ -57,7 +57,7 @@ class Chef set_or_return( :name, arg, - :regex => /^[\-[:alnum:]_]+$/, + :regex => /^[\-[:alnum:]_]+$/ ) end @@ -65,7 +65,7 @@ class Chef set_or_return( :description, arg, - :kind_of => String, + :kind_of => String ) end @@ -120,7 +120,7 @@ class Chef set_or_return( :default_attributes, arg, - :kind_of => Hash, + :kind_of => Hash ) end @@ -128,7 +128,7 @@ class Chef set_or_return( :override_attributes, arg, - :kind_of => Hash, + :kind_of => Hash ) end diff --git a/spec/functional/resource/execute_spec.rb b/spec/functional/resource/execute_spec.rb index 72cb53e78e..c5978da519 100644 --- a/spec/functional/resource/execute_spec.rb +++ b/spec/functional/resource/execute_spec.rb @@ -89,7 +89,7 @@ describe Chef::Resource::Execute do resource.environment({ "SAWS_SECRET" => "supersecret", "SAWS_KEY" => "qwerty", - },) + }) end it "guard inherits :environment value from resource and runs" do diff --git a/spec/functional/resource/package_spec.rb b/spec/functional/resource/package_spec.rb index 1ab247a154..6dc55f7f01 100644 --- a/spec/functional/resource/package_spec.rb +++ b/spec/functional/resource/package_spec.rb @@ -54,7 +54,7 @@ module AptServer :DocumentRoot => apt_data_dir + "/var/www/apt", # Make WEBrick quiet, comment out for debug. :Logger => Logger.new(StringIO.new), - :AccessLog => [ StringIO.new, WEBrick::AccessLog::COMMON_LOG_FORMAT ], + :AccessLog => [ StringIO.new, WEBrick::AccessLog::COMMON_LOG_FORMAT ] ) end diff --git a/spec/functional/resource/windows_service_spec.rb b/spec/functional/resource/windows_service_spec.rb index 9353e92c24..b4af1e9e6a 100644 --- a/spec/functional/resource/windows_service_spec.rb +++ b/spec/functional/resource/windows_service_spec.rb @@ -50,7 +50,7 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_ service_display_name: "windows_service spec #{id}}", service_description: "Test service for running the windows_service functional spec.", service_file_path: global_service_file_path, - }, ) + } ) } let(:manager) { diff --git a/spec/integration/knife/deps_spec.rb b/spec/integration/knife/deps_spec.rb index 358635d0de..de0872d39c 100644 --- a/spec/integration/knife/deps_spec.rb +++ b/spec/integration/knife/deps_spec.rb @@ -218,13 +218,13 @@ depends "self"' it "knife deps prints each once" do knife("deps /cookbooks/foo /cookbooks/self").should_succeed( stdout: "/cookbooks/baz\n/cookbooks/bar\n/cookbooks/foo\n/cookbooks/self\n", - stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n", + stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n" ) end it "knife deps --tree prints each once" do knife("deps --tree /cookbooks/foo /cookbooks/self").should_succeed( stdout: "/cookbooks/foo\n /cookbooks/bar\n /cookbooks/baz\n /cookbooks/foo\n/cookbooks/self\n", - stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n", + stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n" ) end end @@ -258,42 +258,42 @@ EOM knife("deps /blah").should_fail( :exit_code => 2, :stdout => "/blah\n", - :stderr => "ERROR: /blah: No such file or directory\n", + :stderr => "ERROR: /blah: No such file or directory\n" ) end it "knife deps /roles/x.json reports an error" do knife("deps /roles/x.json").should_fail( :exit_code => 2, :stdout => "/roles/x.json\n", - :stderr => "ERROR: /roles/x.json: No such file or directory\n", + :stderr => "ERROR: /roles/x.json: No such file or directory\n" ) end it "knife deps /nodes/x.json reports an error" do knife("deps /nodes/x.json").should_fail( :exit_code => 2, :stdout => "/nodes/x.json\n", - :stderr => "ERROR: /nodes/x.json: No such file or directory\n", + :stderr => "ERROR: /nodes/x.json: No such file or directory\n" ) end it "knife deps /environments/x.json reports an error" do knife("deps /environments/x.json").should_fail( :exit_code => 2, :stdout => "/environments/x.json\n", - :stderr => "ERROR: /environments/x.json: No such file or directory\n", + :stderr => "ERROR: /environments/x.json: No such file or directory\n" ) end it "knife deps /cookbooks/x reports an error" do knife("deps /cookbooks/x").should_fail( :exit_code => 2, :stdout => "/cookbooks/x\n", - :stderr => "ERROR: /cookbooks/x: No such file or directory\n", + :stderr => "ERROR: /cookbooks/x: No such file or directory\n" ) end it "knife deps /data_bags/bag/item reports an error" do knife("deps /data_bags/bag/item").should_fail( :exit_code => 2, :stdout => "/data_bags/bag/item\n", - :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n", + :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n" ) end end @@ -305,7 +305,7 @@ EOM knife("deps /roles/starring.json").should_fail( :exit_code => 2, :stdout => "/cookbooks/quiche\n/roles/starring.json\n", - :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n", + :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n" ) end end @@ -317,7 +317,7 @@ EOM knife("deps /nodes/mort.json").should_fail( :exit_code => 2, :stdout => "/environments/desert.json\n/nodes/mort.json\n", - :stderr => "ERROR: /environments/desert.json: No such file or directory\n", + :stderr => "ERROR: /environments/desert.json: No such file or directory\n" ) end end @@ -329,7 +329,7 @@ EOM knife("deps /roles/starring.json").should_fail( :exit_code => 2, :stdout => "/roles/minor.json\n/roles/starring.json\n", - :stderr => "ERROR: /roles/minor.json: No such file or directory\n", + :stderr => "ERROR: /roles/minor.json: No such file or directory\n" ) end end @@ -343,7 +343,7 @@ EOM knife("deps /roles").should_fail( :exit_code => 2, :stderr => "ERROR: /roles: No such file or directory\n", - :stdout => "/roles\n", + :stdout => "/roles\n" ) end end @@ -357,7 +357,7 @@ EOM before { file "cookbooks/blah/metadata.rb", 'name "blah"' } it "knife deps on a cookbook file shows no dependencies" do knife("deps /cookbooks/blah/metadata.rb").should_succeed( - "/cookbooks/blah/metadata.rb\n", + "/cookbooks/blah/metadata.rb\n" ) end end @@ -596,42 +596,42 @@ EOM knife("deps --remote /blah").should_fail( :exit_code => 2, :stdout => "/blah\n", - :stderr => "ERROR: /blah: No such file or directory\n", + :stderr => "ERROR: /blah: No such file or directory\n" ) end it "knife deps /roles/x.json reports an error" do knife("deps --remote /roles/x.json").should_fail( :exit_code => 2, :stdout => "/roles/x.json\n", - :stderr => "ERROR: /roles/x.json: No such file or directory\n", + :stderr => "ERROR: /roles/x.json: No such file or directory\n" ) end it "knife deps /nodes/x.json reports an error" do knife("deps --remote /nodes/x.json").should_fail( :exit_code => 2, :stdout => "/nodes/x.json\n", - :stderr => "ERROR: /nodes/x.json: No such file or directory\n", + :stderr => "ERROR: /nodes/x.json: No such file or directory\n" ) end it "knife deps /environments/x.json reports an error" do knife("deps --remote /environments/x.json").should_fail( :exit_code => 2, :stdout => "/environments/x.json\n", - :stderr => "ERROR: /environments/x.json: No such file or directory\n", + :stderr => "ERROR: /environments/x.json: No such file or directory\n" ) end it "knife deps /cookbooks/x reports an error" do knife("deps --remote /cookbooks/x").should_fail( :exit_code => 2, :stdout => "/cookbooks/x\n", - :stderr => "ERROR: /cookbooks/x: No such file or directory\n", + :stderr => "ERROR: /cookbooks/x: No such file or directory\n" ) end it "knife deps /data_bags/bag/item reports an error" do knife("deps --remote /data_bags/bag/item").should_fail( :exit_code => 2, :stdout => "/data_bags/bag/item\n", - :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n", + :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n" ) end end @@ -643,7 +643,7 @@ EOM knife("deps --remote /roles/starring.json").should_fail( :exit_code => 2, :stdout => "/cookbooks/quiche\n/roles/starring.json\n", - :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n", + :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n" ) end end @@ -655,7 +655,7 @@ EOM knife("deps --remote /nodes/mort.json").should_fail( :exit_code => 2, :stdout => "/environments/desert.json\n/nodes/mort.json\n", - :stderr => "ERROR: /environments/desert.json: No such file or directory\n", + :stderr => "ERROR: /environments/desert.json: No such file or directory\n" ) end end @@ -667,7 +667,7 @@ EOM knife("deps --remote /roles/starring.json").should_fail( :exit_code => 2, :stdout => "/roles/minor.json\n/roles/starring.json\n", - :stderr => "ERROR: /roles/minor.json: No such file or directory\n", + :stderr => "ERROR: /roles/minor.json: No such file or directory\n" ) end end @@ -693,7 +693,7 @@ EOM end it "knife deps on a cookbook file shows no dependencies" do knife("deps --remote /cookbooks/blah/metadata.rb").should_succeed( - "/cookbooks/blah/metadata.rb\n", + "/cookbooks/blah/metadata.rb\n" ) end end diff --git a/spec/integration/knife/upload_spec.rb b/spec/integration/knife/upload_spec.rb index 1d32fe1e49..739dfa44d1 100644 --- a/spec/integration/knife/upload_spec.rb +++ b/spec/integration/knife/upload_spec.rb @@ -162,7 +162,7 @@ EOM it "should warn", :chef_lt_13_only do knife("upload /cookbooks").should_succeed( stdout: "Updated /cookbooks/x\n", - stderr: "WARN: Ignoring self-dependency in cookbook x, please remove it (in the future this will be fatal).\n", + stderr: "WARN: Ignoring self-dependency in cookbook x, please remove it (in the future this will be fatal).\n" ) knife("diff --name-status /").should_succeed "" end diff --git a/spec/support/shared/functional/securable_resource.rb b/spec/support/shared/functional/securable_resource.rb index 20be3c5c2f..dd8a0216bc 100644 --- a/spec/support/shared/functional/securable_resource.rb +++ b/spec/support/shared/functional/securable_resource.rb @@ -409,7 +409,7 @@ shared_examples_for "a securable resource without existing target" do expect(explicit_aces).to eq( allowed_acl(SID.Everyone, expected_read_perms) + - allowed_acl(SID.Guest, expected_modify_perms), + allowed_acl(SID.Guest, expected_modify_perms) ) end @@ -420,7 +420,7 @@ shared_examples_for "a securable resource without existing target" do expect(explicit_aces).to eq( denied_acl(SID.Guest, expected_modify_perms) + - allowed_acl(SID.Everyone, expected_read_perms), + allowed_acl(SID.Everyone, expected_read_perms) ) end @@ -431,7 +431,7 @@ shared_examples_for "a securable resource without existing target" do expect(explicit_aces).to eq( denied_acl(SID.Guest, expected_modify_perms) + - allowed_acl(SID.Everyone, expected_read_perms), + allowed_acl(SID.Everyone, expected_read_perms) ) end diff --git a/spec/support/shared/integration/app_server_support.rb b/spec/support/shared/integration/app_server_support.rb index 8327caf1c9..9bc48dbd93 100644 --- a/spec/support/shared/integration/app_server_support.rb +++ b/spec/support/shared/integration/app_server_support.rb @@ -27,7 +27,7 @@ module AppServerSupport Rack::Handler::WEBrick.run(app, :Port => 9018, :AccessLog => [], - :Logger => WEBrick::Log.new(StringIO.new, 7), + :Logger => WEBrick::Log.new(StringIO.new, 7) ) do |found_server| server = found_server end diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb index 9383e8e856..ff6f460c13 100644 --- a/spec/unit/application/client_spec.rb +++ b/spec/unit/application/client_spec.rb @@ -85,7 +85,7 @@ describe Chef::Application::Client, "reconfigure" do "Unforked chef-client interval runs are disabled in Chef 12. Configuration settings: interval = 600 seconds -Enable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options.", +Enable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." ) app.reconfigure end diff --git a/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb index af504b621c..4361a2cd33 100644 --- a/spec/unit/application/solo_spec.rb +++ b/spec/unit/application/solo_spec.rb @@ -70,7 +70,7 @@ describe Chef::Application::Solo do "Unforked chef-client interval runs are disabled in Chef 12. Configuration settings: interval = 600 seconds -Enable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options.", +Enable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." ) app.reconfigure end diff --git a/spec/unit/chef_fs/config_spec.rb b/spec/unit/chef_fs/config_spec.rb index 2f65b6db94..5fc5ad57ac 100644 --- a/spec/unit/chef_fs/config_spec.rb +++ b/spec/unit/chef_fs/config_spec.rb @@ -68,7 +68,7 @@ describe Chef::ChefFS::Config do role_path: "/base_path/roles", user_path: "/base_path/users", policy_path: "/base_path/policies", - },) + }) end let(:chef_fs_config) { Chef::ChefFS::Config.new(chef_config, Dir.pwd) } diff --git a/spec/unit/chef_fs/file_system_spec.rb b/spec/unit/chef_fs/file_system_spec.rb index 71befc426c..429e039dda 100644 --- a/spec/unit/chef_fs/file_system_spec.rb +++ b/spec/unit/chef_fs/file_system_spec.rb @@ -68,7 +68,7 @@ describe Chef::ChefFS::FileSystem do }, :x => "", :y => {}, - },) + }) } context "list" do it "/**" do diff --git a/spec/unit/cookbook/metadata_spec.rb b/spec/unit/cookbook/metadata_spec.rb index 976ab61e38..0107667fcd 100644 --- a/spec/unit/cookbook/metadata_spec.rb +++ b/spec/unit/cookbook/metadata_spec.rb @@ -311,7 +311,7 @@ describe Chef::Cookbook::Metadata do it "strips out self-dependencies", :chef_lt_13_only do metadata.name("foo") expect(Chef::Log).to receive(:warn).with( - "Ignoring self-dependency in cookbook foo, please remove it (in the future this will be fatal).", + "Ignoring self-dependency in cookbook foo, please remove it (in the future this will be fatal)." ) metadata.depends("foo") expect(metadata.dependencies).to eql({}) diff --git a/spec/unit/key_spec.rb b/spec/unit/key_spec.rb index ef8d39bb0d..4af506d227 100644 --- a/spec/unit/key_spec.rb +++ b/spec/unit/key_spec.rb @@ -532,7 +532,7 @@ EOS allow(rest).to receive(:put).with(url, key.to_hash).and_return({ "key" => "key_name", "public_key" => public_key_string, - },) + }) end diff --git a/spec/unit/knife/core/node_editor_spec.rb b/spec/unit/knife/core/node_editor_spec.rb index 6665616027..19af419632 100644 --- a/spec/unit/knife/core/node_editor_spec.rb +++ b/spec/unit/knife/core/node_editor_spec.rb @@ -91,7 +91,7 @@ describe Chef::Knife::NodeEditor do "normal" => { "alpha" => { "bravo" => "hotel2" }, "tags" => [ "xyz" ] }, "policy_name" => "mypolicy", "policy_group" => "prod", - "run_list" => %w{role[drama] recipe[mystery]}, + "run_list" => %w{role[drama] recipe[mystery]} ) end @@ -123,7 +123,7 @@ describe Chef::Knife::NodeEditor do "override" => { "alpha" => { "bravo" => "foxtrot2", "delta" => "golf2" } }, "policy_name" => "mypolicy", "policy_group" => "prod", - "run_list" => %w{role[drama] recipe[mystery]}, + "run_list" => %w{role[drama] recipe[mystery]} ) end @@ -159,7 +159,7 @@ describe Chef::Knife::NodeEditor do "override" => { "alpha" => { "bravo" => "foxtrot2", "delta" => "golf2" } }, "policy_name" => "mypolicy", "policy_group" => "prod", - "run_list" => %w{role[drama] recipe[mystery]}, + "run_list" => %w{role[drama] recipe[mystery]} ) end diff --git a/spec/unit/mixin/params_validate_spec.rb b/spec/unit/mixin/params_validate_spec.rb index 38e3ba742e..dcee123982 100644 --- a/spec/unit/mixin/params_validate_spec.rb +++ b/spec/unit/mixin/params_validate_spec.rb @@ -63,7 +63,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :kind_of => String, }, - }, + } ) }.not_to raise_error @@ -74,7 +74,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :kind_of => Array, }, - }, + } ) }.to raise_error(ArgumentError) end @@ -87,7 +87,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :required => true, }, - }, + } ) }.not_to raise_error @@ -98,7 +98,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :required => true, }, - }, + } ) }.to raise_error(ArgumentError) @@ -109,7 +109,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :required => false, }, - }, + } ) }.not_to raise_error end @@ -122,7 +122,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :respond_to => "validate", }, - }, + } ) }.not_to raise_error @@ -133,7 +133,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :respond_to => "monkey", }, - }, + } ) }.to raise_error(ArgumentError) end @@ -146,7 +146,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :respond_to => %w{validate music}, }, - }, + } ) }.not_to raise_error @@ -157,7 +157,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :respond_to => %w{monkey validate}, }, - }, + } ) }.to raise_error(ArgumentError) end @@ -168,7 +168,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :default => "is the loneliest number", }, - },) + }) expect(arguments[:one]).to eq("is the loneliest number") end @@ -180,7 +180,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :regex => /^is good$/, }, - }, + } ) }.not_to raise_error @@ -191,7 +191,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :regex => /^is bad$/, }, - }, + } ) }.to raise_error(ArgumentError) end @@ -208,7 +208,7 @@ describe Chef::Mixin::ParamsValidate do }, }, }, - }, + } ) }.not_to raise_error @@ -223,7 +223,7 @@ describe Chef::Mixin::ParamsValidate do }, }, }, - }, + } ) }.to raise_error(ArgumentError) end @@ -250,7 +250,7 @@ describe Chef::Mixin::ParamsValidate do :required => false, }, :three => { :default => "neato mosquito" }, - }, + } ) }.not_to raise_error expect(args[:three]).to eq("neato mosquito") @@ -274,7 +274,7 @@ describe Chef::Mixin::ParamsValidate do :required => false, }, :three => { :default => "neato mosquito" }, - }, + } ) }.to raise_error(ArgumentError) end @@ -286,7 +286,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :busted => "check", }, - }, + } ) }.to raise_error(ArgumentError) end @@ -305,7 +305,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :kind_of => [ String, Array ], }, - }, + } ) }.not_to raise_error expect { @@ -315,7 +315,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :kind_of => [ String, Array ], }, - }, + } ) }.not_to raise_error expect { @@ -325,7 +325,7 @@ describe Chef::Mixin::ParamsValidate do :one => { :kind_of => [ String, Array ], }, - }, + } ) }.to raise_error(ArgumentError) end diff --git a/spec/unit/mixin/powershell_out_spec.rb b/spec/unit/mixin/powershell_out_spec.rb index b586be7fdc..eae5b033f1 100644 --- a/spec/unit/mixin/powershell_out_spec.rb +++ b/spec/unit/mixin/powershell_out_spec.rb @@ -31,7 +31,7 @@ describe Chef::Mixin::PowershellOut do ret = double("Mixlib::ShellOut") expect(object).to receive(:shell_out).with( "powershell.exe #{flags} -Command \"Get-Process\"", - {}, + {} ).and_return(ret) expect(object.powershell_out("Get-Process")).to eql(ret) end @@ -40,7 +40,7 @@ describe Chef::Mixin::PowershellOut do ret = double("Mixlib::ShellOut") expect(object).to receive(:shell_out).with( "powershell.exe #{flags} -Command \"Get-Process\"", - timeout: 600, + timeout: 600 ).and_return(ret) expect(object.powershell_out("Get-Process", timeout: 600)).to eql(ret) end @@ -51,7 +51,7 @@ describe Chef::Mixin::PowershellOut do mixlib_shellout = double("Mixlib::ShellOut") expect(object).to receive(:shell_out).with( "powershell.exe #{flags} -Command \"Get-Process\"", - {}, + {} ).and_return(mixlib_shellout) expect(mixlib_shellout).to receive(:error!) expect(object.powershell_out!("Get-Process")).to eql(mixlib_shellout) @@ -61,7 +61,7 @@ describe Chef::Mixin::PowershellOut do mixlib_shellout = double("Mixlib::ShellOut") expect(object).to receive(:shell_out).with( "powershell.exe #{flags} -Command \"Get-Process\"", - timeout: 600, + timeout: 600 ).and_return(mixlib_shellout) expect(mixlib_shellout).to receive(:error!) expect(object.powershell_out!("Get-Process", timeout: 600)).to eql(mixlib_shellout) diff --git a/spec/unit/mixin/shell_out_spec.rb b/spec/unit/mixin/shell_out_spec.rb index e2e282da24..e9fabfd0a7 100644 --- a/spec/unit/mixin/shell_out_spec.rb +++ b/spec/unit/mixin/shell_out_spec.rb @@ -144,7 +144,7 @@ describe Chef::Mixin::ShellOut do "LANG" => Chef::Config[:internal_locale], "LANGUAGE" => Chef::Config[:internal_locale], }, - },).and_return(true) + }).and_return(true) shell_out_obj.shell_out(cmd, options) end @@ -157,7 +157,7 @@ describe Chef::Mixin::ShellOut do "LANG" => Chef::Config[:internal_locale], "LANGUAGE" => Chef::Config[:internal_locale], }, - },).and_return(true) + }).and_return(true) shell_out_obj.shell_out(cmd, options) expect(options[:environment].has_key?("LC_ALL")).to be false end @@ -185,7 +185,7 @@ describe Chef::Mixin::ShellOut do "LANG" => Chef::Config[:internal_locale], "LANGUAGE" => Chef::Config[:internal_locale], }, - },).and_return(true) + }).and_return(true) shell_out_obj.shell_out(cmd, options) end @@ -198,7 +198,7 @@ describe Chef::Mixin::ShellOut do "LANG" => Chef::Config[:internal_locale], "LANGUAGE" => Chef::Config[:internal_locale], }, - },).and_return(true) + }).and_return(true) shell_out_obj.shell_out(cmd, options) expect(options[:env].has_key?("LC_ALL")).to be false end @@ -214,7 +214,7 @@ describe Chef::Mixin::ShellOut do "LANG" => Chef::Config[:internal_locale], "LANGUAGE" => Chef::Config[:internal_locale], }, - },).and_return(true) + }).and_return(true) shell_out_obj.shell_out(cmd, options) end end @@ -228,7 +228,7 @@ describe Chef::Mixin::ShellOut do "LANG" => Chef::Config[:internal_locale], "LANGUAGE" => Chef::Config[:internal_locale], }, - },).and_return(true) + }).and_return(true) shell_out_obj.shell_out(cmd) end end diff --git a/spec/unit/node/attribute_spec.rb b/spec/unit/node/attribute_spec.rb index 024599bcee..f28c2598e3 100644 --- a/spec/unit/node/attribute_spec.rb +++ b/spec/unit/node/attribute_spec.rb @@ -558,7 +558,7 @@ describe Chef::Node::Attribute do "one" => { "six" => "seven" }, "snack" => "cookies", }, - {}, + {} ) end @@ -606,7 +606,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -644,7 +644,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -680,7 +680,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -716,7 +716,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -760,7 +760,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) @empty = Chef::Node::Attribute.new({}, {}, {}, {}) end @@ -794,7 +794,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -851,7 +851,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -896,7 +896,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -937,7 +937,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -973,7 +973,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) end @@ -1003,7 +1003,7 @@ describe Chef::Node::Attribute do %w{one six}, %w{snack cookies}, ["snakes", "on a plane"], - ], + ] ) end end @@ -1023,7 +1023,7 @@ describe Chef::Node::Attribute do "one" => "six", "snack" => "cookies", }, - {}, + {} ) @empty = Chef::Node::Attribute.new({}, {}, {}, {}) diff --git a/spec/unit/node_spec.rb b/spec/unit/node_spec.rb index afb491f13a..29f386aa7d 100644 --- a/spec/unit/node_spec.rb +++ b/spec/unit/node_spec.rb @@ -615,7 +615,7 @@ describe Chef::Node do expect( node["mysql"]["server"] ).to eql({ "data_dir" => "/my_raid_volume/lib/mysql", - },) + }) end it "removes all values from the precedence level when setting" do @@ -631,7 +631,7 @@ describe Chef::Node do expect( node["mysql"]["server"]["data_dir"] ).to eql("/my_raid_volume/lib/mysql") expect( node["mysql"]["server"] ).to eql({ "data_dir" => "/my_raid_volume/lib/mysql", - },) + }) end it "higher precedence levels are not removed" do @@ -649,7 +649,7 @@ describe Chef::Node do expect( node["mysql"]["server"] ).to eql({ "service_name" => "fancypants-sql", "data_dir" => "/my_raid_volume/lib/mysql", - },) + }) end it "will autovivify" do @@ -674,7 +674,7 @@ describe Chef::Node do expect( node["mysql"]["server"] ).to eql({ "service_name" => "fancypants-sql", "data_dir" => "/my_raid_volume/lib/mysql", - },) + }) end it "when overwriting a non-hash/array" do @@ -693,7 +693,7 @@ describe Chef::Node do } expect( node["mysql"]["server"] ).to eql({ "data_dir" => "/my_raid_volume/lib/mysql", - },) + }) end end diff --git a/spec/unit/platform_spec.rb b/spec/unit/platform_spec.rb index 264cadee81..0559229d62 100644 --- a/spec/unit/platform_spec.rb +++ b/spec/unit/platform_spec.rb @@ -183,18 +183,18 @@ describe Chef::Platform do :platform => :darwin, :version => "9.2.2", :resource => :file, - :provider => "masterful", + :provider => "masterful" ) expect(Chef::Platform.platforms[:darwin]["9.2.2"][:file]).to eql("masterful") Chef::Platform.set( :platform => :darwin, :resource => :file, - :provider => "masterful", + :provider => "masterful" ) expect(Chef::Platform.platforms[:darwin][:default][:file]).to eql("masterful") Chef::Platform.set( :resource => :file, - :provider => "masterful", + :provider => "masterful" ) expect(Chef::Platform.platforms[:default][:file]).to eql("masterful") @@ -202,13 +202,13 @@ describe Chef::Platform do :platform => :hero, :version => "9.2.2", :resource => :file, - :provider => "masterful", + :provider => "masterful" ) expect(Chef::Platform.platforms[:hero]["9.2.2"][:file]).to eql("masterful") Chef::Platform.set( :resource => :file, - :provider => "masterful", + :provider => "masterful" ) expect(Chef::Platform.platforms[:default][:file]).to eql("masterful") @@ -216,7 +216,7 @@ describe Chef::Platform do Chef::Platform.set( :resource => :file, - :provider => "masterful", + :provider => "masterful" ) expect(Chef::Platform.platforms[:default][:file]).to eql("masterful") @@ -230,7 +230,7 @@ describe Chef::Platform do Chef::Platform.set( :resource => :file, :platform => :default, - :provider => "new school", + :provider => "new school" ) expect(Chef::Platform.platforms[:default][:file]).to eql("new school") expect(Chef::Platform.platforms[:default][:cat]).to eql("nice") diff --git a/spec/unit/provider/group_spec.rb b/spec/unit/provider/group_spec.rb index f056114d89..1d354ea32e 100644 --- a/spec/unit/provider/group_spec.rb +++ b/spec/unit/provider/group_spec.rb @@ -39,7 +39,7 @@ describe Chef::Provider::User do @pw_group = double("Struct::Group", :name => "wheel", :gid => 20, - :mem => %w{root aj}, + :mem => %w{root aj} ) allow(Etc).to receive(:getgrnam).with("wheel").and_return(@pw_group) end diff --git a/spec/unit/provider/osx_profile_spec.rb b/spec/unit/provider/osx_profile_spec.rb index 6c997fbb4c..e307bc2c22 100644 --- a/spec/unit/provider/osx_profile_spec.rb +++ b/spec/unit/provider/osx_profile_spec.rb @@ -131,7 +131,7 @@ describe Chef::Provider::OsxProfile do new_resource.profile test_profile provider.load_current_resource expect( - provider.instance_variable_get(:@new_profile_identifier), + provider.instance_variable_get(:@new_profile_identifier) ).to eql(test_profile["PayloadIdentifier"]) end @@ -226,7 +226,7 @@ describe Chef::Provider::OsxProfile do new_resource.profile_name "com.testprofile.screensaver" new_resource.action(:remove) provider.load_current_resource - expect(provider.instance_variable_get(:@new_profile_identifier), + expect(provider.instance_variable_get(:@new_profile_identifier) ).to eql(new_resource.profile_name) end @@ -234,7 +234,7 @@ describe Chef::Provider::OsxProfile do new_resource.identifier "com.testprofile.screensaver" new_resource.action(:remove) provider.load_current_resource - expect(provider.instance_variable_get(:@new_profile_identifier), + expect(provider.instance_variable_get(:@new_profile_identifier) ).to eql(new_resource.identifier) end diff --git a/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb index f87c1e86bc..b5f0646b79 100644 --- a/spec/unit/provider/package/apt_spec.rb +++ b/spec/unit/provider/package/apt_spec.rb @@ -52,7 +52,7 @@ irssi: it "should create a current resource with the name of the new_resource" do expect(@provider).to receive(:shell_out!).with( "apt-cache policy #{@new_resource.package_name}", - :timeout => @timeout, + :timeout => @timeout ).and_return(@shell_out) @provider.load_current_resource @@ -95,7 +95,7 @@ libmysqlclient15-dev: virtual_package = double(:stdout => virtual_package_out, :exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache policy libmysqlclient15-dev", - :timeout => @timeout, + :timeout => @timeout ).and_return(virtual_package) showpkg_out = <<-SHOWPKG_STDOUT Package: libmysqlclient15-dev @@ -118,7 +118,7 @@ libmysqlclient-dev 5.1.41-3ubuntu12 showpkg = double(:stdout => showpkg_out, :exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache showpkg libmysqlclient15-dev", - :timeout => @timeout, + :timeout => @timeout ).and_return(showpkg) real_package_out = <<-RPKG_STDOUT libmysqlclient-dev: @@ -136,7 +136,7 @@ libmysqlclient-dev: real_package = double(:stdout => real_package_out, :exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache policy libmysqlclient-dev", - :timeout => @timeout, + :timeout => @timeout ).and_return(real_package) @provider.load_current_resource end @@ -152,7 +152,7 @@ mp3-decoder: virtual_package = double(:stdout => virtual_package_out, :exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache policy mp3-decoder", - :timeout => @timeout, + :timeout => @timeout ).and_return(virtual_package) showpkg_out = <<-SHOWPKG_STDOUT Package: mp3-decoder @@ -178,7 +178,7 @@ mpg123 1.12.1-0ubuntu1 showpkg = double(:stdout => showpkg_out, :exitstatus => 0) expect(@provider).to receive(:shell_out!).with( "apt-cache showpkg mp3-decoder", - :timeout => @timeout, + :timeout => @timeout ).and_return(showpkg) expect { @provider.load_current_resource }.to raise_error(Chef::Exceptions::Package) end @@ -191,7 +191,7 @@ mpg123 1.12.1-0ubuntu1 allow(@new_resource).to receive(:provider).and_return(nil) expect(@provider).to receive(:shell_out!).with( "apt-cache -o APT::Default-Release=lenny-backports policy irssi", - :timeout => @timeout, + :timeout => @timeout ).and_return(@shell_out) @provider.load_current_resource end @@ -200,7 +200,7 @@ mpg123 1.12.1-0ubuntu1 @new_resource.source "pluto" expect(@provider).to receive(:shell_out!).with( "apt-cache policy #{@new_resource.package_name}", - :timeout => @timeout, + :timeout => @timeout ).and_return(@shell_out) @provider.load_current_resource @provider.define_resource_requirements @@ -220,7 +220,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!). with( "apt-get -q -y install irssi=0.8.12-7", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @provider.install_package("irssi", "0.8.12-7") end @@ -229,7 +229,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y --force-yes install irssi=0.8.12-7", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @new_resource.options("--force-yes") @provider.install_package("irssi", "0.8.12-7") @@ -245,7 +245,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y -o APT::Default-Release=lenny-backports install irssi=0.8.12-7", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @provider.install_package("irssi", "0.8.12-7") @@ -266,7 +266,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y remove irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @provider.remove_package("irssi", "0.8.12-7") end @@ -275,7 +275,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y --force-yes remove irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @new_resource.options("--force-yes") @@ -289,7 +289,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y purge irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @provider.purge_package("irssi", "0.8.12-7") end @@ -298,7 +298,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y --force-yes purge irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @new_resource.options("--force-yes") @@ -317,7 +317,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "debconf-set-selections /tmp/irssi-0.8.12-7.seed", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @provider.preseed_package(file) @@ -327,7 +327,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "debconf-set-selections /tmp/irssi-0.8.12-7.seed", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) file = @provider.get_preseed_file("irssi", "0.8.12-7") @provider.preseed_package(file) @@ -348,7 +348,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "dpkg-reconfigure irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @provider.reconfig_package("irssi", "0.8.12-7") end @@ -360,7 +360,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y install libmysqlclient-dev", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @provider.install_package("libmysqlclient-dev", "not_a_real_version") end @@ -374,7 +374,7 @@ mpg123 1.12.1-0ubuntu1 expect(@provider).to receive(:shell_out!).with( "apt-get -q -y install libmysqlclient-dev irssi=0.8.12-7", :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil }, - :timeout => @timeout, + :timeout => @timeout ) @provider.install_package(["libmysqlclient-dev", "irssi"], ["not_a_real_version", "0.8.12-7"]) end diff --git a/spec/unit/provider/package/chocolatey_spec.rb b/spec/unit/provider/package/chocolatey_spec.rb index 37b3ef8ccb..a347aa7ebd 100644 --- a/spec/unit/provider/package/chocolatey_spec.rb +++ b/spec/unit/provider/package/chocolatey_spec.rb @@ -132,7 +132,7 @@ munin-node|1.6.1.20130823 it "should load and downcase names in the installed_packages hash" do provider.load_current_resource expect(provider.send(:installed_packages)).to eql( - { "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.0" }, + { "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.0" } ) end @@ -140,7 +140,7 @@ munin-node|1.6.1.20130823 allow_remote_list(["git"]) provider.load_current_resource expect(provider.send(:available_packages)).to eql( - { "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.1", "git" => "2.6.2", "munin-node" => "1.6.1.20130823" }, + { "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.1", "git" => "2.6.2", "munin-node" => "1.6.1.20130823" } ) end diff --git a/spec/unit/provider/package/dpkg_spec.rb b/spec/unit/provider/package/dpkg_spec.rb index 0d651b238a..613f7a326e 100644 --- a/spec/unit/provider/package/dpkg_spec.rb +++ b/spec/unit/provider/package/dpkg_spec.rb @@ -199,7 +199,7 @@ Section: ruby it "and we should raise if we get any other exit codes from dpkg -s" do dpkg_s_status = double( - exitstatus: 3, stderr: "i am very, very angry with you. i'm very, very cross. go to your room.", stdout: "", + exitstatus: 3, stderr: "i am very, very angry with you. i'm very, very cross. go to your room.", stdout: "" ) expect(provider).to receive(:shell_out!).with("dpkg -s #{package}", returns: [0, 1], timeout: 900).and_raise(Mixlib::ShellOut::ShellCommandFailed) expect { provider.load_current_resource }.to raise_error(Mixlib::ShellOut::ShellCommandFailed) diff --git a/spec/unit/provider/package/easy_install_spec.rb b/spec/unit/provider/package/easy_install_spec.rb index 681365b98b..79a5889f9f 100644 --- a/spec/unit/provider/package/easy_install_spec.rb +++ b/spec/unit/provider/package/easy_install_spec.rb @@ -63,14 +63,14 @@ describe Chef::Provider::Package::EasyInstall do it "should run easy_install with the package name and version" do expect(@provider).to receive(:run_command).with({ :command => "easy_install \"boto==1.8d\"", - },) + }) @provider.install_package("boto", "1.8d") end it "should run easy_install with the package name and version and specified options" do expect(@provider).to receive(:run_command).with({ :command => "easy_install --always-unzip \"boto==1.8d\"", - },) + }) allow(@new_resource).to receive(:options).and_return("--always-unzip") @provider.install_package("boto", "1.8d") end @@ -78,21 +78,21 @@ describe Chef::Provider::Package::EasyInstall do it "should run easy_install with the package name and version" do expect(@provider).to receive(:run_command).with({ :command => "easy_install \"boto==1.8d\"", - },) + }) @provider.upgrade_package("boto", "1.8d") end it "should run easy_install -m with the package name and version" do expect(@provider).to receive(:run_command).with({ :command => "easy_install -m boto", - },) + }) @provider.remove_package("boto", "1.8d") end it "should run easy_install -m with the package name and version and specified options" do expect(@provider).to receive(:run_command).with({ :command => "easy_install -x -m boto", - },) + }) allow(@new_resource).to receive(:options).and_return("-x") @provider.remove_package("boto", "1.8d") end @@ -100,7 +100,7 @@ describe Chef::Provider::Package::EasyInstall do it "should run easy_install -m with the package name and version" do expect(@provider).to receive(:run_command).with({ :command => "easy_install -m boto", - },) + }) @provider.purge_package("boto", "1.8d") end diff --git a/spec/unit/provider/package/openbsd_spec.rb b/spec/unit/provider/package/openbsd_spec.rb index 48802f48ce..3e1c1c90b6 100644 --- a/spec/unit/provider/package/openbsd_spec.rb +++ b/spec/unit/provider/package/openbsd_spec.rb @@ -56,7 +56,7 @@ describe Chef::Provider::Package::Openbsd do instance_double("shellout", :stdout => "#{name}-#{version}\n")) expect(provider).to receive(:shell_out!).with( "pkg_add -r #{name}-#{version}", - { :env => { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }, + { :env => { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 } ) { OpenStruct.new :status => true } provider.run_action(:install) end @@ -88,7 +88,7 @@ describe Chef::Provider::Package::Openbsd do instance_double("shellout", :stdout => "#{name}-#{version}-#{flavor}\n")) expect(provider).to receive(:shell_out!).with( "pkg_add -r #{name}-#{version}-#{flavor}", - { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }, + { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 } ) { OpenStruct.new :status => true } provider.run_action(:install) end @@ -104,7 +104,7 @@ describe Chef::Provider::Package::Openbsd do new_resource.version("#{version}-#{flavor_b}") expect(provider).to receive(:shell_out!).with( "pkg_add -r #{name}-#{version}-#{flavor_b}", - { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }, + { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 } ) { OpenStruct.new :status => true } provider.run_action(:install) end diff --git a/spec/unit/provider/package/yum_spec.rb b/spec/unit/provider/package/yum_spec.rb index bb071a6559..3fb60ea10d 100644 --- a/spec/unit/provider/package/yum_spec.rb +++ b/spec/unit/provider/package/yum_spec.rb @@ -36,7 +36,7 @@ describe Chef::Provider::Package::Yum do :version_available? => true, :allow_multi_install => [ "kernel" ], :package_repository => "base", - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -133,7 +133,7 @@ describe Chef::Provider::Package::Yum do it "should set the arch if no existing package_name is found and new_package_name+new_arch is available" do @new_resource = Chef::Resource::YumPackage.new("testing.noarch") @yum_cache = double( - "Chef::Provider::Yum::YumCache", + "Chef::Provider::Yum::YumCache" ) allow(@yum_cache).to receive(:installed_version) do |package_name, arch| # nothing installed for package_name/new_package_name @@ -188,7 +188,7 @@ describe Chef::Provider::Package::Yum do it "should not set the arch when an existing package_name is found" do @new_resource = Chef::Resource::YumPackage.new("testing.beta3") @yum_cache = double( - "Chef::Provider::Yum::YumCache", + "Chef::Provider::Yum::YumCache" ) allow(@yum_cache).to receive(:installed_version) do |package_name, arch| # installed for package_name @@ -224,7 +224,7 @@ describe Chef::Provider::Package::Yum do it "should not set the arch when no existing package_name or new_package_name+new_arch is found" do @new_resource = Chef::Resource::YumPackage.new("testing.beta3") @yum_cache = double( - "Chef::Provider::Yum::YumCache", + "Chef::Provider::Yum::YumCache" ) allow(@yum_cache).to receive(:installed_version) do |package_name, arch| # nothing installed for package_name/new_package_name @@ -256,7 +256,7 @@ describe Chef::Provider::Package::Yum do @new_resource = Chef::Resource::YumPackage.new("testing.i386") @new_resource.arch("x86_64") @yum_cache = double( - "Chef::Provider::Yum::YumCache", + "Chef::Provider::Yum::YumCache" ) allow(@yum_cache).to receive(:installed_version) do |package_name, arch| # nothing installed for package_name/new_package_name @@ -320,7 +320,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "2.0.1.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) } @@ -393,7 +393,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "2.0.1.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -415,7 +415,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -438,7 +438,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "2.0.1.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -463,7 +463,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -483,7 +483,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -508,7 +508,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5", :package_available? => false, :version_available? => true, - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -524,7 +524,7 @@ describe Chef::Provider::Package::Yum do @provider.load_current_resource allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1) expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-1.2.4-11.19.el5", + "-d0 -e0 -y install cups-1.2.4-11.19.el5" ) @provider.install_package("cups", "1.2.4-11.19.el5") end @@ -532,7 +532,7 @@ describe Chef::Provider::Package::Yum do it "should run yum localinstall if given a path to an rpm" do allow(@new_resource).to receive(:source).and_return("/tmp/emacs-21.4-20.el5.i386.rpm") expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y localinstall /tmp/emacs-21.4-20.el5.i386.rpm", + "-d0 -e0 -y localinstall /tmp/emacs-21.4-20.el5.i386.rpm" ) @provider.install_package("emacs", "21.4-20.el5") end @@ -543,7 +543,7 @@ describe Chef::Provider::Package::Yum do @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context) expect(@new_resource.source).to eq("/tmp/emacs-21.4-20.el5.i386.rpm") expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y localinstall /tmp/emacs-21.4-20.el5.i386.rpm", + "-d0 -e0 -y localinstall /tmp/emacs-21.4-20.el5.i386.rpm" ) @provider.install_package("/tmp/emacs-21.4-20.el5.i386.rpm", "21.4-20.el5") end @@ -553,7 +553,7 @@ describe Chef::Provider::Package::Yum do allow(@new_resource).to receive(:arch).and_return("i386") allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1) expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-1.2.4-11.19.el5.i386", + "-d0 -e0 -y install cups-1.2.4-11.19.el5.i386" ) @provider.install_package("cups", "1.2.4-11.19.el5") end @@ -564,7 +564,7 @@ describe Chef::Provider::Package::Yum do allow(@new_resource).to receive(:options).and_return("--disablerepo epmd") allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1) expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y --disablerepo epmd install cups-11", + "-d0 -e0 -y --disablerepo epmd install cups-11" ) @provider.install_package(@new_resource.name, @provider.candidate_version) end @@ -578,7 +578,7 @@ describe Chef::Provider::Package::Yum do :candidate_version => "1.2.4-11.18.el5_2.3", :package_available? => true, :version_available? => nil, - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -597,7 +597,7 @@ describe Chef::Provider::Package::Yum do :package_available? => true, :version_available? => true, :allow_multi_install => [ "kernel" ], - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -617,14 +617,14 @@ describe Chef::Provider::Package::Yum do :version_available? => true, :allow_multi_install => [ "cups" ], :package_repository => "base", - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context) @provider.load_current_resource expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-1.2.4-11.15.el5", + "-d0 -e0 -y install cups-1.2.4-11.15.el5" ) @provider.install_package("cups", "1.2.4-11.15.el5") end @@ -641,14 +641,14 @@ describe Chef::Provider::Package::Yum do :version_available? => true, :allow_multi_install => [], :package_repository => "base", - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context) @provider.load_current_resource expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y downgrade cups-1.2.4-11.15.el5", + "-d0 -e0 -y downgrade cups-1.2.4-11.15.el5" ) @provider.install_package("cups", "1.2.4-11.15.el5") end @@ -658,7 +658,7 @@ describe Chef::Provider::Package::Yum do @provider.load_current_resource allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1) expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-1.2.4-11.15.el5", + "-d0 -e0 -y install cups-1.2.4-11.15.el5" ) expect(@yum_cache).to receive(:reload).once @provider.install_package("cups", "1.2.4-11.15.el5") @@ -669,7 +669,7 @@ describe Chef::Provider::Package::Yum do @provider.load_current_resource allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1) expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-1.2.4-11.15.el5", + "-d0 -e0 -y install cups-1.2.4-11.15.el5" ) expect(@yum_cache).not_to receive(:reload) @provider.install_package("cups", "1.2.4-11.15.el5") @@ -682,7 +682,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:candidate_version).and_return("11") allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1) expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-11", + "-d0 -e0 -y install cups-11" ) @provider.upgrade_package(@new_resource.name, @provider.candidate_version) end @@ -693,7 +693,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:candidate_version).and_return("11") allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1) expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-11", + "-d0 -e0 -y install cups-11" ) @provider.upgrade_package(@new_resource.name, @provider.candidate_version) end @@ -708,7 +708,7 @@ describe Chef::Provider::Package::Yum do :package_available? => true, :version_available? => true, :allow_multi_install => [ "kernel" ], - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -724,7 +724,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:candidate_version).and_return("11") expect(@provider).to receive(:upgrade_package).with( "cups", - "11", + "11" ) @provider.run_action(:upgrade) end @@ -743,7 +743,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:candidate_version).and_return("11") expect(@provider).to receive(:upgrade_package).with( "cups", - "11", + "11" ) @provider.run_action(:upgrade) end @@ -761,7 +761,7 @@ describe Chef::Provider::Package::Yum do describe "when removing a package" do it "should run yum remove with the package name" do expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y remove emacs-1.0", + "-d0 -e0 -y remove emacs-1.0" ) @provider.remove_package("emacs", "1.0") end @@ -769,7 +769,7 @@ describe Chef::Provider::Package::Yum do it "should run yum remove with the package name and arch" do allow(@new_resource).to receive(:arch).and_return("x86_64") expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y remove emacs-1.0.x86_64", + "-d0 -e0 -y remove emacs-1.0.x86_64" ) @provider.remove_package("emacs", "1.0") end @@ -778,7 +778,7 @@ describe Chef::Provider::Package::Yum do describe "when purging a package" do it "should run yum remove with the package name" do expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y remove emacs-1.0", + "-d0 -e0 -y remove emacs-1.0" ) @provider.purge_package("emacs", "1.0") end @@ -790,7 +790,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).once.with( "yum -d0 -e0 -y install emacs-1.0", - { :timeout => Chef::Config[:yum_timeout] }, + { :timeout => Chef::Config[:yum_timeout] } ) @provider.yum_command("-d0 -e0 -y install emacs-1.0") end @@ -800,7 +800,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).once.with( "yum -d0 -e0 -y install emacs-1.0", - { :timeout => Chef::Config[:yum_timeout] }, + { :timeout => Chef::Config[:yum_timeout] } ) expect { @provider.yum_command("-d0 -e0 -y install emacs-1.0") }.to raise_error(Chef::Exceptions::Exec) end @@ -811,7 +811,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).once.with( "yum -d0 -e0 -y install emacs-1.0", - { :timeout => Chef::Config[:yum_timeout] }, + { :timeout => Chef::Config[:yum_timeout] } ) # will still raise an exception, can't stub out the subsequent call expect { @provider.yum_command("-d0 -e0 -y install emacs-1.0") }.to raise_error(Chef::Exceptions::Exec) @@ -823,7 +823,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).twice.with( "yum -d0 -e0 -y install emacs-1.0", - { :timeout => Chef::Config[:yum_timeout] }, + { :timeout => Chef::Config[:yum_timeout] } ) # will still raise an exception, can't stub out the subsequent call expect { @provider.yum_command("-d0 -e0 -y install emacs-1.0") }.to raise_error(Chef::Exceptions::Exec) @@ -837,7 +837,7 @@ describe Chef::Provider::Package::Yum do allow(@provider).to receive(:shell_out).and_return(@status) expect(@provider).to receive(:shell_out).once.with( "yum-deprecated -d0 -e0 -y install emacs-1.0", - { :timeout => Chef::Config[:yum_timeout] }, + { :timeout => Chef::Config[:yum_timeout] } ) @provider.yum_command("-d0 -e0 -y install emacs-1.0") end @@ -2125,7 +2125,7 @@ describe "Chef::Provider::Package::Yum - Multi" do :version_available? => true, :allow_multi_install => [ "kernel" ], :package_repository => "base", - :disable_extra_repo_control => true, + :disable_extra_repo_control => true ) allow(Chef::Provider::Package::Yum::YumCache).to receive(:instance).and_return(@yum_cache) allow(@yum_cache).to receive(:yum_binary=).with("yum") @@ -2211,7 +2211,7 @@ describe "Chef::Provider::Package::Yum - Multi" do allow(@yum_cache).to receive(:installed_version).with("cups", nil).and_return("1.2.4-11.18.el5") allow(@yum_cache).to receive(:installed_version).with("vim", nil).and_return("0.9") expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-1.2.4-11.19.el5 vim-1.0", + "-d0 -e0 -y install cups-1.2.4-11.19.el5 vim-1.0" ) @provider.install_package(%w{cups vim}, ["1.2.4-11.19.el5", "1.0"]) end @@ -2221,7 +2221,7 @@ describe "Chef::Provider::Package::Yum - Multi" do allow(@new_resource).to receive(:arch).and_return("i386") allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1) expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-1.2.4-11.19.el5.i386 vim-1.0.i386", + "-d0 -e0 -y install cups-1.2.4-11.19.el5.i386 vim-1.0.i386" ) @provider.install_package(%w{cups vim}, ["1.2.4-11.19.el5", "1.0"]) end @@ -2232,7 +2232,7 @@ describe "Chef::Provider::Package::Yum - Multi" do allow(@yum_cache).to receive(:installed_version).with("cups", nil).and_return("1.2.4-11.18.el5") allow(@yum_cache).to receive(:installed_version).with("vim", nil).and_return("0.9") expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y --disablerepo epmd install cups-1.2.4-11.19.el5 vim-1.0", + "-d0 -e0 -y --disablerepo epmd install cups-1.2.4-11.19.el5 vim-1.0" ) allow(@new_resource).to receive(:options).and_return("--disablerepo epmd") @provider.install_package(%w{cups vim}, ["1.2.4-11.19.el5", "1.0"]) @@ -2258,7 +2258,7 @@ describe "Chef::Provider::Package::Yum - Multi" do @provider.load_current_resource expect(@provider).to receive(:yum_command).with( - "-d0 -e0 -y install cups-1.2.4-11.19.el5.x86_64 vim-1.0", + "-d0 -e0 -y install cups-1.2.4-11.19.el5.x86_64 vim-1.0" ) @provider.install_package(%w{cups vim}, ["1.2.4-11.19.el5", "1.0"]) end diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb index 4def0f5558..df0a1da9a2 100644 --- a/spec/unit/provider/package/zypper_spec.rb +++ b/spec/unit/provider/package/zypper_spec.rb @@ -61,7 +61,7 @@ describe Chef::Provider::Package::Zypper do it "should run zypper info with the package name" do shell_out_expectation!( - "zypper --non-interactive info #{new_resource.package_name}", + "zypper --non-interactive info #{new_resource.package_name}" ).and_return(status) provider.load_current_resource end @@ -97,23 +97,23 @@ describe Chef::Provider::Package::Zypper do it "should run zypper install with the package name and version" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(true) shell_out_expectation!( - "zypper --non-interactive install --auto-agree-with-licenses emacs=1.0", + "zypper --non-interactive install --auto-agree-with-licenses emacs=1.0" ) provider.install_package(["emacs"], ["1.0"]) end it "should run zypper install without gpg checks" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(false) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0", + "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0" ) provider.install_package(["emacs"], ["1.0"]) end it "should warn about gpg checks on zypper install" do expect(Chef::Log).to receive(:warn).with( - /All packages will be installed without gpg signature checks/, + /All packages will be installed without gpg signature checks/ ) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0", + "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0" ) provider.install_package(["emacs"], ["1.0"]) end @@ -123,29 +123,29 @@ describe Chef::Provider::Package::Zypper do it "should run zypper update with the package name and version" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(true) shell_out_expectation!( - "zypper --non-interactive install --auto-agree-with-licenses emacs=1.0", + "zypper --non-interactive install --auto-agree-with-licenses emacs=1.0" ) provider.upgrade_package(["emacs"], ["1.0"]) end it "should run zypper update without gpg checks" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(false) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0", + "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0" ) provider.upgrade_package(["emacs"], ["1.0"]) end it "should warn about gpg checks on zypper upgrade" do expect(Chef::Log).to receive(:warn).with( - /All packages will be installed without gpg signature checks/, + /All packages will be installed without gpg signature checks/ ) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0", + "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0" ) provider.upgrade_package(["emacs"], ["1.0"]) end it "should run zypper upgrade without gpg checks" do shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0", + "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0" ) provider.upgrade_package(["emacs"], ["1.0"]) end @@ -157,7 +157,7 @@ describe Chef::Provider::Package::Zypper do it "should run zypper remove with the package name" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(true) shell_out_expectation!( - "zypper --non-interactive remove emacs", + "zypper --non-interactive remove emacs" ) provider.remove_package(["emacs"], [nil]) end @@ -167,23 +167,23 @@ describe Chef::Provider::Package::Zypper do it "should run zypper remove with the package name" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(true) shell_out_expectation!( - "zypper --non-interactive remove emacs=1.0", + "zypper --non-interactive remove emacs=1.0" ) provider.remove_package(["emacs"], ["1.0"]) end it "should run zypper remove without gpg checks" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(false) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks remove emacs=1.0", + "zypper --non-interactive --no-gpg-checks remove emacs=1.0" ) provider.remove_package(["emacs"], ["1.0"]) end it "should warn about gpg checks on zypper remove" do expect(Chef::Log).to receive(:warn).with( - /All packages will be installed without gpg signature checks/, + /All packages will be installed without gpg signature checks/ ) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks remove emacs=1.0", + "zypper --non-interactive --no-gpg-checks remove emacs=1.0" ) provider.remove_package(["emacs"], ["1.0"]) end @@ -193,23 +193,23 @@ describe Chef::Provider::Package::Zypper do describe "purge_package" do it "should run remove with the name and version and --clean-deps" do shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks remove --clean-deps emacs=1.0", + "zypper --non-interactive --no-gpg-checks remove --clean-deps emacs=1.0" ) provider.purge_package(["emacs"], ["1.0"]) end it "should run zypper purge without gpg checks" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(false) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks remove --clean-deps emacs=1.0", + "zypper --non-interactive --no-gpg-checks remove --clean-deps emacs=1.0" ) provider.purge_package(["emacs"], ["1.0"]) end it "should warn about gpg checks on zypper purge" do expect(Chef::Log).to receive(:warn).with( - /All packages will be installed without gpg signature checks/, + /All packages will be installed without gpg signature checks/ ) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks remove --clean-deps emacs=1.0", + "zypper --non-interactive --no-gpg-checks remove --clean-deps emacs=1.0" ) provider.purge_package(["emacs"], ["1.0"]) end @@ -223,7 +223,7 @@ describe Chef::Provider::Package::Zypper do describe "install_package" do it "should run zypper install with the package name and version" do shell_out_expectation!( - "zypper --no-gpg-checks install --auto-agree-with-licenses -y emacs", + "zypper --no-gpg-checks install --auto-agree-with-licenses -y emacs" ) provider.install_package(["emacs"], ["1.0"]) end @@ -232,7 +232,7 @@ describe Chef::Provider::Package::Zypper do describe "upgrade_package" do it "should run zypper update with the package name and version" do shell_out_expectation!( - "zypper --no-gpg-checks install --auto-agree-with-licenses -y emacs", + "zypper --no-gpg-checks install --auto-agree-with-licenses -y emacs" ) provider.upgrade_package(["emacs"], ["1.0"]) end @@ -241,7 +241,7 @@ describe Chef::Provider::Package::Zypper do describe "remove_package" do it "should run zypper remove with the package name" do shell_out_expectation!( - "zypper --no-gpg-checks remove -y emacs", + "zypper --no-gpg-checks remove -y emacs" ) provider.remove_package(["emacs"], ["1.0"]) end @@ -252,7 +252,7 @@ describe Chef::Provider::Package::Zypper do it "should install an array of package names and versions" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(false) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0 vim=2.0", + "zypper --non-interactive --no-gpg-checks install " + "--auto-agree-with-licenses emacs=1.0 vim=2.0" ) provider.install_package(%w{emacs vim}, ["1.0", "2.0"]) end @@ -260,7 +260,7 @@ describe Chef::Provider::Package::Zypper do it "should remove an array of package names and versions" do allow(Chef::Config).to receive(:[]).with(:zypper_check_gpg).and_return(false) shell_out_expectation!( - "zypper --non-interactive --no-gpg-checks remove emacs=1.0 vim=2.0", + "zypper --non-interactive --no-gpg-checks remove emacs=1.0 vim=2.0" ) provider.remove_package(%w{emacs vim}, ["1.0", "2.0"]) end diff --git a/spec/unit/provider/package_spec.rb b/spec/unit/provider/package_spec.rb index d0d20a4372..abf0322868 100644 --- a/spec/unit/provider/package_spec.rb +++ b/spec/unit/provider/package_spec.rb @@ -58,11 +58,11 @@ describe Chef::Provider::Package do new_resource.response_file("foo") expect(provider).to receive(:get_preseed_file).with( new_resource.name, - provider.candidate_version, + provider.candidate_version ).and_return("/var/cache/preseed-test") expect(provider).to receive(:preseed_package).with( - "/var/cache/preseed-test", + "/var/cache/preseed-test" ).and_return(true) provider.run_action(:install) end @@ -75,7 +75,7 @@ describe Chef::Provider::Package do it "should install the package at the candidate_version if it is not already installed" do expect(provider).to receive(:install_package).with( new_resource.name, - provider.candidate_version, + provider.candidate_version ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -85,7 +85,7 @@ describe Chef::Provider::Package do new_resource.version("1.0") expect(provider).to receive(:install_package).with( new_resource.name, - new_resource.version, + new_resource.version ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -96,7 +96,7 @@ describe Chef::Provider::Package do allow(current_resource).to receive(:version).and_return("0.99") expect(provider).to receive(:install_package).with( new_resource.name, - new_resource.version, + new_resource.version ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -144,7 +144,7 @@ describe Chef::Provider::Package do it "should upgrade the package if the current version is not the candidate version" do expect(provider).to receive(:upgrade_package).with( new_resource.name, - provider.candidate_version, + provider.candidate_version ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action @@ -468,7 +468,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:install_package).with( [ "vim" ], - [ "1.0" ], + [ "1.0" ] ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -481,7 +481,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:install_package).with( [ "vim" ], - [ "1.0" ], + [ "1.0" ] ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action @@ -494,7 +494,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:upgrade_package).with( [ "vim" ], - [ "1.0" ], + [ "1.0" ] ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action @@ -507,7 +507,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:upgrade_package).with( [ "vim" ], - [ "1.0" ], + [ "1.0" ] ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action @@ -521,7 +521,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:remove_package).with( [ "vim" ], - [ nil ], + [ nil ] ).and_return(true) provider.run_action(:remove) expect(new_resource).to be_updated_by_last_action @@ -535,7 +535,7 @@ describe "Subclass with use_multipackage_api" do provider.candidate_version = [ "1.0" ] expect(provider).to receive(:purge_package).with( [ "vim" ], - [ nil ], + [ nil ] ).and_return(true) provider.run_action(:purge) expect(new_resource).to be_updated_by_last_action @@ -552,7 +552,7 @@ describe "Subclass with use_multipackage_api" do allow(provider).to receive(:reconfig_package).and_return(true) expect(provider).to receive(:reconfig_package).with( [ "vim" ], - [ "1.0" ], + [ "1.0" ] ).and_return(true) provider.run_action(:reconfig) expect(new_resource).to be_updated_by_last_action @@ -582,7 +582,7 @@ describe "Chef::Provider::Package - Multi" do it "installs the candidate versions when none are installed" do expect(provider).to receive(:install_package).with( %w{emacs vi}, - ["1.0", "6.2"], + ["1.0", "6.2"] ).and_return(true) provider.run_action(:install) expect(new_resource).to be_updated @@ -591,7 +591,7 @@ describe "Chef::Provider::Package - Multi" do it "installs the candidate versions when some are installed" do expect(provider).to receive(:install_package).with( [ "vi" ], - [ "6.2" ], + [ "6.2" ] ).and_return(true) current_resource.version(["1.0", nil]) provider.run_action(:install) @@ -675,7 +675,7 @@ describe "Chef::Provider::Package - Multi" do current_resource.version ["0.9", "6.1"] expect(provider).to receive(:upgrade_package).with( new_resource.package_name, - provider.candidate_version, + provider.candidate_version ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action @@ -685,7 +685,7 @@ describe "Chef::Provider::Package - Multi" do current_resource.version ["1.0", "6.1"] expect(provider).to receive(:upgrade_package).with( ["vi"], - ["6.2"], + ["6.2"] ).and_return(true) provider.run_action(:upgrade) expect(new_resource).to be_updated_by_last_action diff --git a/spec/unit/provider_resolver_spec.rb b/spec/unit/provider_resolver_spec.rb index f85c46c836..5d4396ea4d 100644 --- a/spec/unit/provider_resolver_spec.rb +++ b/spec/unit/provider_resolver_spec.rb @@ -248,7 +248,7 @@ describe Chef::ProviderResolver do Chef::Provider::Service::Debian, Chef::Provider::Service::Init, Chef::Provider::Service::Invokercd, - Chef::Provider::Service::Upstart, + Chef::Provider::Service::Upstart ) end @@ -256,10 +256,10 @@ describe Chef::ProviderResolver do expect(provider_resolver.supported_handlers).to include( Chef::Provider::Service::Debian, Chef::Provider::Service::Init, - Chef::Provider::Service::Invokercd, + Chef::Provider::Service::Invokercd ) expect(provider_resolver.supported_handlers).to_not include( - Chef::Provider::Service::Upstart, + Chef::Provider::Service::Upstart ) end @@ -279,7 +279,7 @@ describe Chef::ProviderResolver do Chef::Provider::Service::Debian, Chef::Provider::Service::Init, Chef::Provider::Service::Invokercd, - Chef::Provider::Service::Upstart, + Chef::Provider::Service::Upstart ) end @@ -288,7 +288,7 @@ describe Chef::ProviderResolver do Chef::Provider::Service::Debian, Chef::Provider::Service::Init, Chef::Provider::Service::Invokercd, - Chef::Provider::Service::Upstart, + Chef::Provider::Service::Upstart ) end @@ -308,18 +308,18 @@ describe Chef::ProviderResolver do Chef::Provider::Service::Debian, Chef::Provider::Service::Init, Chef::Provider::Service::Invokercd, - Chef::Provider::Service::Upstart, + Chef::Provider::Service::Upstart ) end it "supports only the upstart handler" do expect(provider_resolver.supported_handlers).to include( - Chef::Provider::Service::Upstart, + Chef::Provider::Service::Upstart ) expect(provider_resolver.supported_handlers).to_not include( Chef::Provider::Service::Debian, Chef::Provider::Service::Init, - Chef::Provider::Service::Invokercd, + Chef::Provider::Service::Invokercd ) end @@ -339,7 +339,7 @@ describe Chef::ProviderResolver do Chef::Provider::Service::Debian, Chef::Provider::Service::Init, Chef::Provider::Service::Invokercd, - Chef::Provider::Service::Upstart, + Chef::Provider::Service::Upstart ) end @@ -348,7 +348,7 @@ describe Chef::ProviderResolver do Chef::Provider::Service::Upstart, Chef::Provider::Service::Debian, Chef::Provider::Service::Init, - Chef::Provider::Service::Invokercd, + Chef::Provider::Service::Invokercd ) end diff --git a/spec/unit/resource/apt_package_spec.rb b/spec/unit/resource/apt_package_spec.rb index 41cdb04a1e..78eccfb444 100644 --- a/spec/unit/resource/apt_package_spec.rb +++ b/spec/unit/resource/apt_package_spec.rb @@ -26,7 +26,7 @@ describe Chef::Resource::AptPackage, "initialize" do provider: Chef::Provider::Package::Apt, name: :apt_package, action: :install, - os: "linux", + os: "linux" ) let(:resource) { Chef::Resource::AptPackage.new("foo") } diff --git a/spec/unit/resource/breakpoint_spec.rb b/spec/unit/resource/breakpoint_spec.rb index 585bcadc68..a5b27bae16 100644 --- a/spec/unit/resource/breakpoint_spec.rb +++ b/spec/unit/resource/breakpoint_spec.rb @@ -25,7 +25,7 @@ describe Chef::Resource::Breakpoint do resource: Chef::Resource::Breakpoint, provider: Chef::Provider::Breakpoint, name: :breakpoint, - action: :break, + action: :break ) before do diff --git a/spec/unit/resource/chef_gem_spec.rb b/spec/unit/resource/chef_gem_spec.rb index 1b1439d7f2..0de9247196 100644 --- a/spec/unit/resource/chef_gem_spec.rb +++ b/spec/unit/resource/chef_gem_spec.rb @@ -26,7 +26,7 @@ describe Chef::Resource::ChefGem, "initialize" do resource: Chef::Resource::ChefGem, provider: Chef::Provider::Package::Rubygems, name: :chef_gem, - action: :install, + action: :install ) end diff --git a/spec/unit/resource/deploy_revision_spec.rb b/spec/unit/resource/deploy_revision_spec.rb index 4cbae68ca2..aa12b9595d 100644 --- a/spec/unit/resource/deploy_revision_spec.rb +++ b/spec/unit/resource/deploy_revision_spec.rb @@ -25,7 +25,7 @@ describe Chef::Resource::DeployRevision do resource: Chef::Resource::DeployRevision, provider: Chef::Provider::Deploy::Revision, name: :deploy_revision, - action: :deploy, + action: :deploy ) end @@ -36,7 +36,7 @@ describe Chef::Resource::DeployBranch do resource: Chef::Resource::DeployBranch, provider: Chef::Provider::Deploy::Revision, name: :deploy_branch, - action: :deploy, + action: :deploy ) end diff --git a/spec/unit/resource/deploy_spec.rb b/spec/unit/resource/deploy_spec.rb index 0eeb51c8a0..33f16b4a89 100644 --- a/spec/unit/resource/deploy_spec.rb +++ b/spec/unit/resource/deploy_spec.rb @@ -25,7 +25,7 @@ describe Chef::Resource::Deploy do resource: Chef::Resource::Deploy, provider: Chef::Provider::Deploy::Timestamped, name: :deploy, - action: :deploy, + action: :deploy ) class << self diff --git a/spec/unit/resource/dpkg_package_spec.rb b/spec/unit/resource/dpkg_package_spec.rb index 7bfe268d7d..66ad86b861 100644 --- a/spec/unit/resource/dpkg_package_spec.rb +++ b/spec/unit/resource/dpkg_package_spec.rb @@ -26,7 +26,7 @@ describe Chef::Resource::DpkgPackage, "initialize" do provider: Chef::Provider::Package::Dpkg, name: :dpkg_package, action: :install, - os: "linux", + os: "linux" ) end diff --git a/spec/unit/resource/easy_install_package_spec.rb b/spec/unit/resource/easy_install_package_spec.rb index 9747e57f65..ce8e6d8bf6 100644 --- a/spec/unit/resource/easy_install_package_spec.rb +++ b/spec/unit/resource/easy_install_package_spec.rb @@ -25,7 +25,7 @@ describe Chef::Resource::EasyInstallPackage, "initialize" do resource: Chef::Resource::EasyInstallPackage, provider: Chef::Provider::Package::EasyInstall, name: :easy_install_package, - action: :install, + action: :install ) before(:each) do diff --git a/spec/unit/resource/gem_package_spec.rb b/spec/unit/resource/gem_package_spec.rb index de6341d0ea..a1571ab9bb 100644 --- a/spec/unit/resource/gem_package_spec.rb +++ b/spec/unit/resource/gem_package_spec.rb @@ -25,7 +25,7 @@ describe Chef::Resource::GemPackage, "initialize" do resource: Chef::Resource::GemPackage, provider: Chef::Provider::Package::Rubygems, name: :gem_package, - action: :install, + action: :install ) end diff --git a/spec/unit/resource/git_spec.rb b/spec/unit/resource/git_spec.rb index 18d6216287..15c1e54f25 100644 --- a/spec/unit/resource/git_spec.rb +++ b/spec/unit/resource/git_spec.rb @@ -25,7 +25,7 @@ describe Chef::Resource::Git do resource: Chef::Resource::Git, provider: Chef::Provider::Git, name: :git, - action: :sync, + action: :sync ) before(:each) do diff --git a/spec/unit/resource/homebrew_package_spec.rb b/spec/unit/resource/homebrew_package_spec.rb index dad9573971..cfcfcd9c3a 100644 --- a/spec/unit/resource/homebrew_package_spec.rb +++ b/spec/unit/resource/homebrew_package_spec.rb @@ -25,7 +25,7 @@ describe Chef::Resource::HomebrewPackage, "initialize" do provider: Chef::Provider::Package::Homebrew, name: :homebrew_package, action: :install, - os: "mac_os_x", + os: "mac_os_x" ) let(:resource) { Chef::Resource::HomebrewPackage.new("emacs") } diff --git a/spec/unit/resource/ips_package_spec.rb b/spec/unit/resource/ips_package_spec.rb index 62656bcf8e..fd1fe2840c 100644 --- a/spec/unit/resource/ips_package_spec.rb +++ b/spec/unit/resource/ips_package_spec.rb @@ -26,7 +26,7 @@ describe Chef::Resource::IpsPackage, "initialize" do provider: Chef::Provider::Package::Ips, name: :ips_package, action: :install, - os: "solaris2", + os: "solaris2" ) before(:each) do diff --git a/spec/unit/resource/launchd_spec.rb b/spec/unit/resource/launchd_spec.rb index 8843ec606d..95febc47cf 100644 --- a/spec/unit/resource/launchd_spec.rb +++ b/spec/unit/resource/launchd_spec.rb @@ -6,7 +6,7 @@ describe Chef::Resource::Launchd do @launchd = Chef::Resource::Launchd.new("io.chef.chef-client") let(:resource) { Chef::Resource::Launchd.new( "io.chef.chef-client", - run_context, + run_context )} it "should create a new Chef::Resource::Launchd" do diff --git a/spec/unit/resource/macports_package_spec.rb b/spec/unit/resource/macports_package_spec.rb index 1aee070fdf..62346def2d 100644 --- a/spec/unit/resource/macports_package_spec.rb +++ b/spec/unit/resource/macports_package_spec.rb @@ -26,7 +26,7 @@ describe Chef::Resource::MacportsPackage, "initialize" do provider: Chef::Provider::Package::Macports, name: :macports_package, action: :install, - os: "mac_os_x", + os: "mac_os_x" ) end diff --git a/spec/unit/resource/pacman_package_spec.rb b/spec/unit/resource/pacman_package_spec.rb index 000470b3d1..b9d2ea21f6 100644 --- a/spec/unit/resource/pacman_package_spec.rb +++ b/spec/unit/resource/pacman_package_spec.rb @@ -26,7 +26,7 @@ describe Chef::Resource::PacmanPackage, "initialize" do provider: Chef::Provider::Package::Pacman, name: :pacman_package, action: :install, - os: "linux", + os: "linux" ) end diff --git a/spec/unit/resource/rpm_package_spec.rb b/spec/unit/resource/rpm_package_spec.rb index 1a0089b4cd..e1488f1dd1 100644 --- a/spec/unit/resource/rpm_package_spec.rb +++ b/spec/unit/resource/rpm_package_spec.rb @@ -27,7 +27,7 @@ describe Chef::Resource::RpmPackage, "initialize" do provider: Chef::Provider::Package::Rpm, name: :rpm_package, action: :install, - os: os, + os: os ) end diff --git a/spec/unit/resource/smartos_package_spec.rb b/spec/unit/resource/smartos_package_spec.rb index 8b1fb2e150..56c0fbdb8b 100644 --- a/spec/unit/resource/smartos_package_spec.rb +++ b/spec/unit/resource/smartos_package_spec.rb @@ -27,7 +27,7 @@ describe Chef::Resource::SmartosPackage, "initialize" do name: :smartos_package, action: :install, os: "solaris2", - platform_family: "smartos", + platform_family: "smartos" ) end diff --git a/spec/unit/resource/solaris_package_spec.rb b/spec/unit/resource/solaris_package_spec.rb index 80d84c1bf5..1f1ef4da30 100644 --- a/spec/unit/resource/solaris_package_spec.rb +++ b/spec/unit/resource/solaris_package_spec.rb @@ -28,7 +28,7 @@ describe Chef::Resource::SolarisPackage, "initialize" do name: :solaris_package, action: :install, os: "solaris2", - platform_family: platform_family, + platform_family: platform_family ) end diff --git a/spec/unit/resource/subversion_spec.rb b/spec/unit/resource/subversion_spec.rb index 47b8ddfdeb..a2901bf53b 100644 --- a/spec/unit/resource/subversion_spec.rb +++ b/spec/unit/resource/subversion_spec.rb @@ -25,7 +25,7 @@ describe Chef::Resource::Subversion do resource: Chef::Resource::Subversion, provider: Chef::Provider::Subversion, name: :subversion, - action: :install, + action: :install ) before do diff --git a/spec/unit/resource/timestamped_deploy_spec.rb b/spec/unit/resource/timestamped_deploy_spec.rb index ad7ebe7a2e..5a2dc8ae02 100644 --- a/spec/unit/resource/timestamped_deploy_spec.rb +++ b/spec/unit/resource/timestamped_deploy_spec.rb @@ -26,7 +26,7 @@ describe Chef::Resource::TimestampedDeploy, "initialize" do name: :timestamped_deploy, action: :deploy, os: "linux", - platform_family: "rhel", + platform_family: "rhel" ) end diff --git a/spec/unit/resource/windows_package_spec.rb b/spec/unit/resource/windows_package_spec.rb index 05c40bfa93..5aa3707199 100644 --- a/spec/unit/resource/windows_package_spec.rb +++ b/spec/unit/resource/windows_package_spec.rb @@ -28,7 +28,7 @@ describe Chef::Resource::WindowsPackage, "initialize" do provider: Chef::Provider::Package::Windows, os: "windows", name: :windows_package, - action: :start, + action: :start ) let(:resource) { Chef::Resource::WindowsPackage.new("solitaire.msi") } diff --git a/spec/unit/resource/windows_service_spec.rb b/spec/unit/resource/windows_service_spec.rb index bb4b91b624..2455a70f02 100644 --- a/spec/unit/resource/windows_service_spec.rb +++ b/spec/unit/resource/windows_service_spec.rb @@ -24,7 +24,7 @@ describe Chef::Resource::WindowsService, "initialize" do provider: Chef::Provider::Service::Windows, os: "windows", name: :windows_service, - action: :start, + action: :start ) let(:resource) { Chef::Resource::WindowsService.new("BITS") } diff --git a/spec/unit/resource/yum_package_spec.rb b/spec/unit/resource/yum_package_spec.rb index 195f8c56e8..dd0d3ae928 100644 --- a/spec/unit/resource/yum_package_spec.rb +++ b/spec/unit/resource/yum_package_spec.rb @@ -27,7 +27,7 @@ describe Chef::Resource::YumPackage, "initialize" do name: :yum_package, action: :install, os: "linux", - platform_family: "rhel", + platform_family: "rhel" ) end diff --git a/spec/unit/resource_reporter_spec.rb b/spec/unit/resource_reporter_spec.rb index 30b5717f4e..0df3a165bd 100644 --- a/spec/unit/resource_reporter_spec.rb +++ b/spec/unit/resource_reporter_spec.rb @@ -699,7 +699,7 @@ describe Chef::ResourceReporter do expect(method).to eq(:POST) expect(headers).to eq({ "Content-Encoding" => "gzip", "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION, - },) + }) data_stream = Zlib::GzipReader.new(StringIO.new(data)) data = data_stream.read expect(data).to eq(Chef::JSONCompat.to_json(@expected_data)) diff --git a/spec/unit/resource_spec.rb b/spec/unit/resource_spec.rb index 1c3a825ea1..09edbd7869 100644 --- a/spec/unit/resource_spec.rb +++ b/spec/unit/resource_spec.rb @@ -820,7 +820,7 @@ describe Chef::Resource do runner = Chef::Runner.new(run_context) Chef::Platform.set( :resource => :cat, - :provider => Chef::Provider::SnakeOil, + :provider => Chef::Provider::SnakeOil ) resource1.only_if { snitch_var1 = 1 } diff --git a/spec/unit/run_context_spec.rb b/spec/unit/run_context_spec.rb index f78f63f494..7b2a27e9f6 100644 --- a/spec/unit/run_context_spec.rb +++ b/spec/unit/run_context_spec.rb @@ -83,7 +83,7 @@ describe Chef::RunContext do "test-with-deps" => { "version" => "0.0.0", }, - }, + } ) end diff --git a/spec/unit/runner_spec.rb b/spec/unit/runner_spec.rb index 300d51229b..f15f3951e0 100644 --- a/spec/unit/runner_spec.rb +++ b/spec/unit/runner_spec.rb @@ -104,7 +104,7 @@ describe Chef::Runner do # set up old Chef::Platform resolution instead of provider_resolver Chef::Platform.set( :resource => :cat, - :provider => Chef::Provider::SnakeOil, + :provider => Chef::Provider::SnakeOil ) allow(Chef::ProviderResolver).to receive(:new).and_return(provider_resolver) allow(provider_resolver).to receive(:maybe_dynamic_provider_resolution).with(first_resource, anything()).and_return(nil) diff --git a/spec/unit/windows_service_spec.rb b/spec/unit/windows_service_spec.rb index 3f9419bb99..3555b70f1b 100644 --- a/spec/unit/windows_service_spec.rb +++ b/spec/unit/windows_service_spec.rb @@ -52,7 +52,7 @@ describe "Chef::Application::WindowsService", :windows_only do it "passes DEFAULT_LOG_LOCATION to chef-client instead of STDOUT" do expect(subject).to receive(:shell_out).with( "chef-client.bat --no-fork -c test_config_file -L #{Chef::Application::WindowsService::DEFAULT_LOG_LOCATION}", - shellout_options, + shellout_options ).and_return(shell_out_result) subject.service_main end @@ -74,7 +74,7 @@ describe "Chef::Application::WindowsService", :windows_only do it "uses the configured log location" do expect(subject).to receive(:shell_out).with( "chef-client.bat --no-fork -c test_config_file -L #{tempfile.path}", - shellout_options, + shellout_options ).and_return(shell_out_result) subject.service_main end @@ -91,7 +91,7 @@ describe "Chef::Application::WindowsService", :windows_only do it "does not pass log location to new process" do expect(subject).to receive(:shell_out).with( "chef-client.bat --no-fork -c test_config_file", - shellout_options, + shellout_options ).and_return(shell_out_result) subject.service_main end @@ -108,7 +108,7 @@ describe "Chef::Application::WindowsService", :windows_only do it "passes watchdog timeout to new process" do expect(subject).to receive(:shell_out).with( "chef-client.bat --no-fork -c test_config_file -L #{Chef::Application::WindowsService::DEFAULT_LOG_LOCATION}", - shellout_options, + shellout_options ).and_return(shell_out_result) subject.service_main end |