chef-zero 14.0.6 → 14.0.11

data/lib/chef_zero/endpoints/node_identifiers_endpoint.rb

@@ -9,9 +9,9 @@ module ChefZero
       def get(request)
         if get_data(request, request.rest_path[0..3])
           result = {
-            :id => UUIDTools::UUID.parse_raw(request.rest_path[0..4].to_s).to_s.delete("-"),
-            :authz_id => "0" * 32,
-            :org_id => UUIDTools::UUID.parse_raw(request.rest_path[0..1].to_s).to_s.delete("-") }
+            id: UUIDTools::UUID.parse_raw(request.rest_path[0..4].to_s).to_s.delete("-"),
+            authz_id: "0" * 32,
+            org_id: UUIDTools::UUID.parse_raw(request.rest_path[0..1].to_s).to_s.delete("-") }
           json_response(200, result)
         else
           raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")

data/lib/chef_zero/endpoints/nodes_endpoint.rb

@@ -12,12 +12,12 @@ module ChefZero
         if request.rest_path.last == "nodes"
           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
         end
 
@@ -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

data/lib/chef_zero/endpoints/not_found_endpoint.rb

@@ -4,7 +4,7 @@ module ChefZero
   module Endpoints
     class NotFoundEndpoint
       def call(request)
-        [404, { "Content-Type" => "application/json" }, FFI_Yajl::Encoder.encode({ "error" => ["Object not found: #{request.env['REQUEST_PATH']}"] }, :pretty => true)]
+        [404, { "Content-Type" => "application/json" }, FFI_Yajl::Encoder.encode({ "error" => ["Object not found: #{request.env['REQUEST_PATH']}"] }, pretty: true)]
       end
     end
   end

data/lib/chef_zero/endpoints/organization_endpoint.rb

@@ -16,14 +16,14 @@ module ChefZero
         new_org.each do |key, value|
           org[key] = value
         end
-        save_org = FFI_Yajl::Encoder.encode(org, :pretty => true)
+        save_org = FFI_Yajl::Encoder.encode(org, pretty: true)
         if new_org["name"] != request.rest_path[-1]
           # This is a rename
           return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org['name']}: rename not supported for orgs")
         end
         set_data(request, request.rest_path + [ "org" ], save_org)
         json_response(200, {
-          "uri" => "#{build_uri(request.base_uri, request.rest_path)}",
+          "uri" => (build_uri(request.base_uri, request.rest_path)).to_s,
           "name" => org["name"],
           "org_type" => org["org_type"],
           "full_name" => org["full_name"],
@@ -39,7 +39,7 @@ module ChefZero
       def populate_defaults(request, response_json)
         org = FFI_Yajl::Parser.parse(response_json)
         org = ChefData::DataNormalizer.normalize_organization(org, request.rest_path[1])
-        FFI_Yajl::Encoder.encode(org, :pretty => true)
+        FFI_Yajl::Encoder.encode(org, pretty: true)
       end
     end
   end

data/lib/chef_zero/endpoints/organization_users_endpoint.rb

@@ -30,7 +30,7 @@ module ChefZero
         if !users["users"] || !users["users"].include?(username)
           users["users"] ||= []
           users["users"] |= [ username ]
-          set_data(request, [ "organizations", orgname, "groups", "users" ], FFI_Yajl::Encoder.encode(users, :pretty => true))
+          set_data(request, [ "organizations", orgname, "groups", "users" ], FFI_Yajl::Encoder.encode(users, pretty: true))
         end
         json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ username ]) })
       end

data/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb

@@ -12,7 +12,7 @@ module ChefZero
         validator = FFI_Yajl::Parser.parse(get_data(request, validator_path))
         private_key, public_key = server.gen_key_pair
         validator["public_key"] = public_key
-        set_data(request, validator_path, FFI_Yajl::Encoder.encode(validator, :pretty => true))
+        set_data(request, validator_path, FFI_Yajl::Encoder.encode(validator, pretty: true))
         json_response(200, { "private_key" => private_key })
       end
     end

data/lib/chef_zero/endpoints/organizations_endpoint.rb

@@ -25,14 +25,14 @@ module ChefZero
         elsif exists_data_dir?(request, request.rest_path + [ name ])
           error(409, "Organization already exists")
         else
-          create_data_dir(request, request.rest_path, name, :requestor => request.requestor)
+          create_data_dir(request, request.rest_path, name, requestor: request.requestor)
 
           org = {
             "guid" => UUIDTools::UUID.random_create.to_s.delete("-"),
             "assigned_at" => Time.now.to_s,
           }.merge(contents)
           org_path = request.rest_path + [ name ]
-          set_data(request, org_path + [ "org" ], FFI_Yajl::Encoder.encode(org, :pretty => true))
+          set_data(request, org_path + [ "org" ], FFI_Yajl::Encoder.encode(org, pretty: true))
 
           if server.generate_real_keys?
             # Create the validator client
@@ -42,12 +42,12 @@ module ChefZero
             validator = FFI_Yajl::Encoder.encode({
               "validator" => true,
               "public_key" => public_key,
-            }, :pretty => true)
+            }, pretty: true)
             set_data(request, validator_path, validator)
           end
 
           json_response(201, {
-            "uri" => "#{build_uri(request.base_uri, org_path)}",
+            "uri" => (build_uri(request.base_uri, org_path)).to_s,
             "name" => name,
             "org_type" => org["org_type"],
             "full_name" => full_name,

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -17,7 +17,7 @@ module ChefZero
         # Get the result
         result_hash = {}
         list_data(request).sort.each do |name|
-          result_hash[name] = "#{build_uri(request.base_uri, request.rest_path + [name])}"
+          result_hash[name] = (build_uri(request.base_uri, request.rest_path + [name])).to_s
         end
         json_response(200, result_hash)
       end
@@ -29,7 +29,7 @@ module ChefZero
           error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
         else
           create_data(request, request.rest_path, key, contents)
-          json_response(201, { "uri" => "#{build_uri(request.base_uri, request.rest_path + [key])}" })
+          json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [key])).to_s })
         end
       end
 

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -52,7 +52,7 @@ module ChefZero
           existing_json = FFI_Yajl::Parser.parse(existing_value)
           merged_json = existing_json.merge(request_json)
           if merged_json.size > request_json.size
-            return FFI_Yajl::Encoder.encode(merged_json, :pretty => true)
+            return FFI_Yajl::Encoder.encode(merged_json, pretty: true)
           end
         end
 

data/lib/chef_zero/endpoints/role_endpoint.rb

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

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -15,11 +15,11 @@ module ChefZero
         end
         delete_data(request)
         json_response(200, {
-          :guid => request.rest_path[3],
-          :name => request.rest_path[3],
-          :checksums => existing_sandbox["checksums"],
-          :create_time => existing_sandbox["create_time"],
-          :is_completed => true,
+          guid: request.rest_path[3],
+          name: request.rest_path[3],
+          checksums: existing_sandbox["checksums"],
+          create_time: existing_sandbox["create_time"],
+          is_completed: true,
         })
       end
     end

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -17,11 +17,11 @@ module ChefZero
         result_checksums = {}
         needed_checksums.keys.each do |needed_checksum|
           if list_data(request, request.rest_path[0..1] + %w{file_store checksums}).include?(needed_checksum)
-            result_checksums[needed_checksum] = { :needs_upload => false }
+            result_checksums[needed_checksum] = { needs_upload: false }
           else
             result_checksums[needed_checksum] = {
-              :needs_upload => true,
-              :url => build_uri(request.base_uri, request.rest_path[0..1] + ["file_store", "checksums", needed_checksum]),
+              needs_upload: true,
+              url: build_uri(request.base_uri, request.rest_path[0..1] + ["file_store", "checksums", needed_checksum]),
             }
             sandbox_checksums << needed_checksum
           end
@@ -35,14 +35,14 @@ module ChefZero
         time_str = "#{time_str[0..21]}:#{time_str[22..23]}"
 
         create_data(request, request.rest_path, id, FFI_Yajl::Encoder.encode({
-          :create_time => time_str,
-          :checksums => sandbox_checksums,
-        }, :pretty => true))
+          create_time: time_str,
+          checksums: sandbox_checksums,
+        }, pretty: true))
 
         json_response(201, {
-          :uri => build_uri(request.base_uri, request.rest_path + [id]),
-          :checksums => result_checksums,
-          :sandbox_id => id,
+          uri: build_uri(request.base_uri, request.rest_path + [id]),
+          checksums: result_checksums,
+          sandbox_id: id,
         })
       end
     end

