chef-zero 4.8.0 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b1777b8332d31b59e467917da633172429a610f
-  data.tar.gz: 994c97845bc1a3cd6899f5effd61d5ffde45456e
+  metadata.gz: 8c7f3a055202722134203eea195e863199ebe127
+  data.tar.gz: e9840b8dcffaac05370d37bb63a9ea3181026700
 SHA512:
-  metadata.gz: 7d7cd1a182106317d3847068cc7f8db5bcc7f76a77734006ad884f31d4413b0c3c852cb6cf0d85b25f555fba1cc4526d04a40855446a62638080ce79b14fb17c
-  data.tar.gz: a55e55cca7fe1288808ce6a7ba6dc59f0d7cae8387a16ee9a61638caf9db9ec5b5a3c32a68ea40481f651614f967da95a8b3bce4808e30c6ffe624a62b921086
+  metadata.gz: b856efb3361afc894f457b253fd1b682a39fee7e4e5f924273052e546b932cbd35b575792280821427ba29a3406af93bfa098cb331d38d15e421a8d6952e9391
+  data.tar.gz: 272ae46e85c90e99f8d1cecffad2f2ef4017b1c7d4dce079f14dcc6dfb6ddf54747dfe07298b5baf812dfa11ead7aae6ad500ee47804d07f7a69261451a84bbf

data/Gemfile

@@ -1,20 +1,24 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec
 
 # gem 'rest-client', :github => 'chef/rest-client'
 
-gem 'oc-chef-pedant', :github => 'chef/chef-server'
+gem "oc-chef-pedant", :github => "chef/chef-server"
 
 group :changelog do
   gem "github_changelog_generator"
 end
 
+group :development, :test do
+  gem "chefstyle", "= 0.3.1"
+end
+
 # bundler resolve failure on "rspec_junit_formatter"
 # gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
 
 # gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls'
 
-if ENV['GEMFILE_MOD']
+if ENV["GEMFILE_MOD"]
   puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"
-  instance_eval(ENV['GEMFILE_MOD'])
+  instance_eval(ENV["GEMFILE_MOD"])
 end

data/Rakefile

@@ -1,11 +1,11 @@
-require 'bundler'
-require 'bundler/gem_tasks'
+require "bundler"
+require "bundler/gem_tasks"
 
-require 'chef_zero/version'
+require "chef_zero/version"
 
-def run_oc_pedant(env={})
+def run_oc_pedant(env = {})
   ENV.update(env)
-  require File.expand_path('spec/run_oc_pedant')
+  require File.expand_path("spec/run_oc_pedant")
 end
 
 ENV_DOCS = <<END
@@ -22,7 +22,7 @@ task :default => :pedant
 
 desc "Run specs"
 task :spec do
-  system('rspec spec/*_spec.rb')
+  system("rspec spec/*_spec.rb")
 end
 
 desc "Run oc-chef-pedant\n\n#{ENV_DOCS}"
@@ -30,12 +30,12 @@ task :pedant => :oc_pedant
 
 desc "Run oc-chef-pedant with CHEF_FS set\n\n#{ENV_DOCS}"
 task :cheffs do
-  run_oc_pedant('CHEF_FS' => 'yes')
+  run_oc_pedant("CHEF_FS" => "yes")
 end
 
 desc "Run oc-chef-pedant with FILE_STORE set\n\n#{ENV_DOCS}"
 task :filestore do
-  run_oc_pedant('FILE_STORE' => 'yes')
+  run_oc_pedant("FILE_STORE" => "yes")
 end
 
 task :oc_pedant do
@@ -43,15 +43,25 @@ task :oc_pedant do
 end
 
 task :chef_spec do
-  gem_path = Bundler.environment.specs['chef'].first.full_gem_path
+  gem_path = Bundler.environment.specs["chef"].first.full_gem_path
   system("cd #{gem_path} && rspec spec/integration")
 end
 
 task :berkshelf_spec do
-  gem_path = Bundler.environment.specs['berkshelf'].first.full_gem_path
+  gem_path = Bundler.environment.specs["berkshelf"].first.full_gem_path
   system("cd #{gem_path} && thor spec:ci")
 end
 
+begin
+  require "chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:style) do |task|
+    task.options += ["--display-cop-names", "--no-color"]
+  end
+rescue LoadError
+  puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
+end
+
 begin
   require "github_changelog_generator/task"
 

data/bin/chef-zero

@@ -1,21 +1,21 @@
 #!/usr/bin/env ruby
 
 # Trap interrupts to quit cleanly.
-Signal.trap('INT') { exit 1 }
+Signal.trap("INT") { exit 1 }
 
-require 'rubygems'
+require "rubygems"
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 
-require 'chef_zero/log'
-require 'chef_zero/version'
-require 'chef_zero/server'
-require 'chef_zero/data_store/raw_file_store'
-require 'optparse'
+require "chef_zero/log"
+require "chef_zero/version"
+require "chef_zero/server"
+require "chef_zero/data_store/raw_file_store"
+require "optparse"
 
 def parse_port(port)
   array = []
-  port.split(',').each do |part|
-    a,b = part.split('-',2)
+  port.split(",").each do |part|
+    a, b = part.split("-", 2)
     if b
       array = array.concat(a.to_i.upto(b.to_i).to_a)
     else
@@ -99,10 +99,10 @@ if options[:daemon]
     Process.daemon(true)
     server.start(true)
   else
-    if ENV['OS'] == 'Windows_NT' 
-      abort 'Daemonization is not supported on Windows. Running 'start chef-zero' will fork the process.'
+    if ENV["OS"] == "Windows_NT"
+      abort "Daemonization is not supported on Windows. Running 'start chef-zero' will fork the process."
     else
-      abort 'Process.daemon requires Ruby >= 1.9'
+      abort "Process.daemon requires Ruby >= 1.9"
     end
   end
 else

data/chef-zero.gemspec

@@ -1,35 +1,35 @@
-$:.unshift(File.dirname(__FILE__) + '/lib')
-require 'chef_zero/version'
+$:.unshift(File.dirname(__FILE__) + "/lib")
+require "chef_zero/version"
 
 Gem::Specification.new do |s|
-  s.name = 'chef-zero'
+  s.name = "chef-zero"
   s.version = ChefZero::VERSION
   s.platform = Gem::Platform::RUBY
-  s.summary = 'Self-contained, easy-setup, fast-start in-memory Chef server for testing and solo setup purposes'
+  s.summary = "Self-contained, easy-setup, fast-start in-memory Chef server for testing and solo setup purposes"
   s.description = s.summary
-  s.author = 'John Keiser'
-  s.email = 'jkeiser@chef.io'
-  s.homepage = 'http://www.chef.io'
-  s.license = 'Apache 2.0'
+  s.author = "John Keiser"
+  s.email = "jkeiser@chef.io"
+  s.homepage = "http://www.chef.io"
+  s.license = "Apache 2.0"
 
   s.required_ruby_version = ">= 2.1.0"
 
-  s.add_dependency 'mixlib-log', '~> 1.3'
-  s.add_dependency 'hashie', '>= 2.0', '< 4.0'
-  s.add_dependency 'uuidtools', '~> 2.1'
-  s.add_dependency 'ffi-yajl', '~> 2.2'
-  s.add_dependency 'rack', '< 2' # 2.0 requires Ruby 2.2+
+  s.add_dependency "mixlib-log", "~> 1.3"
+  s.add_dependency "hashie", ">= 2.0", "< 4.0"
+  s.add_dependency "uuidtools", "~> 2.1"
+  s.add_dependency "ffi-yajl", "~> 2.2"
+  s.add_dependency "rack", "< 2" # 2.0 requires Ruby 2.2+
 
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'pry-byebug'
-  s.add_development_dependency 'pry-stack_explorer'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'chef'
+  s.add_development_dependency "pry"
+  s.add_development_dependency "pry-byebug"
+  s.add_development_dependency "pry-stack_explorer"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "chef"
 
-  s.bindir       = 'bin'
-  s.executables  = ['chef-zero']
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.md Gemfile Rakefile) + Dir.glob('*.gemspec') +
-      Dir.glob('{lib,spec}/**/*', File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+  s.bindir       = "bin"
+  s.executables  = ["chef-zero"]
+  s.require_path = "lib"
+  s.files = %w{LICENSE README.md Gemfile Rakefile} + Dir.glob("*.gemspec") +
+    Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 end

data/lib/chef_zero.rb

@@ -1,5 +1,5 @@
 module ChefZero
-  require 'chef_zero/log'
+  require "chef_zero/log"
 
   MIN_API_VERSION = 0
   MAX_API_VERSION = 1

data/lib/chef_zero/chef_data/acl_path.rb

@@ -13,9 +13,9 @@ module ChefZero
     #   specified on X, they are not inherited from X's parent
     # - stop adding pivotal to acls (he already has access to what he needs)
     module AclPath
-      ORG_DATA_TYPES = %w(clients cookbook_artifacts cookbooks containers data environments groups
-                          nodes policies policy_groups roles sandboxes)
-      TOP_DATA_TYPES = %w(containers organizations users)
+      ORG_DATA_TYPES = %w{clients cookbook_artifacts cookbooks containers data environments groups
+                          nodes policies policy_groups roles sandboxes}
+      TOP_DATA_TYPES = %w{containers organizations users}
 
       # ACL data paths for a partition are:
       # /          -> /acls/root
@@ -42,7 +42,7 @@ module ChefZero
       # return nil, because it is the parent path (data/bag) that has an ACL.
       def self.get_acl_data_path(path)
         # Things under organizations have their own acls hierarchy
-        if path[0] == 'organizations' && path.size >= 2
+        if path[0] == "organizations" && path.size >= 2
           under_org = partition_acl_data_path(path[2..-1], ORG_DATA_TYPES)
           if under_org
             path[0..1] + under_org
@@ -63,14 +63,14 @@ module ChefZero
       # /containers/nodes, not /nodes.
       #
       def self.get_object_path(acl_data_path)
-        if acl_data_path[0] == 'acls'
-          if acl_data_path[1] == 'root'
+        if acl_data_path[0] == "acls"
+          if acl_data_path[1] == "root"
             []
           else
             acl_data_path[1..-1]
           end
-        elsif acl_data_path[0] == 'organizations' && acl_data_path[2] == 'acls'
-          if acl_data_path[3] == 'root'
+        elsif acl_data_path[0] == "organizations" && acl_data_path[2] == "acls"
+          if acl_data_path[3] == "root"
             acl_data_path[0..1]
           else
             acl_data_path[0..1] + acl_data_path[3..-1]
@@ -91,13 +91,13 @@ module ChefZero
       # /acls/root ->
       # nil
       def self.parent_acl_data_path(acl_data_path)
-        if acl_data_path[0] == 'organizations'
+        if acl_data_path[0] == "organizations"
           under_org = partition_parent_acl_data_path(acl_data_path[2..-1])
           if under_org
             acl_data_path[0..1] + under_org
           else
             # ACL data path is /organizations/X/acls/root; therefore parent is "/organizations"
-            [ 'acls', 'containers', 'organizations' ]
+            %w{acls containers organizations}
           end
         else
           partition_parent_acl_data_path(acl_data_path)
@@ -114,10 +114,10 @@ module ChefZero
       # Returns nil if the path is /acls/root
       def self.partition_parent_acl_data_path(acl_data_path)
         if acl_data_path.size == 3
-          if acl_data_path == %w(acls containers containers)
-            [ 'acls', 'root' ]
+          if acl_data_path == %w{acls containers containers}
+            %w{acls root}
           else
-            [ 'acls', 'containers', acl_data_path[1]]
+            [ "acls", "containers", acl_data_path[1]]
           end
         else
           nil
@@ -126,12 +126,12 @@ module ChefZero
 
       def self.partition_acl_data_path(path, data_types)
         if path.size == 0
-          [ 'acls', 'root']
+          %w{acls root}
         elsif data_types.include?(path[0])
           if path.size == 0
-            [ 'acls', 'containers', path[0] ]
+            [ "acls", "containers", path[0] ]
           elsif path.size == 2
-            [ 'acls', path[0], path[1] ]
+            [ "acls", path[0], path[1] ]
           end
         end
       end

data/lib/chef_zero/chef_data/cookbook_data.rb

@@ -1,10 +1,10 @@
-require 'digest/md5'
-require 'hashie/mash'
+require "digest/md5"
+require "hashie/mash"
 
 module ChefZero
   module ChefData
     module CookbookData
-      def self.to_hash(cookbook, name, version=nil)
+      def self.to_hash(cookbook, name, version = nil)
         frozen = false
         if cookbook.has_key?(:frozen)
           frozen = cookbook[:frozen]
@@ -15,14 +15,14 @@ module ChefZero
         result = files_from(cookbook)
         recipe_names = result[:recipes].map do |recipe|
           recipe_name = recipe[:name][0..-2]
-          recipe_name == 'default' ? name : "#{name}::#{recipe_name}"
+          recipe_name == "default" ? name : "#{name}::#{recipe_name}"
         end
         result[:metadata] = metadata_from(cookbook, name, version, recipe_names)
         result[:name] = "#{name}-#{result[:metadata][:version]}"
-        result[:json_class] = 'Chef::CookbookVersion'
+        result[:json_class] = "Chef::CookbookVersion"
         result[:cookbook_name] = name
         result[:version] = result[:metadata][:version]
-        result[:chef_type] = 'cookbook_version'
+        result[:chef_type] = "cookbook_version"
         result[:frozen?] = true if frozen
         result
       end
@@ -32,18 +32,18 @@ module ChefZero
         # If both .rb and .json exist, read .rb
         # TODO if recipes has 3 recipes in it, and the Ruby/JSON has only one, should
         # the resulting recipe list have 1, or 3-4 recipes in it?
-        if has_child(directory, 'metadata.rb')
+        if has_child(directory, "metadata.rb")
           begin
-            file = filename(directory, 'metadata.rb') || "(#{name}/metadata.rb)"
-            metadata.instance_eval(read_file(directory, 'metadata.rb'), file)
+            file = filename(directory, "metadata.rb") || "(#{name}/metadata.rb)"
+            metadata.instance_eval(read_file(directory, "metadata.rb"), file)
           rescue
             ChefZero::Log.error("Error loading cookbook #{name}: #{$!}\n  #{$!.backtrace.join("\n  ")}")
           end
-        elsif has_child(directory, 'metadata.json')
-          metadata.from_json(read_file(directory, 'metadata.json'))
+        elsif has_child(directory, "metadata.json")
+          metadata.from_json(read_file(directory, "metadata.json"))
         end
         result = {}
-        metadata.to_hash.each_pair do |key,value|
+        metadata.to_hash.each_pair do |key, value|
           result[key.to_sym] = value
         end
         result[:version] = version if version
@@ -69,7 +69,7 @@ module ChefZero
         def initialize(cookbook)
           self.name(cookbook.name)
           self.recipes(cookbook.fully_qualified_recipe_names)
-          %w(attributes grouping dependencies supports recommendations suggestions conflicting providing replacing recipes).each do |hash_arg|
+          %w{attributes grouping dependencies supports recommendations suggestions conflicting providing replacing recipes}.each do |hash_arg|
             self[hash_arg.to_sym] = Hashie::Mash.new
           end
         end
@@ -145,15 +145,15 @@ module ChefZero
       def self.files_from(directory)
         # TODO some support .rb only
         result = {
-          :attributes => load_child_files(directory, 'attributes', false),
-          :definitions => load_child_files(directory, 'definitions', false),
-          :recipes => load_child_files(directory, 'recipes', false),
-          :libraries => load_child_files(directory, 'libraries', true),
-          :templates => load_child_files(directory, 'templates', true),
-          :files => load_child_files(directory, 'files', true),
-          :resources => load_child_files(directory, 'resources', true),
-          :providers => load_child_files(directory, 'providers', true),
-          :root_files => load_files(directory, false)
+          :attributes => load_child_files(directory, "attributes", false),
+          :definitions => load_child_files(directory, "definitions", false),
+          :recipes => load_child_files(directory, "recipes", false),
+          :libraries => load_child_files(directory, "libraries", true),
+          :templates => load_child_files(directory, "templates", true),
+          :files => load_child_files(directory, "files", true),
+          :resources => load_child_files(directory, "resources", true),
+          :providers => load_child_files(directory, "providers", true),
+          :root_files => load_files(directory, false),
         }
         set_specificity(result[:templates])
         set_specificity(result[:files])
@@ -231,13 +231,13 @@ module ChefZero
           :name => name,
           :path => name,
           :checksum => Digest::MD5.hexdigest(value),
-          :specificity => 'default'
+          :specificity => "default",
         }]
       end
 
       def self.set_specificity(files)
         files.each do |file|
-          parts = file[:path].split('/')
+          parts = file[:path].split("/")
           raise "Only directories are allowed directly under templates or files: #{file[:path]}" if parts.size == 2
           file[:specificity] = parts[1]
         end

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -1,6 +1,6 @@
-require 'chef_zero'
-require 'chef_zero/rest_base'
-require 'chef_zero/chef_data/default_creator'
+require "chef_zero"
+require "chef_zero/rest_base"
+require "chef_zero/chef_data/default_creator"
 
 module ChefZero
   module ChefData
@@ -8,210 +8,210 @@ module ChefZero
       def self.normalize_acls(acls)
         ChefData::DefaultCreator::PERMISSIONS.each do |perm|
           acls[perm] ||= {}
-          (acls[perm]['actors'] ||= []).uniq!    # this gets doubled sometimes, for reasons.
-          acls[perm]['groups'] ||= []
+          (acls[perm]["actors"] ||= []).uniq! # this gets doubled sometimes, for reasons.
+          acls[perm]["groups"] ||= []
         end
         acls
       end
 
       def self.normalize_client(client, name, orgname = nil)
-        client['name'] ||= name
-        client['clientname'] ||= name
-        client['admin'] = !!client['admin'] if client.key?('admin')
-        client['public_key'] = PUBLIC_KEY unless client.key?('public_key')
-        client['orgname'] ||= orgname
-        client['validator'] ||= false
-        client['validator'] = !!client['validator']
-        client['json_class'] ||= "Chef::ApiClient"
-        client['chef_type'] ||= "client"
+        client["name"] ||= name
+        client["clientname"] ||= name
+        client["admin"] = !!client["admin"] if client.key?("admin")
+        client["public_key"] = PUBLIC_KEY unless client.key?("public_key")
+        client["orgname"] ||= orgname
+        client["validator"] ||= false
+        client["validator"] = !!client["validator"]
+        client["json_class"] ||= "Chef::ApiClient"
+        client["chef_type"] ||= "client"
         client
       end
 
       def self.normalize_container(container, name)
-        container.delete('id')
-        container['containername'] = name
-        container['containerpath'] = name
+        container.delete("id")
+        container["containername"] = name
+        container["containerpath"] = name
         container
       end
 
-      def self.normalize_user(user, name, identity_keys, osc_compat, method=nil)
+      def self.normalize_user(user, name, identity_keys, osc_compat, method = nil)
         user[identity_keys.first] ||= name
-        user['public_key'] = PUBLIC_KEY unless user.key?('public_key')
-        user['admin'] ||= false
-        user['admin'] = !!user['admin']
-        user['openid'] ||= nil
+        user["public_key"] = PUBLIC_KEY unless user.key?("public_key")
+        user["admin"] ||= false
+        user["admin"] = !!user["admin"]
+        user["openid"] ||= nil
         if !osc_compat
-          if method == 'GET'
-            user.delete('admin')
-            user.delete('password')
-            user.delete('openid')
+          if method == "GET"
+            user.delete("admin")
+            user.delete("password")
+            user.delete("openid")
           end
-          user['email'] ||= nil
-          user['first_name'] ||= nil
-          user['last_name'] ||= nil
+          user["email"] ||= nil
+          user["first_name"] ||= nil
+          user["last_name"] ||= nil
         end
         user
       end
 
       def self.normalize_data_bag_item(data_bag_item, data_bag_name, id, method)
-        if method == 'DELETE'
+        if method == "DELETE"
           # TODO SERIOUSLY, WHO DOES THIS MANY EXCEPTIONS IN THEIR INTERFACE
