chef 0.8.14 → 0.8.16

data/lib/chef.rb

@@ -30,7 +30,7 @@ require 'chef/webui_user'
 require 'chef/openid_registration'
 
 class Chef
-  VERSION = "0.8.14"
+  VERSION = "0.8.16"
 end
 
 # Adds a Dir.glob to Ruby 1.8.5, for compat

data/lib/chef/client.rb

@@ -315,10 +315,9 @@ class Chef
         # Check for cookbooks in the path given
         # Chef::Config[:cookbook_path] can be a string or an array
         # if it's an array, go through it and check each one, raise error at the last one if no files are found
-        Chef::Log.fatal "BUGBUG: cookbook_path: #{Chef::Config[:cookbook_path]}"
+        Chef::Log.debug "loading from cookbook_path: #{Array(Chef::Config[:cookbook_path]).map { |path| File.expand_path(path) }.join(', ')}" 
         Array(Chef::Config[:cookbook_path]).each_with_index do |cookbook_path, index|
           if directory_not_empty?(cookbook_path)
-            Chef::Log.fatal "BUGBUG: cb path not empty: #{cookbook_path}"
             break
           else
             msg = "No cookbook found in #{Chef::Config[:cookbook_path].inspect}, make sure cookboook_path is set correctly."

data/lib/chef/provider/template.rb

@@ -73,7 +73,7 @@ class Chef
 
           if update
             backup
-            FileUtils.mv(template_file.path, @new_resource.path)
+            FileUtils.cp(template_file.path, @new_resource.path)
             @new_resource.updated = true
           else
             Chef::Log.debug("#{@new_resource} is unchanged")

data/lib/chef/shef.rb

@@ -199,6 +199,9 @@ module Shef
 
     def parse_opts
       parse_options
+      # We have to nuke ARGV to make sure irb's option parser never sees it.
+      # otherwise, IRB complains about command line switches it doesn't recognize.
+      ARGV.clear
       config[:config_file] = config_file_for_shef_mode
       config_msg = config[:config_file] || "none (standalone shef session)"
       puts "loading configuration: #{config_msg}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 14
-  version: 0.8.14
+  - 16
+  version: 0.8.16
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -07:00
+date: 2010-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,7 +35,6 @@ dependencies:
   name: mixlib-cli
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -51,7 +49,6 @@ dependencies:
   name: mixlib-log
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -66,7 +63,6 @@ dependencies:
   name: mixlib-authentication
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -81,7 +77,6 @@ dependencies:
   name: ohai
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -96,7 +91,6 @@ dependencies:
   name: bunny
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -111,7 +105,6 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
@@ -126,7 +119,6 @@ dependencies:
   name: erubis
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -139,7 +131,6 @@ dependencies:
   name: extlib
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -152,7 +143,6 @@ dependencies:
   name: moneta
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -421,10 +411,6 @@ files:
 - lib/chef/util/file_edit.rb
 - lib/chef/webui_user.rb
 - lib/chef.rb
-- bin/chef-client
-- bin/chef-solo
-- bin/knife
-- bin/shef
 has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
@@ -435,7 +421,6 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -443,7 +428,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -453,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6.1
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.