data/lib/chef_zero/endpoints/user_association_request_endpoint.rb

@@ -26,7 +26,7 @@ module ChefZero
           if !users["users"] || !users["users"].include?(username)
             users["users"] ||= []
             users["users"] |= [ username ]
-            set_data(request, [ "organizations", orgname, "groups", "users" ], FFI_Yajl::Encoder.encode(users, :pretty => true))
+            set_data(request, [ "organizations", orgname, "groups", "users" ], FFI_Yajl::Encoder.encode(users, pretty: true))
           end
         elsif json["response"] == "reject"
           delete_data(request, association_request_path)

data/lib/chef_zero/rest_base.rb

@@ -145,7 +145,7 @@ module ChefZero
     def set_data(request, rest_path, data, *options)
       rest_path ||= request.rest_path
       begin
-        data_store.set(rest_path, data, *options, :requestor => request.requestor)
+        data_store.set(rest_path, data, *options, requestor: request.requestor)
       rescue DataStore::DataNotFoundError
         if options.include?(:data_store_exceptions)
           raise
@@ -158,7 +158,7 @@ module ChefZero
     def create_data_dir(request, rest_path, name, *options)
       rest_path ||= request.rest_path
       begin
-        data_store.create_dir(rest_path, name, *options, :requestor => request.requestor)
+        data_store.create_dir(rest_path, name, *options, requestor: request.requestor)
       rescue DataStore::DataNotFoundError
         if options.include?(:data_store_exceptions)
           raise
@@ -177,7 +177,7 @@ module ChefZero
     def create_data(request, rest_path, name, data, *options)
       rest_path ||= request.rest_path
       begin
-        data_store.create(rest_path, name, data, *options, :requestor => request.requestor)
+        data_store.create(rest_path, name, data, *options, requestor: request.requestor)
       rescue DataStore::DataNotFoundError
         if options.include?(:data_store_exceptions)
           raise
@@ -296,7 +296,7 @@ module ChefZero
     end
 
     def to_json(data)
-      FFI_Yajl::Encoder.encode(data, :pretty => true)
+      FFI_Yajl::Encoder.encode(data, pretty: true)
     end
 
     def get_data_or_else(request, path, or_else_value)

data/lib/chef_zero/rspec.rb

@@ -219,7 +219,7 @@ module ChefZero
         with_object_path("cookbooks/#{name}") do
           # If you didn't specify metadata.rb, we generate it for you. If you
           # explicitly set it to nil, that means you don't want it at all.
-          if data.has_key?("metadata.rb")
+          if data.key?("metadata.rb")
             if data["metadata.rb"].nil?
               data.delete("metadata.rb")
             end
@@ -235,7 +235,7 @@ module ChefZero
         with_object_path("cookbook_artifacts/#{name}") do
           # If you didn't specify metadata.rb, we generate it for you. If you
           # explicitly set it to nil, that means you don't want it at all.
-          if data.has_key?("metadata.rb")
+          if data.key?("metadata.rb")
             if data["metadata.rb"].nil?
               data.delete("metadata.rb")
             end
@@ -333,7 +333,7 @@ module ChefZero
         if data.is_a?(String)
           data
         else
-          FFI_Yajl::Encoder.encode(data, :pretty => true)
+          FFI_Yajl::Encoder.encode(data, pretty: true)
         end
       end
 

data/lib/chef_zero/server.rb

@@ -112,23 +112,23 @@ module ChefZero
   class Server
 
     DEFAULT_OPTIONS = {
-      :host => ["127.0.0.1"],
-      :port => 8889,
-      :log_level => :warn,
-      :generate_real_keys => true,
-      :single_org => "chef",
-      :ssl => false,
+      host: ["127.0.0.1"],
+      port: 8889,
+      log_level: :warn,
+      generate_real_keys: true,
+      single_org: "chef",
+      ssl: false,
     }.freeze
 
     GLOBAL_ENDPOINTS = [
       "/license",
       "/version",
       "/server_api_version",
-    ]
+    ].freeze
 
     def initialize(options = {})
       @options = DEFAULT_OPTIONS.merge(options)
-      if @options[:single_org] && !@options.has_key?(:osc_compat)
+      if @options[:single_org] && !@options.key?(:osc_compat)
         @options[:osc_compat] = true
       end
       @options.freeze
@@ -281,14 +281,14 @@ module ChefZero
 
     def start_background(wait = 5)
       @server = WEBrick::HTTPServer.new(
-        :DoNotListen => true,
-        :AccessLog   => [],
-        :Logger      => WEBrick::Log.new(StringIO.new, 7),
-        :RequestTimeout => 300,
-        :SSLEnable => options[:ssl],
-        :SSLOptions => ssl_opts,
-        :SSLCertName => [ [ "CN", WEBrick::Utils.getservername ] ],
-        :StartCallback => proc do
+        DoNotListen: true,
+        AccessLog: [],
+        Logger: WEBrick::Log.new(StringIO.new, 7),
+        RequestTimeout: 300,
+        SSLEnable: options[:ssl],
+        SSLOptions: ssl_opts,
+        SSLCertName: [ [ "CN", WEBrick::Utils.getservername ] ],
+        StartCallback: proc do
           @running = true
         end
       )
@@ -484,7 +484,7 @@ module ChefZero
       if contents["policy_groups"]
         contents["policy_groups"].each_pair do |group_name, group|
           group["policies"].each do |policy_name, policy_revision|
-            data_store.set(["organizations", org_name, "policy_groups", group_name, "policies", policy_name], FFI_Yajl::Encoder.encode(policy_revision["revision_id"], :pretty => true), :create, :create_dir)
+            data_store.set(["organizations", org_name, "policy_groups", group_name, "policies", policy_name], FFI_Yajl::Encoder.encode(policy_revision["revision_id"], pretty: true), :create, :create_dir)
           end
         end
       end
@@ -502,7 +502,7 @@ module ChefZero
             end
             raise "No version specified" if !cookbook_data[:version]
             data_store.create_dir(["organizations", org_name, cookbook_type], cookbook_data[:cookbook_name], :recursive)
-            data_store.set(["organizations", org_name, cookbook_type, cookbook_data[:cookbook_name], cookbook_data[:version]], FFI_Yajl::Encoder.encode(cookbook_data, :pretty => true), :create)
+            data_store.set(["organizations", org_name, cookbook_type, cookbook_data[:cookbook_name], cookbook_data[:version]], FFI_Yajl::Encoder.encode(cookbook_data, pretty: true), :create)
             cookbook_data.values.each do |files|
               next unless files.is_a? Array
               files.each do |file|
@@ -699,7 +699,7 @@ module ChefZero
     end
 
     def dejsonize(value)
-      value.is_a?(Hash) ? FFI_Yajl::Encoder.encode(value, :pretty => true) : value
+      value.is_a?(Hash) ? FFI_Yajl::Encoder.encode(value, pretty: true) : value
     end
 
     def get_file(directory, path)

data/lib/chef_zero/solr/query/range_query.rb

@@ -39,7 +39,7 @@ module ChefZero
           matches_values?(doc[DEFAULT_FIELD])
         end
 
-        DEFAULT_FIELD = "text"
+        DEFAULT_FIELD = "text".freeze
       end
     end
   end

data/lib/chef_zero/solr/query/regexpable_query.rb

@@ -21,9 +21,9 @@ module ChefZero
           values.any? { |value| !@regexp.match(value).nil? }
         end
 
-        DEFAULT_FIELD = "text"
-        WORD_CHARACTER = "[A-Za-z0-9@._':\-]"
-        NON_WORD_CHARACTER = "[^A-Za-z0-9@._':\-]"
+        DEFAULT_FIELD = "text".freeze
+        WORD_CHARACTER = "[A-Za-z0-9@._':\-]".freeze
+        NON_WORD_CHARACTER = "[^A-Za-z0-9@._':\-]".freeze
       end
     end
   end

data/lib/chef_zero/solr/solr_parser.rb

@@ -200,7 +200,7 @@ module ChefZero
         end
       end
 
-      DEFAULT_FIELD = "text"
+      DEFAULT_FIELD = "text".freeze
     end
   end
 end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "14.0.6"
+  VERSION = "14.0.11".freeze
 end

data/spec/server_spec.rb

@@ -5,7 +5,7 @@ require "uri"
 describe ChefZero::Server do
   context "with a server bound to port 8889" do
     before :each do
