knife-eucalyptus 0.5.0 → 0.5.2

data/lib/chef/knife/euca_base.rb

@@ -21,39 +21,45 @@ require 'chef/knife'
 
 class Chef
   class Knife
-    class EucaBase < Knife
+    module EucaBase
 
-      deps do
-        require 'fog'
-        require 'net/ssh/multi'
-        require 'readline'
-        require 'chef/json_compat'
-      end
+      # :nodoc:
+      # Would prefer to do this in a rational way, but can't be done b/c of
+      # Mixlib::CLI's design :(
+      def self.included(includer)
+        includer.class_eval do
 
-      banner ""
+          deps do
+            require 'fog'
+            require 'net/ssh/multi'
+            require 'readline'
+            require 'chef/json_compat'
+          end
 
-      option :euca_access_key_id,
-        :short => "-A ID",
-        :long => "--euca-access-key-id KEY",
-        :description => "Your Eucalyptus Access Key ID",
-        :proc => Proc.new { |key| Chef::Config[:knife][:euca_access_key_id] = key }
+          option :euca_access_key_id,
+            :short => "-A ID",
+            :long => "--euca-access-key-id KEY",
+            :description => "Your Eucalyptus Access Key ID",
+            :proc => Proc.new { |key| Chef::Config[:knife][:euca_access_key_id] = key }
 
-      option :euca_secret_access_key,
-        :short => "-K SECRET",
-        :long => "--euca-secret-access-key SECRET",
-        :description => "Your Eucalyptus API Secret Access Key",
-        :proc => Proc.new { |key| Chef::Config[:knife][:euca_secret_access_key] = key }
+          option :euca_secret_access_key,
+            :short => "-K SECRET",
+            :long => "--euca-secret-access-key SECRET",
+            :description => "Your Eucalyptus API Secret Access Key",
+            :proc => Proc.new { |key| Chef::Config[:knife][:euca_secret_access_key] = key }
 
-      option :euca_api_endpoint,
-        :long => "--euca-api-endpoint ENDPOINT",
-        :description => "Your Eucalyptus API endpoint",
-        :default => "http://ecc.eucalyptus.com:8773/services/Eucalyptus",
-        :proc => Proc.new { |endpoint| Chef::Config[:knife][:euca_api_endpoint] = endpoint }
+          option :euca_api_endpoint,
+            :long => "--euca-api-endpoint ENDPOINT",
+            :description => "Your Eucalyptus API endpoint",
+            :default => "http://ecc.eucalyptus.com:8773/services/Eucalyptus",
+            :proc => Proc.new { |endpoint| Chef::Config[:knife][:euca_api_endpoint] = endpoint }
 
-      option :region,
-        :long => "--region REGION",
-        :description => "Your Eucalyptus region",
-        :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
+          option :region,
+            :long => "--region REGION",
+            :description => "Your Eucalyptus region",
+            :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
+        end
+      end
 
       def connection
         @connection ||= begin

data/lib/chef/knife/euca_flavor_list.rb

@@ -20,7 +20,9 @@ require 'chef/knife/euca_base'
 
 class Chef
   class Knife
-    class EucaFlavorList < EucaBase
+    class EucaFlavorList < Knife
+
+      include Knife::EucaBase
 
       banner "knife euca flavor list (options)"
 

data/lib/chef/knife/euca_image_list.rb

@@ -20,7 +20,9 @@ require 'chef/knife/euca_base'
 
 class Chef
   class Knife
-    class EucaImageList < EucaBase
+    class EucaImageList < Knife
+
+      include Knife::EucaBase
 
       banner "knife euca image list (options)"
 

data/lib/chef/knife/euca_server_create.rb

@@ -20,9 +20,15 @@ require 'chef/knife/euca_base'
 
 class Chef
   class Knife
-    class EucaServerCreate < EucaBase
+    class EucaServerCreate < Knife
+
+      include Knife::EucaBase
 
       deps do
+        require 'fog'
+        require 'net/ssh/multi'
+        require 'readline'
+        require 'chef/json_compat'
         require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
       end
@@ -177,7 +183,7 @@ class Chef
         print "\n#{ui.color("Waiting for sshd", :magenta)}"
 
         print(".") until tcp_test_ssh(display_name) {
-          sleep @initial_sleep_delay ||= 10
+          sleep @initial_sleep_delay ||= 20
           puts("done")
         }
 

data/lib/chef/knife/euca_server_delete.rb

@@ -20,7 +20,9 @@ require 'chef/knife/euca_base'
 
 class Chef
   class Knife
-    class EucaServerDelete < EucaBase
+    class EucaServerDelete < Knife
+
+      include Knife::EucaBase
 
       banner "knife euca server delete SERVER_ID [SERVER_ID] (options)"
 

data/lib/chef/knife/euca_server_list.rb

@@ -20,7 +20,9 @@ require 'chef/knife/euca_base'
 
 class Chef
   class Knife
-    class EucaServerList < EucaBase
+    class EucaServerList < Knife
+
+      include Knife::EucaBase
 
       banner "knife euca server list (options)"
 
@@ -41,7 +43,16 @@ class Chef
           server_list << (server.flavor_id || "")
           server_list << (server.image_id || "")
           server_list << server.groups.join(", ")
-          server_list << server.state
+          server_list << begin
+            case server.state
+            when 'shutting-down'
+              ui.color(server.state, :red)
+            when 'pending'
+              ui.color(server.state, :yellow)
+            else
+              ui.color(server.state, :green)
+            end
+          end
         end
         puts ui.list(server_list, :columns_across, 6)
       end

data/lib/knife-eucalyptus/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Eucalyptus
-    VERSION = "0.5.0"
+    VERSION = "0.5.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: knife-eucalyptus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 -07:00
+date: 2011-07-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency