knife-openstack 0.5.0 → 0.5.1

data/knife-openstack.gemspec

@@ -19,9 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "chef", ">= 0.9.14"
   s.add_dependency "fog", "~> 0.6.0"
   s.add_dependency "net-ssh", "~> 2.1.3"
   s.add_dependency "net-ssh-multi", "~> 1.0.1"
-  s.add_dependency "highline", "~> 1.6.1"
 end

data/lib/chef/knife/openstack_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 OpenstackFlavorList < Knife
 
+      deps do
+        require 'fog'
+        require 'chef/json_compat'
+      end
+      
       banner "knife openstack flavor list (options)"
 
       option :openstack_access_key_id,
@@ -48,13 +51,7 @@ class Chef
         :description => "Your OpenStack region",
         :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
-        require 'fog'
-
         connection = Fog::Compute.new(
           :provider => 'AWS',
           :aws_access_key_id => Chef::Config[:knife][:openstack_access_key_id],
@@ -63,7 +60,14 @@ class Chef
           :region => Chef::Config[:knife][:region] || config[:region]
         )
 
-        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
@@ -72,7 +76,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/openstack_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 OpenstackImageList < Knife
 
+      deps do
+        require 'fog'
+        require 'chef/json_compat'
+      end
+
       banner "knife openstack image list (options)"
 
       option :openstack_access_key_id,
@@ -48,13 +51,7 @@ class Chef
         :description => "Your OpenStack region",
         :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
-        require 'fog'
-
         connection = Fog::Compute.new(
           :provider => 'AWS',
           :aws_access_key_id => Chef::Config[:knife][:openstack_access_key_id],
@@ -63,7 +60,14 @@ class Chef
           :region => Chef::Config[:knife][:region] || config[:region]
         )
 
-        image_list = [ h.color('ID', :bold), h.color('Kernel ID', :bold), h.color('Architecture', :bold), h.color('Root Store', :bold), h.color('Name', :bold), h.color('Location', :bold)  ]
+        image_list = [
+          ui.color('ID', :bold),
+          ui.color('Kernel ID', :bold),
+          ui.color('Architecture', :bold),
+          ui.color('Root Store', :bold),
+          ui.color('Name', :bold),
+          ui.color('Location', :bold)
+        ]
         connection.images.sort_by(&:name).each do |image|
           image_list << image.id.to_s
           image_list << image.kernel_id.to_s
@@ -72,7 +76,7 @@ class Chef
           image_list << image.name
           image_list << image.location
         end
-        puts h.list(image_list, :columns_across, 6)
+        puts ui.list(image_list, :columns_across, 6)
       end
     end
   end

data/lib/chef/knife/openstack_server_create.rb

@@ -16,16 +16,22 @@
 # limitations under the License.
 #
 
-require 'fog'
-require 'socket'
 require 'chef/knife'
-require 'chef/knife/bootstrap'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class OpenstackServerCreate < Knife
 
+      deps do
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+        require 'fog'
+        require 'socket'
+        require 'net/ssh/multi'
+        require 'readline'
+        require 'chef/json_compat'
+      end
+
       banner "knife openstack server create (options)"
 
       attr_accessor :initial_sleep_delay
@@ -134,10 +140,6 @@ class Chef
         :boolean => true,
         :default => false
 
-      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)
@@ -158,10 +160,6 @@ class Chef
       end
 
       def run
-        require 'fog'
-        require 'highline'
-        require 'net/ssh/multi'
-        require 'readline'
 
         $stdout.sync = true
 
@@ -211,14 +209,14 @@ class Chef
       end
         server = connection.servers.create(server_def)
 
-        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
-        puts "#{h.color("Image", :cyan)}: #{server.image_id}"
-        puts "#{h.color("Availability Zone", :cyan)}: #{server.availability_zone}"
-        puts "#{h.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
-        puts "#{h.color("SSH Key", :cyan)}: #{server.key_name}"
+        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor_id}"
+        puts "#{ui.color("Image", :cyan)}: #{server.image_id}"
+        puts "#{ui.color("Availability Zone", :cyan)}: #{server.availability_zone}"
+        puts "#{ui.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
+        puts "#{ui.color("SSH Key", :cyan)}: #{server.key_name}"
 
-        print "\n#{h.color("Waiting for server", :magenta)}"
+        print "\n#{ui.color("Waiting for server", :magenta)}"
 
         display_name = server.dns_name
 
@@ -227,12 +225,12 @@ class Chef
 
         puts("\n")
 
