chef-zero 4.8.0 → 4.9.0

data/lib/chef_zero/endpoints/user_association_requests_endpoint.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -8,8 +8,8 @@ module ChefZero
       def get(request)
         get_data(request, request.rest_path[0..-2])
         username = request.rest_path[1]
-        result = list_data(request, [ 'organizations' ]).select do |org|
-          exists_data?(request, [ 'organizations', org, 'association_requests', username ])
+        result = list_data(request, [ "organizations" ]).select do |org|
+          exists_data?(request, [ "organizations", org, "association_requests", username ])
         end
         result = result.map { |org| { "id" => "#{username}-#{org}", "orgname" => org } }
         json_response(200, result)

data/lib/chef_zero/endpoints/user_organizations_endpoint.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -7,11 +7,11 @@ module ChefZero
     class UserOrganizationsEndpoint < RestBase
       def get(request)
         username = request.rest_path[1]
-        result = list_data(request, [ 'organizations' ]).select do |orgname|
-          exists_data?(request, [ 'organizations', orgname, 'users', username ])
+        result = list_data(request, [ "organizations" ]).select do |orgname|
+          exists_data?(request, [ "organizations", orgname, "users", username ])
         end
         result = result.map do |orgname|
-          org = get_data(request, [ 'organizations', orgname, 'org' ])
+          org = get_data(request, [ "organizations", orgname, "org" ])
           org = FFI_Yajl::Parser.parse(org, :create_additions => false)
           { "organization" => ChefData::DataNormalizer.normalize_organization(org, orgname) }
         end

data/lib/chef_zero/endpoints/version_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/rest_base'
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/log.rb

@@ -1,4 +1,4 @@
-require 'mixlib/log'
+require "mixlib/log"
 
 module ChefZero
   class Log

data/lib/chef_zero/rest_base.rb

@@ -1,7 +1,7 @@
-require 'chef_zero/rest_request'
-require 'chef_zero/rest_error_response'
-require 'chef_zero/data_store/data_not_found_error'
-require 'chef_zero/chef_data/acl_path'
+require "chef_zero/rest_request"
+require "chef_zero/rest_error_response"
+require "chef_zero/data_store/data_not_found_error"
+require "chef_zero/chef_data/acl_path"
 
 module ChefZero
   class RestBase
@@ -34,7 +34,7 @@ module ChefZero
           "error" => "invalid-x-ops-server-api-version",
           "message" => "Specified version #{version} not supported",
           "min_api_version" => MIN_API_VERSION,
