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

data/lib/chef/knife/data_bag_from_file.rb

@@ -26,6 +26,7 @@ class Chef
       deps do
         require 'chef/data_bag'
         require 'chef/data_bag_item'
+        require 'chef/knife/core/object_loader'
         require 'chef/json_compat'
         require 'chef/encrypted_data_bag_item'
       end
@@ -58,12 +59,17 @@ class Chef
         config[:secret] || config[:secret_file]
       end
 
+      def loader
+        @loader ||= Knife::Core::ObjectLoader.new(DataBagItem, ui)
+      end
+
       def run
         if @name_args.size != 2
           stdout.puts opt_parser
           exit(1)
         end
-        item = load_from_file(Chef::DataBagItem, @name_args[1], @name_args[0])
+        @data_bag, @item_path = @name_args[0], @name_args[1]
+        item = loader.load_from("data_bags", @data_bag, @item_path)
         item = if use_encryption
                  secret = read_secret
                  Chef::EncryptedDataBagItem.encrypt_data_bag_item(item, secret)
@@ -74,7 +80,7 @@ class Chef
         dbag.data_bag(@name_args[0])
         dbag.raw_data = item
         dbag.save
-        ui.info("Updated data_bag_item[#{@name_args[1]}]")
+        ui.info("Updated data_bag_item[#{dbag.data_bag}::#{dbag.id}]")
       end
     end
   end

data/lib/chef/knife/environment_from_file.rb

@@ -20,8 +20,18 @@ class Chef
   class Knife
     class EnvironmentFromFile < Knife
 
+      deps do
+        require 'chef/environment'
+        require 'chef/knife/core/object_loader'
+      end
+
       banner "knife environment from file FILE (options)"
 
+      def loader
+        @loader ||= Knife::Core::ObjectLoader.new(Chef::Environment, ui)
+      end
+
+
       def run
         if @name_args[0].nil?
           show_usage
@@ -29,11 +39,12 @@ class Chef
           exit 1
         end
 
-        updated = load_from_file(Chef::Environment, @name_args[0])
+
+        updated = loader.load_from("environments", @name_args[0])
         updated.save
         output(format_for_display(updated)) if config[:print_after]
-        ui.warn("Updated Environment #{updated.name}!")
+        ui.info("Updated Environment #{updated.name}")
       end
     end
   end
-end
+end

data/lib/chef/knife/node_edit.rb

@@ -21,110 +21,14 @@ require 'chef/knife'
 class Chef
   class Knife
 
-    module NodeEditController
-      def edit_node
-        abort "You specified the --no-editor option, nothing to edit" if config[:no_editor]
-        assert_editor_set!
-
-        updated_node_data = edit_data(view)
-        apply_updates(updated_node_data)
-        @updated_node
-      end
-
-      def view
-        result = {}
-        result["name"] = node.name
-        result["chef_environment"] = node.chef_environment
-        result["normal"] = node.normal_attrs
-        result["run_list"] = node.run_list
-
-        if config[:all_attributes]
-          result["default"]   = node.default_attrs
-          result["override"]  = node.override_attrs
-          result["automatic"] = node.automatic_attrs
-        end
-        Chef::JSONCompat.to_json_pretty(result)
-      end
-
-      def edit_data(text)
-        edited_data = tempfile_for(text) {|filename| system("#{config[:editor]} #{filename}")}
-        Chef::JSONCompat.from_json(edited_data)
-      end
-
-      def apply_updates(updated_data)
-        # TODO: should warn/error/ask for confirmation when changing the
-        # name, since this results in a new node, not an edited node.
-        @updated_node = Node.new.tap do |n|
-          n.name( updated_data["name"] )
-          n.chef_environment( updated_data["chef_environment"] )
-          n.run_list( updated_data["run_list"])
-          n.normal_attrs = updated_data["normal"]
-
-          if config[:all_attributes]
-            n.default_attrs   = updated_data["default"]
-            n.override_attrs  = updated_data["override"]
-            n.automatic_attrs = updated_data["automatic"]
-          else
-            n.default_attrs   = node.default_attrs
-            n.override_attrs  = node.override_attrs
-            n.automatic_attrs = node.automatic_attrs
-          end
-        end
-      end
-
-      def updated?
-        pristine_copy = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(node), :create_additions => false)
-        updated_copy  = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(@updated_node), :create_additions => false)
-        unless pristine_copy == updated_copy
-          updated_properties = %w{name normal chef_environment run_list default override automatic}.reject do |key|
-             pristine_copy[key] == updated_copy[key]
-          end
-        end
-        ( pristine_copy != updated_copy ) && updated_properties
-      end
-
-      private
-
-      def abort(message)
-        STDERR.puts("ERROR: #{message}")
-        exit 1
-      end
-
-      def assert_editor_set!
-        unless config[:editor]
-          abort "You must set your EDITOR environment variable or configure your editor via knife.rb"
-        end
-      end
-
-      def tempfile_for(data)
-        # TODO: include useful info like the node name in the temp file
-        # name
-        basename = "knife-edit-" << rand(1_000_000_000_000_000).to_s.rjust(15, '0') << '.js'
-        filename = File.join(Dir.tmpdir, basename)
-        File.open(filename, "w+") do |f|
-          f.sync = true
-          f.puts data
-        end
-
-        yield filename
-
-        IO.read(filename)
-      ensure
-        File.unlink(filename)
-      end
-    end
-
     class NodeEdit < Knife
-      include NodeEditController
 
       deps do
         require 'chef/node'
         require 'chef/json_compat'
+        require 'chef/knife/core/node_editor'
       end
 
-      attr_reader :node_name
-      attr_reader :node
-
       banner "knife node edit NODE (options)"
 
       option :all_attributes,
@@ -134,17 +38,14 @@ class Chef
         :description => "Display all attributes when editing"
 
       def run
-        node_name = @name_args[0]
-
         if node_name.nil?
           show_usage
           ui.fatal("You must specify a node name")
           exit 1
         end
 
-        load_node(node_name)
-        updated_node = edit_node
-        if updated_values = updated?
+        updated_node = node_editor.edit_node
+        if updated_values = node_editor.updated?
           ui.info "Saving updated #{updated_values.join(', ')} on node #{node.name}"
           updated_node.save
         else
@@ -152,10 +53,18 @@ class Chef
         end
       end
 
-      def load_node(node_name)
-        @node = Chef::Node.load(node_name)
-        # TODO: rescue errors with a helpful message
+      def node_name
+        @node_name ||= @name_args[0]
+      end
+
+      def node_editor
+        @node_editor ||= Knife::NodeEditor.new(node, ui, config)
+      end
+
+      def node
+        @node ||= Chef::Node.load(node_name)
       end
+
     end
   end
 end

data/lib/chef/knife/node_from_file.rb

@@ -25,12 +25,17 @@ class Chef
       deps do
         require 'chef/node'
         require 'chef/json_compat'
+        require 'chef/knife/core/object_loader'
       end
 
       banner "knife node from file FILE (options)"
 
+      def loader
+        @loader ||= Knife::Core::ObjectLoader.new(Chef::Node, ui)
+      end
+
       def run
-        updated = load_from_file(Chef::Node, @name_args[0])
+        updated = loader.load_from('nodes', @name_args[0])
 
         updated.save
 

data/lib/chef/knife/node_show.rb

@@ -17,11 +17,14 @@
 #
 
 require 'chef/knife'
+require 'chef/knife/core/node_presenter'
 
 class Chef
   class Knife
     class NodeShow < Knife
 
+      include Knife::Core::NodeFormattingOptions
+
       deps do
         require 'chef/node'
         require 'chef/json_compat'
@@ -29,9 +32,11 @@ class Chef
 
       banner "knife node show NODE (options)"
 
+      attrs_to_show = []
       option :attribute,
         :short => "-a [ATTR]",
         :long => "--attribute [ATTR]",
+        :proc => lambda {|val| attrs_to_show << val},
         :description => "Show only one attribute"
 
       option :run_list,
@@ -45,6 +50,7 @@ class Chef
         :description  => "Show only the Chef environment"
 
       def run
+        ui.use_presenter Knife::Core::NodePresenter
         @node_name = @name_args[0]
 
         if @node_name.nil?

data/lib/chef/knife/role_from_file.rb

@@ -24,13 +24,18 @@ class Chef
 
       deps do
         require 'chef/role'
+        require 'chef/knife/core/object_loader'
         require 'chef/json_compat'
       end
 
       banner "knife role from file FILE (options)"
 
+      def loader
+        @loader ||= Knife::Core::ObjectLoader.new(Chef::Role, ui)
+      end
+
       def run
-        updated = load_from_file(Chef::Role, @name_args[0])
+        updated = loader.load_from("roles", @name_args[0])
 
         updated.save
 

data/lib/chef/knife/search.rb

@@ -24,8 +24,11 @@ class Chef
 
       deps do
         require 'chef/search/query'
+        require 'chef/knife/core/node_presenter'
       end
 
+      include Knife::Core::NodeFormattingOptions
+
       banner "knife search INDEX QUERY (options)"
 
       option :sort,
@@ -70,48 +73,60 @@ class Chef
 
       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
+          ui.error "please specify query as an argument or an option via -q, not both"
+          ui.msg 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
+          ui.error "no query specified"
+          ui.msg opt_parser
+          exit 1
+        end
+
+        if name_args[0].nil?
+          ui.error "you must specify an item type to search for"
           exit 1
         end
 
+        if name_args[0] == 'node'
+          ui.use_presenter Knife::Core::NodePresenter
+        end
+
+
         q = Chef::Search::Query.new
-        display = { :total => 0, :start => config[:start] ? config[:start] : 0, :rows => [ ] }
         query = URI.escape(raw_query,
                            Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-        rows = config[:rows] ? config[:rows] : 20
-        start = config[:start] ? config[:start] : 0
+
+        result_items = []
+        result_count = 0
+
+        rows = config[:rows]
+        start = config[:start]
         begin
           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
             end
-            display[:rows] << formatted_item
-            display[:total] += 1
+            result_items << formatted_item
+            result_count += 1
           end
         rescue Net::HTTPServerException => e
           msg = Chef::JSONCompat.from_json(e.response.body)["error"].first
-          ui.msg("knife search failed: #{msg}")
+          ui.error("knife search failed: #{msg}")
           exit 1
         end
 
-        if config[:id_only]
-          if config[:attribute]
-            display[:rows].each do |row|
-              puts row[config[:attribute]] if row.has_key?(config[:attribute]) && !row[config[:attribute]].nil?
-            end
-          else
-            puts display[:rows].join("\n")
-          end
+        if ui.interchange?
+          output({:results => result_count, :rows => result_items})
         else
-          output(display)
+          ui.msg "#{result_count} items found"
+          ui.msg("\n")
+          result_items.each do |item|
+            output(item)
+            ui.msg("\n")
+          end
         end
       end
     end

data/lib/chef/knife/status.rb

@@ -68,7 +68,21 @@ class Chef
             text = minutes_text
           end
 
-          highline.say("<%= color('#{text}', #{color}) %> ago, #{node.name}, #{node['platform']} #{node['platform_version']}, #{fqdn}, #{ipaddress}#{run_list}")
+          line_parts = Array.new
+          line_parts << "<%= color('#{text}', #{color}) %> ago" << node.name
+          line_parts << fqdn if fqdn
+          line_parts << ipaddress if ipaddress
+          line_parts << run_list if run_list
+
+          if node['platform']
+            platform = node['platform']
+            if node['platform_version']
+              platform << " #{node['platform_version']}"
+            end
+            line_parts << platform
+          end
+
+          highline.say(line_parts.join(', ') + '.')
         end
 
       end

data/lib/chef/mixin/recipe_definition_dsl_core.rb

@@ -61,10 +61,7 @@ class Chef
           resource = Chef::Resource.const_get(rname).new(*args)
           resource.load_prior_resource
           resource.cookbook_name = cookbook_name
-          # TODO: 5/21/2010 cw/dan: do we need recipe_name for
-          # anything? it's not even possible that this ivar is set on
-          # Chef::Provider.
-#          resource.recipe_name = @recipe_name
+          resource.recipe_name = @recipe_name
           resource.params = @params
           resource.source_line = caller[0]
           # Determine whether this resource is being created in the context of an enclosing Provider

data/lib/chef/mixin/shell_out.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require 'chef/shell_out'
+require 'chef/config'
 
 class Chef
   module Mixin

data/lib/chef/node.rb

@@ -19,6 +19,7 @@
 # limitations under the License.
 #
 
+require 'forwardable'
 require 'chef/config'
 require 'chef/cookbook/cookbook_collection'
 require 'chef/nil_argument'
@@ -39,6 +40,10 @@ require 'chef/json_compat'
 class Chef
   class Node
 
+    extend Forwardable
+
+    def_delegators :construct_attributes, :keys, :each_key, :each_value, :key?, :has_key?
+
     attr_accessor :recipe_list, :couchdb, :couchdb_rev, :run_state, :run_list
     attr_accessor :override_attrs, :default_attrs, :normal_attrs, :automatic_attrs
     attr_reader :couchdb_id
@@ -363,11 +368,6 @@ class Chef
       args.length > 0 ? @run_list.reset!(args) : @run_list
     end
 
-    def recipes(*args)
-      Chef::Log.warn "Chef::Node#recipes method is deprecated.  Please use Chef::Node#run_list"
-      run_list(*args)
-    end
-
     # Returns true if this Node expects a given role, false if not.
     def run_list?(item)
       run_list.detect { |r| r == item } ? true : false
@@ -468,6 +468,18 @@ class Chef
       index_hash
     end
 
+    def display_hash
+      display = {}
+      display["name"]             = name
+      display["chef_environment"] = chef_environment
+      display["automatic"]        = automatic_attrs
+      display["normal"]           = normal_attrs
+      display["default"]          = default_attrs
+      display["override"]         = override_attrs
+      display["run_list"]         = run_list.run_list
+      display
+    end
+
     # Serialize this object as a hash
     def to_json(*a)
       result = {