chef 0.10.0.beta.6 → 0.10.0.beta.7

data/lib/chef/resource/deploy.rb

@@ -274,7 +274,7 @@ class Chef
 
       def environment(arg=nil)
         if arg.is_a?(String)
-          Chef::Log.info "Setting RAILS_ENV, RACK_ENV, and MERB_ENV to `#{arg}'"
+          Chef::Log.debug "Setting RAILS_ENV, RACK_ENV, and MERB_ENV to `#{arg}'"
           Chef::Log.warn "[DEPRECATED] please modify your deploy recipe or attributes to set the environment using a hash"
           arg = {"RAILS_ENV"=>arg,"MERB_ENV"=>arg,"RACK_ENV"=>arg}
         end

data/lib/chef/rest/rest_request.rb

@@ -101,7 +101,7 @@ class Chef
         # http://redmine.ruby-lang.org/issues/show/2708
         # http://redmine.ruby-lang.org/issues/show/2758
         if e.to_s =~ /#{Regexp.escape(%q|undefined method `closed?' for nil:NilClass|)}/
-          Chef::Log.debug("rescued error in http connect, re-raising as Errno::ECONNREFUSED to hide bug in net/http")
+          Chef::Log.debug("Rescued error in http connect, re-raising as Errno::ECONNREFUSED to hide bug in net/http")
           Chef::Log.debug("#{e.class.name}: #{e.to_s}")
           Chef::Log.debug(e.backtrace.join("\n"))
           raise Errno::ECONNREFUSED, "Connection refused attempting to contact #{url.scheme}://#{host}:#{port}"
@@ -141,7 +141,7 @@ class Chef
         if http_proxy.nil?
           @http_client = Net::HTTP.new(host, port)
         else
-          Chef::Log.debug("using #{http_proxy.host}:#{http_proxy.port} for proxy")
+          Chef::Log.debug("Using #{http_proxy.host}:#{http_proxy.port} for proxy")
           user = Chef::Config["#{url.scheme}_proxy_user"]
           pass = Chef::Config["#{url.scheme}_proxy_pass"]
           @http_client = Net::HTTP.Proxy(http_proxy.host, http_proxy.port, user, pass).new(host, port)

data/lib/chef/run_context.rb

@@ -107,7 +107,7 @@ class Chef
         resourcelist = Chef::ResourceDefinitionList.new
         resourcelist.from_file(filename)
         definitions.merge!(resourcelist.defines) do |key, oldval, newval|
-          Chef::Log.info("Overriding duplicate definition #{key}, new found in #{filename}")
+          Chef::Log.info("Overriding duplicate definition #{key}, new definition found in #{filename}")
           newval
         end
       end

data/lib/chef/shell_out.rb

@@ -56,6 +56,8 @@ class Chef
     attr_accessor :cwd
     attr_accessor :valid_exit_codes
     attr_accessor :live_stream
+    attr_accessor :command_log_level
+    attr_accessor :command_log_prepend
 
     attr_reader :command, :umask, :environment
     attr_writer :timeout
@@ -111,6 +113,8 @@ class Chef
     def initialize(*command_args)
       @stdout, @stderr = '', ''
       @live_stream = nil
+      @command_log_level = :debug
+      @command_log_prepend = nil 
       @environment = DEFAULT_ENVIRONMENT
       @cwd = nil
       @valid_exit_codes = [0]
@@ -169,7 +173,11 @@ class Chef
     # * Chef::Exceptions::CommandTimeout  when the command does not complete
     #   within +timeout+ seconds (default: 60s)
     def run_command
-      Chef::Log.info("sh(#{@command})")
+      if command_log_prepend
+        Chef::Log.send(command_log_level, "#{command_log_prepend} sh(#{@command})")
+      else
+        Chef::Log.send(command_log_level, "sh(#{@command})")
+      end
       super
     end
 
@@ -224,6 +232,10 @@ class Chef
           self.valid_exit_codes = Array(setting)
         when 'live_stream'
           self.live_stream = setting
+        when 'command_log_level'
+          self.command_log_level = setting
+        when 'command_log_prepend'
+          self.command_log_prepend = setting
         when 'environment', 'env'
           # passing :environment => nil means don't set any new ENV vars
           @environment = setting.nil? ? {} : @environment.dup.merge!(setting)

