knife-rackspace 0.5.4 → 0.5.6

data/README.rdoc

@@ -6,6 +6,10 @@ This is the official Opscode Knife plugin for Rackspace. This plugin gives knife
 
 = INSTALLATION:
 
+Be sure you are running the latest version Chef. Versions earlier than 0.10.0 don't support plugins:
+
+    gem install chef
+
 This plugin is distributed as a Ruby Gem. To install it, run:
 
     gem install knife-rackspace

data/lib/chef/knife/rackspace_flavor_list.rb

@@ -52,7 +52,7 @@ class Chef
         connection = Fog::Compute.new(
           :provider => 'Rackspace',
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
-          :rackspace_username => Chef::Config[:knife][:rackspace_api_username],
+          :rackspace_username => Chef::Config[:knife][:rackspace_api_username] || Chef::Config[:knife][:rackspace_username],
           :rackspace_auth_url => Chef::Config[:knife][:rackspace_api_auth_url] || config[:rackspace_api_auth_url]
         )
 

data/lib/chef/knife/rackspace_image_list.rb

@@ -51,7 +51,7 @@ class Chef
         connection = Fog::Compute.new(
           :provider => 'Rackspace',
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
-          :rackspace_username => Chef::Config[:knife][:rackspace_api_username],
+          :rackspace_username => Chef::Config[:knife][:rackspace_api_username] || Chef::Config[:knife][:rackspace_username],
           :rackspace_auth_url => Chef::Config[:knife][:rackspace_api_auth_url] || config[:rackspace_api_auth_url]
         )
 

data/lib/chef/knife/rackspace_server_create.rb

@@ -38,8 +38,9 @@ class Chef
       option :flavor,
         :short => "-f FLAVOR",
         :long => "--flavor FLAVOR",
-        :description => "The flavor of server",
-        :proc => Proc.new { |f| Chef::Config[:knife][:flavor] = f.to_i }
+        :description => "The flavor of server; default is 2 (512 MB)",
+        :proc => Proc.new { |f| Chef::Config[:knife][:flavor] = f.to_i },
+        :default => 2
 
       option :image,
         :short => "-I IMAGE",
@@ -60,7 +61,7 @@ class Chef
       option :ssh_user,
         :short => "-x USERNAME",
         :long => "--ssh-user USERNAME",
-        :description => "The ssh username",
+        :description => "The ssh username; default is 'root'",
         :default => "root"
 
       option :ssh_password,
@@ -82,7 +83,7 @@ class Chef
 
       option :rackspace_api_auth_url,
         :long => "--rackspace-api-auth-url URL",
-        :description => "Your rackspace API auth url",
+        :description => "Your rackspace API auth url; default is 'auth.api.rackspacecloud.com'",
         :proc => Proc.new { |url| Chef::Config[:knife][:rackspace_api_auth_url] = url },
         :default => "auth.api.rackspacecloud.com"
 
@@ -98,7 +99,7 @@ class Chef
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
-        :description => "Bootstrap a distro using a template",
+        :description => "Bootstrap a distro using a template; default is 'ubuntu10.04-gems'",
         :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
         :default => "ubuntu10.04-gems"
 
@@ -132,9 +133,14 @@ class Chef
         end
       rescue Errno::ETIMEDOUT
         false
+      rescue Errno::EPERM
+        false
       rescue Errno::ECONNREFUSED
         sleep 2
         false
+      rescue Errno::EHOSTUNREACH
+        sleep 2
+        false
       ensure
         tcp_socket && tcp_socket.close
       end
@@ -145,14 +151,19 @@ class Chef
         connection = Fog::Compute.new(
           :provider => 'Rackspace',
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
-          :rackspace_username => Chef::Config[:knife][:rackspace_api_username],
-          :rackspace_auth_url => Chef::Config[:knife][:rackspace_api_auth_url] || config[:rackspace_api_auth_url]
+          :rackspace_username => Chef::Config[:knife][:rackspace_api_username] || Chef::Config[:knife][:rackspace_username],
+          :rackspace_auth_url => locate_config_value(:rackspace_api_auth_url)
         )
 
+        unless Chef::Config[:knife][:image]
+          ui.error("You have not provided a valid image value.  Please note the short option for this value recently changed from '-i' to '-I'.")
+          exit 1
+        end
+
         server = connection.servers.create(
           :name => config[:server_name],
           :image_id => Chef::Config[:knife][:image],
-          :flavor_id => Chef::Config[:knife][:flavor]
+          :flavor_id => locate_config_value(:flavor)
         )
 
         puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"

data/lib/chef/knife/rackspace_server_delete.rb

@@ -29,7 +29,7 @@ class Chef
         require 'resolv'
       end
       
-      banner "knife rackspace server delete SERVER (options)"
+      banner "knife rackspace server delete SERVER_ID (options)"
 
       option :rackspace_api_key,
         :short => "-K KEY",
@@ -58,7 +58,7 @@ class Chef
         connection = Fog::Compute.new(
           :provider => 'Rackspace',
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
-          :rackspace_username => Chef::Config[:knife][:rackspace_api_username],
+          :rackspace_username => Chef::Config[:knife][:rackspace_api_username] || Chef::Config[:knife][:rackspace_username],
           :rackspace_auth_url => Chef::Config[:knife][:rackspace_api_auth_url] || config[:rackspace_api_auth_url]
         )
 

data/lib/chef/knife/rackspace_server_list.rb

@@ -43,7 +43,7 @@ class Chef
 
       option :rackspace_api_auth_url,
         :long => "--rackspace-api-auth-url URL",
-        :description => "Your rackspace API auth url",
+        :description => "Your rackspace API auth url; default is 'auth.api.rackspacecloud.com'",
         :default => "auth.api.rackspacecloud.com",
         :proc => Proc.new { |url| Chef::Config[:knife][:rackspace_api_auth_url] = url }
 
@@ -53,27 +53,27 @@ class Chef
         connection = Fog::Compute.new(
           :provider => 'Rackspace',
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
-          :rackspace_username => Chef::Config[:knife][:rackspace_api_username],
+          :rackspace_username => Chef::Config[:knife][:rackspace_api_username] || Chef::Config[:knife][:rackspace_username],
           :rackspace_auth_url => Chef::Config[:knife][:rackspace_api_auth_url] || config[:rackspace_api_auth_url]
         )
 
         server_list = [
-          ui.color('ID', :bold),
-          ui.color('Name', :bold),
+          ui.color('Instance ID', :bold),
           ui.color('Public IP', :bold),
           ui.color('Private IP', :bold),
           ui.color('Flavor', :bold),
           ui.color('Image', :bold),
+          ui.color('Name', :bold),
           ui.color('State', :bold)
         ]
         connection.servers.all.each do |server|
           server_list << server.id.to_s
+          server_list << (server.public_ip_address == nil ? "" : server.public_ip_address)
+          server_list << (server.addresses["private"].first == nil ? "" : server.addresses["private"].first)
+          server_list << (server.flavor_id == nil ? "" : server.flavor_id.to_s)
+          server_list << (server.image_id == nil ? "" : server.image_id.to_s)
           server_list << server.name
-          server_list << server.addresses["public"][0]
-          server_list << server.addresses["private"][0]
-          server_list << server.flavor.name.split(/\s/).first
-          server_list << server.image.name
-          server_list << server.status.downcase
+          server_list << (server.state == nil ? "" : server.state.downcase)
         end
         puts ui.list(server_list, :columns_across, 7)
 

data/lib/knife-rackspace/version.rb

@@ -1,3 +1,3 @@
 module KnifeRackspace
-  VERSION = "0.5.4"
+  VERSION = "0.5.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: knife-rackspace
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -04:00
+date: 2011-06-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.7.2
+        version: 0.8.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency