chef 0.8.10 → 0.8.14

data/lib/chef/index_queue/indexable.rb

@@ -44,10 +44,12 @@ class Chef
         self.class.index_object_type || Mixin::ConvertToClassName.snake_case_basename(self.class.name)
       end
       
-      def with_indexer_metadata(with_metadata={})
+      def with_indexer_metadata(indexer_metadata={})
         # changing input param symbol keys to strings, as the keys in hash that goes to solr are expected to be strings [cb]
-        with_metadata.each do |key,value|
-          with_metadata[key.to_s] = with_metadata.delete(key)
+        # Ruby 1.9 hates you, cb [dan]
+        with_metadata = {}
+        indexer_metadata.each_key do |key|
+          with_metadata[key.to_s] = indexer_metadata[key]
         end
 
         with_metadata["type"]     ||= self.index_object_type

data/lib/chef/knife.rb

@@ -20,6 +20,8 @@
 require 'mixlib/cli'
 require 'chef/mixin/convert_to_class_name'
 
+require 'pp'
+
 class Chef
   class Knife
     include Mixlib::CLI
@@ -96,11 +98,17 @@ class Chef
       klass_instance
     end
 
-    def ask_question(q)
-      print q 
-      a = STDIN.readline
-      a.chomp!
-      a
+    def ask_question(question, opts={})
+      question = question + "[#{opts[:default]}] " if opts[:default]
+        
+      stdout.print question
+      a = stdin.readline.strip
+
+      if opts[:default]
+        a.empty? ? opts[:default] : a
+      else
+        a
+      end
     end
 
     def configure_chef
@@ -126,8 +134,24 @@ class Chef
       puts data
     end
 
-    def json_pretty_print(data)
-      puts JSON.pretty_generate(data)
+    def output(data)
+      case config[:format]
+      when "json", nil
+        puts JSON.pretty_generate(data)
+      when "yaml"
+        require 'yaml'
+        puts YAML::dump(data)
+      when "text"
+        # If you were looking for some attribute and there is only one match
+        # just dump the attribute value
+        if data.length == 1 and config[:attribute]
+          puts data.values[0]
+        else
+          pp data
+        end
+      else
+        raise ArgumentError, "Unknown output format #{config[:format]}"
+      end
     end
 
     def format_list_for_display(list)
@@ -182,7 +206,7 @@ class Chef
       return true if config[:yes]
 
       print "#{question}? (Y/N) "
-      answer = STDIN.readline
+      answer = stdin.readline
       answer.chomp!
       case answer
       when "Y", "y"
@@ -237,7 +261,7 @@ class Chef
 
       Chef::Log.info("Saved #{output}")
 
-      json_pretty_print(format_for_display(object)) if config[:print_after]
+      output(format_for_display(object)) if config[:print_after]
     end
 
     def create_object(object, pretty_name=nil, &block)
@@ -253,7 +277,7 @@ class Chef
 
       Chef::Log.info("Created (or updated) #{pretty_name}")
       
-      json_pretty_print(output) if config[:print_after]
+      output(output) if config[:print_after]
     end
 
     def delete_object(klass, name, delete_name=nil, &block)
@@ -266,7 +290,7 @@ class Chef
         object.destroy
       end
 
-      json_pretty_print(format_for_display(object)) if config[:print_after]
+      output(format_for_display(object)) if config[:print_after]
 
       obj_name = delete_name ? "#{delete_name}[#{name}]" : object
       Chef::Log.warn("Deleted #{obj_name}!")
@@ -285,7 +309,7 @@ class Chef
         to_delete = object_list
       end
 
-      json_pretty_print(format_list_for_display(to_delete))
+      output(format_list_for_display(to_delete))
 
       confirm("Do you really want to delete the above items")
 
@@ -295,10 +319,18 @@ class Chef
         else
           object.destroy
         end
-        json_pretty_print(format_for_display(object)) if config[:print_after]
+        output(format_for_display(object)) if config[:print_after]
         Chef::Log.warn("Deleted #{fancy_name} #{name}")
       end
     end
+    
+    def stdout
+      STDOUT
+    end
+
+    def stdin
+      STDIN
+    end
 
     def rest
       @rest ||= Chef::REST.new(Chef::Config[:chef_server_url])

data/lib/chef/knife/client_list.rb

@@ -32,7 +32,7 @@ class Chef
         :description => "Show corresponding URIs"
 
       def run 
-        json_pretty_print(format_list_for_display(Chef::ApiClient.list))
+        output(format_list_for_display(Chef::ApiClient.list))
       end
     end
   end

data/lib/chef/knife/client_show.rb

@@ -33,7 +33,7 @@ class Chef
 
       def run 
         client = Chef::ApiClient.load(@name_args[0])
-        json_pretty_print(format_for_display(client))
+        output(format_for_display(client))
       end
 
     end

data/lib/chef/knife/configure.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.
@@ -21,6 +21,8 @@ require 'chef/knife'
 class Chef
   class Knife
     class Configure < Knife
+      attr_reader :chef_server, :new_client_name, :admin_client_name, :admin_client_key
+      attr_reader :chef_repo, :new_client_key, :validation_client_name, :validation_key
 
       banner "Sub-Command: configure (options)"
 
@@ -37,58 +39,48 @@ class Chef
 
       def configure_chef
         # We are just faking out the system so that you can do this without a key specified
-        Chef::Config[:node_name] = 'woot' 
+        Chef::Config[:node_name] = 'woot'
         super
         Chef::Config[:node_name] = nil
       end
 
-      def run 
-        config[:config_file] ||= ask_question("Where should I put the config file? ") 
-        if File.exists?(config[:config_file]) 
-          confirm("Overwrite #{config[:config_file]}")
-        end
+      def run
+        ask_user_for_config_path
 
         Mixlib::Log::Formatter.show_time = false
         Chef::Log.init(STDOUT)
         Chef::Log.level(:info)
 
-        chef_config_path = File.dirname(config[:config_file])
-        FileUtils.mkdir_p(File.dirname(config[:config_file]))
+        FileUtils.mkdir_p(chef_config_path)
 
-        chef_server = config[:chef_server_url] || ask_question("Your chef server URL? ")
-        opscode_user = config[:node_name] || ask_question("Your client user name? ")
-        opscode_key = config[:client_key] || File.join(chef_config_path, "#{opscode_user}.pem")
-        validation_user = config[:validation_client_name] || ask_question("Your validation client user name? ")
-        validation_key = config[:validation_key] || File.join(chef_config_path, "#{validation_user}.pem")
-        chef_repo = config[:repository] || ask_question("Path to a chef repository (or leave blank)? ")
-        
+        ask_user_for_config
 
-        File.open(config[:config_file], "w") do |f|
-          f.puts <<EOH
+        ::File.open(config[:config_file], "w") do |f|
+          f.puts <<-EOH
 log_level                :info
 log_location             STDOUT
-node_name                '#{opscode_user}'
-client_key               '#{opscode_key}'
-validation_client_name   '#{validation_user}'
+node_name                '#{new_client_name}'
+client_key               '#{new_client_key}'
+validation_client_name   '#{validation_client_name}'
 validation_key           '#{validation_key}'
-chef_server_url          '#{chef_server}'  
+chef_server_url          '#{chef_server}'
 cache_type               'BasicFile'
 cache_options( :path => '#{File.join(chef_config_path, "checksums")}' )
 EOH
-          unless chef_repo == ""
+          unless chef_repo.empty?
             f.puts "cookbook_path [ '#{chef_repo}/cookbooks', '#{chef_repo}/site-cookbooks' ]"
-          end 
+          end
         end
 
         if config[:initial]
           Chef::Log.warn("Creating initial API user...")
           Chef::Config[:chef_server_url] = chef_server
