chef-zero 14.0.6 → 14.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d0707f86a20fcf72ca9611f063fcc032229f68e0da454e46d912cf67b9a023a
-  data.tar.gz: 97a4261a6e7f741d42834b8e848dd2f5d181e5046d2f332205e955812fa1d401
+  metadata.gz: 81a886b9fb926d3f1f355c4de530c96f2d65d7a3565c39415ad4a5d257689493
+  data.tar.gz: 7575b3e658f703ef7f9e3ea4d04a3a263ae4fe1318ac40af36ba6d235d8b1faf
 SHA512:
-  metadata.gz: f2c25d07cf431f85fa377db925c1473050f08b89fa776024989ab050d3e3419187aa204ec26bf3afd91c1ea9a2c50da40e7f18bf89e8605f92155637a4ff0031
-  data.tar.gz: 4bac9abe81e5f922809fd6d202dc7e766550bb77915cffdf59067167dd9e23101bf4b3d888e4fb9523125b05754f72b5922f6977d41abc9aa91dfff03d105c55
+  metadata.gz: 7dd8837c30d93b11a012bd1dfcd335938ee42e91a0e0e0b46a20d89cd4acfd0101220185c209f77f99cc9e5d6f68c6f1ca79db9d76d760e83c925986438d7669
+  data.tar.gz: d4bd90dd779dbdcec494219f9a08c8f1402c349b9b1985f39c836724c0ee235a7e1a49feeaf8c640381a8fb4297259a91314f9659cb1757ef834dbce85c74143

data/Gemfile

@@ -1,10 +1,11 @@
 source "https://rubygems.org"
+
 gemspec
 
 # gem 'rest-client', :git => 'https://github.com/chef/rest-client.git'
 
 group :pedant do
-  gem "oc-chef-pedant", :git => "https://github.com/chef/chef-server.git"
+  gem "oc-chef-pedant", git: "https://github.com/chef/chef-server.git"
 end
 
 group :development, :test do
@@ -16,6 +17,13 @@ if ENV["GEMFILE_MOD"]
   instance_eval(ENV["GEMFILE_MOD"])
 else
   gem "chef", "~> 14.0"
+  gem "ohai", "~> 14.0"
+end
+
+group :debug do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-stack_explorer"
 end
 
 # If you want to load debugging tools into the bundle exec sandbox,

data/Rakefile

@@ -1,24 +1,21 @@
-require "bundler"
 require "bundler/gem_tasks"
 
-require "chef_zero/version"
-
 def run_oc_pedant(env = {})
   ENV.update(env)
   require File.expand_path("spec/run_oc_pedant")
 end
 
-ENV_DOCS = <<END
-Environment:
- - RSPEC_OPTS   Options to pass to RSpec
-                e.g. RSPEC_OPTS="--fail-fast --profile 5"
- - PEDANT_OPTS  Options to pass to oc-chef-pedant
-                e.g. PEDANT_OPTS="--focus-keys --skip-users"
- - LOG_LEVEL    Set the log level (default: warn)
-                e.g. LOG_LEVEL=debug
+ENV_DOCS = <<~END.freeze
+  Environment:
+   - RSPEC_OPTS   Options to pass to RSpec
+                  e.g. RSPEC_OPTS="--fail-fast --profile 5"
+   - PEDANT_OPTS  Options to pass to oc-chef-pedant
+                  e.g. PEDANT_OPTS="--focus-keys --skip-users"
+   - LOG_LEVEL    Set the log level (default: warn)
+                  e.g. LOG_LEVEL=debug
 END
 
-task :default => :pedant
+task default: :pedant
 
 desc "Run specs"
 task :spec do
@@ -26,7 +23,7 @@ task :spec do
 end
 
 desc "Run oc-chef-pedant\n\n#{ENV_DOCS}"
-task :pedant => :oc_pedant
+task pedant: :oc_pedant
 
 desc "Run oc-chef-pedant with CHEF_FS set\n\n#{ENV_DOCS}"
 task :cheffs do
