chef-zero 0.9.9 → 0.9.11

data/bin/chef-zero

@@ -18,13 +18,19 @@ OptionParser.new do |opts|
   opts.on("-H", "--host HOST", "Host to bind to (default: 127.0.0.1)") do |value|
     options[:host] = value
   end
+
   opts.on("-p", "--port PORT", Integer, "Port to listen on") do |value|
     options[:port] = value
   end
+
   opts.on("--[no-]generate-keys", "Whether to generate actual keys or fake it (faster).  Default: false.") do |value|
     options[:generate_real_keys] = value
   end
 
+  opts.on("-d", "--debug", "Show requests and debugging output") do |value|
+    options[:debug] = true
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit

data/lib/chef_zero/cookbook_data.rb

@@ -1,5 +1,5 @@
 require 'digest/md5'
-require 'chef_zero/chef/cookbook/metadata'
+require 'hashie/mash'
 
 module ChefZero
   module CookbookData
@@ -29,8 +29,80 @@ module ChefZero
       attr_reader :name, :fully_qualified_recipe_names
     end
 
+    # Handles loading configuration values from a Chef config file
+    #
+    # @author Justin Campbell <justin.campbell@riotgames.com>
+    class PretendCookbookMetadata < Hash
+      # @param [String] path
+      def initialize(cookbook)
+        self.name(cookbook.name)
+        self.recipes(cookbook.fully_qualified_recipe_names)
+        %w(dependencies supports recommendations suggestions conflicting providing replacing recipes).each do |cookbook_arg|
+          self[cookbook_arg.to_sym] = Hashie::Mash.new
+        end
+      end
+
+      def from_json(filepath)
+        self.merge!(JSON.parse(File.read(filepath)))
+      end
+
+      private
+
+      def depends(cookbook, *version_constraints)
+        cookbook_arg(:dependencies, cookbook, version_constraints)
+      end
+
+      def supports(cookbook, *version_constraints)
+        cookbook_arg(:supports, cookbook, version_constraints)
+      end
+
+      def recommends(cookbook, *version_constraints)
+        cookbook_arg(:recommendations, cookbook, version_constraints)
+      end
+
+      def suggests(cookbook, *version_constraints)
+        cookbook_arg(:suggestions, cookbook, version_constraints)
+      end
+
+      def conflicts(cookbook, *version_constraints)
+        cookbook_arg(:conflicting, cookbook, version_constraints)
+      end
+
+      def provides(cookbook, *version_constraints)
+        cookbook_arg(:providing, cookbook, version_constraints)
+      end
+
+      def replaces(cookbook, *version_constraints)
+        cookbook_arg(:replacing, cookbook, version_constraints)
+      end
+
+      def recipe(recipe, description)
+        self[:recipes][recipe] = description
+      end
+
+      def attribute(name, options)
+        self[:attributes][name] = options
+      end
+
+      def grouping(name, options)
+        self[:grouping][name] = options
+      end
+
+      def cookbook_arg(key, cookbook, version_constraints)
+        self[key][cookbook] = version_constraints.first || ">= 0.0.0"
+      end
+
+      def method_missing(key, value = nil)
+        if value.nil?
+          self[key.to_sym]
+        else
+          store key.to_sym, value
+        end
+      end
+    end
+
     def self.metadata_from(directory, name, version, recipe_names)
-      metadata = ChefZero::Chef::Cookbook::Metadata.new(PretendCookbook.new(name, recipe_names))
+      metadata = PretendCookbookMetadata.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?

data/lib/chef_zero/rest_router.rb

@@ -12,18 +12,29 @@ module ChefZero
 
     def call(request)
       begin
-        ChefZero::Log.debug "Request: #{request}"
+        ChefZero::Log.debug(request)
+
         clean_path = "/" + request.rest_path.join("/")
-        routes.each do |route, endpoint|
-          if route.match(clean_path)
-            return endpoint.call(request)
-          end
-        end
-        not_found.call(request)
+
+        response = find_endpoint(clean_path).call(request)
+        ChefZero::Log.debug([
+          "",
+          "--- RESPONSE (#{response[0]}) ---",
+          response[2],
+          "--- END RESPONSE ---",
+        ].join("\n"))
+        return response
       rescue
         ChefZero::Log.error("#{$!.inspect}\n#{$!.backtrace.join("\n")}")
         [500, {"Content-Type" => "text/plain"}, "Exception raised!  #{$!.inspect}\n#{$!.backtrace.join("\n")}"]
       end
     end
+
+    private
+
+      def find_endpoint(clean_path)
+        _, endpoint = routes.find { |route, endpoint| route.match(clean_path) }
+        endpoint || not_found
+      end
   end
 end

data/lib/chef_zero/server.rb

@@ -59,6 +59,7 @@ module ChefZero
       options[:host] ||= '127.0.0.1'
       options[:port] ||= 80
       options[:generate_real_keys] = true if !options.has_key?(:generate_real_keys)
+      ChefZero::Log.level = :debug if options.has_key?(:debug)
       thin_options = {}
       thin_options[:signals] = options[:signals] if options.has_key?(:signals)
       @server = Thin::Server.new(options[:host], options[:port], make_app, thin_options)

data/lib/chef_zero/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
@@ -88,7 +88,6 @@ 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

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

@@ -1,30 +0,0 @@
-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