-          Chef::Config[:node_name] = 'chef-webui'
-          Chef::Config[:client_key] = '/etc/chef/webui.pem'
+          Chef::Config[:node_name] = admin_client_name
+          Chef::Config[:client_key] = admin_client_key
           client_create = Chef::Knife::ClientCreate.new
-          client_create.name_args = [ opscode_user ]
+          client_create.name_args = [ new_client_name ]
           client_create.config[:admin] = true
-          client_create.config[:file] = opscode_key
+          client_create.config[:file] = new_client_key
           client_create.config[:yes] = true
           client_create.config[:no_editor] = true
           client_create.run
@@ -96,7 +88,7 @@ EOH
           Chef::Log.warn("*****")
           Chef::Log.warn("")
           Chef::Log.warn("You must place your client key in:")
-          Chef::Log.warn("  #{opscode_key}")
+          Chef::Log.warn("  #{new_client_key}")
           Chef::Log.warn("Before running commands with Knife!")
           Chef::Log.warn("")
           Chef::Log.warn("*****")
@@ -111,13 +103,32 @@ EOH
         Chef::Log.warn("Configuration file written to #{config[:config_file]}")
       end
 
-    end
-  end
-end
-
-
-
+      def ask_user_for_config_path
+        config[:config_file] ||= ask_question("Where should I put the config file? ")
+        if File.exists?(config[:config_file])
+          confirm("Overwrite #{config[:config_file]}")
+        end
+      end
 
+      def ask_user_for_config
+        @chef_server            = config[:chef_server_url] || ask_question("Your chef server URL? ", :default => 'http://localhost:4000')
+        @new_client_name        = config[:node_name] || ask_question("Select a user name for your new client: ", :default => Etc.getlogin)
+        @admin_client_name      = config[:admin_client_name] || ask_question("Your existing admin client user name? ", :default => 'chef-webui')
+        @admin_client_key       = config[:admin_client_key] || ask_question("The location of your existing admin key? ", :default => '/etc/chef/webui.pem')
+        @validation_client_name = config[:validation_client_name] || ask_question("Your validation client user name? ", :default => 'chef-validator')
+        @validation_key         = config[:validation_key] || ask_question("The location of your validation key? ", :default => '/etc/chef/validation.pem')
+        @chef_repo              = config[:repository] || ask_question("Path to a chef repository (or leave blank)? ")
 
+        @new_client_key = config[:client_key] || File.join(chef_config_path, "#{@new_client_name}.pem")
+      end
 
+      def config_file
+        config[:config_file]
+      end
 
+      def chef_config_path
+        File.dirname(config_file)
+      end
+    end
+  end
+end

data/lib/chef/knife/cookbook_list.rb

@@ -31,7 +31,7 @@ class Chef
         :description => "Show corresponding URIs"
 
       def run 
-        json_pretty_print(format_list_for_display(rest.get_rest('cookbooks')))
+        output(format_list_for_display(rest.get_rest('cookbooks')))
       end
     end
   end

data/lib/chef/knife/cookbook_metadata.rb

@@ -7,9 +7,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.
@@ -36,20 +36,20 @@ class Chef
         :long => "--all",
         :description => "Generate metadata for all cookbooks, rather than just a single cookbook"
 
-      def run 
+      def run
         if config[:cookbook_path]
           Chef::Config[:cookbook_path] = config[:cookbook_path]
         else
           config[:cookbook_path] = Chef::Config[:cookbook_path]
         end
 
-        if config[:all] 
+        if config[:all]
           cl = Chef::CookbookLoader.new
           cl.each do |cookbook|
             generate_metadata(cookbook.name.to_s)
           end
         else
-          generate_metadata(@name_args[0]) 
+          generate_metadata(@name_args[0])
         end
       end
 
@@ -57,31 +57,26 @@ class Chef
         Chef::Log.info("Generating metadata for #{cookbook}")
         config[:cookbook_path].reverse.each do |path|
           file = File.expand_path(File.join(path, cookbook, 'metadata.rb'))
