chef 0.9.8 → 0.9.10.rc.0

data/lib/chef/knife/ssh.rb

@@ -68,7 +68,19 @@ class Chef
         :description => "The SSH identity file used for authentication"
 
       def session
-        @session ||= Net::SSH::Multi.start(:concurrent_connections => config[:concurrency])
+        ssh_error_handler = Proc.new do |server|
+          if config[:manual]
+            node_name = server.host
+          else
+            @action_nodes.each do |n|
+              node_name = n if format_for_display(n)[config[:attribute]] == server.host
+            end
+          end
+          Chef::Log.warn "Failed to connect to #{node_name} -- #{$!.class.name}: #{$!.message}"
+          $!.backtrace.each { |l| Chef::Log.debug(l) }
+        end
+
+        @session ||= Net::SSH::Multi.start(:concurrent_connections => config[:concurrency], :on_error => ssh_error_handler)
       end
 
       def h
@@ -82,10 +94,10 @@ class Chef
                when false
                  r = Array.new
                  q = Chef::Search::Query.new
-                 q.search(:node, @name_args[0]) do |item|
-                   r << format_for_display(item)[config[:attribute]]
+                 @action_nodes = q.search(:node, @name_args[0])[0]
+                 r = @action_nodes.map do |item|
+                   format_for_display(item)[config[:attribute]]
                  end
-                 r
                end
         (Chef::Log.fatal("No nodes returned from search!"); exit 10) if list.length == 0
         session_from_list(list)
@@ -94,15 +106,15 @@ class Chef
       def session_from_list(list)
         list.each do |item|
           Chef::Log.debug("Adding #{item}")
-          item = "#{config[:ssh_user]}@#{item}" if config[:ssh_user]
 
-          if config[:identity_file]
-            session.use item, :keys => File.expand_path(config[:identity_file])
-          elsif config[:password]
-            session.use item, :password => config[:password]
-          else
-            session.use item
-          end
+          hostspec = config[:ssh_user] ? "#{config[:ssh_user]}@#{item}" : item
+          session_opts = {}
+          session_opts[:keys] = File.expand_path(config[:identity_file]) if config[:identity_file]
+          session_opts[:password] = config[:ssh_password] if config[:ssh_password]
+          session_opts[:logger] = Chef::Log.logger if Chef::Log.level == :debug
+
+          session.use(hostspec, session_opts)
+
           @longest = item.length if item.length > @longest
         end
         session
@@ -268,10 +280,10 @@ class Chef
       end
 
       def load_late_dependencies
-        require 'net/ssh/multi'
         require 'readline'
-        require 'highline'
-
+        %w[net/ssh/multi highline].each do |dep|
+          load_late_dependency dep
+        end
         assert_net_ssh_version_acceptable!
       end
 

data/lib/chef/knife/status.rb

@@ -24,7 +24,12 @@ class Chef
   class Knife
     class Status < Knife
 
-      banner "knife status"
+      banner "knife status QUERY (options)"
+
+      option :run_list,
+        :short => "-r",
+        :long => "--run-list",
+        :description => "Show the run list"
 
       def highline
         @h ||= HighLine.new
@@ -32,23 +37,35 @@ class Chef
 
       def run
         all_nodes = []
-        Chef::Search::Query.new.search(:node, '*:*') do |node|
+        q = Chef::Search::Query.new
+        query = @name_args[0] || "*:*"
+        q.search(:node, query) do |node|
           all_nodes << node
         end
         all_nodes.sort { |n1, n2| n1["ohai_time"] <=> n2["ohai_time"] }.each do |node|
-          # 59 seconds
-          # 1000 hours
-          # date = DateTime.parse(Time.at(node["ohai_time"]).to_s)
+          if node.has_key?("ec2")
+            fqdn = node['ec2']['public_hostname']
+            ipaddress = node['ec2']['public_ipv4']
+          else
+            fqdn = node['fqdn']
+            ipaddress = node['ipaddress']
+          end
           hours, minutes, seconds = time_difference_in_hms(node["ohai_time"])
           hours_text   = "#{hours} hour#{hours == 1 ? ' ' : 's'}"
           minutes_text = "#{minutes} minute#{minutes == 1 ? ' ' : 's'}"
+          run_list = ", #{node.run_list}." if config[:run_list]
           if hours > 24