-        puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
-        puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
-        puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
-        puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+        puts "#{ui.color("Public DNS Name", :cyan)}: #{server.dns_name}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.ip_address}"
+        puts "#{ui.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
+        puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
 
-        print "\n#{h.color("Waiting for sshd", :magenta)}"
+        print "\n#{ui.color("Waiting for sshd", :magenta)}"
 
         print(".") until tcp_test_ssh(display_name) {
           sleep @initial_sleep_delay ||= 10
@@ -242,17 +240,17 @@ class Chef
         bootstrap_for_node(server).run
 
         puts "\n"
-        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
-        puts "#{h.color("Image", :cyan)}: #{server.image_id}"
-        puts "#{h.color("Availability Zone", :cyan)}: #{server.availability_zone}"
-        puts "#{h.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
-        puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
-        puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
-        puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
-        puts "#{h.color("SSH Key", :cyan)}: #{server.key_name}"
-        puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
-        puts "#{h.color("Run List", :cyan)}: #{@name_args.join(', ')}"
+        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor_id}"
+        puts "#{ui.color("Image", :cyan)}: #{server.image_id}"
+        puts "#{ui.color("Availability Zone", :cyan)}: #{server.availability_zone}"
+        puts "#{ui.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
+        puts "#{ui.color("Public DNS Name", :cyan)}: #{server.dns_name}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.ip_address}"
+        puts "#{ui.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
+        puts "#{ui.color("SSH Key", :cyan)}: #{server.key_name}"
+        puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+        puts "#{ui.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
       end
 
       def bootstrap_for_node(server)

data/lib/chef/knife/openstack_server_delete.rb

@@ -17,12 +17,18 @@
 #
 
 require 'chef/knife'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class OpenstackServerDelete < Knife
 
+      deps do
+        require 'fog'
+        require 'net/ssh/multi'
+        require 'readline'
+        require 'chef/json_compat'
+      end
+
       banner "knife openstack server delete SERVER [SERVER] (options)"
 
       option :openstack_access_key_id,
@@ -47,16 +53,7 @@ class Chef
         :description => "Your OpenStack region",
         :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
-        require 'fog'
-        require 'highline'
-        require 'net/ssh/multi'
-        require 'readline'
-
         connection = Fog::Compute.new(
           :provider => 'AWS',
           :aws_access_key_id => Chef::Config[:knife][:openstack_access_key_id],
@@ -84,13 +81,13 @@ class Chef
 
           server.destroy
 
-          Chef::Log.warn("Deleted server #{server.id}")
+          ui.warn("Deleted server #{server.id}")
         end
       end
 
       def msg(label, value)
         if value && !value.empty?
-          puts "#{h.color(label, :cyan)}: #{value}"
+          puts "#{ui.color(label, :cyan)}: #{value}"
         end
       end
 

data/lib/chef/knife/openstack_server_list.rb

@@ -17,12 +17,18 @@
 #
 
 require 'chef/knife'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class OpenstackServerList < Knife
 
+      deps do
+        require 'fog'
+        require 'net/ssh/multi'
+        require 'readline'
+        require 'chef/json_compat'
+      end
+
       banner "knife openstack server list (options)"
 
       option :openstack_access_key_id,
@@ -47,15 +53,7 @@ class Chef
         :description => "Your OpenStack region",
         :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
-        require 'fog'
-        require 'highline'
-        require 'net/ssh/multi'
-        require 'readline'
 
         $stdout.sync = true
 
@@ -68,13 +66,13 @@ class Chef
         )
 
         server_list = [
-          h.color('Instance ID', :bold),
-          h.color('Public IP', :bold),
-          h.color('Private IP', :bold),
-          h.color('Flavor', :bold),
-          h.color('Image', :bold),
-          h.color('Security Groups', :bold),
-          h.color('State', :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('Security Groups', :bold),
+          ui.color('State', :bold)
         ]
         connection.servers.all.each do |server|
           server_list << server.id.to_s
@@ -85,7 +83,7 @@ class Chef
           server_list << server.groups.join(", ")
           server_list << server.state
         end
-        puts h.list(server_list, :columns_across, 7)
+        puts ui.list(server_list, :columns_across, 7)
 
       end
     end

data/lib/knife-openstack/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: knife-openstack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -10,64 +10,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.14
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fog
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.6.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.1.3
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-ssh-multi
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         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
+  version_requirements: *id003
 description: OpenStack Compute Support for Chef's Knife Command
 email: 
 - schisamo@opscode.com