data/lib/chef/solr_query.rb

@@ -104,7 +104,7 @@ class Chef
     def objects
       if !object_ids.empty?
         @bulk_objects ||= @couchdb.bulk_get(object_ids)
-        Chef::Log.debug { "bulk get of objects: #{@bulk_objects.inspect}" }
+        Chef::Log.debug { "Bulk get of objects: #{@bulk_objects.inspect}" }
         @bulk_objects
       else
         []

data/lib/chef/solr_query/solr_http_request.rb

@@ -97,7 +97,7 @@ class Chef
         # http://redmine.ruby-lang.org/issues/show/2758
         if e.to_s =~ /#{Regexp.escape(%q|undefined method 'closed?' for nil:NilClass|)}/
           Chef::Log.fatal("#{description} failed.  Chef::Exceptions::SolrConnectionError exception: Errno::ECONNREFUSED (net/http undefined method closed?) attempting to contact #{solr_url}")
-          Chef::Log.debug("rescued error in http connect, treating it as Errno::ECONNREFUSED to hide bug in net/http")
+          Chef::Log.debug("Rescued error in http connect, treating it as Errno::ECONNREFUSED to hide bug in net/http")
           Chef::Log.debug(e.backtrace.join("\n"))
           raise Chef::Exceptions::SolrConnectionError, "Errno::ECONNREFUSED: Connection refused attempting to contact #{solr_url}"
         else

data/lib/chef/tasks/chef_repo.rake

@@ -254,3 +254,77 @@ task :test_cookbook, :cookbook do |t, args|
   system("knife cookbook test #{args.cookbook}")
 end
 
+namespace :databag do
+  path = "data_bags"
+
+  desc "Upload a single databag"
+  task :upload, :databag do |t, args|
+    input_databag = args[:databag] || 'none_specified'
+    databag = File.join(path, input_databag)
+
+    if File.exists?(databag) && File.directory?(databag)
+      system "knife data bag create #{input_databag}"
+      Dir.foreach(databag) do |item|
+        name, type = item.split('.')
+        if type == 'json' && name.length > 0
+          system "knife data bag from file #{input_databag} " + File.join(databag, item)
+        end
+      end
+    else
+      puts "ERROR: Could not find the databag in your databag path (" + File.join(path, input_databag) + "), skipping it"
+    end
+  end
+
+  desc "Upload all databags"
+  task :upload_all do
+    if File.exists?(path) && File.directory?(path)
+      Dir.foreach(path) do |databag|
+        if databag == databag[/^[\-[:alnum:]_]+$/]
+          Rake::Task['databag:upload'].execute( { :databag => databag } )
+        end
+      end
+    else
+      puts "ERROR: Could not find any databags, skipping it"  
+    end
+  end
+
+  desc "Create a databag"
+  task :create, :databag do |t, args|
+    input_databag = args[:databag] || 'none_specified'
+
+    FileUtils.mkdir(path) unless File.exists?(path)
+    databag = File.join(path, input_databag)
+    FileUtils.mkdir(databag) unless File.exists?(databag)
+  end
+
+  desc "Create a databag item stub"
+  task :create_item, :databag, :item do |t, args|
+    input_databag = args[:databag] || 'none_specified'
+    input_item = args[:item] || false
+
+    databag = File.join(path, input_databag)
+    if File.exists?(databag) && File.directory?(databag)
+      if input_item
+        json_filename = File.join(databag, "#{input_item}.json")
+        if !File.exists?(json_filename)
+          stub = <<EOH
+{
+  "id" : "#{input_item}"
+}
+EOH
+          json_file = File.new(json_filename, "w")
+          json_file.write(stub)
+          json_file.close
+        else
+          puts "ERROR: databag item already exists (#{json_filename}), skipping it"
+        end
+      else
+        puts "ERROR: No item id specified, skipping it"
+      end
+    else
+      puts "ERROR: Could not find your databag (#{databag}), skipping it"
+    end   
+  end
+
+end
+

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.10.0.beta.6'
+  VERSION = '0.10.0.beta.7'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

metadata

@@ -2,7 +2,7 @@
 name: chef
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.6
+  version: 0.10.0.beta.7
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -07:00
+date: 2011-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency