diff options
-rw-r--r-- | lib/chef/application/client.rb | 8 | ||||
-rw-r--r-- | lib/chef/application/solo.rb | 4 | ||||
-rw-r--r-- | lib/chef/chef_fs/data_handler/data_handler_base.rb | 2 | ||||
-rw-r--r-- | lib/chef/monkey_patches/webrick-utils.rb | 2 | ||||
-rw-r--r-- | lib/chef/node/attribute.rb | 2 | ||||
-rw-r--r-- | spec/unit/provider/deploy_spec.rb | 4 | ||||
-rw-r--r-- | spec/unit/resource/dsc_resource_spec.rb | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index a3cac2782a..1f232c651d 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -188,9 +188,9 @@ class Chef::Application::Client < Chef::Application :short => "-o RunlistItem,RunlistItem...", :long => "--override-runlist RunlistItem,RunlistItem...", :description => "Replace current run list with specified items for a single run", - :proc => lambda{|items| + :proc => lambda {|items| items = items.split(",") - items.compact.map{|item| + items.compact.map {|item| Chef::RunList::RunListItem.new(item) } } @@ -199,9 +199,9 @@ class Chef::Application::Client < Chef::Application :short => "-r RunlistItem,RunlistItem...", :long => "--runlist RunlistItem,RunlistItem...", :description => "Permanently replace current run list with specified items", - :proc => lambda{|items| + :proc => lambda {|items| items = items.split(",") - items.compact.map{|item| + items.compact.map {|item| Chef::RunList::RunListItem.new(item) } } diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index dbf843125e..26bd6ba52e 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -152,9 +152,9 @@ class Chef::Application::Solo < Chef::Application :short => "-o RunlistItem,RunlistItem...", :long => "--override-runlist RunlistItem,RunlistItem...", :description => "Replace current run list with specified items", - :proc => lambda{|items| + :proc => lambda {|items| items = items.split(",") - items.compact.map{|item| + items.compact.map {|item| Chef::RunList::RunListItem.new(item) } } diff --git a/lib/chef/chef_fs/data_handler/data_handler_base.rb b/lib/chef/chef_fs/data_handler/data_handler_base.rb index b8d0b7cd4f..83f56ed16d 100644 --- a/lib/chef/chef_fs/data_handler/data_handler_base.rb +++ b/lib/chef/chef_fs/data_handler/data_handler_base.rb @@ -94,7 +94,7 @@ class Chef # name to recipe[name]. Then calls uniq on the result. # def normalize_run_list(run_list) - run_list.map{|item| + run_list.map {|item| case item.to_s when /^recipe\[.*\]$/ item # explicit recipe diff --git a/lib/chef/monkey_patches/webrick-utils.rb b/lib/chef/monkey_patches/webrick-utils.rb index ff275a434d..71bed2bb74 100644 --- a/lib/chef/monkey_patches/webrick-utils.rb +++ b/lib/chef/monkey_patches/webrick-utils.rb @@ -31,7 +31,7 @@ module WEBrick Socket::AI_PASSIVE) # flag last_error = nil sockets = [] - res.each{|ai| + res.each {|ai| begin logger.debug("TCPServer.new(#{ai[3]}, #{port})") if logger sock = TCPServer.new(ai[3], port) diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb index 13ce75455f..ab97cf99bf 100644 --- a/lib/chef/node/attribute.rb +++ b/lib/chef/node/attribute.rb @@ -480,7 +480,7 @@ class Chef end def inspect - "#<#{self.class} " << (COMPONENTS + [:@merged_attributes, :@properties]).map{|iv| + "#<#{self.class} " << (COMPONENTS + [:@merged_attributes, :@properties]).map {|iv| "#{iv}=#{instance_variable_get(iv).inspect}" }.join(", ") << ">" end diff --git a/spec/unit/provider/deploy_spec.rb b/spec/unit/provider/deploy_spec.rb index da5a69ac1b..62d9123e7b 100644 --- a/spec/unit/provider/deploy_spec.rb +++ b/spec/unit/provider/deploy_spec.rb @@ -556,7 +556,7 @@ describe Chef::Provider::Deploy do @resource.deploy_to("/my/app") expect(mock_execution).to receive(:user).with("notCoolMan") expect(mock_execution).to receive(:group).with("Ggroup") - expect(mock_execution).to receive(:cwd){|*args| + expect(mock_execution).to receive(:cwd) {|*args| if args.empty? nil else @@ -564,7 +564,7 @@ describe Chef::Provider::Deploy do expect(args.first).to eq(@provider.release_path) end }.twice - expect(mock_execution).to receive(:environment){ |*args| + expect(mock_execution).to receive(:environment) { |*args| if args.empty? nil else diff --git a/spec/unit/resource/dsc_resource_spec.rb b/spec/unit/resource/dsc_resource_spec.rb index 64f5f50e5e..00e667c9de 100644 --- a/spec/unit/resource/dsc_resource_spec.rb +++ b/spec/unit/resource/dsc_resource_spec.rb @@ -71,7 +71,7 @@ describe Chef::Resource::DscResource do end it "raises a TypeError if property_name is not a symbol" do - expect{ + expect { dsc_test_resource.property("Foo", dsc_test_property_value) }.to raise_error(TypeError) end |