diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-12 09:32:14 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-12 09:32:14 -0800 |
| commit | 03eadde04eb219bfa8abe52d312261a5142e7266 (patch) | |
| tree | b0864a3e70741f5a15f0337824f25b69fc319c07 /lib/chef/environment.rb | |
| parent | 1e324f073455db7596f37da6bf21b2f6521529ce (diff) | |
| download | chef-03eadde04eb219bfa8abe52d312261a5142e7266.tar.gz | |
pull rubocop 0.37.2 into chefstyle
this is from the same ruleset that we had, but the new code catches more
conditions.
Diffstat (limited to 'lib/chef/environment.rb')
| -rw-r--r-- | lib/chef/environment.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb index b286dad4e2..9cdb8a8522 100644 --- a/lib/chef/environment.rb +++ b/lib/chef/environment.rb @@ -36,7 +36,7 @@ class Chef attr_accessor :chef_server_rest - COMBINED_COOKBOOK_CONSTRAINT = /(.+)(?:[\s]+)((?:#{Chef::VersionConstraint::OPS.join('|')})(?:[\s]+).+)$/.freeze + COMBINED_COOKBOOK_CONSTRAINT = /(.+)(?:[\s]+)((?:#{Chef::VersionConstraint::OPS.join('|')})(?:[\s]+).+)$/ def initialize(chef_server_rest: nil) @name = "" @@ -123,7 +123,7 @@ class Chef result = { "name" => @name, "description" => @description, - "cookbook_versions" => @cookbook_versions, + "cookbook_versions" => @cookbook_versions, "json_class" => self.class.name, "chef_type" => "environment", "default_attributes" => @default_attributes, |