-          if File.exists?(file)
-            Chef::Log.info("Generating from #{file}")
-            md = Chef::Cookbook::Metadata.new
-            md.name(cookbook)
-            md.from_file(file)
-            json_file = File.join(File.dirname(file), 'metadata.json')
-            File.open(json_file, "w") do |f|
-              f.write(JSON.pretty_generate(md))
-            end
-            generated = true 
-            Chef::Log.info("Generated #{json_file}")
-          else
-            Chef::Log.debug("No #{file} found; skipping!")
-          end
+          generate_metadata_from_file(cookbook, file)
         end
       end
 
+      def generate_metadata_from_file(cookbook, file)
+        if File.exists?(file)
+          Chef::Log.info("Generating from #{file}")
+          md = Chef::Cookbook::Metadata.new
+          md.name(cookbook)
+          md.from_file(file)
+          json_file = File.join(File.dirname(file), 'metadata.json')
+          File.open(json_file, "w") do |f|
+            f.write(JSON.pretty_generate(md))
+          end
+          generated = true
+          Chef::Log.info("Generated #{json_file}")
+        else
+          Chef::Log.debug("No #{file} found; skipping!")
+        end
+      end
     end
   end
 end
-
-
-
-
-
-
-
-

data/lib/chef/knife/cookbook_metadata_from_file.rb

@@ -0,0 +1,40 @@
+#
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Matthew Kent (<mkent@magoazul.com>)
+# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Copyright:: Copyright (c) 2010 Matthew Kent
+# 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/knife'
+
+class Chef
+  class Knife
+    class CookbookMetadataFromFile < Knife
+
+      banner "Sub-Command: cookbook metadata from FILE (options)"
+
+      def run
+        file = @name_args[0]
+        cookbook = File.basename(File.dirname(file))
+
+        @metadata = Chef::Knife::CookbookMetadata.new
+        @metadata.generate_metadata_from_file(cookbook, file)
+      end
+
+    end
+  end
+end

data/lib/chef/knife/cookbook_show.rb

@@ -52,9 +52,9 @@ class Chef
           pretty_print(result)
         when 2 # We are showing a specific part of the cookbook
           result = rest.get_rest("cookbooks/#{@name_args[0]}")
-          json_pretty_print(result[@name_args[1]])
+          output(result[@name_args[1]])
         when 1 # We are showing the whole cookbook data
-          json_pretty_print(rest.get_rest("cookbooks/#{@name_args[0]}"))
+          output(rest.get_rest("cookbooks/#{@name_args[0]}"))
         end
       end
 

data/lib/chef/knife/cookbook_site_download.rb

@@ -0,0 +1,57 @@
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 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/knife'
+
+class Chef
+  class Knife
+    class CookbookSiteDownload < Knife
+
+      attr_reader :version
+
+      banner "Sub-Command: cookbook site download COOKBOOK [VERSION] (options)"
+
+      option :file,
+       :short => "-f FILE",
+       :long => "--file FILE",
+       :description => "The filename to write to"
+
+      def run
+        if @name_args.length == 1
+          current = rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}")
+          cookbook_data = rest.get_rest(current["latest_version"])
+        else
+          cookbook_data = rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
+        end
+
+        @version = cookbook_data['version']
+
+        Chef::Log.info("Downloading #{@name_args[0]} from the cookbooks site at version #{cookbook_data['version']}")
+        rest.sign_on_redirect = false
+        tf = rest.get_rest(cookbook_data["file"], true)
+        unless config[:file]
+          config[:file] = File.join(Dir.pwd, "#{@name_args[0]}-#{cookbook_data['version']}.tar.gz")
+        end
+        FileUtils.cp(tf.path, config[:file])
+        Chef::Log.info("Cookbook saved: #{config[:file]}")
+      end
+
+    end
+  end
+end
+
+