@@ -59,5 +56,5 @@ begin
     task.options += ["--display-cop-names", "--no-color"]
   end
 rescue LoadError
-  puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
+  puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
 end

data/chef-zero.gemspec

@@ -4,13 +4,12 @@ require "chef_zero/version"
 Gem::Specification.new do |s|
   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.description = s.summary
   s.author = "John Keiser"
   s.email = "jkeiser@chef.io"
-  s.homepage = "http://www.chef.io"
-  s.license = "Apache 2.0"
+  s.homepage = "https://github.com/chef/chef-zero"
+  s.license = "Apache-2.0"
 
   s.required_ruby_version = ">= 2.4.0"
 
@@ -18,17 +17,14 @@ Gem::Specification.new do |s|
   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.0"
+  s.add_dependency "rack", "~> 2.0", ">= 2.0.6"
 
-  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.bindir       = "bin"
   s.executables  = ["chef-zero"]
   s.require_path = "lib"
-  s.files = %w{LICENSE README.md Gemfile Rakefile} + Dir.glob("*.gemspec") +
+  s.files = %w{LICENSE Gemfile Rakefile} + Dir.glob("*.gemspec") +
     Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 end

data/lib/chef_zero.rb

@@ -4,7 +4,7 @@ module ChefZero
   MIN_API_VERSION = 0
   MAX_API_VERSION = 2
 
-  CERTIFICATE = "-----BEGIN CERTIFICATE-----\nMIIDMzCCApygAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx\nEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNVBAoM\nDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw\nBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t\nMB4XDTEyMTEyMTAwMzQyMVoXDTIyMTExOTAwMzQyMVowgZsxEDAOBgNVBAcTB1Nl\nYXR0bGUxEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAYTAlVTMRwwGgYDVQQL\nExNDZXJ0aWZpY2F0ZSBTZXJ2aWNlMRYwFAYDVQQKEw1PcHNjb2RlLCBJbmMuMS8w\nLQYDVQQDFCZVUkk6aHR0cDovL29wc2NvZGUuY29tL0dVSURTL3VzZXJfZ3VpZDCC\nASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANLDmPbR71bS2esZlZh/HfC6\n0azXFjl2677wq2ovk9xrUb0Ui4ZLC66TqQ9C/RBzOjXU4TRf3hgPTqvlCgHusl0d\nIcLCrsSl6kPEhJpYWWfRoroIAwf82A9yLQekhqXZEXu5EKkwoUMqyF6m0ZCasaE1\ny8niQxdLAsk3ady/CGQlFqHTPKFfU5UASR2LRtYC1MCIvJHDFRKAp9kPJbQo9P37\nZ8IU7cDudkZFgNLmDixlWsh7C0ghX8fgAlj1P6FgsFufygam973k79GhIP54dELB\nc0S6E8ekkRSOXU9jX/IoiXuFglBvFihAdhvED58bMXzj2AwXUyeAlxItnvs+NVUC\nAwEAATANBgkqhkiG9w0BAQUFAAOBgQBkFZRbMoywK3hb0/X7MXmPYa7nlfnd5UXq\nr2n32ettzZNmEPaI2d1j+//nL5qqhOlrWPS88eKEPnBOX/jZpUWOuAAddnrvFzgw\nrp/C2H7oMT+29F+5ezeViLKbzoFYb4yECHBoi66IFXNae13yj7taMboBeUmE664G\nTB/MZpRr8g==\n-----END CERTIFICATE-----\n"
-  PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0sOY9tHvVtLZ6xmVmH8d\n8LrRrNcWOXbrvvCrai+T3GtRvRSLhksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6y\nXR0hwsKuxKXqQ8SEmlhZZ9GiuggDB/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqx\noTXLyeJDF0sCyTdp3L8IZCUWodM8oV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0\n/ftnwhTtwO52RkWA0uYOLGVayHsLSCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0\nQsFzRLoTx6SRFI5dT2Nf8iiJe4WCUG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41\nVQIDAQAB\n-----END PUBLIC KEY-----\n"
-  PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA0sOY9tHvVtLZ6xmVmH8d8LrRrNcWOXbrvvCrai+T3GtRvRSL\nhksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6yXR0hwsKuxKXqQ8SEmlhZZ9GiuggD\nB/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqxoTXLyeJDF0sCyTdp3L8IZCUWodM8\noV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0/ftnwhTtwO52RkWA0uYOLGVayHsL\nSCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0QsFzRLoTx6SRFI5dT2Nf8iiJe4WC\nUG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41VQIDAQABAoIBAALhqbW2KQ+G0nPk\nZacwFbi01SkHx8YBWjfCEpXhEKRy0ytCnKW5YO+CFU2gHNWcva7+uhV9OgwaKXkw\nKHLeUJH1VADVqI4Htqw2g5mYm6BPvWnNsjzpuAp+BR+VoEGkNhj67r9hatMAQr0I\nitTvSH5rvd2EumYXIHKfz1K1SegUk1u1EL1RcMzRmZe4gDb6eNBs9Sg4im4ybTG6\npPIytA8vBQVWhjuAR2Tm+wZHiy0Az6Vu7c2mS07FSX6FO4E8SxWf8idaK9ijMGSq\nFvIS04mrY6XCPUPUC4qm1qNnhDPpOr7CpI2OO98SqGanStS5NFlSFXeXPpM280/u\nfZUA0AECgYEA+x7QUnffDrt7LK2cX6wbvn4mRnFxet7bJjrfWIHf+Rm0URikaNma\nh0/wNKpKBwIH+eHK/LslgzcplrqPytGGHLOG97Gyo5tGAzyLHUWBmsNkRksY2sPL\nuHq6pYWJNkqhnWGnIbmqCr0EWih82x/y4qxbJYpYqXMrit0wVf7yAgkCgYEA1twI\ngFaXqesetTPoEHSQSgC8S4D5/NkdriUXCYb06REcvo9IpFMuiOkVUYNN5d3MDNTP\nIdBicfmvfNELvBtXDomEUD8ls1UuoTIXRNGZ0VsZXu7OErXCK0JKNNyqRmOwcvYL\nJRqLfnlei5Ndo1lu286yL74c5rdTLs/nI2p4e+0CgYB079ZmcLeILrmfBoFI8+Y/\ngJLmPrFvXBOE6+lRV7kqUFPtZ6I3yQzyccETZTDvrnx0WjaiFavUPH27WMjY01S2\nTMtO0Iq1MPsbSrglO1as8MvjB9ldFcvp7gy4Q0Sv6XT0yqJ/S+vo8Df0m+H4UBpU\nf5o6EwBSd/UQxwtZIE0lsQKBgQCswfjX8Eg8KL/lJNpIOOE3j4XXE9ptksmJl2sB\njxDnQYoiMqVO808saHVquC/vTrpd6tKtNpehWwjeTFuqITWLi8jmmQ+gNTKsC9Gn\n1Pxf2Gb67PqnEpwQGln+TRtgQ5HBrdHiQIi+5am+gnw89pDrjjO5rZwhanAo6KPJ\n1zcPNQKBgQDxFu8v4frDmRNCVaZS4f1B6wTrcMrnibIDlnzrK9GG6Hz1U7dDv8s8\nNf4UmeMzDXjlPWZVOvS5+9HKJPdPj7/onv8B2m18+lcgTTDJBkza7R1mjL1Cje/Z\nKcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==\n-----END RSA PRIVATE KEY-----\n"
+  CERTIFICATE = "-----BEGIN CERTIFICATE-----\nMIIDMzCCApygAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx\nEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNVBAoM\nDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw\nBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t\nMB4XDTEyMTEyMTAwMzQyMVoXDTIyMTExOTAwMzQyMVowgZsxEDAOBgNVBAcTB1Nl\nYXR0bGUxEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAYTAlVTMRwwGgYDVQQL\nExNDZXJ0aWZpY2F0ZSBTZXJ2aWNlMRYwFAYDVQQKEw1PcHNjb2RlLCBJbmMuMS8w\nLQYDVQQDFCZVUkk6aHR0cDovL29wc2NvZGUuY29tL0dVSURTL3VzZXJfZ3VpZDCC\nASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANLDmPbR71bS2esZlZh/HfC6\n0azXFjl2677wq2ovk9xrUb0Ui4ZLC66TqQ9C/RBzOjXU4TRf3hgPTqvlCgHusl0d\nIcLCrsSl6kPEhJpYWWfRoroIAwf82A9yLQekhqXZEXu5EKkwoUMqyF6m0ZCasaE1\ny8niQxdLAsk3ady/CGQlFqHTPKFfU5UASR2LRtYC1MCIvJHDFRKAp9kPJbQo9P37\nZ8IU7cDudkZFgNLmDixlWsh7C0ghX8fgAlj1P6FgsFufygam973k79GhIP54dELB\nc0S6E8ekkRSOXU9jX/IoiXuFglBvFihAdhvED58bMXzj2AwXUyeAlxItnvs+NVUC\nAwEAATANBgkqhkiG9w0BAQUFAAOBgQBkFZRbMoywK3hb0/X7MXmPYa7nlfnd5UXq\nr2n32ettzZNmEPaI2d1j+//nL5qqhOlrWPS88eKEPnBOX/jZpUWOuAAddnrvFzgw\nrp/C2H7oMT+29F+5ezeViLKbzoFYb4yECHBoi66IFXNae13yj7taMboBeUmE664G\nTB/MZpRr8g==\n-----END CERTIFICATE-----\n".freeze
+  PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0sOY9tHvVtLZ6xmVmH8d\n8LrRrNcWOXbrvvCrai+T3GtRvRSLhksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6y\nXR0hwsKuxKXqQ8SEmlhZZ9GiuggDB/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqx\noTXLyeJDF0sCyTdp3L8IZCUWodM8oV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0\n/ftnwhTtwO52RkWA0uYOLGVayHsLSCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0\nQsFzRLoTx6SRFI5dT2Nf8iiJe4WCUG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41\nVQIDAQAB\n-----END PUBLIC KEY-----\n".freeze
+  PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA0sOY9tHvVtLZ6xmVmH8d8LrRrNcWOXbrvvCrai+T3GtRvRSL\nhksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6yXR0hwsKuxKXqQ8SEmlhZZ9GiuggD\nB/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqxoTXLyeJDF0sCyTdp3L8IZCUWodM8\noV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0/ftnwhTtwO52RkWA0uYOLGVayHsL\nSCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0QsFzRLoTx6SRFI5dT2Nf8iiJe4WC\nUG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41VQIDAQABAoIBAALhqbW2KQ+G0nPk\nZacwFbi01SkHx8YBWjfCEpXhEKRy0ytCnKW5YO+CFU2gHNWcva7+uhV9OgwaKXkw\nKHLeUJH1VADVqI4Htqw2g5mYm6BPvWnNsjzpuAp+BR+VoEGkNhj67r9hatMAQr0I\nitTvSH5rvd2EumYXIHKfz1K1SegUk1u1EL1RcMzRmZe4gDb6eNBs9Sg4im4ybTG6\npPIytA8vBQVWhjuAR2Tm+wZHiy0Az6Vu7c2mS07FSX6FO4E8SxWf8idaK9ijMGSq\nFvIS04mrY6XCPUPUC4qm1qNnhDPpOr7CpI2OO98SqGanStS5NFlSFXeXPpM280/u\nfZUA0AECgYEA+x7QUnffDrt7LK2cX6wbvn4mRnFxet7bJjrfWIHf+Rm0URikaNma\nh0/wNKpKBwIH+eHK/LslgzcplrqPytGGHLOG97Gyo5tGAzyLHUWBmsNkRksY2sPL\nuHq6pYWJNkqhnWGnIbmqCr0EWih82x/y4qxbJYpYqXMrit0wVf7yAgkCgYEA1twI\ngFaXqesetTPoEHSQSgC8S4D5/NkdriUXCYb06REcvo9IpFMuiOkVUYNN5d3MDNTP\nIdBicfmvfNELvBtXDomEUD8ls1UuoTIXRNGZ0VsZXu7OErXCK0JKNNyqRmOwcvYL\nJRqLfnlei5Ndo1lu286yL74c5rdTLs/nI2p4e+0CgYB079ZmcLeILrmfBoFI8+Y/\ngJLmPrFvXBOE6+lRV7kqUFPtZ6I3yQzyccETZTDvrnx0WjaiFavUPH27WMjY01S2\nTMtO0Iq1MPsbSrglO1as8MvjB9ldFcvp7gy4Q0Sv6XT0yqJ/S+vo8Df0m+H4UBpU\nf5o6EwBSd/UQxwtZIE0lsQKBgQCswfjX8Eg8KL/lJNpIOOE3j4XXE9ptksmJl2sB\njxDnQYoiMqVO808saHVquC/vTrpd6tKtNpehWwjeTFuqITWLi8jmmQ+gNTKsC9Gn\n1Pxf2Gb67PqnEpwQGln+TRtgQ5HBrdHiQIi+5am+gnw89pDrjjO5rZwhanAo6KPJ\n1zcPNQKBgQDxFu8v4frDmRNCVaZS4f1B6wTrcMrnibIDlnzrK9GG6Hz1U7dDv8s8\nNf4UmeMzDXjlPWZVOvS5+9HKJPdPj7/onv8B2m18+lcgTTDJBkza7R1mjL1Cje/Z\nKcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==\n-----END RSA PRIVATE KEY-----\n".freeze
 end

