knife-joyent 0.0.7 → 0.0.9

data/lib/chef/knife/joyent_server_create.rb

@@ -1,16 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/base')
+
 module KnifeJoyent
   class JoyentServerCreate < Chef::Knife
 
     include KnifeJoyent::Base
 
     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'
+      require 'chef/knife/bootstrap'
+      Chef::Knife::Bootstrap.load_deps
     end
     
     banner 'knife joyent server create (options)'
@@ -63,14 +63,7 @@ module KnifeJoyent
       :description => "Bootstrap a distro using a template",
       :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
       :default => "chef-full"
-
-    option :environment,
-      :short => "-E Environment",
-      :long => "--environment ENVIRONMENT",
-      :description => "Assign an environment to Chef Node",
-      :proc => Proc.new { |e| Chef::Config[:environment][:distro] = e },
-      :default => "_default"
-
+      
     option :no_host_key_verify,
       :long => "--no-host-key-verify",
       :description => "Disable host key verification",
@@ -132,11 +125,12 @@ module KnifeJoyent
 
     # Go
     def run
+      puts ui.color("Creating machine #{config[:chef_node_name]}", :cyan)
       begin
         server = self.connection.servers.create(:dataset => config[:dataset],
                                             :package => config[:package],
                                             :name => config[:name])
-
+      server.wait_for { print "."; ready? }                                      
       rescue => e
         Chef::Log.debug("e: #{e}")
         if e.response && e.response.body.kind_of?(String)
@@ -147,8 +141,14 @@ module KnifeJoyent
           raise
         end
       end
-
-      puts ui.color("Created machine: #{server.id}", :cyan)
+      
+      puts ui.color("Created machine:", :cyan)
+      msg("ID", server.id.to_s)
+      msg("Name", server.name)
+      msg("State", server.state)
+      msg("Type", server.type)
+      msg("Dataset", server.dataset)
+      msg("IP's", server.ips)
       puts ui.color("attempting to bootstrap on #{server.ips.last}", :cyan)
     
       print(".") until tcp_test_ssh(server.ips.last) {
@@ -158,6 +158,11 @@ module KnifeJoyent
       bootstrap_for_node(server).run
       exit 0
     end
-
+    
+    def msg(label, value = nil)
+      if value && !value.empty?
+        puts "#{ui.color(label, :cyan)}: #{value}"
+      end
+    end
   end
 end

data/lib/chef/knife/joyent_server_delete.rb

@@ -0,0 +1,73 @@
+require File.expand_path(File.dirname(__FILE__) + '/base')
+
+require 'chef/api_client'
+
+module KnifeJoyent
+  class JoyentServerDelete < Chef::Knife
+
+    include KnifeJoyent::Base
+
+    banner 'knife joyent server delete <server_id>'
+
+    def run
+      unless name_args.size === 1
+        show_usage
+        exit 1
+      end
+
+      id = name_args.first
+
+      server = self.connection.servers.get(id)
+      
+      msg("ID", server.id.to_s)
+      msg("Name", server.name)
+      msg("State", server.state)
+      msg("Type", server.type)
+      msg("Dataset", server.dataset)
+      msg("IP's", server.ips)
+     
+      unless server
+        puts ui.error("Unable to locate server: #{id}")
+        exit 1
+      end
+     
+      puts "\n"
+      confirm("Do you really want to delete this server")
+     
+      puts ui.color("Stopping server...", :cyan)
+
+      if server.stopped?
+        puts ui.color("Server #{id} is already stopped", :cyan)
+      else
+        if server.stop
+          puts ui.color("Server stopped", :cyan)
+        else
+          puts ui.error("Failed to stop server")
+          exit 1
+        end
+      end
+    
+      server.destroy
+      puts ui.color("Deleted server: #{id}", :cyan)
+    
+      puts "\n"
+      confirm("Delete client and node for #{server.name}?")
+      
+      node = Chef::Node.load(server.name)
+      puts "deleting node #{node.name}"
+      node.destroy
+      ui.warn("Deleted node named #{node.name}")
+      
+      client = Chef::ApiClient.load(server.name)
+      puts "deleting client #{client.name}"
+      client.destroy
+      ui.warn("Deleted client named #{client.name}")
+    end
+    
+    def msg(label, value)
+      if value && !value.empty?
+        puts "#{ui.color(label, :cyan)}: #{value}"
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_server_list.rb

@@ -29,11 +29,12 @@ module KnifeJoyent
         servers << case s.state
         when 'running'
           ui.color(s.state, :green)
-        when 'stopping'
-        when 'provisioning'
+        when 'stopping', 'provisioning'
           ui.color(s.state, :yellow)
         when 'stopped'
           ui.color(s.state, :red)
+        else
+          ui.color('unknown', :red)
         end
 
         servers << s.type

data/lib/chef/knife/joyent_snapshot_create.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/base')
+
 module KnifeJoyent
   class JoyentSnapshotCreate < Chef::Knife
 

data/lib/chef/knife/joyent_snapshot_delete.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/base')
+
 module KnifeJoyent
   class JoyentSnapshotDelete < Chef::Knife
 

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -65,6 +65,7 @@ files:
 - lib/chef/knife/joyent_key_delete.rb
 - lib/chef/knife/joyent_key_list.rb
 - lib/chef/knife/joyent_server_create.rb
+- lib/chef/knife/joyent_server_delete.rb
 - lib/chef/knife/joyent_server_list.rb
 - lib/chef/knife/joyent_server_reboot.rb
 - lib/chef/knife/joyent_server_resize.rb