-            highline.say("<%= color('#{hours_text}', RED) %> ago, #{node['fqdn']} checked in as a #{node['platform']} #{node['platform_version']} node.")
-          elsif hours > 1
-            highline.say("<%= color('#{hours_text}', YELLOW) %> ago, #{node['fqdn']} checked in as a #{node['platform']} #{node['platform_version']} node.")
-          elsif hours == 0
-            highline.say("<%= color('#{minutes_text}', GREEN) %> ago, #{node['fqdn']} checked in as a #{node['platform']} #{node['platform_version']} node.")
+            color = "RED"
+            text = hours_text
+          elsif hours >= 1
+            color = "YELLOW"
+            text = hours_text
+          else
+            color = "GREEN"
+            text = minutes_text
           end
+
+          highline.say("<%= color('#{text}', #{color}) %> ago, #{node.name}, #{node['platform']} #{node['platform_version']}, #{fqdn}, #{ipaddress}#{run_list}")
         end
 
       end

data/lib/chef/knife/windows_bootstrap.rb

@@ -0,0 +1,154 @@
+#
+# 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'
+require 'chef/knife/bootstrap.rb'
+
+class Chef
+  class Knife
+    class WindowsBootstrap < Chef::Knife::Bootstrap
+
+      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
+            Chef::Log.info("Mounted #{@admin_share} for copying files")
+          else
+            Chef::Log.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
+          Chef::Log.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]))
+
+        Chef::Log.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

data/lib/chef/mixin/checksum.rb

@@ -17,14 +17,14 @@
 #
 
 require 'digest/sha2'
-require 'chef/cache/checksum'
+require 'chef/checksum_cache'
 
 class Chef
   module Mixin
     module Checksum
 
       def checksum(file)
-        Chef::Cache::Checksum.checksum_for_file(file)
+        Chef::ChecksumCache.checksum_for_file(file)
       end
       
     end

data/lib/chef/mixin/xml_escape.rb

@@ -46,69 +46,95 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'chef/log'
+
+begin
+  require 'fast_xs'
+rescue LoadError
+  Chef::Log.info "The fast_xs gem is not installed, slower pure ruby XML escaping will be used."
+end
 
 class Chef
   module Mixin
     module XMLEscape
-      extend self
 
-      CP1252 = {
-        128 => 8364, # euro sign
-        130 => 8218, # single low-9 quotation mark
-        131 =>  402, # latin small letter f with hook
-        132 => 8222, # double low-9 quotation mark
-        133 => 8230, # horizontal ellipsis
-        134 => 8224, # dagger
-        135 => 8225, # double dagger
-        136 =>  710, # modifier letter circumflex accent
-        137 => 8240, # per mille sign
-        138 =>  352, # latin capital letter s with caron
-        139 => 8249, # single left-pointing angle quotation mark
-        140 =>  338, # latin capital ligature oe
-        142 =>  381, # latin capital letter z with caron
-        145 => 8216, # left single quotation mark
-        146 => 8217, # right single quotation mark
-        147 => 8220, # left double quotation mark
-        148 => 8221, # right double quotation mark
-        149 => 8226, # bullet
-        150 => 8211, # en dash
-        151 => 8212, # em dash
-        152 =>  732, # small tilde
-        153 => 8482, # trade mark sign
-        154 =>  353, # latin small letter s with caron
-        155 => 8250, # single right-pointing angle quotation mark
-        156 =>  339, # latin small ligature oe
-        158 =>  382, # latin small letter z with caron
-        159 =>  376 # latin capital letter y with diaeresis
-      }
+      module PureRuby
+        extend self
+
+        CP1252 = {
+          128 => 8364, # euro sign
+          130 => 8218, # single low-9 quotation mark
+          131 =>  402, # latin small letter f with hook
+          132 => 8222, # double low-9 quotation mark
+          133 => 8230, # horizontal ellipsis
+          134 => 8224, # dagger
+          135 => 8225, # double dagger
+          136 =>  710, # modifier letter circumflex accent
+          137 => 8240, # per mille sign
+          138 =>  352, # latin capital letter s with caron
+          139 => 8249, # single left-pointing angle quotation mark
+          140 =>  338, # latin capital ligature oe
+          142 =>  381, # latin capital letter z with caron
+          145 => 8216, # left single quotation mark
+          146 => 8217, # right single quotation mark
+          147 => 8220, # left double quotation mark
+          148 => 8221, # right double quotation mark
+          149 => 8226, # bullet
+          150 => 8211, # en dash
+          151 => 8212, # em dash
+          152 =>  732, # small tilde
+          153 => 8482, # trade mark sign
+          154 =>  353, # latin small letter s with caron
+          155 => 8250, # single right-pointing angle quotation mark
+          156 =>  339, # latin small ligature oe
+          158 =>  382, # latin small letter z with caron
+          159 =>  376 # latin capital letter y with diaeresis
+        }
+
+        # http://www.w3.org/TR/REC-xml/#dt-chardata
+        PREDEFINED = {
+          38 => '&', # ampersand
+          60 => '<',  # left angle bracket
+          62 => '>'  # right angle bracket
+        }
 
-      # http://www.w3.org/TR/REC-xml/#dt-chardata
-      PREDEFINED = {
-        38 => '&', # ampersand
-        60 => '<',  # left angle bracket
-        62 => '>'  # right angle bracket
-      }
+        # http://www.w3.org/TR/REC-xml/#charsets
+        VALID = [[0x9, 0xA, 0xD], (0x20..0xD7FF), 
+          (0xE000..0xFFFD), (0x10000..0x10FFFF)]
 
-      # http://www.w3.org/TR/REC-xml/#charsets
-      VALID = [[0x9, 0xA, 0xD], (0x20..0xD7FF), 
-        (0xE000..0xFFFD), (0x10000..0x10FFFF)]
+        def xml_escape(unescaped_str)
+          begin
+            unescaped_str.unpack("U*").map {|char| xml_escape_char!(char)}.join
+          rescue
+            unescaped_str.unpack("C*").map {|char| xml_escape_char!(char)}.join
+          end
+        end
+
+        private
 
-      def xml_escape(unescaped_str)
-        begin
-          unescaped_str.unpack("U*").map {|char| xml_escape_char!(char)}.join
-        rescue
-          unescaped_str.unpack("C*").map {|char| xml_escape_char!(char)}.join
+        def xml_escape_char!(char)
+          char = CP1252[char] || char
+          char = 42 unless VALID.detect {|range| range.include? char}
+          char = PREDEFINED[char] || (char<128 ? char.chr : "&##{char};")
         end
       end
+      
+      module FastXS
+        extend self
 
-      private
+        def xml_escape(string)
+          string.fast_xs
+        end
 
-      def xml_escape_char!(char)
-        char = CP1252[char] || char
-        char = 42 unless VALID.detect {|range| range.include? char}
-        char = PREDEFINED[char] || (char<128 ? char.chr : "&##{char};")
       end
 
+      if "strings".respond_to?(:fast_xs)
+        include FastXS
+        extend FastXS
+      else
+        include PureRuby
+        extend PureRuby
+      end
     end
   end
 end

data/lib/chef/node.rb

@@ -197,7 +197,8 @@ class Chef
         validate(
                  {:name => arg },
                  {:name => { :kind_of => String,
-                     :cannot_be => :blank}
+                     :cannot_be => :blank,
+                     :regex => /^[\-[:alnum:]_:.]+$/}
                  })
         @name = arg
       else
@@ -352,6 +353,28 @@ class Chef
       run_list.detect { |r| r == item } ? true : false
     end
 
+    # Consume data from ohai and Attributes provided as JSON on the command line.
+    def consume_external_attrs(ohai_data, json_cli_attrs)
+      Chef::Log.debug("Extracting run list from JSON attributes provided on command line")
+      consume_attributes(json_cli_attrs)
+
+      @automatic_attrs = ohai_data
+
+      platform, version = Chef::Platform.find_platform_and_version(self)
+      Chef::Log.debug("Platform is #{platform} version #{version}")
+      @automatic_attrs[:platform] = platform
+      @automatic_attrs[:platform_version] = version
+    end
+
+    # Consumes the combined run_list and other attributes in +attrs+
+    def consume_attributes(attrs)
+      normal_attrs_to_merge = consume_run_list(attrs)
+      Chef::Log.debug("Applying attributes from json file")
+      @normal_attrs = Chef::Mixin::DeepMerge.merge(@normal_attrs,normal_attrs_to_merge)
+      self[:tags] = Array.new unless attribute?(:tags)
+    end
+
+    # Extracts the run list from +attrs+ and applies it. Returns the remaining attributes
     def consume_run_list(attrs)
       attrs = attrs ? attrs.dup : {}
       if new_run_list = attrs.delete("recipes") || attrs.delete("run_list")
@@ -364,13 +387,37 @@ class Chef
       attrs
     end
 
-    # TODO: this code should be killed and removed, but it is used by shef and 
-    # I don't have time to fix it right now. [Dan - 09/Jun/2010]
-    def consume_attributes(attrs)
-      attrs = consume_run_list(attrs)
-      Chef::Log.debug("Applying attributes from json file")
-      @normal_attrs = Chef::Mixin::DeepMerge.merge(@normal_attrs,attrs)
+    # Clear defaults and overrides, so that any deleted attributes between runs are
+    # still gone.
+    def reset_defaults_and_overrides
+      @default_attrs = Mash.new
+      @override_attrs = Mash.new
+    end
+
+    # Expands the node's run list and deep merges the default and
+    # override attributes. Also applies stored attributes (from json provided
+    # on the command line)
+    #
+    # Returns the fully-expanded list of recipes.
+    #
+    # TODO: timh/cw, 5-14-2010: Should this method exist? Should we
+    # instead modify default_attrs and override_attrs whenever our
+    # run_list is mutated? Or perhaps do something smarter like
+    # on-demand generation of default_attrs and override_attrs,
+    # invalidated only when run_list is mutated?
+    def expand!
+      # This call should only be called on a chef-client run.
+      expansion = run_list.expand('server')
+      raise Chef::Exceptions::MissingRole if expansion.errors?
+
       self[:tags] = Array.new unless attribute?(:tags)
+      @default_attrs = Chef::Mixin::DeepMerge.merge(default_attrs, expansion.default_attrs)
+      @override_attrs = Chef::Mixin::DeepMerge.merge(override_attrs, expansion.override_attrs)
+
+      @automatic_attrs[:recipes] = expansion.recipes
+      @automatic_attrs[:roles] = expansion.roles
+
+      expansion.recipes
     end
 
     # Transform the node to a Hash
@@ -550,56 +597,5 @@ class Chef
       self
     end
 
-    # Consume data from ohai and Attributes provided as JSON on the command line.
-    # The run_list from the command-line attributes will be applied immediately,
-    # other attributes from the command line will be saved for later. Ohai data
-    # is applied immediately
-    def process_external_attrs(ohai_data, json_cli_attrs)
-      Chef::Log.debug("Extracting run list from JSON attributes provided on command line")
-      @json_attrib_for_expansion = consume_run_list(json_cli_attrs)
-
-      node.automatic_attrs = ohai_data
-
-      platform, version = Chef::Platform.find_platform_and_version(self)
-      Chef::Log.debug("Platform is #{platform} version #{version}")
-      @automatic_attrs[:platform] = platform
-      @automatic_attrs[:platform_version] = version
-    end
-
-    # Clear defaults and overrides, so that any deleted attributes between runs are
-    # still gone.
-    def reset_defaults_and_overrides
-      @default_attrs = Mash.new
-      @override_attrs = Mash.new
-    end
-
-    # Expands the node's run list and deep merges the default and
-    # override attributes. Also applies stored attributes (from json provided
-    # on the command line)
-    #
-    # Returns the fully-expanded list of recipes.
-    #
-    # TODO: timh/cw, 5-14-2010: Should this method exist? Should we
-    # instead modify default_attrs and override_attrs whenever our
-    # run_list is mutated? Or perhaps do something smarter like
-    # on-demand generation of default_attrs and override_attrs,
-    # invalidated only when run_list is mutated?
-    def expand!
-      # This call should only be called on a chef-client run.
-      expansion = run_list.expand('server')
-      raise Chef::Exceptions::MissingRole if expansion.errors?
-
-      Chef::Log.debug("Applying attributes from json file")
-      @normal_attrs = Chef::Mixin::DeepMerge.merge(@normal_attrs, @json_attrib_for_expansion)
-      self[:tags] = Array.new unless attribute?(:tags)
-      @default_attrs = Chef::Mixin::DeepMerge.merge(default_attrs, expansion.default_attrs)
-      @override_attrs = Chef::Mixin::DeepMerge.merge(override_attrs, expansion.override_attrs)
-
-      @automatic_attrs[:recipes] = expansion.recipes
-      @automatic_attrs[:roles] = expansion.roles
-
-      expansion.recipes
-    end
-    
   end
 end