data/lib/chef_zero/chef_data/acl_path.rb

@@ -14,8 +14,8 @@ module ChefZero
     # - 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}
+                          nodes policies policy_groups roles sandboxes}.freeze
+      TOP_DATA_TYPES = %w{containers organizations users}.freeze
 
       # ACL data paths for a partition are:
       # /          -> /acls/root

data/lib/chef_zero/chef_data/cookbook_data.rb

@@ -11,7 +11,7 @@ module ChefZero
       class << self
         def to_hash(cookbook, name, version = nil)
           frozen = false
-          if cookbook.has_key?(:frozen)
+          if cookbook.key?(:frozen)
             frozen = cookbook[:frozen]
             cookbook = cookbook.dup
             cookbook.delete(:frozen)
@@ -72,7 +72,7 @@ module ChefZero
 
         def has_child(directory, name)
           if directory.is_a?(Hash)
-            directory.has_key?(name)
+            directory.key?(name)
           else
             directory.child(name).exists?
           end
@@ -140,10 +140,10 @@ module ChefZero
         def load_file(value, name, part = nil)
           specific_name = part ? "#{part}/#{name}" : name
           [{
-            :name => specific_name,
-            :path => name,
-            :checksum => Digest::MD5.hexdigest(value),
-            :specificity => "default",
+            name: specific_name,
+            path: name,
+            checksum: Digest::MD5.hexdigest(value),
+            specificity: "default",
           }]
         end
 

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -6,13 +6,13 @@ module ChefZero
   module ChefData
     class DataNormalizer
 
