chef-zero 0.9.8 → 0.9.9

data/lib/chef_zero.rb

@@ -1,4 +1,8 @@
+require 'chef_zero/core_ext'
+
 module ChefZero
+  autoload :Log, 'chef_zero/log'
+
   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"

data/lib/chef_zero/chef/cookbook/metadata.rb

@@ -0,0 +1,30 @@
+module ChefZero
+  module Chef
+      module Cookbook
+      # Handles loading configuration values from a Chef config file
+      #
+      # @author Justin Campbell <justin.campbell@riotgames.com>
+      class Metadata < Hash
+        # @param [String] path
+        def initialize(cookbook)
+          self.name(cookbook.name)
+          self.recipes(cookbook.fully_qualified_recipe_names)
+        end
+
+        def from_json(filepath)
+          self.merge!(JSON.parse(File.read(filepath)))
+        end
+
+        private
+
+          def method_missing(key, value = nil)
+            if value.nil?
+              self[key.to_sym]
+            else
+              store key.to_sym, value
+            end
+          end
+      end
+    end
+  end
+end

data/lib/chef_zero/cookbook_data.rb

@@ -1,5 +1,5 @@
 require 'digest/md5'
-require 'chef/cookbook/metadata' # for ruby metadata.rb dsl
+require 'chef_zero/chef/cookbook/metadata'
 
 module ChefZero
   module CookbookData
@@ -30,7 +30,7 @@ module ChefZero
     end
 
     def self.metadata_from(directory, name, version, recipe_names)
-      metadata = Chef::Cookbook::Metadata.new(PretendCookbook.new(name, recipe_names))
+      metadata = ChefZero::Chef::Cookbook::Metadata.new(PretendCookbook.new(name, recipe_names))
       # 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?
@@ -45,7 +45,6 @@ module ChefZero
       end
       result[:version] = version
       result
-
     end
 
     def self.files_from(directory)

data/lib/chef_zero/core_ext.rb

@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
+  require "chef_zero/core_ext/#{File.basename(path, '.rb')}"
+end

data/lib/chef_zero/core_ext/hash.rb

@@ -0,0 +1,5 @@
+require 'hashie'
+
+class Hash
+  include Hashie::Extensions::DeepMerge
+end

data/lib/chef_zero/endpoints/cookbook_endpoint.rb

@@ -1,4 +1,5 @@
 require 'chef_zero/endpoints/cookbooks_base'
+require 'solve'
 
 module ChefZero
   module Endpoints
@@ -31,7 +32,7 @@ module ChefZero
       end
 
       def latest_version(versions)
-        sorted = versions.sort_by { |version| Chef::Version.new(version) }
+        sorted = versions.sort_by { |version| Solve::Version.new(version) }
         sorted[-1]
       end
     end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'chef_zero/endpoints/rest_object_endpoint'
 require 'chef_zero/rest_error_response'
 require 'chef_zero/data_normalizer'
+require 'solve'
 
 module ChefZero
   module Endpoints
@@ -98,7 +99,7 @@ module ChefZero
       end
 
       def latest_version(versions)
-        sorted = versions.sort_by { |version| Chef::Version.new(version) }
+        sorted = versions.sort_by { |version| Solve::Version.new(version) }
         sorted[-1]
       end
     end

data/lib/chef_zero/endpoints/cookbooks_base.rb

@@ -1,9 +1,7 @@
 require 'json'
-require 'chef/exceptions' # Needed so Chef::Version/VersionConstraint load
-require 'chef/version_class'
-require 'chef/version_constraint'
 require 'chef_zero/rest_base'
 require 'chef_zero/data_normalizer'
+require 'solve'
 
 module ChefZero
   module Endpoints
@@ -28,11 +26,11 @@ module ChefZero
 
       def filter_cookbooks(cookbooks_list, constraints = {}, num_versions = nil)
         cookbooks_list.keys.sort.each do |name|
-          constraint = Chef::VersionConstraint.new(constraints[name])
+          constraint = Solve::Constraint.new(constraints[name])
           versions = []
