knife-rackspace 0.5.1 → 0.5.2

data/lib/chef/knife/rackspace_flavor_list.rb

@@ -16,14 +16,17 @@
 # limitations under the License.
 #
 
-require 'fog'
 require 'chef/knife'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class RackspaceFlavorList < Knife
 
+      deps do
+        require 'fog'
+        require 'chef/json_compat'
+      end
+
       banner "knife rackspace flavor list (options)"
 
       option :rackspace_api_key,
@@ -44,12 +47,7 @@ class Chef
         :default => "auth.api.rackspacecloud.com",
         :proc => Proc.new { |url| Chef::Config[:knife][:rackspace_api_auth_url] = url }
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
-        require 'fog'
 
         connection = Fog::Compute.new(
           :provider => 'Rackspace',
@@ -58,7 +56,7 @@ class Chef
           :rackspace_auth_url => Chef::Config[:knife][:rackspace_api_auth_url] || config[:rackspace_api_auth_url]
         )
 
-        flavor_list = [ h.color('ID', :bold), h.color('Name', :bold), h.color('Architecture', :bold), h.color('RAM', :bold), h.color('Disk', :bold) , h.color('Cores', :bold) ]
+        flavor_list = [ ui.color('ID', :bold), ui.color('Name', :bold), ui.color('Architecture', :bold), ui.color('RAM', :bold), ui.color('Disk', :bold) , ui.color('Cores', :bold) ]
         connection.flavors.sort_by(&:id).each do |flavor|
           flavor_list << flavor.id.to_s
           flavor_list << flavor.name
@@ -67,7 +65,7 @@ class Chef
           flavor_list << "#{flavor.disk.to_s} GB"
           flavor_list << flavor.cores.to_s
         end
-        puts h.list(flavor_list, :columns_across, 6)
+        puts ui.list(flavor_list, :columns_across, 6)
       end
     end
   end

data/lib/chef/knife/rackspace_image_list.rb

@@ -16,14 +16,17 @@
 # limitations under the License.
 #
 
-require 'fog'
 require 'chef/knife'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class RackspaceImageList < Knife
 
+      deps do
+        require 'fog'
+        require 'chef/json_compat'
+      end
+
       banner "knife rackspace image list (options)"
 
       option :rackspace_api_key,
@@ -44,13 +47,7 @@ class Chef
         :default => "auth.api.rackspacecloud.com",
         :proc => Proc.new { |url| Chef::Config[:knife][:rackspace_api_auth_url] = url }
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
-        require 'fog'
-
         connection = Fog::Compute.new(
           :provider => 'Rackspace',
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
@@ -58,12 +55,12 @@ class Chef
           :rackspace_auth_url => Chef::Config[:knife][:rackspace_api_auth_url] || config[:rackspace_api_auth_url]
         )
 
-        image_list = [ h.color('ID', :bold), h.color('Name', :bold) ]
+        image_list = [ ui.color('ID', :bold), ui.color('Name', :bold) ]
         connection.images.sort_by(&:name).each do |image|
           image_list << image.id.to_s
           image_list << image.name
         end
-        puts h.list(image_list, :columns_across, 2)
+        puts ui.list(image_list, :columns_across, 2)
       end
     end
   end

data/lib/chef/knife/rackspace_server_create.rb

@@ -16,22 +16,21 @@
 # limitations under the License.
 #
 
-require 'fog'
 require 'chef/knife'
-require 'chef/knife/bootstrap'
-require 'chef/json_compat'
-require 'resolv'
 
 class Chef
   class Knife
     class RackspaceServerCreate < Knife
 
       deps do
+        require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
         require 'fog'
         require 'highline'
         require 'net/ssh/multi'
         require 'readline'
+        require 'resolv'
+        require 'chef/json_compat'
       end
 
       banner "knife rackspace server create (options)"
@@ -116,10 +115,6 @@ class Chef
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def tcp_test_ssh(hostname)
         tcp_socket = TCPSocket.new(hostname, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
@@ -140,10 +135,6 @@ class Chef
       end
 
       def run
-        require 'fog'
-        require 'highline'
-        require 'net/ssh/multi'
-        require 'readline'
 
         $stdout.sync = true
 
@@ -160,41 +151,41 @@ class Chef
           :flavor_id => Chef::Config[:knife][:flavor]
         )
 
-        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{h.color("Host ID", :cyan)}: #{server.host_id}"
-        puts "#{h.color("Name", :cyan)}: #{server.name}"
-        puts "#{h.color("Flavor", :cyan)}: #{server.flavor.name}"
-        puts "#{h.color("Image", :cyan)}: #{server.image.name}"
+        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{ui.color("Host ID", :cyan)}: #{server.host_id}"
+        puts "#{ui.color("Name", :cyan)}: #{server.name}"
+        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor.name}"
+        puts "#{ui.color("Image", :cyan)}: #{server.image.name}"
 
-        print "\n#{h.color("Waiting server", :magenta)}"
+        print "\n#{ui.color("Waiting server", :magenta)}"
 
         # wait for it to be ready to do stuff
         server.wait_for { print "."; ready? }
 
         puts("\n")
 
-        puts "#{h.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
-        puts "#{h.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
-        puts "#{h.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
-        puts "#{h.color("Password", :cyan)}: #{server.password}"
+        puts "#{ui.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
+        puts "#{ui.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
+        puts "#{ui.color("Password", :cyan)}: #{server.password}"
 
-        print "\n#{h.color("Waiting for sshd", :magenta)}"
+        print "\n#{ui.color("Waiting for sshd", :magenta)}"
 
         print(".") until tcp_test_ssh(server.addresses["public"][0]) { sleep @initial_sleep_delay ||= 10; puts("done") }
 
         bootstrap_for_node(server).run
 
         puts "\n"
-        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{h.color("Host ID", :cyan)}: #{server.host_id}"
-        puts "#{h.color("Name", :cyan)}: #{server.name}"
-        puts "#{h.color("Flavor", :cyan)}: #{server.flavor.name}"
-        puts "#{h.color("Image", :cyan)}: #{server.image.name}"
-        puts "#{h.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
-        puts "#{h.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
-        puts "#{h.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
-        puts "#{h.color("Password", :cyan)}: #{server.password}"
-        puts "#{h.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
+        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{ui.color("Host ID", :cyan)}: #{server.host_id}"
+        puts "#{ui.color("Name", :cyan)}: #{server.name}"
+        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor.name}"
+        puts "#{ui.color("Image", :cyan)}: #{server.image.name}"
+        puts "#{ui.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
+        puts "#{ui.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
+        puts "#{ui.color("Password", :cyan)}: #{server.password}"
+        puts "#{ui.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
       end
 
       def bootstrap_for_node(server)

data/lib/chef/knife/rackspace_server_delete.rb

@@ -16,15 +16,19 @@
 # limitations under the License.
 #
 
-require 'fog'
 require 'chef/knife'
-require 'chef/json_compat'
-require 'resolv'
 
 class Chef
   class Knife
     class RackspaceServerDelete < Knife
-
+      
+      deps do
+        require 'fog'
+        require 'chef/knife'
+        require 'chef/json_compat'
+        require 'resolv'
+      end
+      
       banner "knife rackspace server delete SERVER (options)"
 
       option :rackspace_api_key,
@@ -45,10 +49,6 @@ class Chef
         :default => "auth.api.rackspacecloud.com",
         :proc => Proc.new { |url| Chef::Config[:knife][:rackspace_api_auth_url] = url }
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
         require 'fog'
         require 'highline'
@@ -64,21 +64,21 @@ class Chef
 
         server = connection.servers.get(@name_args[0])
 
-        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{h.color("Host ID", :cyan)}: #{server.host_id}"
-        puts "#{h.color("Name", :cyan)}: #{server.name}"
-        puts "#{h.color("Flavor", :cyan)}: #{server.flavor.name}"
-        puts "#{h.color("Image", :cyan)}: #{server.image.name}"
-        puts "#{h.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
-        puts "#{h.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
-        puts "#{h.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
+        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{ui.color("Host ID", :cyan)}: #{server.host_id}"
+        puts "#{ui.color("Name", :cyan)}: #{server.name}"
+        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor.name}"
+        puts "#{ui.color("Image", :cyan)}: #{server.image.name}"
+        puts "#{ui.color("Public DNS Name", :cyan)}: #{public_dns_name(server)}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
+        puts "#{ui.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
 
         puts "\n"
         confirm("Do you really want to delete this server")
 
         server.destroy
 
-        Chef::Log.warn("Deleted server #{server.id} named #{server.name}")
+        ui.warn("Deleted server #{server.id} named #{server.name}")
       end
 
       def public_dns_name(server)

data/lib/chef/knife/rackspace_server_list.rb

@@ -16,14 +16,17 @@
 # limitations under the License.
 #
 
-require 'fog'
 require 'chef/knife'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class RackspaceServerList < Knife
 
+      deps do
+        require 'fog'
+        require 'chef/json_compat'
+      end
+
       banner "knife rackspace server list (options)"
 
       option :rackspace_api_key,
@@ -44,16 +47,9 @@ class Chef
         :default => "auth.api.rackspacecloud.com",
         :proc => Proc.new { |url| Chef::Config[:knife][:rackspace_api_auth_url] = url }
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
-        require 'fog'
-        require 'highline'
-        require 'net/ssh/multi'
-        require 'readline'
-
+        $stdout.sync = true
+        
         connection = Fog::Compute.new(
           :provider => 'Rackspace',
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
@@ -61,7 +57,15 @@ class Chef
           :rackspace_auth_url => Chef::Config[:knife][:rackspace_api_auth_url] || config[:rackspace_api_auth_url]
         )
 
-        server_list = [ h.color('ID', :bold), h.color('Name', :bold), h.color('Public IP', :bold), h.color('Private IP', :bold), h.color('Flavor', :bold), h.color('Image', :bold), h.color('State', :bold) ]
+        server_list = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('Public IP', :bold),
+          ui.color('Private IP', :bold),
+          ui.color('Flavor', :bold),
+          ui.color('Image', :bold),
+          ui.color('State', :bold)
+        ]
         connection.servers.all.each do |server|
           server_list << server.id.to_s
           server_list << server.name
@@ -71,7 +75,7 @@ class Chef
           server_list << server.image.name
           server_list << server.status.downcase
         end
-        puts h.list(server_list, :columns_across, 7)
+        puts ui.list(server_list, :columns_across, 7)
 
       end
     end

data/lib/knife-rackspace/version.rb

@@ -1,3 +1,3 @@
 module KnifeRackspace
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: knife-rackspace
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -04:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,17 +57,6 @@ dependencies:
         version: 1.0.1
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: highline
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.6.1
-  type: :runtime
-  version_requirements: *id005
 description: Rackspace Support for Chef's Knife Command
 email: adam@opscode.com
 executables: []