-      COOKBOOK_SEGMENTS = %w{ resources providers recipes definitions libraries attributes files templates root_files }
+      COOKBOOK_SEGMENTS = %w{ resources providers recipes definitions libraries attributes files templates root_files }.freeze
 
       def self.normalize_acls(acls)
         ChefData::DefaultCreator::PERMISSIONS.each do |perm|
           acls[perm] ||= {}
           acls[perm]["groups"] ||= []
-          if acls[perm].has_key? "users"
+          if acls[perm].key? "users"
             # When clients and users are split, their combined list
             # is the final list of actors that a subsequent GET will
             # provide. Each list is guaranteed to be unique, but the
@@ -98,7 +98,7 @@ module ChefZero
         if method == "PUT" && api_version < 2
           cookbook["all_files"] = cookbook.delete(["root_files"]) { [] }
           COOKBOOK_SEGMENTS.each do |segment|
-            next unless cookbook.has_key? segment
+            next unless cookbook.key? segment
             cookbook[segment].each do |file|
               file["name"] = "#{segment}/#{file['name']}"
               cookbook["all_files"] << file
@@ -108,7 +108,7 @@ module ChefZero
         elsif method != "PUT"
           if cookbook.key? "all_files"
             cookbook["all_files"].each do |file|
-              if file.is_a?(Hash) && file.has_key?("checksum")
+              if file.is_a?(Hash) && file.key?("checksum")
                 file["url"] ||= endpoint.build_uri(base_uri, org_prefix + ["file_store", "checksums", file["checksum"]])
               end
             end

data/lib/chef_zero/chef_data/default_creator.rb

@@ -24,8 +24,8 @@ module ChefZero
       attr_reader :creators
       attr_writer :deleted
 
-      PERMISSIONS = %w{create read update delete grant}
-      DEFAULT_SUPERUSERS = %w{pivotal}
+      PERMISSIONS = %w{create read update delete grant}.freeze
+      DEFAULT_SUPERUSERS = %w{pivotal}.freeze
 
       def clear
         @creators = { [] => @superusers }
@@ -166,7 +166,7 @@ module ChefZero
         "containers" => %w{clients containers cookbook_artifacts cookbooks data environments groups nodes policies policy_groups roles sandboxes},
         "groups" => %w{admins billing-admins clients users},
         "association_requests" => {},
-      }
+      }.freeze
 
       def list_org_default(path)
         if path.size >= 3 && path[2] == "acls"
@@ -373,7 +373,7 @@ module ChefZero
           end
           owners = filter_owners(path, unknown_owners)
 
-          #ANGRY
+          # ANGRY
           # Non-default containers do not get superusers added to them,
           # because reasons.
           unless path.size == 4 && path[0] == "organizations" && path[2] == "containers" && !exists?(path)

data/lib/chef_zero/data_store/default_facade.rb

@@ -70,7 +70,7 @@ module ChefZero
       rescue DataNotFoundError
         result = default_creator.get(path)
         if result
-          FFI_Yajl::Encoder.encode(result, :pretty => true)
+          FFI_Yajl::Encoder.encode(result, pretty: true)
         else
           raise
         end

data/lib/chef_zero/data_store/memory_store_v2.rb

@@ -36,7 +36,7 @@ module ChefZero
       def create_dir(path, name, *options)
         parent = _get(path, options.include?(:recursive))
 
-        if parent.has_key?(name)
+        if parent.key?(name)
           if !options.include?(:recursive)
             raise DataAlreadyExistsError.new(path + [name])
           end
@@ -52,7 +52,7 @@ module ChefZero
 
         parent = _get(path, options.include?(:create_dir))
 
-        if parent.has_key?(name)
+        if parent.key?(name)
           raise DataAlreadyExistsError.new(path + [name])
         end
         parent[name] = data
@@ -82,7 +82,7 @@ module ChefZero
 
       def delete(path)
         parent = _get(path[0, path.length - 1])
-        if !parent.has_key?(path[-1])
+        if !parent.key?(path[-1])
           raise DataNotFoundError.new(path)
         end
         if !parent[path[-1]].is_a?(String)
@@ -93,7 +93,7 @@ module ChefZero
 
       def delete_dir(path, *options)
         parent = _get(path[0, path.length - 1])
-        if !parent.has_key?(path[-1])
+        if !parent.key?(path[-1])
           raise DataNotFoundError.new(path)
         end
         if !parent[path[-1]].is_a?(Hash)
@@ -135,7 +135,7 @@ module ChefZero
       def _get(path, create_dir = false)
         value = @data
         path.each_with_index do |path_part, index|
-          if !value.has_key?(path_part)
+          if !value.key?(path_part)
             if create_dir
               value[path_part] = {}
             else

data/lib/chef_zero/data_store/raw_file_store.rb

@@ -69,7 +69,7 @@ module ChefZero
           FileUtils.mkdir_p(path_to(path))
         end
         begin
-          File.open(path_to(path, name), File::WRONLY | File::CREAT | File::EXCL | File::BINARY, :internal_encoding => nil) do |file|
+          File.open(path_to(path, name), File::WRONLY | File::CREAT | File::EXCL | File::BINARY, internal_encoding: nil) do |file|
             file.write data
           end
         rescue Errno::ENOENT
@@ -94,7 +94,7 @@ module ChefZero
           if options.include?(:create)
             mode |= File::CREAT
           end
-          File.open(path_to(path), mode, :internal_encoding => nil) do |file|
+          File.open(path_to(path), mode, internal_encoding: nil) do |file|
             file.write data
           end
         rescue Errno::ENOENT

data/lib/chef_zero/endpoints/acl_endpoint.rb

@@ -30,8 +30,8 @@ module ChefZero
         path, perm = validate_request(request)
         acls = FFI_Yajl::Parser.parse(get_data(request, path))
         acls[perm] = FFI_Yajl::Parser.parse(request.body)[perm]
-        set_data(request, path, FFI_Yajl::Encoder.encode(acls, :pretty => true))
-        json_response(200, { "uri" => "#{build_uri(request.base_uri, request.rest_path)}" })
+        set_data(request, path, FFI_Yajl::Encoder.encode(acls, pretty: true))
+        json_response(200, { "uri" => (build_uri(request.base_uri, request.rest_path)).to_s })
       end
     end
   end

data/lib/chef_zero/endpoints/actor_keys_endpoint.rb

@@ -5,8 +5,8 @@ module ChefZero
     # /users/USER/keys
     # /organizations/ORG/clients/CLIENT/keys
     class ActorKeysEndpoint < RestBase
-      DEFAULT_PUBLIC_KEY_NAME = "default"
-      DATE_FORMAT = "%FT%TZ" # e.g. 2015-12-24T21:00:00Z
+      DEFAULT_PUBLIC_KEY_NAME = "default".freeze
+      DATE_FORMAT = "%FT%TZ".freeze # e.g. 2015-12-24T21:00:00Z
 
       def get(request, alt_uri_root = nil)
         path = data_path(request)

data/lib/chef_zero/endpoints/container_endpoint.rb

@@ -15,7 +15,7 @@ module ChefZero
       def populate_defaults(request, response_json)
         container = FFI_Yajl::Parser.parse(response_json)
         container = ChefData::DataNormalizer.normalize_container(container, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(container, :pretty => true)
+        FFI_Yajl::Encoder.encode(container, pretty: true)
       end
     end
   end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -31,7 +31,7 @@ module ChefZero
             request_body = FFI_Yajl::Parser.parse(request.body)
             if !request_body["frozen?"]
               request_body["frozen?"] = true
-              request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true)
+              request.body = FFI_Yajl::Encoder.encode(request_body, pretty: true)
             end
           end
         end
@@ -74,7 +74,7 @@ module ChefZero
         FFI_Yajl::Parser.parse(cookbook).each_pair do |key, value|
           if value.is_a?(Array)
             value.each do |file|
-              if file.is_a?(Hash) && file.has_key?("checksum")
+              if file.is_a?(Hash) && file.key?("checksum")
                 result << file["checksum"]
               end
             end
@@ -122,7 +122,7 @@ module ChefZero
         cookbook["chef_type"] ||= "cookbook_version"
         cookbook["json_class"] ||= "Chef::CookbookVersion"
         cookbook = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, request.rest_path[3], request.rest_path[4], request.base_uri, request.method, false, api_version: request.api_version) if normalize
-        FFI_Yajl::Encoder.encode(cookbook, :pretty => true)
+        FFI_Yajl::Encoder.encode(cookbook, pretty: true)
       end
 
       def latest_version(versions)