-      @server = ChefZero::Server.new(:port => 8889)
+      @server = ChefZero::Server.new(port: 8889)
       @server.start_background
     end
     after :each do
@@ -13,18 +13,18 @@ describe ChefZero::Server do
     end
 
     it "a second server bound to port 8889 throws EADDRINUSE" do
-      expect { ChefZero::Server.new(:port => 8889).start }.to raise_error Errno::EADDRINUSE
+      expect { ChefZero::Server.new(port: 8889).start }.to raise_error Errno::EADDRINUSE
     end
 
     it "a server bound to range 8889-9999 binds to a port > 8889" do
-      server = ChefZero::Server.new(:port => 8889.upto(9999))
+      server = ChefZero::Server.new(port: 8889.upto(9999))
       server.start_background
       expect(server.port).to be > 8889
       expect(URI(server.url).port).to be > 8889
     end
 
     it "a server bound to range 8889-8889 throws an exception" do
-      expect { ChefZero::Server.new(:port => 8889.upto(8889)).start_background }.to raise_error Errno::EADDRINUSE
+      expect { ChefZero::Server.new(port: 8889.upto(8889)).start_background }.to raise_error Errno::EADDRINUSE
     end
 
     it "has a very patient request timeout" do

data/spec/support/oc_pedant.rb

@@ -32,7 +32,7 @@ chef_server "http://127.0.0.1:8889"
 # testing location, you should not specify a value for this parameter.
 # The tests will still run, albeit slower, as they will now need to
 # poll for a period to ensure they are querying committed results.
-#search_server "http://localhost:8983"
+# search_server "http://localhost:8983"
 
 # Related to the 'search_server' parameter, this specifies the maximum
 # amout of time (in seconds) that search endpoint requests should be
@@ -93,49 +93,49 @@ end
 keyfile_maybe = ENV["CHEF_FS"] ? { key_file: key } : { key_file: nil }
 
 requestors({
-             :clients => {
+             clients: {
                # The the admin user, for the purposes of getting things rolling
-               :admin => {
-                 :name => "pedant_admin_client",
-                 :create_me => true,
-                 :create_knife => true,
-                 :admin => true,
+               admin: {
+                 name: "pedant_admin_client",
+                 create_me: true,
+                 create_knife: true,
+                 admin: true,
                },
-               :non_admin => {
-                 :name => "pedant_client",
-                 :create_me => true,
-                 :create_knife => true,
+               non_admin: {
+                 name: "pedant_client",
+                 create_me: true,
+                 create_knife: true,
                },
-               :bad => {
-                 :name => "bad_client",
-                 :create_me => true,
-                 :create_knife => true,
-                 :bogus => true,
+               bad: {
+                 name: "bad_client",
+                 create_me: true,
+                 create_knife: true,
+                 bogus: true,
                },
              },
 
-             :users => {
+             users: {
                # An administrator in the testing organization
-               :admin => {
-                 :name => cheffs_or_else_user("pedant_admin_user"),
-                 :create_me => !ENV["CHEF_FS"],
-                 :associate => !ENV["CHEF_FS"],
-                 :create_knife => true,
+               admin: {
+                 name: cheffs_or_else_user("pedant_admin_user"),
+                 create_me: !ENV["CHEF_FS"],
+                 associate: !ENV["CHEF_FS"],
+                 create_knife: true,
                }.merge(keyfile_maybe),
 
-               :non_admin => {
-                 :name => cheffs_or_else_user("pedant_user"),
-                 :create_me => !ENV["CHEF_FS"],
-                 :associate => !ENV["CHEF_FS"],
-                 :create_knife => true,
+               non_admin: {
+                 name: cheffs_or_else_user("pedant_user"),
+                 create_me: !ENV["CHEF_FS"],
+                 associate: !ENV["CHEF_FS"],
+                 create_knife: true,
                }.merge(keyfile_maybe),
 
                # A user that is not a member of the testing organization
-               :bad => {
-                 :name => cheffs_or_else_user("pedant-nobody"),
-                 :create_me => !ENV["CHEF_FS"],
-                 :create_knife => true,
-                 :associate => false,
+               bad: {
+                 name: cheffs_or_else_user("pedant-nobody"),
+                 create_me: !ENV["CHEF_FS"],
+                 create_knife: true,
+                 associate: false,
                }.merge(keyfile_maybe),
              },
            })