diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-08-09 12:31:01 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-08-16 18:41:25 -0700 |
commit | 498d60207ce6664f0ca807b3f7a4690b3097014c (patch) | |
tree | 2bf61e71d06b1a577c1b984765c20a0f64ec8ccf | |
parent | e792cfd2df516c13ae5ca6ce1eed2b8e10628581 (diff) | |
download | chef-498d60207ce6664f0ca807b3f7a4690b3097014c.tar.gz |
autofixing Style/SpaceBeforeSemicolon cop
-rw-r--r-- | lib/chef/cookbook_uploader.rb | 2 | ||||
-rw-r--r-- | lib/chef/cookbook_version.rb | 2 | ||||
-rw-r--r-- | lib/chef/exceptions.rb | 2 | ||||
-rw-r--r-- | lib/chef/run_list.rb | 4 | ||||
-rw-r--r-- | spec/functional/file_content_management/deploy_strategies_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/file_access_control_spec.rb | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/cookbook_uploader.rb b/lib/chef/cookbook_uploader.rb index 95c27799ec..bb75234563 100644 --- a/lib/chef/cookbook_uploader.rb +++ b/lib/chef/cookbook_uploader.rb @@ -55,7 +55,7 @@ class Chef checksum_files.merge!(cb.checksums) end - checksums = checksum_files.inject({}) { |memo, elt| memo[elt.first] = nil ; memo } + checksums = checksum_files.inject({}) { |memo, elt| memo[elt.first] = nil; memo } new_sandbox = rest.post("sandboxes", { :checksums => checksums }) Chef::Log.info("Uploading files") diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb index 1e903608b5..63b39abdb7 100644 --- a/lib/chef/cookbook_version.rb +++ b/lib/chef/cookbook_version.rb @@ -623,7 +623,7 @@ class Chef # For each filename, produce a mapping of base filename (i.e. recipe name # or attribute file) to on disk location def filenames_by_name(filenames) - filenames.select { |filename| filename =~ /\.rb$/ }.inject({}) { |memo, filename| memo[File.basename(filename, ".rb")] = filename ; memo } + filenames.select { |filename| filename =~ /\.rb$/ }.inject({}) { |memo, filename| memo[File.basename(filename, ".rb")] = filename; memo } end def file_vendor diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb index 43759568a7..a4d5ff60e2 100644 --- a/lib/chef/exceptions.rb +++ b/lib/chef/exceptions.rb @@ -184,7 +184,7 @@ class Chef # A different version of a cookbook was added to a # VersionedRecipeList than the one already there. - class CookbookVersionConflict < ArgumentError ; end + class CookbookVersionConflict < ArgumentError; end # does not follow X.Y.Z format. ArgumentError? class InvalidPlatformVersion < ArgumentError; end diff --git a/lib/chef/run_list.rb b/lib/chef/run_list.rb index 4dea938423..3ac5fab07b 100644 --- a/lib/chef/run_list.rb +++ b/lib/chef/run_list.rb @@ -47,13 +47,13 @@ class Chef end def role_names - @run_list_items.inject([]) { |memo, run_list_item| memo << run_list_item.name if run_list_item.role? ; memo } + @run_list_items.inject([]) { |memo, run_list_item| memo << run_list_item.name if run_list_item.role?; memo } end alias :roles :role_names def recipe_names - @run_list_items.inject([]) { |memo, run_list_item| memo << run_list_item.name if run_list_item.recipe? ; memo } + @run_list_items.inject([]) { |memo, run_list_item| memo << run_list_item.name if run_list_item.recipe?; memo } end alias :recipes :recipe_names diff --git a/spec/functional/file_content_management/deploy_strategies_spec.rb b/spec/functional/file_content_management/deploy_strategies_spec.rb index 7c54af347c..9e2131388f 100644 --- a/spec/functional/file_content_management/deploy_strategies_spec.rb +++ b/spec/functional/file_content_management/deploy_strategies_spec.rb @@ -209,7 +209,7 @@ describe Chef::FileContentManagement::Deploy::MvUnix, :unix_only do end # On Unix we won't have loaded the file, avoid undefined constant errors: -class Chef::FileContentManagement::Deploy::MvWindows ; end +class Chef::FileContentManagement::Deploy::MvWindows; end describe Chef::FileContentManagement::Deploy::MvWindows, :windows_only do diff --git a/spec/unit/file_access_control_spec.rb b/spec/unit/file_access_control_spec.rb index 4357a91148..4118133692 100644 --- a/spec/unit/file_access_control_spec.rb +++ b/spec/unit/file_access_control_spec.rb @@ -67,7 +67,7 @@ describe Chef::FileAccessControl do it "raises a Chef::Exceptions::UserIDNotFound error when Etc can't find the user's name" do expect(Etc).to receive(:getpwnam).with("toor").and_raise(ArgumentError) - expect { @fac.target_uid ; @provider_requirements.run(:create) }.to raise_error(Chef::Exceptions::UserIDNotFound, "cannot determine user id for 'toor', does the user exist on this system?") + expect { @fac.target_uid; @provider_requirements.run(:create) }.to raise_error(Chef::Exceptions::UserIDNotFound, "cannot determine user id for 'toor', does the user exist on this system?") end it "does not attempt to resolve the uid if the user is not specified" do @@ -84,7 +84,7 @@ describe Chef::FileAccessControl do it "raises an ArgumentError if the resource's owner is set to something wack" do @resource.instance_variable_set(:@owner, :diaf) - expect { @fac.target_uid ; @provider_requirements.run(:create) }.to raise_error(ArgumentError) + expect { @fac.target_uid; @provider_requirements.run(:create) }.to raise_error(ArgumentError) end it "uses the resource's uid for the target uid when the resource's owner is specified by an integer" do |