-          cookbooks_list[name].keys.sort_by { |version| Chef::Version.new(version) }.reverse.each do |version|
+          cookbooks_list[name].keys.sort_by { |version| Solve::Version.new(version) }.reverse.each do |version|
             break if num_versions && versions.size >= num_versions
-            if constraint.include?(version)
+            if constraint.satisfies?(version)
               versions << version
             end
           end

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -1,9 +1,7 @@
 require 'json'
-require 'chef/exceptions' # Needed so Chef::Version/VersionConstraint load
-require 'chef/version_class'
-require 'chef/version_constraint'
 require 'chef_zero/rest_base'
 require 'chef_zero/rest_error_response'
+require 'solve'
 
 module ChefZero
   module Endpoints
@@ -100,15 +98,15 @@ module ChefZero
       end
 
       def sort_versions(versions)
-        result = versions.sort_by { |version| Chef::Version.new(version) }
+        result = versions.sort_by { |version| Solve::Version.new(version) }
         result.reverse
       end
 
       def filter_by_constraint(versions, cookbook_name, constraint)
         return versions if !constraint
-        constraint = Chef::VersionConstraint.new(constraint)
+        constraint = Solve::Constraint.new(constraint)
         new_versions = versions[cookbook_name]
-        new_versions = new_versions.select { |version| constraint.include?(version) }
+        new_versions = new_versions.select { |version| constraint.satisfies?(version) }
         result = versions.clone
         result[cookbook_name] = new_versions
         result

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'chef/mixin/deep_merge'
 require 'chef_zero/endpoints/rest_object_endpoint'
 require 'chef_zero/data_normalizer'
 require 'chef_zero/rest_error_response'
@@ -64,10 +63,10 @@ module ChefZero
       def expand_for_indexing(value, index, id)
         if index == 'node'
           result = {}
-          Chef::Mixin::DeepMerge.deep_merge!(value['default'] || {}, result)
-          Chef::Mixin::DeepMerge.deep_merge!(value['normal'] || {}, result)
-          Chef::Mixin::DeepMerge.deep_merge!(value['override'] || {}, result)
-          Chef::Mixin::DeepMerge.deep_merge!(value['automatic'] || {}, result)
+          result.deep_merge!(value['default'] || {})
+          result.deep_merge!(value['normal'] || {})
+          result.deep_merge!(value['override'] || {})
+          result.deep_merge!(value['automatic'] || {})
           result['recipe'] = []
           result['role'] = []
           if value['run_list']

data/lib/chef_zero/log.rb

@@ -0,0 +1,7 @@
+require 'mixlib/log'
+
+module ChefZero
+  class Log
+    extend Mixlib::Log
+  end
+end

data/lib/chef_zero/rest_base.rb

@@ -1,6 +1,5 @@
 require 'chef_zero/rest_request'
 require 'chef_zero/rest_error_response'
-require 'chef/log'
 
 module ChefZero
   class RestBase
@@ -21,7 +20,7 @@ module ChefZero
         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 && !request.env['HTTP_ACCEPT'].split(';').include?('application/json')
+      if json_only && request.env['HTTP_ACCEPT'] && !request.env['HTTP_ACCEPT'].split(';').include?('application/json')
         return [406, {"Content-Type" => "text/plain"}, "Must accept application/json"]
       end
       # Dispatch to get()/post()/put()/delete()

data/lib/chef_zero/rest_router.rb

@@ -1,5 +1,3 @@
-require 'chef/log'
-
 module ChefZero
   class RestRouter
     def initialize(routes)
@@ -14,7 +12,7 @@ module ChefZero
 
     def call(request)
       begin
-        Chef::Log.debug "Request: #{request}"
+        ChefZero::Log.debug "Request: #{request}"
         clean_path = "/" + request.rest_path.join("/")
         routes.each do |route, endpoint|
           if route.match(clean_path)
@@ -23,7 +21,7 @@ module ChefZero
         end
         not_found.call(request)
       rescue
-        Chef::Log.error("#{$!.inspect}\n#{$!.backtrace.join("\n")}")
+        ChefZero::Log.error("#{$!.inspect}\n#{$!.backtrace.join("\n")}")
         [500, {"Content-Type" => "text/plain"}, "Exception raised!  #{$!.inspect}\n#{$!.backtrace.join("\n")}"]
       end
     end

data/lib/chef_zero/rspec.rb

@@ -2,7 +2,6 @@ require 'thin'
 require 'tempfile'
 require 'chef_zero/server'
 require 'chef_zero/rest_request'
-require 'chef/config'
 
 module ChefZero
   module RSpec
@@ -45,19 +44,23 @@ module ChefZero
           end
           ChefZero::RSpec.clear_request_log
 
-          @old_chef_server_url = Chef::Config.chef_server_url
-          @old_node_name = Chef::Config.node_name
-          @old_client_key = Chef::Config.client_key
-          Chef::Config.chef_server_url = ChefZero::RSpec.server.url
-          Chef::Config.node_name = 'admin'
-          Chef::Config.client_key = ChefZero::RSpec.client_key.path
-          Chef::Config.http_retry_count = 0
+          if defined?(Chef::Config)
+            @old_chef_server_url = Chef::Config.chef_server_url
+            @old_node_name = Chef::Config.node_name
+            @old_client_key = Chef::Config.client_key
+            Chef::Config.chef_server_url = ChefZero::RSpec.server.url
+            Chef::Config.node_name = 'admin'
+            Chef::Config.client_key = ChefZero::RSpec.client_key.path
+            Chef::Config.http_retry_count = 0
+          end
         end
 
-        after :each do
-          Chef::Config.chef_server_url = @old_chef_server_url
-          Chef::Config.node_name = @old_node_name
-          Chef::Config.client_key = @old_client_key
+        if defined?(Chef::Config)
+          after :each do
+            Chef::Config.chef_server_url = @old_chef_server_url
+            Chef::Config.node_name = @old_node_name
+            Chef::Config.client_key = @old_client_key
+          end
         end
 
         def self.client(name, client)

data/lib/chef_zero/server.rb

@@ -87,13 +87,14 @@ module ChefZero
           server.start
         rescue
           @server_error = $!
-          Chef::Log.error("#{$!.message}\n#{$!.backtrace.join("\n")}")
+          ChefZero::Log.error("#{$!.message}\n#{$!.backtrace.join("\n")}")
         end
       end
       Timeout::timeout(timeout) do
         until server.running? || @server_error
           sleep(0.01)
         end
+        raise @server_error if @server_error
       end
     end
 
@@ -107,7 +108,7 @@ module ChefZero
         @thread.join(timeout)
         @thread = nil
       rescue
-        Chef::Log.error("Server did not stop within #{timeout}s.  Killing.")
+        ChefZero::Log.error("Server did not stop within #{timeout}s.  Killing.")
         @thread.kill if @thread
         @thread = nil
       end
@@ -210,6 +211,10 @@ module ChefZero
       }
     end
 
+    def request_handler(&block)
+      @request_handler = block
+    end
+
     private
 
     def make_app
@@ -254,7 +259,13 @@ module ChefZero
         if @on_request_proc
           @on_request_proc.call(request)
         end
-        response = router.call(request)
+        response = nil
+        if @request_handler
+          response = @request_handler.call(request)
+        end
+        unless response
+          response = router.call(request)
+        end
         if @on_response_proc
           @on_response_proc.call(request, response)
         end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '0.9.8'
+  VERSION = '0.9.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: solve
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 description: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 email: jkeiser@opscode.com
@@ -56,7 +88,10 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- lib/chef_zero/chef/cookbook/metadata.rb
 - lib/chef_zero/cookbook_data.rb
+- lib/chef_zero/core_ext/hash.rb
+- lib/chef_zero/core_ext.rb
 - lib/chef_zero/data_normalizer.rb
 - lib/chef_zero/endpoints/actor_endpoint.rb
 - lib/chef_zero/endpoints/actors_endpoint.rb
@@ -87,6 +122,7 @@ files:
 - lib/chef_zero/endpoints/sandboxes_endpoint.rb
 - lib/chef_zero/endpoints/search_endpoint.rb
 - lib/chef_zero/endpoints/searches_endpoint.rb
+- lib/chef_zero/log.rb
 - lib/chef_zero/rest_base.rb
 - lib/chef_zero/rest_error_response.rb
 - lib/chef_zero/rest_request.rb