summaryrefslogtreecommitdiff
path: root/lib/chef/environment.rb
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-02-18 18:39:11 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-02-18 18:39:11 -0800
commit6077b99f6ad1bc9a082f575f3818e69f05d8c8dc (patch)
treeae132bad653614ae549e6301a01f991f8cf5cb5b /lib/chef/environment.rb
parent8f9a0dbd88de3014161bebfef7a02821e0010a37 (diff)
downloadchef-6077b99f6ad1bc9a082f575f3818e69f05d8c8dc.tar.gz
deal with 0.37.2 renamed cops
252 Style/TrailingCommaInLiteral 84 Style/TrailingCommaInArguments 15 Style/SpaceAroundKeyword -- 351 Total We already dealt with SpaceAroundKeyword under its old name SpaceBeforeModifierKeyword, it looks like it got stricter about spaces after keywords. TrailingComma also got split, and it looks like the TrailingCommaInArguments behavior is new?
Diffstat (limited to 'lib/chef/environment.rb')
-rw-r--r--lib/chef/environment.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb
index 9cdb8a8522..cd3bbd96ff 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
@@ -102,7 +102,7 @@ class Chef
{
:kind_of => Hash,
:callbacks => {
- "should be a valid set of cookbook version requirements" => lambda { |cv| Chef::Environment.validate_cookbook_versions(cv) }
+ "should be a valid set of cookbook version requirements" => lambda { |cv| Chef::Environment.validate_cookbook_versions(cv) },
},
},
)
@@ -110,11 +110,11 @@ class Chef
def cookbook(cookbook, version)
validate({
- :version => version
+ :version => version,
}, {
:version => {
- :callbacks => { "should be a valid version requirement" => lambda { |v| Chef::Environment.validate_cookbook_version(v) } }
- }
+ :callbacks => { "should be a valid version requirement" => lambda { |v| Chef::Environment.validate_cookbook_version(v) } },
+ },
},)
@cookbook_versions[cookbook] = version
end