data/lib/chef_zero/endpoints/data_bag_item_endpoint.rb

@@ -18,7 +18,7 @@ module ChefZero
       def self.populate_defaults(request, response_json, data_bag, data_bag_item)
         response = FFI_Yajl::Parser.parse(response_json)
         response = ChefData::DataNormalizer.normalize_data_bag_item(response, data_bag, data_bag_item, request.method)
-        FFI_Yajl::Encoder.encode(response, :pretty => true)
+        FFI_Yajl::Encoder.encode(response, pretty: true)
       end
     end
   end

data/lib/chef_zero/endpoints/data_bags_endpoint.rb

@@ -15,7 +15,7 @@ module ChefZero
           error(409, "Object already exists")
         else
           create_data_dir(request, request.rest_path[0..1] + ["data"], name, :recursive)
-          json_response(201, { "uri" => "#{build_uri(request.base_uri, request.rest_path + [name])}" })
+          json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [name])).to_s })
         end
       end
     end

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -81,7 +81,7 @@ module ChefZero
           cookbook_dependencies.each_pair do |dep_name, dep_constraint|
             # If the dep is not already in the list, add it to the list to solve
             # and bring in all environment-allowed cookbook versions to desired_versions
-            if !new_desired_versions.has_key?(dep_name)
+            if !new_desired_versions.key?(dep_name)
               new_unsolved += [dep_name]
               # If the dep is missing, we will try other versions of the cookbook that might not have the bad dep.
               if !exists_data_dir?(request, request.rest_path[0..1] + ["cookbooks", dep_name])

data/lib/chef_zero/endpoints/environment_endpoint.rb

@@ -26,7 +26,7 @@ module ChefZero
       def populate_defaults(request, response_json)
         response = FFI_Yajl::Parser.parse(response_json)
         response = ChefData::DataNormalizer.normalize_environment(response, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(response, :pretty => true)
+        FFI_Yajl::Encoder.encode(response, pretty: true)
       end
     end
   end

data/lib/chef_zero/endpoints/file_store_file_endpoint.rb

@@ -14,7 +14,7 @@ module ChefZero
       end
 
       def put(request)
-        data_store.set(request.rest_path, request.body, :create, :create_dir, :requestor => request.requestor)
+        data_store.set(request.rest_path, request.body, :create, :create_dir, requestor: request.requestor)
         json_response(200, {})
       end
     end

data/lib/chef_zero/endpoints/group_endpoint.rb

@@ -13,7 +13,7 @@ module ChefZero
       def populate_defaults(request, response_json)
         group = FFI_Yajl::Parser.parse(response_json)
         group = ChefData::DataNormalizer.normalize_group(group, request.rest_path[3], request.rest_path[1])
-        FFI_Yajl::Encoder.encode(group, :pretty => true)
+        FFI_Yajl::Encoder.encode(group, pretty: true)
       end
     end
   end

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -9,12 +9,12 @@ module ChefZero
       def put(request)
         data = parse_json(request.body)
 
-        if data.has_key?("policy_name") && policy_name_invalid?(data["policy_name"])
-          return error(400, "Field 'policy_name' invalid", :pretty => false)
+        if data.key?("policy_name") && policy_name_invalid?(data["policy_name"])
+          return error(400, "Field 'policy_name' invalid", pretty: false)
         end
 
-        if data.has_key?("policy_group") && policy_name_invalid?(data["policy_group"])
-          return error(400, "Field 'policy_group' invalid", :pretty => false)
+        if data.key?("policy_group") && policy_name_invalid?(data["policy_group"])
+          return error(400, "Field 'policy_group' invalid", pretty: false)
         end
 
         super(request)
@@ -27,7 +27,7 @@ module ChefZero
       def populate_defaults(request, response_json)
         node = FFI_Yajl::Parser.parse(response_json)
         node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(node, :pretty => true)
+        FFI_Yajl::Encoder.encode(node, pretty: true)
       end
     end
   end