chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/knife/environment_list.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Copyright:: Copyright (c) 2010 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 EnvironmentList < Knife
+
+      deps do
+        require 'chef/environment'
+        require 'chef/json_compat'
+      end
+
+      banner "knife environment list (options)"
+
+      option :with_uri,
+        :short => "-w",
+        :long => "--with-uri",
+        :description => "Show corresponding URIs"
+
+      def run
+        output(format_list_for_display(Chef::Environment.list))
+      end
+    end
+  end
+end

data/lib/chef/knife/environment_show.rb

@@ -0,0 +1,46 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Copyright:: Copyright (c) 2010 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 EnvironmentShow < Knife
+
+      deps do
+        require 'chef/environment'
+        require 'chef/json_compat'
+      end
+
+      banner "knife environment show ENVIRONMENT (options)"
+
+      def run
+        env_name = @name_args[0]
+
+        if env_name.nil?
+          show_usage
+          ui.fatal("You must specify an environment name")
+          exit 1
+        end
+
+        env = Chef::Environment.load(env_name)
+        output(format_for_display(env))
+      end
+    end
+  end
+end

data/lib/chef/knife/exec.rb

@@ -27,7 +27,7 @@ class Chef::Knife::Exec < Chef::Knife
     :long => "--exec CODE",
     :description => "a string of Chef code to execute"
 
-  def late_load_deps
+  deps do
     require 'chef/shef/ext'
   end
 

data/lib/chef/knife/index_rebuild.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,24 +17,23 @@
 #
 
 require 'chef/knife'
-require 'pp'
 
 class Chef
   class Knife
     class IndexRebuild < Knife
-      
+
       banner "knife index rebuild (options)"
       option :yes,
         :short        => "-y",
         :long         => "--yes",
         :boolean      => true,
         :description  => "don't bother to ask if I'm sure"
-        
+
       def run
         nag
         output rest.post_rest("/search/reindex", {})
       end
-      
+
       def nag
         unless config[:yes]
           yea_or_nay = ask_question("This operation is destructive. Rebuilding the index may take some time. You sure? (yes/no): ")
@@ -42,10 +41,10 @@ class Chef
             puts "aborting"
             exit 7
           end
-        end 
+        end
       end
-      
-      
+
+
     end
   end
 end

data/lib/chef/knife/node_bulk_delete.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,18 +17,21 @@
 #
 
 require 'chef/knife'
-require 'chef/node'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class NodeBulkDelete < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife node bulk delete REGEX (options)"
 
-      def run 
+      def run
         if @name_args.length < 1
-          Chef::Log.fatal("You must supply a regular expression to match the results against")
+          ui.fatal("You must supply a regular expression to match the results against")
           exit 42
         else
           bulk_delete(Chef::Node, "node", nil, nil, @name_args[0])

data/lib/chef/knife/node_create.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 NodeCreate < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife node create NODE (options)"
 
       def run
@@ -31,10 +34,10 @@ class Chef
 
         if @node_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a node name")
+          ui.fatal("You must specify a node name")
           exit 1
         end
-        
+
         node = Chef::Node.new
         node.name(@node_name)
         create_object(node)

data/lib/chef/knife/node_delete.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,24 +17,27 @@
 #
 
 require 'chef/knife'
-require 'chef/node'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class NodeDelete < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife node delete NODE (options)"
 
-      def run 
+      def run
         @node_name = @name_args[0]
 
         if @node_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a node name")
+          ui.fatal("You must specify a node name")
           exit 1
         end
-        
+
         delete_object(Chef::Node, @node_name)
       end
 

data/lib/chef/knife/node_edit.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,25 +17,144 @@
 #
 
 require 'chef/knife'
-require 'chef/node'
-require 'chef/json_compat'
 
 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'
+      end
+
+      attr_reader :node_name
+      attr_reader :node
 
       banner "knife node edit NODE (options)"
 
-      def run 
-        @node_name = @name_args[0]
+      option :all_attributes,
+        :short => "-a",
+        :long => "--all",
+        :boolean => true,
+        :description => "Display all attributes when editing"
+
+      def run
+        node_name = @name_args[0]
 
-        if @node_name.nil?
+        if node_name.nil?
           show_usage
-          Chef::Log.fatal("You must specify a node name")
+          ui.fatal("You must specify a node name")
           exit 1
         end
-        
-        edit_object(Chef::Node, @node_name)
+
+        load_node(node_name)
+        updated_node = edit_node
+        if updated_values = updated?
+          ui.info "Saving updated #{updated_values.join(', ')} on node #{node.name}"
+          updated_node.save
+        else
+          ui.info "Node not updated, skipping node save"
+        end
+      end
+
+      def load_node(node_name)
+        @node = Chef::Node.load(node_name)
+        # TODO: rescue errors with a helpful message
       end
     end
   end

data/lib/chef/knife/node_from_file.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,23 +17,26 @@
 #
 
 require 'chef/knife'
-require 'chef/node'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class NodeFromFile < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife node from file FILE (options)"
 
-      def run 
+      def run
         updated = load_from_file(Chef::Node, @name_args[0])
 
         updated.save
-        
+
         output(format_for_display(updated)) if config[:print_after]
 
-        Chef::Log.info("Updated Node #{updated.name}!")
+        ui.info("Updated Node #{updated.name}!")
       end
 
     end