-          "max_api_version" => MAX_API_VERSION
+          "max_api_version" => MAX_API_VERSION,
         }
 
         return json_response(406,
@@ -51,11 +51,11 @@ module ChefZero
       method = request.method.downcase.to_sym
       if !self.respond_to?(method)
         accept_methods = [:get, :put, :post, :delete].select { |m| self.respond_to?(m) }
-        accept_methods_str = accept_methods.map { |m| m.to_s.upcase }.join(', ')
-        return [405, {"Content-Type" => "text/plain", "Allow" => accept_methods_str}, "Bad request method for '#{request.env['REQUEST_PATH']}': #{request.env['REQUEST_METHOD']}"]
+        accept_methods_str = accept_methods.map { |m| m.to_s.upcase }.join(", ")
+        return [405, { "Content-Type" => "text/plain", "Allow" => accept_methods_str }, "Bad request method for '#{request.env['REQUEST_PATH']}': #{request.env['REQUEST_METHOD']}"]
       end
-      if json_only && !accepts?(request, 'application', 'json')
-        return [406, {"Content-Type" => "text/plain"}, "Must accept application/json"]
+      if json_only && !accepts?(request, "application", "json")
+        return [406, { "Content-Type" => "text/plain" }, "Must accept application/json"]
       end
       # Dispatch to get()/post()/put()/delete()
       begin
@@ -73,12 +73,12 @@ module ChefZero
     def accepts?(request, category, type)
       # If HTTP_ACCEPT is not sent at all, assume it accepts anything
       # This parses as per http://tools.ietf.org/html/rfc7231#section-5.3
-      return true if !request.env['HTTP_ACCEPT']
-      accepts = request.env['HTTP_ACCEPT'].split(/,\s*/).map { |x| x.split(';',2)[0].strip }
-      return accepts.include?("#{category}/#{type}") || accepts.include?("#{category}/*") || accepts.include?('*/*')
+      return true if !request.env["HTTP_ACCEPT"]
+      accepts = request.env["HTTP_ACCEPT"].split(/,\s*/).map { |x| x.split(";", 2)[0].strip }
+      return accepts.include?("#{category}/#{type}") || accepts.include?("#{category}/*") || accepts.include?("*/*")
     end
 
-    def get_data(request, rest_path=nil, *options)
+    def get_data(request, rest_path = nil, *options)
       rest_path ||= request.rest_path
       rest_path = rest_path.map { |v| URI.decode(v) }
       begin
@@ -94,7 +94,7 @@ module ChefZero
       end
     end
 
-    def list_data(request, rest_path=nil, *options)
+    def list_data(request, rest_path = nil, *options)
       rest_path ||= request.rest_path
       begin
         data_store.list(rest_path)
@@ -107,7 +107,7 @@ module ChefZero
       end
     end
 
-    def delete_data(request, rest_path=nil, *options)
+    def delete_data(request, rest_path = nil, *options)
       rest_path ||= request.rest_path
       begin
         data_store.delete(rest_path, *options)
@@ -196,17 +196,17 @@ module ChefZero
       end
     end
 
-    def exists_data?(request, rest_path=nil)
+    def exists_data?(request, rest_path = nil)
       rest_path ||= request.rest_path
       data_store.exists?(rest_path)
     end
 
-    def exists_data_dir?(request, rest_path=nil)
+    def exists_data_dir?(request, rest_path = nil)
       rest_path ||= request.rest_path
       data_store.exists_dir?(rest_path)
     end
 
-    def error(response_code, error, opts={})
+    def error(response_code, error, opts = {})
       json_response(response_code, { "error" => [ error ] }, opts)
     end
 
@@ -223,7 +223,7 @@ module ChefZero
     #
     # @return (see #already_json_response)
     #
-    def json_response(response_code, data, options={})
+    def json_response(response_code, data, options = {})
       options = { pretty: true }.merge(options)
       do_pretty_json = !!options.delete(:pretty) # make sure we have a proper Boolean.
       json = FFI_Yajl::Encoder.encode(data, pretty: do_pretty_json)
@@ -231,7 +231,7 @@ module ChefZero
     end
 
     def text_response(response_code, text)
-      [response_code, {"Content-Type" => "text/plain"}, text]
+      [response_code, { "Content-Type" => "text/plain" }, text]
     end
 
     # Returns an Array with the response code, HTTP headers, and JSON body.
@@ -245,7 +245,7 @@ module ChefZero
     #
     # @return [Array(Fixnum, Hash{String => String}, String)]
     #
-    def already_json_response(response_code, json_text, options={})
+    def already_json_response(response_code, json_text, options = {})
       version_header = FFI_Yajl::Encoder.encode(
         "min_version" => MIN_API_VERSION.to_s,
         "max_version" => MAX_API_VERSION.to_s,
@@ -255,7 +255,7 @@ module ChefZero
 
       headers = {
         "Content-Type" => "application/json",
-        "X-Ops-Server-API-Version" => version_header
+        "X-Ops-Server-API-Version" => version_header,
       }
       headers.merge!(options[:headers]) if options[:headers]
 
@@ -266,7 +266,7 @@ module ChefZero
     def build_uri(base_uri, rest_path)
       if server.options[:single_org]
         # Strip off /organizations/chef if we are in single org mode
-        if rest_path[0..1] != [ 'organizations', server.options[:single_org] ]
+        if rest_path[0..1] != [ "organizations", server.options[:single_org] ]
           raise "Unexpected URL #{rest_path[0..1]} passed to build_uri in single org mode"
         end
 
@@ -314,8 +314,8 @@ module ChefZero
 
     def policy_name_invalid?(name)
       !name.is_a?(String) ||
-       name.size > 255 ||
-       name =~ /[+ !]/
+        name.size > 255 ||
+        name =~ /[+ !]/
     end
   end
 end

data/lib/chef_zero/rest_request.rb

@@ -1,4 +1,4 @@
-require 'rack/request'
+require "rack/request"
 
 module ChefZero
   class RestRequest
@@ -15,10 +15,10 @@ module ChefZero
 
     def base_uri
       # Load balancer awareness
-      if env['HTTP_X_FORWARDED_PROTO']
-        scheme = env['HTTP_X_FORWARDED_PROTO']
+      if env["HTTP_X_FORWARDED_PROTO"]
+        scheme = env["HTTP_X_FORWARDED_PROTO"]
       else
-        scheme = env['rack.url_scheme']
+        scheme = env["rack.url_scheme"]
       end
       @base_uri ||= "#{scheme}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}"
     end
@@ -28,7 +28,7 @@ module ChefZero
     end
 
     def api_version
-      @env['HTTP_X_OPS_SERVER_API_VERSION'] || ZERO
+      @env["HTTP_X_OPS_SERVER_API_VERSION"] || ZERO
     end
 
     def api_v0?
@@ -36,15 +36,15 @@ module ChefZero
     end
 
     def requestor
-      @env['HTTP_X_OPS_USERID']
+      @env["HTTP_X_OPS_USERID"]
     end
 
     def method
-      @env['REQUEST_METHOD']
+      @env["REQUEST_METHOD"]
     end
 
     def rest_path
-      @rest_path ||= rest_base_prefix + env['PATH_INFO'].split('/').select { |part| part != "" }
+      @rest_path ||= rest_base_prefix + env["PATH_INFO"].split("/").select { |part| part != "" }
     end
 
     def rest_path=(rest_path)
@@ -56,7 +56,7 @@ module ChefZero
     end
 
     def body
-      @body ||= env['rack.input'].read
+      @body ||= env["rack.input"].read
     end
 
     def query_params
@@ -72,9 +72,9 @@ module ChefZero
     def to_s
       result = "#{method} #{rest_path.join('/')}"
       if query_params.size > 0
-        result << "?#{query_params.map { |k,v| "#{k}=#{v}" }.join('&') }"
+        result << "?#{query_params.map { |k, v| "#{k}=#{v}" }.join('&') }"
       end
-      if body.chomp != ''
+      if body.chomp != ""
         result << "\n--- #{method} BODY ---\n"
         result << body
         result << "\n" if !body.end_with?("\n")

data/lib/chef_zero/rest_router.rb

@@ -1,4 +1,4 @@
-require 'pp'
+require "pp"
 
 module ChefZero
   class RestRouter
@@ -33,40 +33,40 @@ module ChefZero
 
     private
 
-      def find_endpoint(clean_path)
-        _, endpoint = routes.find { |route, endpoint| route.match(clean_path) }
-        endpoint || not_found
-      end
+    def find_endpoint(clean_path)
+      _, endpoint = routes.find { |route, endpoint| route.match(clean_path) }
+      endpoint || not_found
+    end
 
-      def log_request(request)
-        ChefZero::Log.debug do
-          "#{request.method} /#{request.rest_path.join("/")}".tap do |msg|
-            next unless request.method =~ /^(POST|PUT)$/
+    def log_request(request)
+      ChefZero::Log.debug do
+        "#{request.method} /#{request.rest_path.join("/")}".tap do |msg|
+          next unless request.method =~ /^(POST|PUT)$/
 
-            if request.body.nil? || request.body.empty?
-              msg << " (no body)"
-            else
-              msg << [
-                "",
-                "--- #{request.method} BODY ---",
-                request.body.chomp,
-                "--- END #{request.method} BODY ---"
-              ].join("\n")
-            end
+          if request.body.nil? || request.body.empty?
+            msg << " (no body)"
+          else
+            msg << [
+              "",
+              "--- #{request.method} BODY ---",
+              request.body.chomp,
+              "--- END #{request.method} BODY ---",
+            ].join("\n")
           end
         end
-
-        ChefZero::Log.debug { request.pretty_inspect }
       end
 
-      def log_response(response)
-        ChefZero::Log.debug {
-          [ "",
-            "--- RESPONSE (#{response[0]}) ---",
-            response[2].chomp,
-            "--- END RESPONSE ---",
-          ].join("\n")
-        }
-      end
+      ChefZero::Log.debug { request.pretty_inspect }
+    end
+
+    def log_response(response)
+      ChefZero::Log.debug {
+        [ "",
+          "--- RESPONSE (#{response[0]}) ---",
+          response[2].chomp,
+          "--- END RESPONSE ---",
+        ].join("\n")
+      }
+    end
   end
 end

data/lib/chef_zero/rspec.rb

@@ -1,6 +1,6 @@
-require 'tempfile'
-require 'chef_zero/server'
-require 'chef_zero/rest_request'
+require "tempfile"
+require "chef_zero/server"
+require "chef_zero/rest_request"
 
 module ChefZero
   module RSpec
@@ -25,7 +25,7 @@ module ChefZero
 
           # Set up configuration so that clients will point to the server
           self.server = ChefZero::Server.new(chef_server_options)
-          self.client_key = Tempfile.new(['chef_zero_client_key', '.pem'])
+          self.client_key = Tempfile.new(["chef_zero_client_key", ".pem"])
           client_key.write(ChefZero::PRIVATE_KEY)
           client_key.close
           # Start the server
@@ -84,7 +84,7 @@ module ChefZero
             else
               Chef::Config.chef_server_url = ChefZero::RSpec.server.url
             end
-            Chef::Config.node_name = 'admin'
+            Chef::Config.node_name = "admin"
             Chef::Config.client_key = ChefZero::RSpec.client_key.path
             Chef::Config.http_retry_count = 0
           end
@@ -103,7 +103,7 @@ module ChefZero
     end
 
     module WhenTheChefServerClassMethods
-      def organization(name, org = '{}', &block)
+      def organization(name, org = "{}", &block)
         before(chef_server_options[:server_scope]) { organization(name, org, &block) }
       end
 
@@ -175,8 +175,8 @@ module ChefZero
     end
 
     module WhenTheChefServerInstanceMethods
-      def organization(name, org = '{}', &block)
-        ChefZero::RSpec.server.data_store.set([ 'organizations', name, 'org' ], dejsonize(org), :create_dir, :create)
+      def organization(name, org = "{}", &block)
+        ChefZero::RSpec.server.data_store.set([ "organizations", name, "org" ], dejsonize(org), :create_dir, :create)
         prev_org_name = @current_org
         @current_org = name
         prev_object_path = @current_object_path
@@ -192,7 +192,7 @@ module ChefZero
       end
 
       def acl_for(path, data)
-        ChefZero::RSpec.server.load_data({ 'acls' => { path => data } }, current_org)
+        ChefZero::RSpec.server.load_data({ "acls" => { path => data } }, current_org)
       end
 
       def acl(data)
@@ -201,14 +201,14 @@ module ChefZero
 
       def client(name, data, &block)
         with_object_path("clients/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'clients' => { name => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "clients" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def container(name, data, &block)
         with_object_path("containers/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'containers' => { name => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "containers" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
@@ -217,14 +217,14 @@ 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['metadata.rb'].nil?
-              data.delete('metadata.rb')
+          if data.has_key?("metadata.rb")
+            if data["metadata.rb"].nil?
+              data.delete("metadata.rb")
             end
           else
-            data['metadata.rb'] = "name #{name.inspect}; version #{version.inspect}"
+            data["metadata.rb"] = "name #{name.inspect}; version #{version.inspect}"
           end
-          ChefZero::RSpec.server.load_data({ 'cookbooks' => { "#{name}-#{version}" => data.merge(options) }}, current_org)
+          ChefZero::RSpec.server.load_data({ "cookbooks" => { "#{name}-#{version}" => data.merge(options) } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
@@ -233,78 +233,78 @@ 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['metadata.rb'].nil?
-              data.delete('metadata.rb')
+          if data.has_key?("metadata.rb")
+            if data["metadata.rb"].nil?
+              data.delete("metadata.rb")
             end
           else
-            data['metadata.rb'] = "name #{name.inspect}"
+            data["metadata.rb"] = "name #{name.inspect}"
           end
-          ChefZero::RSpec.server.load_data({ 'cookbook_artifacts' => { "#{name}-#{identifier}" => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "cookbook_artifacts" => { "#{name}-#{identifier}" => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def data_bag(name, data, &block)
         with_object_path("data/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'data' => { name => data }}, current_org)
+          ChefZero::RSpec.server.load_data({ "data" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def environment(name, data, &block)
         with_object_path("environments/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'environments' => { name => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "environments" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def group(name, data, &block)
         with_object_path("groups/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'groups' => { name => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "groups" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def node(name, data, &block)
         with_object_path("nodes/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'nodes' => { name => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "nodes" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def org_invite(*usernames)
-        ChefZero::RSpec.server.load_data({ 'invites' => usernames }, current_org)
+        ChefZero::RSpec.server.load_data({ "invites" => usernames }, current_org)
       end
 
       def org_member(*usernames)
-        ChefZero::RSpec.server.load_data({ 'members' => usernames }, current_org)
+        ChefZero::RSpec.server.load_data({ "members" => usernames }, current_org)
       end
 
       def policy(name, version, data, &block)
         with_object_path("policies/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'policies' => { name => { version => data } } }, current_org)
+          ChefZero::RSpec.server.load_data({ "policies" => { name => { version => data } } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def policy_group(name, data, &block)
         with_object_path("policy_groups/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'policy_groups' => { name => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "policy_groups" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def role(name, data, &block)
         with_object_path("roles/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'roles' => { name => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "roles" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
 
       def sandbox(name, data, &block)
         with_object_path("sandboxes/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'sandboxes' => { name => data } }, current_org)
+          ChefZero::RSpec.server.load_data({ "sandboxes" => { name => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end
@@ -312,14 +312,14 @@ module ChefZero
       def user(name, data, &block)
         if ChefZero::RSpec.server.options[:osc_compat]
           with_object_path("users/#{name}") do
-            ChefZero::RSpec.server.load_data({ 'users' => { name => data }}, current_org)
+            ChefZero::RSpec.server.load_data({ "users" => { name => data } }, current_org)
             instance_eval(&block) if block_given?
           end
         else
           old_object_path = @current_object_path
           @current_object_path = "users/#{name}"
           begin
-            ChefZero::RSpec.server.load_data({ 'users' => { name => data }}, current_org)
+            ChefZero::RSpec.server.load_data({ "users" => { name => data } }, current_org)
             instance_eval(&block) if block_given?
           ensure
             @current_object_path = old_object_path