chef-zero 1.4 → 1.5

data/bin/chef-zero

@@ -24,6 +24,10 @@ OptionParser.new do |opts|
     options[:generate_real_keys] = value
   end
 
+  opts.on("-d", "--daemon", "Run as a daemon process") do |value|
+    options[:daemon] = value
+  end
+
   opts.on("-l", "--log-level LEVEL", "Set the output log level") do |value|
     options[:log_level] = value
   end
@@ -40,4 +44,14 @@ OptionParser.new do |opts|
 end.parse!
 
 server = ChefZero::Server.new(options)
-server.start(:publish => true)
+
+if options[:daemon]
+  unless Process.respond_to?('daemon')
+    abort 'Process.deamon requires Ruby >= 1.9'
+  else
+    Process.daemon(true)
+    server.start(:publish => true)
+  end
+else
+  server.start(:publish => true)
+end

data/lib/chef_zero/cookbook_data.rb

@@ -32,7 +32,12 @@ module ChefZero
       # 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?
       if has_child(directory, 'metadata.rb')
-        metadata.instance_eval(read_file(directory, 'metadata.rb'))
+        begin
+          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}")
+        end
       elsif has_child(directory, 'metadata.json')
         metadata.from_json(read_file(directory, 'metadata.json'))
       end
@@ -161,6 +166,14 @@ module ChefZero
       end
     end
 
+    def self.filename(directory, name)
+      if directory.respond_to?(:file_path)
+        File.join(directory.file_path, name)
+      else
+        nil
+      end
+    end
+
     def self.get_directory(directory, name)
       if directory.is_a?(Hash)
         directory[name].is_a?(Hash) ? directory[name] : nil

data/lib/chef_zero/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -190,7 +190,8 @@ files:
 - spec/run.rb
 - spec/support/pedant.rb
 - spec/support/stickywicket.pem
-- bin/chef-zero
+- !binary |-
+  YmluL2NoZWYtemVybw==
 homepage: http://www.opscode.com
 licenses: []
 post_install_message: