chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/knife/role_show.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/node'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class RoleShow < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife role show ROLE (options)"
 
       option :attribute,
@@ -31,17 +34,17 @@ class Chef
         :long => "--attribute ATTR",
         :description => "Show only one attribute"
 
-      def run 
+      def run
         @role_name = @name_args[0]
 
         if @role_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a role name")
+          ui.fatal("You must specify a role name")
           exit 1
         end
-        
+
         role = Chef::Role.load(@role_name)
-        output(format_for_display(role))
+        output(format_for_display(config[:environment] ? role.environment(config[:environment]) : role))
       end
 
     end

data/lib/chef/knife/search.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -17,12 +17,15 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag_item'
 
 class Chef
   class Knife
     class Search < Knife
 
+      deps do
+        require 'chef/search/query'
+      end
+
       banner "knife search INDEX QUERY (options)"
 
       option :sort,
@@ -31,14 +34,14 @@ class Chef
         :description => "The order to sort the results in",
         :default => nil
 
-      option :start, 
+      option :start,
         :short => "-b ROW",
         :long => "--start ROW",
         :description => "The row to start returning results at",
         :default => 0,
         :proc => lambda { |i| i.to_i }
 
-      option :rows, 
+      option :rows,
         :short => "-R INT",
         :long => "--rows INT",
         :description => "The number of rows to return",
@@ -60,14 +63,34 @@ class Chef
         :long => "--id-only",
         :description => "Show only the ID of matching objects"
 
-      def run 
+      option :query,
+        :short => "-q QUERY",
+        :long => "--query QUERY",
+        :description => "The search query; useful to protect queries starting with -"
+
+      def run
+        if config[:query] && @name_args[1]
+          puts "please specify query as an argument or an option via -q, not both"
+          puts opt_parser
+          exit 1
+        end
+        raw_query = config[:query] || @name_args[1]
+        if !raw_query || raw_query.empty?
+          puts "no query specified"
+          puts opt_parser
+          exit 1
+        end
+
         q = Chef::Search::Query.new
         display = { :total => 0, :start => config[:start] ? config[:start] : 0, :rows => [ ] }
-
-        q.search(@name_args[0], @name_args[1], config[:sort], config[:start] ? config[:start] : 0, config[:rows] ? config[:rows] : 20) do |item|
+        query = URI.escape(raw_query,
+                           Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+        rows = config[:rows] ? config[:rows] : 20
+        start = config[:start] ? config[:start] : 0
+        q.search(@name_args[0], query, config[:sort], start, rows) do |item|
           formatted_item = format_for_display(item)
           if formatted_item.respond_to?(:has_key?) && !formatted_item.has_key?('id')
-            formatted_item['id'] = item.has_key?('id') ? item['id'] : item.name 
+            formatted_item['id'] = item.has_key?('id') ? item['id'] : item.name
           end
           display[:rows] << formatted_item
           display[:total] += 1
@@ -79,7 +102,7 @@ class Chef
               puts row[config[:attribute]] if row.has_key?(config[:attribute]) && !row[config[:attribute]].nil?
             end
           else
-            puts display[:rows].join("\n") 
+            puts display[:rows].join("\n")
           end
         else
           output(display)

data/lib/chef/knife/ssh.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -17,17 +17,17 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag_item'
-
-begin
-  gem "net-ssh", ">= 2.0.23"
-rescue LoadError
-end
 
 class Chef
   class Knife
     class Ssh < Knife
 
+      deps do
+        require 'net/ssh'
+        require 'net/ssh/multi'
+        require 'chef/search/query'
+      end
+
       attr_writer :password
 
       banner "knife ssh QUERY COMMAND (options)"
@@ -43,7 +43,7 @@ class Chef
         :short => "-a ATTR",
         :long => "--attribute ATTR",
         :description => "The attribute to use for opening the connection - default is fqdn",
-        :default => "fqdn" 
+        :default => "fqdn"
 
       option :manual,
         :short => "-m",
@@ -62,18 +62,17 @@ class Chef
         :long => "--ssh-password PASSWORD",
         :description => "The ssh password"
 
-      option :ssh_port,
-        :short => "-p PORT",
-        :long => "--ssh-port PORT",
-        :description => "The ssh port",
-        :default => "22",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
-
       option :identity_file,
         :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
         :description => "The SSH identity file used for authentication"
 
+      option :no_host_key_verify,
+        :long => "--no-host-key-verify",
+        :description => "Disable host key verification",
+        :boolean => true,
+        :default => false
+
       def session
         ssh_error_handler = Proc.new do |server|
           if config[:manual]
@@ -83,17 +82,13 @@ class Chef
               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}"
+          ui.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
-        @highline ||= HighLine.new
-      end
-
       def configure_session
         list = case config[:manual]
                when true
@@ -108,7 +103,7 @@ class Chef
                  end
                  r
                end
-        (Chef::Log.fatal("No nodes returned from search!"); exit 10) if list.length == 0
+        (ui.fatal("No nodes returned from search!"); exit 10) if list.length == 0
         session_from_list(list)
       end
 
@@ -120,13 +115,18 @@ class Chef
           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[:port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
           session_opts[:logger] = Chef::Log.logger if Chef::Log.level == :debug
 
+          if config[:no_host_key_verify]
+            session_opts[:paranoid] = false
+            session_opts[:user_known_hosts_file] = "/dev/null"
+          end
+
           session.use(hostspec, session_opts)
 
           @longest = item.length if item.length > @longest
         end
+
         session
       end
 
@@ -139,7 +139,7 @@ class Chef
           data.split(/\n/).each { |d| print_data(host, d) }
         else
           padding = @longest - host.length
-          print h.color(host, :cyan)
+          print ui.color(host, :cyan)
           padding.downto(0) { print " " }
           puts data
         end
@@ -164,7 +164,7 @@ class Chef
       end
 
       def get_password
-        @password ||= h.ask("Enter your password: ") { |q| q.echo = false }
+        @password ||= ui.ask("Enter your password: ") { |q| q.echo = false }
       end
 
       # Present the prompt and read a single line from the console. It also
@@ -173,7 +173,7 @@ class Chef
       # line is input.
       def read_line
         loop do
-          command = reader.readline("#{h.color('knife-ssh>', :bold)} ", true)
+          command = reader.readline("#{ui.color('knife-ssh>', :bold)} ", true)
 
           if command.nil?
             command = "exit"
@@ -193,7 +193,7 @@ class Chef
       end
 
       def interactive
-        puts "Connected to #{h.list(session.servers_for.collect { |s| h.color(s.host, :cyan) }, :inline, " and ")}"
+        puts "Connected to #{ui.list(session.servers_for.collect { |s| ui.color(s.host, :cyan) }, :inline, " and ")}"
         puts
         puts "To run a command on a list of servers, do:"
         puts "  on SERVER1 SERVER2 SERVER3; COMMAND"
@@ -211,7 +211,7 @@ class Chef
             raw_list = $1.split(" ")
             server_list = Array.new
             session.servers.each do |session_server|
-              server_list << session_server if raw_list.include?(session_server.host) 
+              server_list << session_server if raw_list.include?(session_server.host)
             end
             command = $2
             ssh_command(command, session.on(*server_list))
@@ -274,9 +274,9 @@ class Chef
           raise
         end
 
-        Appscript.app("/Applications/Utilities/Terminal.app").windows.first.activate  
+        Appscript.app("/Applications/Utilities/Terminal.app").windows.first.activate
         Appscript.app("System Events").application_processes["Terminal.app"].keystroke("n", :using=>:command_down)
-        term = Appscript.app('Terminal')  
+        term = Appscript.app('Terminal')
         window = term.windows.first.get
 
         (session.servers_for.size - 1).times do |i|
@@ -290,16 +290,15 @@ class Chef
         end
       end
 
-      def run 
-        @longest = 0
+      def run
 
-        load_late_dependencies
+        @longest = 0
 
         configure_session
 
         case @name_args[1]
         when "interactive"
-          interactive 
+          interactive
         when "screen"
           screen
         when "tmux"
@@ -313,33 +312,6 @@ class Chef
         session.close
       end
 
-      def load_late_dependencies
-        require 'readline'
-        %w[net/ssh/multi highline].each do |dep|
-          load_late_dependency dep
-        end
-        assert_net_ssh_version_acceptable!
-      end
-
-      # :nodoc:
-      # TODO: remove this stuff entirely and package knife ssh as a knife plugin. (Dan - 08 Jul 2010)
-      #
-      # The correct way to specify version deps is in the gemspec or other packaging.
-      # However, we don't want to have a gem dep on net-ssh, because it's a hassle
-      # when you only need the chef-client (e.g., on a managed node). So we have to
-      # check here that you have a decent version of Net::SSH.
-      #
-      # net-ssh of lower versions has a bug that causes 'knife ssh (searchterm) (commandname)" 
-      # to loop infinitely and consume all the CPU of one core.
-      def assert_net_ssh_version_acceptable!
-        netssh_version = Net::SSH::Version
-        # we want version 2.0.23 and higher:
-        unless (netssh_version::MAJOR == 2) && (netssh_version::TINY >= 23 || netssh_version::MINOR >= 1)
-          STDERR.puts "ERROR: Please install net-ssh version 2.0.23 or higher, as lower versions cause issues."
-          exit 1
-        end
-      end
-
     end
   end
 end

data/lib/chef/knife/status.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'highline'
-require 'chef/search/query'
 
 class Chef
   class Knife
     class Status < Knife
 
+      deps do
+        require 'highline'
+        require 'chef/search/query'
+      end
+
       banner "knife status QUERY (options)"
 
       option :run_list,

data/lib/chef/knife/subcommand_loader.rb

@@ -0,0 +1,101 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Christopher Brown (<cb@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2009, 2011 Opscode, 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 'chef/version'
+
+class Chef
+  class Knife
+    class SubcommandLoader
+
+      CHEF_FILE_IN_GEM = /chef-[\d]+\.[\d]+\.[\d]+/
+      CURRENT_CHEF_GEM = /chef-#{Regexp.escape(Chef::VERSION)}/
+
+      attr_reader :chef_config_dir
+      attr_reader :env
+
+      def initialize(chef_config_dir, env=ENV)
+        @chef_config_dir, @env = chef_config_dir, env
+      end
+
+      # Load all the sub-commands
+      def load_commands
+        subcommand_files.each { |subcommand| require subcommand }
+        true
+      end
+
+      # Returns an Array of paths to knife commands located in chef_config_dir/plugins/knife/
+      # and ~/.chef/plugins/knife/
+      def site_subcommands
+        user_specific_files = []
+
+        if chef_config_dir
+          user_specific_files.concat Dir.glob(File.expand_path("plugins/knife/*.rb", chef_config_dir))
+        end
+
+        # finally search ~/.chef/plugins/knife/*.rb
+        user_specific_files.concat Dir.glob(File.join(env['HOME'], '.chef', 'plugins', 'knife', '*.rb'))
+
+        user_specific_files.map! { |path| path[/(.+).rb/, 1] }
+        user_specific_files
+      end
+
+      # Returns an Array of paths to knife commands built-in to chef, or installed via gem.
+      # If rubygems is not installed, falls back to globbing the knife directory.
+      def gem_and_builtin_subcommands
+        # search all gems for chef/knife/*.rb
+        require 'rubygems'
+        find_subcommands_via_rubygems
+      rescue LoadError
+        find_subcommands_via_dirglob
+      end
+
+      def subcommand_files
+        @subcommand_files ||= (gem_and_builtin_subcommands + site_subcommands).flatten.uniq
+      end
+
+      def find_subcommands_via_dirglob
+        # The "require paths" of the core knife subcommands bundled with chef
+        files = Dir[File.expand_path('../../knife/*.rb', __FILE__)]
+        files.map! { |knife_file| knife_file[/#{CHEF_ROOT}#{Regexp.escape(File::SEPARATOR)}(.*)\.rb/,1] }
+        files
+      end
+
+      def find_subcommands_via_rubygems
+        files = Gem.find_files 'chef/knife/*.rb'
+        files.reject! {|f| from_old_gem?(f) }
+        files.map! do |file|
+          file[/(#{Regexp.escape File.join('chef', 'knife', '')}.*)\.rb/, 1]
+        end.uniq!
+        files
+      end
+
+      private
+
+      # wow, this is a sad hack :(
+      # Gem.find_files finds files in all versions of a gem, which
+      # means that if chef 0.10 and 0.9.x are installed, we'll try to
+      # require, e.g., chef/knife/ec2_server_create, which will cause
+      # a gem activation error. So remove files from older chef gems.
+      def from_old_gem?(path)
+        path =~ CHEF_FILE_IN_GEM && path !~ CURRENT_CHEF_GEM
+      end
+    end
+  end
+end