-          if !(data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data'])
-            data_bag_item['id'] ||= id
-            data_bag_item = { 'raw_data' => data_bag_item }
-            data_bag_item['chef_type'] ||= 'data_bag_item'
-            data_bag_item['json_class'] ||= 'Chef::DataBagItem'
-            data_bag_item['data_bag'] ||= data_bag_name
-            data_bag_item['name'] ||= "data_bag_item_#{data_bag_name}_#{id}"
+          if !(data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"])
+            data_bag_item["id"] ||= id
+            data_bag_item = { "raw_data" => data_bag_item }
+            data_bag_item["chef_type"] ||= "data_bag_item"
+            data_bag_item["json_class"] ||= "Chef::DataBagItem"
+            data_bag_item["data_bag"] ||= data_bag_name
+            data_bag_item["name"] ||= "data_bag_item_#{data_bag_name}_#{id}"
           end
         else
           # If it's not already wrapped with raw_data, wrap it.
-          if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
-            data_bag_item = data_bag_item['raw_data']
+          if data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"]
+            data_bag_item = data_bag_item["raw_data"]
           end
           # Argh.  We don't do this on GET, but we do on PUT and POST????
-          if %w(PUT POST).include?(method)
-            data_bag_item['chef_type'] ||= 'data_bag_item'
-            data_bag_item['data_bag'] ||= data_bag_name
+          if %w{PUT POST}.include?(method)
+            data_bag_item["chef_type"] ||= "data_bag_item"
+            data_bag_item["data_bag"] ||= data_bag_name
           end
-          data_bag_item['id'] ||= id
+          data_bag_item["id"] ||= id
         end
         data_bag_item
       end
 
       def self.normalize_cookbook(endpoint, org_prefix, cookbook, name, version, base_uri, method,
-                                  is_cookbook_artifact=false)
+                                  is_cookbook_artifact = false)
         # TODO I feel dirty
-        if method != 'PUT'
+        if method != "PUT"
           cookbook.each_pair do |key, value|
             if value.is_a?(Array)
               value.each do |file|
-                if file.is_a?(Hash) && file.has_key?('checksum')
-                  file['url'] ||= endpoint.build_uri(base_uri, org_prefix + ['file_store', 'checksums', file['checksum']])
+                if file.is_a?(Hash) && file.has_key?("checksum")
+                  file["url"] ||= endpoint.build_uri(base_uri, org_prefix + ["file_store", "checksums", file["checksum"]])
                 end
               end
             end
           end
-          cookbook['name'] ||= "#{name}-#{version}"
+          cookbook["name"] ||= "#{name}-#{version}"
           # TODO it feels wrong, but the real chef server doesn't expand 'version', so we don't either.
 
-          cookbook['frozen?'] ||= false
-          cookbook['metadata'] ||= {}
-          cookbook['metadata']['version'] ||= version
+          cookbook["frozen?"] ||= false
+          cookbook["metadata"] ||= {}
+          cookbook["metadata"]["version"] ||= version
 
           # defaults set by the client and not the Server:
           # metadata[name, description, maintainer, maintainer_email, license]
 
-          cookbook['metadata']['long_description'] ||= ""
-          cookbook['metadata']['dependencies'] ||= {}
-          cookbook['metadata']['attributes'] ||= {}
-          cookbook['metadata']['recipes'] ||= {}
+          cookbook["metadata"]["long_description"] ||= ""
+          cookbook["metadata"]["dependencies"] ||= {}
+          cookbook["metadata"]["attributes"] ||= {}
+          cookbook["metadata"]["recipes"] ||= {}
         end
 
         if is_cookbook_artifact
-          cookbook.delete('json_class')
+          cookbook.delete("json_class")
         else
-          cookbook['cookbook_name'] ||= name
-          cookbook['json_class'] ||= 'Chef::CookbookVersion'
+          cookbook["cookbook_name"] ||= name
+          cookbook["json_class"] ||= "Chef::CookbookVersion"
         end
 
-        cookbook['chef_type'] ||= 'cookbook_version'
-        if method == 'MIN'
-          cookbook['metadata'].delete('attributes')
-          cookbook['metadata'].delete('long_description')
+        cookbook["chef_type"] ||= "cookbook_version"
+        if method == "MIN"
+          cookbook["metadata"].delete("attributes")
+          cookbook["metadata"].delete("long_description")
         end
         cookbook
       end
 
       def self.normalize_environment(environment, name)
-        environment['name'] ||= name
-        environment['description'] ||= ''
-        environment['cookbook_versions'] ||= {}
-        environment['json_class'] ||= "Chef::Environment"
-        environment['chef_type'] ||= "environment"
-        environment['default_attributes'] ||= {}
-        environment['override_attributes'] ||= {}
+        environment["name"] ||= name
+        environment["description"] ||= ""
+        environment["cookbook_versions"] ||= {}
+        environment["json_class"] ||= "Chef::Environment"
+        environment["chef_type"] ||= "environment"
+        environment["default_attributes"] ||= {}
+        environment["override_attributes"] ||= {}
         environment
       end
 
       def self.normalize_group(group, name, orgname)
-        group.delete('id')
-        if group['actors'].is_a?(Hash)
-          group['users'] ||= group['actors']['users']
-          group['clients'] ||= group['actors']['clients']
-          group['groups'] ||= group['actors']['groups']
-          group['actors'] = nil
+        group.delete("id")
+        if group["actors"].is_a?(Hash)
+          group["users"] ||= group["actors"]["users"]
+          group["clients"] ||= group["actors"]["clients"]
+          group["groups"] ||= group["actors"]["groups"]
+          group["actors"] = nil
         end
-        group['users'] ||= []
-        group['clients'] ||= []
-        group['actors'] ||= (group['clients'] + group['users'])
-        group['groups'] ||= []
-        group['orgname'] ||= orgname if orgname
-        group['name'] ||= name
-        group['groupname'] ||= name
-
-        group['users'].uniq!
-        group['clients'].uniq!
-        group['actors'].uniq!
-        group['groups'].uniq!
+        group["users"] ||= []
+        group["clients"] ||= []
+        group["actors"] ||= (group["clients"] + group["users"])
+        group["groups"] ||= []
+        group["orgname"] ||= orgname if orgname
+        group["name"] ||= name
+        group["groupname"] ||= name
+
+        group["users"].uniq!
+        group["clients"].uniq!
+        group["actors"].uniq!
+        group["groups"].uniq!
         group
       end
 
       def self.normalize_node(node, name)
-        node['name'] ||= name
-        node['json_class'] ||= 'Chef::Node'
-        node['chef_type'] ||= 'node'
-        node['chef_environment'] ||= '_default'
-        node['override'] ||= {}
-        node['normal'] ||= {"tags" => []}
-        node['default'] ||= {}
-        node['automatic'] ||= {}
-        node['run_list'] ||= []
-        node['run_list'] = normalize_run_list(node['run_list'])
+        node["name"] ||= name
+        node["json_class"] ||= "Chef::Node"
+        node["chef_type"] ||= "node"
+        node["chef_environment"] ||= "_default"
+        node["override"] ||= {}
+        node["normal"] ||= { "tags" => [] }
+        node["default"] ||= {}
+        node["automatic"] ||= {}
+        node["run_list"] ||= []
+        node["run_list"] = normalize_run_list(node["run_list"])
         node
       end
 
       def self.normalize_policy(policy, name, revision)
-        policy['name'] ||= name
-        policy['revision_id'] ||= revision
-        policy['run_list'] ||= []
-        policy['cookbook_locks'] ||= {}
+        policy["name"] ||= name
+        policy["revision_id"] ||= revision
+        policy["run_list"] ||= []
+        policy["cookbook_locks"] ||= {}
         policy
       end
 
       def self.normalize_policy_group(policy_group, name)
-        policy_group[name] ||= 'name'
-        policy_group['policies'] ||= {}
+        policy_group[name] ||= "name"
+        policy_group["policies"] ||= {}
         policy_group
       end
 
       def self.normalize_organization(org, name)
-        org['name'] ||= name
-        org['full_name'] ||= name
-        org['org_type'] ||= 'Business'
-        org['clientname'] ||= "#{name}-validator"
-        org['billing_plan'] ||= 'platform-free'
+        org["name"] ||= name
+        org["full_name"] ||= name
+        org["org_type"] ||= "Business"
+        org["clientname"] ||= "#{name}-validator"
+        org["billing_plan"] ||= "platform-free"
         org
       end
 
       def self.normalize_role(role, name)
-        role['name'] ||= name
-        role['description'] ||= ''
-        role['json_class'] ||= 'Chef::Role'
-        role['chef_type'] ||= 'role'
-        role['default_attributes'] ||= {}
-        role['override_attributes'] ||= {}
-        role['run_list'] ||= []
-        role['run_list'] = normalize_run_list(role['run_list'])
-        role['env_run_lists'] ||= {}
-        role['env_run_lists'].each_pair do |env, run_list|
-          role['env_run_lists'][env] = normalize_run_list(run_list)
+        role["name"] ||= name
+        role["description"] ||= ""
+        role["json_class"] ||= "Chef::Role"
+        role["chef_type"] ||= "role"
+        role["default_attributes"] ||= {}
+        role["override_attributes"] ||= {}
+        role["run_list"] ||= []
+        role["run_list"] = normalize_run_list(role["run_list"])
+        role["env_run_lists"] ||= {}
+        role["env_run_lists"].each_pair do |env, run_list|
+          role["env_run_lists"][env] = normalize_run_list(run_list)
         end
         role
       end
 
       def self.normalize_run_list(run_list)
-        run_list.map{|item|
+        run_list.map {|item|
           case item
           when /^recipe\[.*\]$/
             item # explicit recipe