chef 0.9.6 → 0.9.8.beta.1

data/lib/chef/knife/data_bag_create.rb

@@ -23,7 +23,8 @@ class Chef
   class Knife
     class DataBagCreate < Knife
 
-      banner "Sub-Command: data bag create BAG [ITEM] (options)"
+      banner "knife data bag create BAG [ITEM] (options)"
+      category "data bag"
 
       def run
         @data_bag_name, @data_bag_item_name = @name_args

data/lib/chef/knife/data_bag_delete.rb

@@ -23,7 +23,8 @@ class Chef
   class Knife
     class DataBagDelete < Knife
 
-      banner "Sub-Command: data bag delete BAG [ITEM] (options)"
+      banner "knife data bag delete BAG [ITEM] (options)"
+      category "data bag"
 
       def run 
         if @name_args.length == 2

data/lib/chef/knife/data_bag_edit.rb

@@ -23,7 +23,8 @@ class Chef
   class Knife
     class DataBagEdit < Knife
 
-      banner "Sub-Command: data bag edit BAG ITEM (options)"
+      banner "knife data bag edit BAG ITEM (options)"
+      category "data bag"
 
       def run 
         if @name_args.length != 2

data/lib/chef/knife/data_bag_from_file.rb

@@ -24,7 +24,8 @@ class Chef
   class Knife
     class DataBagFromFile < Knife
 
-      banner "Sub-Command: data bag from file BAG FILE (options)"
+      banner "knife data bag from file BAG FILE (options)"
+      category "data bag"
 
       def run 
         updated = load_from_file(Chef::DataBagItem, @name_args[1], @name_args[0])

data/lib/chef/knife/data_bag_list.rb

@@ -23,7 +23,8 @@ class Chef
   class Knife
     class DataBagList < Knife
 
-      banner "Sub-Command: data bag list (options)"
+      banner "knife data bag list (options)"
+      category "data bag"
 
       option :with_uri,
         :short => "-w",

data/lib/chef/knife/data_bag_show.rb

@@ -23,7 +23,8 @@ class Chef
   class Knife
     class DataBagShow < Knife
 
-      banner "Sub-Command: data bag show BAG [ITEM] (options)"
+      banner "knife data bag show BAG [ITEM] (options)"
+      category "data bag"
 
       def run
         display = case @name_args.length

data/lib/chef/knife/ec2_instance_data.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2InstanceData < Knife
 
-      banner "Sub-Command: ec2 instance data [RUN LIST...] (options)"
+      banner "knife ec2 instance data [RUN LIST...] (options)"
 
       option :edit,
         :short => "-e",

data/lib/chef/knife/ec2_server_create.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2ServerCreate < Knife
 
-      banner "Sub-Command: ec2 server create [RUN LIST...] (options)"
+      banner "knife ec2 server create [RUN LIST...] (options)"
 
       option :flavor,
         :short => "-f FLAVOR",
@@ -60,7 +60,12 @@ class Chef
         :long => "--ssh-user USERNAME",
         :description => "The ssh username",
         :default => "root" 
-
+ 
+      option :identity_file,
+        :short => "-i IDENTITY_FILE",
+        :long => "--identity-file IDENTITY_FILE",
+        :description => "The SSH identity file used for authentication"
+ 
       option :aws_access_key_id,
         :short => "-A ID",
         :long => "--aws-access-key-id KEY",
@@ -77,6 +82,11 @@ class Chef
         :long => "--prerelease",
         :description => "Install the pre-release chef gems"
 
+      option :region,
+        :long => "--region REGION",
+        :description => "Your AWS region",
+        :default => "us-east-1"
+
       def h
         @highline ||= HighLine.new
       end
@@ -91,7 +101,8 @@ class Chef
 
         connection = Fog::AWS::EC2.new(
           :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
-          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key]
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
+          :region => config[:region]
         )
 
         server = connection.servers.create(
@@ -124,7 +135,8 @@ class Chef
         begin
           bootstrap = Chef::Knife::Bootstrap.new
           bootstrap.name_args = [ server.ip_address, @name_args ].flatten
-          bootstrap.config[:ssh_user] = config[:ssh_user] 
+          bootstrap.config[:ssh_user] = config[:ssh_user]
+          bootstrap.config[:identity_file] = config[:identity_file]
           bootstrap.config[:chef_node_name] = server.id
           bootstrap.config[:prerelease] = config[:prerelease]
           bootstrap.run

data/lib/chef/knife/ec2_server_delete.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2ServerDelete < Knife
 
-      banner "Sub-Command: ec2 server delete SERVER [SERVER] (options)"
+      banner "knife ec2 server delete SERVER [SERVER] (options)"
       
       option :aws_access_key_id,
         :short => "-A ID",
@@ -37,6 +37,11 @@ class Chef
         :description => "Your AWS API Secret Access Key",
         :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key } 
 
+      option :region,
+        :long => "--region REGION",
+        :description => "Your AWS region",
+        :default => "us-east-1"
+
       def h
         @highline ||= HighLine.new
       end
@@ -49,7 +54,8 @@ class Chef
 
         connection = Fog::AWS::EC2.new(
           :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
-          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key]
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
+          :region => config[:region]
         )
 
         @name_args.each do |instance_id|

data/lib/chef/knife/ec2_server_list.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2ServerList < Knife
 
-      banner "Sub-Command: ec2 server list [RUN LIST...] (options)"
+      banner "knife ec2 server list [RUN LIST...] (options)"
 
       option :aws_access_key_id,
         :short => "-A ID",
@@ -37,6 +37,11 @@ class Chef
         :description => "Your AWS API Secret Access Key",
         :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key } 
 
+      option :region,
+        :long => "--region REGION",
+        :description => "Your AWS region",
+        :default => "us-east-1"
+
       def h
         @highline ||= HighLine.new
       end
@@ -51,7 +56,8 @@ class Chef
 
         connection = Fog::AWS::EC2.new(
           :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
-          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key]
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
+          :region => config[:region]
         )
 
         server_list = [ 

data/lib/chef/knife/index_rebuild.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class IndexRebuild < Knife
       
-      banner "Sub-Command: index rebuild (options)"
+      banner "knife index rebuild (options)"
       option :yes,
         :short        => "-y",
         :long         => "--yes",

data/lib/chef/knife/node_bulk_delete.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeBulkDelete < Knife
 
-      banner "Sub-Command: node bulk delete REGEX (options)"
+      banner "knife node bulk delete REGEX (options)"
 
       def run 
         if @name_args.length < 1

data/lib/chef/knife/node_create.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeCreate < Knife
 
-      banner "Sub-Command: node create NODE (options)"
+      banner "knife node create NODE (options)"
 
       def run
         @node_name = @name_args[0]

data/lib/chef/knife/node_delete.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeDelete < Knife
 
-      banner "Sub-Command: node delete NODE (options)"
+      banner "knife node delete NODE (options)"
 
       def run 
         @node_name = @name_args[0]

data/lib/chef/knife/node_edit.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeEdit < Knife
 
-      banner "Sub-Command: node edit NODE (options)"
+      banner "knife node edit NODE (options)"
 
       def run 
         @node_name = @name_args[0]

data/lib/chef/knife/node_from_file.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeFromFile < Knife
 
-      banner "Sub-Command: node from file FILE (options)"
+      banner "knife node from file FILE (options)"
 
       def run 
         updated = load_from_file(Chef::Node, @name_args[0])

data/lib/chef/knife/node_list.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeList < Knife
 
-      banner "Sub-Command: node list (options)"
+      banner "knife node list (options)"
 
       option :with_uri,
         :short => "-w",

data/lib/chef/knife/node_run_list_add.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeRunListAdd < Knife
 
-      banner "Sub-Command: node run_list add [NODE] [ENTRY] (options)"
+      banner "knife node run_list add [NODE] [ENTRY] (options)"
 
       option :after,
         :short => "-a ITEM",

data/lib/chef/knife/node_run_list_remove.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeRunListRemove < Knife
 
-      banner "Sub-Command: node run_list remove [NODE] [ENTRY] (options)"
+      banner "knife node run_list remove [NODE] [ENTRY] (options)"
 
       def run 
         node = Chef::Node.load(@name_args[0])

data/lib/chef/knife/node_show.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeShow < Knife
 
-      banner "Sub-Command: node show NODE (options)"
+      banner "knife node show NODE (options)"
 
       option :attribute,
         :short => "-a [ATTR]",

data/lib/chef/knife/rackspace_server_create.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class RackspaceServerCreate < Knife
 
-      banner "Sub-Command: rackspace server create [RUN LIST...] (options)"
+      banner "knife rackspace server create [RUN LIST...] (options)"
 
       option :flavor,
         :short => "-f FLAVOR",

data/lib/chef/knife/rackspace_server_delete.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class RackspaceServerDelete < Knife
 
-      banner "Sub-Command: rackspace server delete SERVER (options)"
+      banner "knife rackspace server delete SERVER (options)"
 
       def h
         @highline ||= HighLine.new

data/lib/chef/knife/rackspace_server_list.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class RackspaceServerList < Knife
 
-      banner "Sub-Command: rackspace server list (options)"
+      banner "knife rackspace server list (options)"
 
       def h
         @highline ||= HighLine.new

data/lib/chef/knife/recipe_list.rb

@@ -19,7 +19,7 @@
 require 'chef/knife'
 class Chef::Knife::RecipeList < Chef::Knife
   
-  banner "Sub-Command: recipe list [PATTERN]"
+  banner "knife recipe list [PATTERN]"
 
   def run
     recipes = rest.get_rest('cookbooks/_recipes')

data/lib/chef/knife/role_bulk_delete.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleBulkDelete < Knife
 
-      banner "Sub-Command: role bulk delete REGEX (options)"
+      banner "knife role bulk delete REGEX (options)"
 
       def run 
         if @name_args.length < 1

data/lib/chef/knife/role_create.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleCreate < Knife
 
-      banner "Sub-Command: role create ROLE (options)"
+      banner "knife role create ROLE (options)"
 
       option :description,
         :short => "-d",

data/lib/chef/knife/role_delete.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleDelete < Knife
 
-      banner "Sub-Command: role delete ROLE (options)"
+      banner "knife role delete ROLE (options)"
 
       def run 
         @role_name = @name_args[0]

data/lib/chef/knife/role_edit.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleEdit < Knife
 
-      banner "Sub-Command: role edit ROLE (options)"
+      banner "knife role edit ROLE (options)"
 
       def run 
         @role_name = @name_args[0]

data/lib/chef/knife/role_from_file.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleFromFile < Knife
 
-      banner "Sub-Command: role from file FILE (options)"
+      banner "knife role from file FILE (options)"
 
       def run 
         updated = load_from_file(Chef::Role, @name_args[0])

data/lib/chef/knife/role_list.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleList < Knife
 
-      banner "Sub-Command: role list (options)"
+      banner "knife role list (options)"
 
       option :with_uri,
         :short => "-w",

data/lib/chef/knife/role_show.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleShow < Knife
 
-      banner "Sub-Command: role show ROLE (options)"
+      banner "knife role show ROLE (options)"
 
       option :attribute,
         :short => "-a ATTR",

data/lib/chef/knife/search.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Search < Knife
 
-      banner "Sub-Command: search INDEX QUERY (options)"
+      banner "knife search INDEX QUERY (options)"
 
       option :sort,
         :short => "-o SORT",

data/lib/chef/knife/slicehost_images_list.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class SlicehostImagesList < Knife
 
-      banner "Sub-Command: slicehost images list"
+      banner "knife slicehost images list"
 
       def highline
         @highline ||= HighLine.new

data/lib/chef/knife/slicehost_server_create.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class SlicehostServerCreate < Knife
 
-      banner "Sub-Command: slicehost server create [RUN LIST...] (options)"
+      banner "knife slicehost server create [RUN LIST...] (options)"
 
       option :flavor,
         :short => "-f FLAVOR",

data/lib/chef/knife/slicehost_server_delete.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class SlicehostServerDelete < Knife
 
-      banner "Sub-Command: slicehost server delete SLICENAME"
+      banner "knife slicehost server delete SLICENAME"
 
       def run 
         require 'fog'

data/lib/chef/knife/slicehost_server_list.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class SlicehostServerList < Knife
 
-      banner "Sub-Command: slicehost server list (options)"
+      banner "knife slicehost server list (options)"
 
       def h
         @highline ||= HighLine.new