chef-zero 1.5 → 1.5.1

data/bin/chef-zero

@@ -20,6 +20,10 @@ OptionParser.new do |opts|
     options[:port] = value
   end
 
+  opts.on("--socket PATH", String, "Unix socket path to listen on") do |value|
+    options[:socket] = 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

data/lib/chef_zero/cookbook_data.rb

@@ -36,7 +36,7 @@ module ChefZero
           file = filename(directory, 'metadata.rb') || "(#{name}/metadata.rb)"
           metadata.instance_eval(read_file(directory, 'metadata.rb'), file)
         rescue
-          ChefZero::Log.error("Error loading cookbook #{name}: #{$!}\n#{$!.backtrace}")
+          ChefZero::Log.error("Error loading cookbook #{name}: #{$!}\n  #{$!.backtrace.join("\n  ")}")
         end
       elsif has_child(directory, 'metadata.json')
         metadata.from_json(read_file(directory, 'metadata.json'))
@@ -68,8 +68,8 @@ module ChefZero
       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
+        %w(attributes grouping dependencies supports recommendations suggestions conflicting providing replacing recipes).each do |hash_arg|
+          self[hash_arg.to_sym] = Hashie::Mash.new
         end
       end
 

data/lib/chef_zero/server.rb

@@ -60,6 +60,7 @@ module ChefZero
     DEFAULT_OPTIONS = {
       :host => '127.0.0.1',
       :port => 8889,
+      :socket => nil,
       :log_level => :info,
       :generate_real_keys => true
     }.freeze
@@ -72,7 +73,12 @@ module ChefZero
       ChefZero::Log.level = options[:log_level].to_sym
 
       @server = Puma::Server.new(make_app, Puma::Events.new(STDERR, STDOUT))
-      @server.add_tcp_listener(options[:host], options[:port])
+      if options[:socket]
+        @server.add_unix_listener(options[:socket])
+      else
+        @server.add_tcp_listener(options[:host], options[:port])
+      end
+
 
       @data_store = options[:data_store] || DataStore::MemoryStore.new
     end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.5'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma