chef 0.10.0.beta.5 → 0.10.0.beta.6

data/lib/chef/resource.rb

@@ -372,34 +372,57 @@ F
       @not_if
     end
 
+    def defined_at
+      if cookbook_name && recipe_name && source_line
+        "#{cookbook_name}::#{recipe_name} line #{source_line.split(':')[1]}"
+      elsif source_line
+        file, line_no = source_line.split(':')
+        "#{file} line #{line_no}"
+      else
+        "dynamically defined"
+      end
+    end
+
     def run_action(action)
+      Chef::Log.info("Processing #{self} action #{action} (#{defined_at})")
+
       # ensure that we don't leave @updated_by_last_action set to true
       # on accident
       updated_by_last_action(false)
 
-      # Check if this resource has an only_if block -- if it does,
-      # evaluate the only_if block and skip the resource if
-      # appropriate.
-      if only_if
-        unless Chef::Mixin::Command.only_if(only_if, only_if_args)
-          Chef::Log.debug("Skipping #{self} due to only_if")
-          return
+      begin
+        # Check if this resource has an only_if block -- if it does,
+        # evaluate the only_if block and skip the resource if
+        # appropriate.
+        if only_if
+          unless Chef::Mixin::Command.only_if(only_if, only_if_args)
+            Chef::Log.debug("Skipping #{self} due to only_if")
+            return
+          end
         end
-      end
 
-      # Check if this resource has a not_if block -- if it does,
-      # evaluate the not_if block and skip the resource if
-      # appropriate.
-      if not_if
-        unless Chef::Mixin::Command.not_if(not_if, not_if_args)
-          Chef::Log.debug("Skipping #{self} due to not_if")
-          return
+        # Check if this resource has a not_if block -- if it does,
+        # evaluate the not_if block and skip the resource if
+        # appropriate.
+        if not_if
+          unless Chef::Mixin::Command.not_if(not_if, not_if_args)
+            Chef::Log.debug("Skipping #{self} due to not_if")
+            return
+          end
         end
-      end
 
-      provider = Chef::Platform.provider_for_resource(self)
-      provider.load_current_resource
-      provider.send("action_#{action}")
+        provider = Chef::Platform.provider_for_resource(self)
+        provider.load_current_resource
+        provider.send("action_#{action}")
+      rescue => e
+        if ignore_failure
+          Chef::Log.error("#{self} (#{defined_at}) had an error: #{e.message}")
+        else
+          Chef::Log.error("#{self} (#{defined_at}) has had an error")
+          msg = e.message
+          raise e.exception("#{self} (#{defined_at}) had an error: #{e.message}") 
+        end
+      end
     end
 
     def updated_by_last_action(true_or_false)

data/lib/chef/rest.rb

@@ -24,7 +24,6 @@ require 'net/https'
 require 'uri'
 require 'chef/json_compat'
 require 'tempfile'
-require 'chef/api_client'
 require 'chef/rest/auth_credentials'
 require 'chef/rest/rest_request'
 require 'chef/monkey_patches/string'
@@ -64,6 +63,10 @@ class Chef
     end
 
     # Register the client
+    #--
+    # Requires you to load chef/api_client beforehand. explicit require is removed since
+    # most users of this class have no need for chef/api_client. This functionality
+    # should be moved anyway...
     def register(name=Chef::Config[:node_name], destination=Chef::Config[:client_key])
       if (File.exists?(destination) &&  !File.writable?(destination))
         raise Chef::Exceptions::CannotWritePrivateKey, "I cannot write your private key to #{destination} - check permissions?"
@@ -229,7 +232,7 @@ class Chef
             exception = Chef::JSONCompat.from_json(response.body)
             msg = "HTTP Request Returned #{response.code} #{response.message}: "
             msg << (exception["error"].respond_to?(:join) ? exception["error"].join(", ") : exception["error"].to_s)
-            Chef::Log.warn(msg)
+            Chef::Log.info(msg)
           end
           response.error!
         end
@@ -284,6 +287,9 @@ class Chef
 
         res = yield rest_request
 
+      rescue SocketError, Errno::ETIMEDOUT => e
+        e.message.replace "Error connecting to #{url} - #{e.message}"
+        raise e
       rescue Errno::ECONNREFUSED
         if http_retry_count - http_attempts + 1 > 0
           Chef::Log.error("Connection refused connecting to #{url.host}:#{url.port} for #{rest_request.path}, retry #{http_attempts}/#{http_retry_count}")
@@ -298,11 +304,13 @@ class Chef
           retry
         end
         raise Timeout::Error, "Timeout connecting to #{url.host}:#{url.port} for #{rest_request.path}, giving up"
-      rescue Net::HTTPServerException
-        if res.kind_of?(Net::HTTPForbidden)
+      rescue Net::HTTPFatalError => e
+        case e.response
+        when Net::HTTPServiceUnavailable
           if http_retry_count - http_attempts + 1 > 0
-            Chef::Log.error("Received 403 Forbidden against #{url.host}:#{url.port} for #{rest_request.path}, retry #{http_attempts}/#{http_retry_count}")
-            sleep(http_retry_delay)
+            sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
+            Chef::Log.error("Service Unavailable for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
+            sleep(sleep_time)
             retry
           end
         end

data/lib/chef/rest/auth_credentials.rb

@@ -58,7 +58,7 @@ class Chef
         @raw_key = IO.read(key_file).strip
         @key = OpenSSL::PKey::RSA.new(@raw_key)
       rescue SystemCallError, IOError => e
-        Chef::Log.fatal "Failed to read the private key #{key_file}: #{e.inspect}, #{e.backtrace}"
+        Chef::Log.warn "Failed to read the private key #{key_file}: #{e.inspect}"
         raise Chef::Exceptions::PrivateKeyMissing, "I cannot read #{key_file}, which you told me to use to sign requests!"
       rescue OpenSSL::PKey::RSAError
         msg = "The file #{key_file} does not contain a correctly formatted private key.\n"

data/lib/chef/rest/rest_request.rb

@@ -1,4 +1,4 @@
-#
+#--
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Thom May (<thom@clearairturbulence.org>)
 # Author:: Nuo Yan (<nuo@opscode.com>)
@@ -23,11 +23,35 @@
 require 'uri'
 require 'net/http'
 require 'chef/rest/cookie_jar'
+
+# To load faster, we only want ohai's version string.
+# However, in ohai before 0.6.0, the version is defined
+# in ohai, not ohai/version
+begin
+  require 'ohai/version' #used in user agent string.
+rescue LoadError
+  require 'ohai'
+end
+
 require 'chef/version'
 
 class Chef
   class REST
     class RESTRequest
+
+      engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+
+      UA_COMMON = "/#{::Chef::VERSION} (#{engine}-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}; ohai-#{Ohai::VERSION}; #{RUBY_PLATFORM}; +http://opscode.com)"
+      DEFAULT_UA = "Chef Client" << UA_COMMON
+
+      def self.user_agent=(ua)
+        @user_agent = ua
+      end
+
+      def self.user_agent
+        @user_agent ||= DEFAULT_UA
+      end
+
       attr_reader :method, :url, :headers, :http_client, :http_request
 
       def initialize(method, url, req_body, base_headers={})
@@ -181,6 +205,7 @@ class Chef
         @http_request.body = request_body if (request_body && @http_request.request_body_permitted?)
         # Optionally handle HTTP Basic Authentication
         @http_request.basic_auth(url.user, url.password) if url.user
+        @http_request['User-Agent'] = self.class.user_agent
       end
 
     end

data/lib/chef/runner.rb

@@ -74,15 +74,8 @@ class Chef
 
       # Execute each resource.
       run_context.resource_collection.execute_each_resource do |resource|
-        begin
-          Chef::Log.debug("Processing #{resource} on #{run_context.node.name}")
-
-          # Execute each of this resource's actions.
-          Array(resource.action).each {|action| run_action(resource, action)}
-        rescue => e
-          Chef::Log.error("#{resource} (#{resource.source_line}) had an error:\n#{e}\n#{e.backtrace.join("\n")}")
-          raise e unless resource.ignore_failure
-        end
+        # Execute each of this resource's actions.
+        Array(resource.action).each {|action| run_action(resource, action) }
       end
 
       # Run all our :delayed actions

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.5'
+  VERSION = '0.10.0.beta.6'
 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.5
+  version: 0.10.0.beta.6
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -07:00
+date: 2011-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -295,11 +295,9 @@ files:
 - lib/chef/json_compat.rb
 - lib/chef/knife/bootstrap/archlinux-gems.erb
 - lib/chef/knife/bootstrap/centos5-gems.erb
-- lib/chef/knife/bootstrap/client-install.vbs
 - lib/chef/knife/bootstrap/fedora13-gems.erb
 - lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
 - lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
-- lib/chef/knife/bootstrap/windows-gems.erb
 - lib/chef/knife/bootstrap.rb
 - lib/chef/knife/client_bulk_delete.rb
 - lib/chef/knife/client_create.rb
@@ -325,8 +323,17 @@ files:
 - lib/chef/knife/cookbook_site_share.rb
 - lib/chef/knife/cookbook_site_show.rb
 - lib/chef/knife/cookbook_site_unshare.rb
+- lib/chef/knife/cookbook_site_vendor.rb
 - lib/chef/knife/cookbook_test.rb
 - lib/chef/knife/cookbook_upload.rb
+- lib/chef/knife/core/cookbook_scm_repo.rb
+- lib/chef/knife/core/generic_presenter.rb
+- lib/chef/knife/core/node_editor.rb
+- lib/chef/knife/core/node_presenter.rb
+- lib/chef/knife/core/object_loader.rb
+- lib/chef/knife/core/subcommand_loader.rb
+- lib/chef/knife/core/text_formatter.rb
+- lib/chef/knife/core/ui.rb
 - lib/chef/knife/data_bag_create.rb
 - lib/chef/knife/data_bag_delete.rb
 - lib/chef/knife/data_bag_edit.rb
@@ -361,12 +368,9 @@ files:
 - lib/chef/knife/search.rb
 - lib/chef/knife/ssh.rb
 - lib/chef/knife/status.rb
-- lib/chef/knife/subcommand_loader.rb
 - lib/chef/knife/tag_create.rb
 - lib/chef/knife/tag_delete.rb
 - lib/chef/knife/tag_list.rb
-- lib/chef/knife/ui.rb
-- lib/chef/knife/windows_bootstrap.rb
 - lib/chef/knife.rb
 - lib/chef/log.rb
 - lib/chef/mash.rb

data/lib/chef/knife/bootstrap/client-install.vbs

@@ -1,80 +0,0 @@
-'
-' Author:: Doug MacEachern <dougm@vmware.com>
-' Copyright:: Copyright (c) 2010 VMware, Inc.
-' License:: Apache License, Version 2.0
-'
-' Licensed under the Apache License, Version 2.0 (the "License");
-' you may not use this file except in compliance with the License.
-' You may obtain a copy of the License at
-' 
-'     http://www.apache.org/licenses/LICENSE-2.0
-' 
-' Unless required by applicable law or agreed to in writing, software
-' distributed under the License is distributed on an "AS IS" BASIS,
-' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-' See the License for the specific language governing permissions and
-' limitations under the License.
-'
-' download & install ruby && install chef client gems
-
-Exe = "rubyinstaller-1.8.7-p249-rc2.exe"
-Url = "http://rubyforge.org/frs/download.php/69034/" & Exe
-Dst = "C:\Ruby"
-Proxy = ""
-If WScript.Arguments.Count = 1 Then
-  Proxy = WScript.Arguments.Item(0)
-  WScript.Echo "Using HTTP proxy=" & Proxy
-End If
-
-Set Shell = CreateObject("WScript.Shell")
-Set Fs = CreateObject("Scripting.FileSystemObject")
-If Fs.FileExists(Exe) Then
-  WScript.Echo "Using existing " & Exe
-Else
-  WScript.Echo "Downloading " & Url
-  Set Http = CreateObject("WinHttp.WinHttpRequest.5.1")
-  If Proxy <> "" Then
-     Http.setProxy 2, Proxy, ""
-  End If
-  Http.Open "GET", Url, False
-  Http.Send
-  Set BinaryStream = CreateObject("ADODB.Stream")
-  BinaryStream.Type = 1
-  BinaryStream.Open
-  BinaryStream.Write Http.ResponseBody
-  BinaryStream.SaveToFile Exe, 2
-  BinaryStream.Close
-End If
-
-Ruby = Dst & "\bin\ruby.exe"
-
-If Fs.FileExists(Ruby) Then
-  WScript.Echo Dst & " exists"
-Else
-  WScript.Echo "Installing " & Exe & " to " & Dst
-  Cmd = Exe & " /dir=" & Dst & " /verysilent /tasks=assocfiles,modpath"
-  WScript.Echo Cmd
-  Set Exec = Shell.Exec(Cmd)
-  Do Until Exec.StdOut.AtEndOfStream
-    Line = Exec.StdOut.ReadLine()
-    Wscript.Echo Line
-  Loop
-End If
-
-GemProxy = ""
-If Proxy <> "" Then
-  GemProxy = " --http-proxy=http://" & Proxy
-End If
-
-Cmd = Ruby & " " & Dst & "\bin\gem install" & GemProxy & " --no-ri --no-rdoc chef ruby-wmi windows-pr win32-open3 rubyzip"
-WScript.Echo Cmd
-Set Exec = Shell.Exec(Cmd)
-Do Until Exec.StdOut.AtEndOfStream
-  Line = Exec.StdOut.ReadLine()
-  Wscript.Echo Line
-Loop
-Do Until Exec.StdErr.AtEndOfStream
-  Line = Exec.StdErr.ReadLine()
-  Wscript.Echo Line
-Loop
-

data/lib/chef/knife/bootstrap/windows-gems.erb

@@ -1,34 +0,0 @@
-cscript /nologo client-install.vbs <%= @config[:proxy] %>
-
-> c:/chef/etc/client.rb (
- @echo.log_level        :info
- @echo.log_location     STDOUT
- @echo.chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
- @echo.validation_client_name "<%= Chef::Config[:validation_client_name] %>"
- @echo.client_key "c:/chef/etc/client.pem"
- @echo.validation_key "c:/chef/etc/validation.pem"
- @echo.checksum_path "c:/chef/var/checksums"
- @echo.file_cache_path "c:/chef/var/cache"
- @echo.file_backup_path "c:/chef/var/backup"
- @echo.cache_options ^( {:path, "c:/chef/var/cache/checksums", :skip_expires, true} ^)
-<% if Chef::Config[:http_proxy] != nil %>
- @echo.http_proxy       "<%= Chef::Config[:http_proxy] %>"
-<% end %>
-<% if Chef::Config[:https_proxy] != nil %>
- @echo.https_proxy       "<%= Chef::Config[:https_proxy] %>"
-<% end %>
-<% if Chef::Config[:no_proxy] != nil %>
- @echo.no_proxy          "<%= Chef::Config[:no_proxy] %>"
-<% end %>
-<% if @config[:chef_node_name] == nil %>
- @echo.# Using default node name
-<% else %>
- @echo.node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
-)
-
-> c:/chef/etc/first-boot.json (
- @echo.<%= { "run_list" => @run_list }.to_json %>
-)
-
-c:/ruby/bin/ruby c:/ruby/bin/chef-client -c c:/chef/etc/client.rb -j c:/chef/etc/first-boot.json -l <%= Chef::Config[:log_level] %>"

data/lib/chef/knife/windows_bootstrap.rb

@@ -1,157 +0,0 @@
-#
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'fileutils'
-
-class Chef
-  class Knife
-    class WindowsBootstrap < Chef::Knife::Bootstrap
-
-      deps do
-        require 'chef/knife/bootstrap.rb'
-      end
-
-      banner "knife windows bootstrap FQDN [RUN LIST...] (options)"
-
-      option :user,
-        :short => "-x USERNAME",
-        :long  => "--user USERNAME",
-        :description => "The Windows username"
-
-      option :password,
-        :short => "-P PASSWORD",
-        :long  => "--password PASSWORD",
-        :description => "The Windows password"
-
-      option :chef_node_name,
-        :short => "-N NAME",
-        :long => "--node-name NAME",
-        :description => "The Chef node name for your new node"
-
-      option :distro,
-        :short => "-d DISTRO",
-        :long => "--distro DISTRO",
-        :description => "Bootstrap a distro using a template",
-        :default => "windows-gems"
-
-      option :template_file,
-        :long => "--template-file TEMPLATE",
-        :description => "Full path to location of template to use",
-        :default => false
-
-      option :run_list,
-        :short => "-r RUN_LIST",
-        :long => "--run-list RUN_LIST",
-        :description => "Comma separated list of roles/recipes to apply",
-        :proc => lambda { |o| o.split(",") },
-        :default => []
-
-      def is_mounted
-        @net_use ||= Chef::Util::Windows::NetUse.new(@admin_share)
-        begin
-          @net_use.get_info
-          return true
-        rescue
-          return false
-        end
-      end
-
-      def mount_admin_share
-        if @add_mount && !is_mounted
-          use = {
-            :remote => @admin_share, :local => '',
-            :username => config[:user], :password => config[:password]
-          }
-          @net_use.add(use)
-          if is_mounted
-            ui.info("Mounted #{@admin_share} for copying files")
-          else
-            ui.fatal("Failed to mount #{@admin_share}")
-            exit 1
-          end
-        end
-      end
-
-      def unmount_admin_share
-        if @add_mount && is_mounted
-          Chef::Log.debug("Unmounting #{@admin_share}")
-          @net_use.delete
-        end
-      end
-
-      def psexec(args)
-        cmd = ['psexec', @unc_path, "-h", "-w", 'c:\chef\tmp']
-        if config[:user]
-          cmd << "-u" << config[:user]
-        end
-        if config[:password]
-          cmd << "-p" << config[:password]
-        end
-        cmd << args
-        cmd = cmd.join(' ')
-        Chef::Log.debug("system #{cmd}")
-        system(cmd)
-      end
-
-      def run
-        require 'chef/util/windows/net_use'
-
-        if @name_args.first == nil
-          ui.error("Must pass a node name/ip to windows bootstrap")
-          exit 1
-        end
-
-        config[:server_name] = @name_args.first
-        if Chef::Config[:http_proxy]
-          uri = URI.parse(Chef::Config[:http_proxy])
-          config[:proxy] = "#{uri.host}:#{uri.port}"
-        end
-
-        @unc_path = "\\\\#{config[:server_name]}"
-        @admin_share = "#{@unc_path}\\c$"
-        path = "#{@admin_share}\\chef"
-        etc = "#{path}\\etc"
-        tmp = "#{path}\\tmp"
-
-        $stdout.sync = true
-
-        command = render_template(load_template(config[:bootstrap_template]))
-
-        ui.info("Bootstrapping Chef on #{config[:server_name]}")
-
-        @add_mount = config[:user] != nil && !is_mounted
-        mount_admin_share
-
-        begin
-          [etc, tmp, "#{path}\\log"].each do |dir|
-            unless File.exists?(dir)
-              Chef::Log.debug("mkdir_p #{dir}")
-              FileUtils.mkdir_p(dir)
-            end
-          end
-          File.open("#{tmp}\\bootstrap.bat", 'w') {|f| f.write(command) }
-          FileUtils.cp(File.join(File.dirname(__FILE__), 'bootstrap', 'client-install.vbs'), tmp)
-          FileUtils.cp(Chef::Config[:validation_key], etc)
-          psexec("cmd.exe /c bootstrap.bat")
-        ensure
-          unmount_admin_share
-        end
-      end
-    end
-  end
-end