chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/knife/node_list.rb

@@ -1,14 +1,14 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# 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.
@@ -17,13 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/node'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class NodeList < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife node list (options)"
 
       option :with_uri,
@@ -32,8 +35,10 @@ class Chef
         :description => "Show corresponding URIs"
 
       def run
-        output(format_list_for_display(Chef::Node.list))
+        env = Chef::Config[:environment]
+        output(format_list_for_display( env ? Chef::Node.list_by_environment(env) : Chef::Node.list ))
       end
+
     end
   end
 end

data/lib/chef/knife/node_run_list_add.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 NodeRunListAdd < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife node run_list add [NODE] [ENTRY] (options)"
 
       option :after,
@@ -31,17 +34,17 @@ class Chef
         :long  => "--after ITEM",
         :description => "Place the ENTRY in the run list after ITEM"
 
-      def run 
+      def run
         node = Chef::Node.load(@name_args[0])
         entry = @name_args[1]
-       
+
         add_to_run_list(node, entry, config[:after])
 
         node.save
 
         config[:run_list] = true
 
-        output(format_for_display(node)) 
+        output(format_for_display(node))
       end
 
       def add_to_run_list(node, new_value, after=nil)

data/lib/chef/knife/node_run_list_remove.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,16 +17,19 @@
 #
 
 require 'chef/knife'
-require 'chef/node'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class NodeRunListRemove < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife node run_list remove [NODE] [ENTRY] (options)"
 
-      def run 
+      def run
         node = Chef::Node.load(@name_args[0])
         entry = @name_args[1]
 
@@ -36,7 +39,7 @@ class Chef
 
         config[:run_list] = true
 
-        output(format_for_display(node)) 
+        output(format_for_display(node))
       end
 
     end

data/lib/chef/knife/node_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 NodeShow < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife node show NODE (options)"
 
       option :attribute,
@@ -36,15 +39,20 @@ class Chef
         :long => "--run-list",
         :description => "Show only the run list"
 
-      def run 
+      option :environment,
+        :short        => "-E",
+        :long         => "--environment",
+        :description  => "Show only the Chef environment"
+
+      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
-        
+
         node = Chef::Node.load(@node_name)
         output(format_for_display(node))
       end

data/lib/chef/knife/recipe_list.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.
@@ -18,11 +18,12 @@
 
 require 'chef/knife'
 class Chef::Knife::RecipeList < Chef::Knife
-  
+
   banner "knife recipe list [PATTERN]"
 
   def run
     recipes = rest.get_rest('cookbooks/_recipes')
+    recipes = recipes.keys.map { |cb| recipes[cb].map {|ver, rec| rec.map{ |rn| "#{cb}::#{rn} (#{ver})" }}}.flatten.uniq
     if pattern = @name_args.first
       recipes = recipes.grep(Regexp.new(pattern))
     end

data/lib/chef/knife/role_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 RoleBulkDelete < Knife
 
+      deps do
+        require 'chef/role'
+        require 'chef/json_compat'
+      end
+
       banner "knife role 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::Role, "role", nil, nil, @name_args[0])

data/lib/chef/knife/role_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/role'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class RoleCreate < Knife
 
+      deps do
+        require 'chef/role'
+        require 'chef/json_compat'
+      end
+
       banner "knife role create ROLE (options)"
 
       option :description,
@@ -36,10 +39,10 @@ class Chef
 
         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.new
         role.name(@role_name)
         role.description(config[:description]) if config[:description]

data/lib/chef/knife/role_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/role'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class RoleDelete < Knife
 
+      deps do
+        require 'chef/role'
+        require 'chef/json_compat'
+      end
+
       banner "knife role delete ROLE (options)"
 
-      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
-        
+
         delete_object(Chef::Role, @role_name)
       end
 

data/lib/chef/knife/role_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,28 @@
 #
 
 require 'chef/knife'
-require 'chef/role'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class RoleEdit < Knife
 
+      deps do
+        require 'chef/role'
+        require 'chef/json_compat'
+      end
+
       banner "knife role edit ROLE (options)"
 
-      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
-        
-        edit_object(Chef::Role, @role_name)
+
+        ui.edit_object(Chef::Role, @role_name)
       end
     end
   end

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

data/lib/chef/knife/role_list.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 RoleList < Knife
 
+      deps do
+        require 'chef/node'
+        require 'chef/json_compat'
+      end
+
       banner "knife role list (options)"
 
       option :with_uri,
@@ -31,7 +34,7 @@ class Chef
         :long => "--with-uri",
         :description => "Show corresponding URIs"
 
-      def run 
+      def run
         output(format_list_for_display(Chef::Role.list))
       end
     end