summaryrefslogtreecommitdiff
path: root/lib/chef/environment.rb
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-02-19 14:31:48 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-02-19 14:31:48 -0800
commit91918b3db2c1985b9368084a4d82de4ac6854473 (patch)
tree2cffea3fc9466d0c5e2baa7cc7630abb0ed7aecb /lib/chef/environment.rb
parent8f9a0dbd88de3014161bebfef7a02821e0010a37 (diff)
parent92bec4bb96d857f027068fc56af46c76c484fd50 (diff)
downloadchef-91918b3db2c1985b9368084a4d82de4ac6854473.tar.gz
Merge pull request #4603 from chef/lcg/rubocop-0.37.2
deal with 0.37.2 renamed cops
Diffstat (limited to 'lib/chef/environment.rb')
-rw-r--r--lib/chef/environment.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb
index 9cdb8a8522..f6d22843d4 100644
--- a/lib/chef/environment.rb
+++ b/lib/chef/environment.rb
@@ -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
@@ -102,20 +102,20 @@ 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) },
},
- },
+ }
)
end
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