knife-joyent 0.0.1 → 0.0.2

data/README.md

@@ -1,27 +1,50 @@
 Knife Joyent
 ===
 
-This is a Knife plugin for Joyent CloudAPI. This plugin gives knife
-the ability to create, bootstrap, and manage servers on the Joyent Public Cloud
-as well as Cloud providers powered by Joyent's SmartDataCenter product.
+This is a [Knife](http://wiki.opscode.com/display/chef/Knife) plugin for Joyent CloudAPI. This plugin gives knife
+the ability to create, bootstrap, and manage servers on the [Joyent Public Cloud](http://www.joyentcloud.com/) as well as Cloud providers powered by Joyent's [SmartDataCenter](http://www.joyent.com/products/smartdatacenter/) product offering.
+
+For more information on Joyent CloudAPI, see: [CloudAPI Documentation](api.joyentcloud.com/docs)
 
 ## Installation
 
-With chef already installed (> 0.10.0):
+With chef already installed ``(> 0.10.0)``:
 
     gem install knife-joyent
 
 ## Usage
 
-For available commands:
+For a list of commands:
 
     knife joyent --help
 
+Currently available commands:
+
+    knife joyent flavor list <options>
+    knife joyent image list <options>
+    knife joyent key add -f <keyfile> -k <name>
+    knife joyent key delete <name>
+    knife joyent key list
+    knife joyent server create (options)
+    knife joyent server list <options>
+    knife joyent server reboot <server_id>
+    knife joyent server resize <server_id> -f <flavor>
+    knife joyent server start <server_id>
+    knife joyent server stop <server_id>
+    knife joyent snapshot create <server> <snapshot_name>
+    knife joyent snapshot delete <server> <snapshot_name>
+    knife joyent snapshot list <server_id>
+    knife joyent tag create <server_id> <tag> <value>
+    knife joyent tag delete <server_id> <tag>
+    knife joyent tag delete <server_id> -A
+    knife joyent tag list <server>
+
 ## Configuration
 
 The following options can be specified in your knife configuration file
+``knife.rb``
 
-### Required
+#### Required
 
 You can authenticate against CloudAPI using either:
 
@@ -36,12 +59,14 @@ or, your ssh key
     knife[:joyent_keyname] = "Name of key stored on Joyent"
     knife[:joyent_keyfile] = "/path/to/your/private/key"
 
-### Optional
+#### Optional
+
+**joyent_api_url**
 
-    # Specify a custom API endpoint, this is required if you want to specify 
-    # where you want to provision your machines, or if you are using knife with a
-    # provider powered by SmartDataCenter.
-    #
+Specify a custom API endpoint, this is required if you want to specify 
+where you want to provision your machines, or if you are using knife with a
+provider powered by [SmartDataCenter](http://www.joyent.com/products/smartdatacenter/).
+    
     # Defaults to https://us-west-1.api.joyentcloud.com/
     knife[:joyent_api_url] = "https://us-sw-1.api.joyentcloud.com/"
 

data/lib/knife-joyent/joyent_flavor_list.rb

@@ -22,7 +22,8 @@ module KnifeJoyent
         flavor_list << "#{flavor.disk/1024} GB"
         flavor_list << "#{flavor.swap/1024} GB"
       end
-      puts ui.list(flavor_list, :columns_across, 4)
+
+      puts ui.list(flavor_list, :uneven_columns_across, 4)
     end
   end
 end

data/lib/knife-joyent/joyent_image_list.rb

@@ -24,7 +24,7 @@ module KnifeJoyent
         images << i.type
       end
 
-      puts ui.list(images, :columns_across, 5)
+      puts ui.list(images, :uneven_columns_across, 5)
     end
   end
 end

data/lib/knife-joyent/joyent_key_list.rb

@@ -18,7 +18,7 @@ module KnifeJoyent
         keys << k.key[0..32] + '...'
       end
 
-      puts ui.list(keys, :columns_across, 2)
+      puts ui.list(keys, :uneven_columns_across, 2)
 
     end
   end

data/lib/knife-joyent/joyent_server_list.rb

@@ -14,24 +14,34 @@ module KnifeJoyent
         ui.color('Name', :bold),
         ui.color('State', :bold),
         ui.color('Type', :bold),
-        ui.color('Dataset', :bold),
+        ui.color('Image', :bold),
         ui.color('IPs', :bold),
-        ui.color('Memory', :bold),
+        ui.color('RAM', :bold),
         ui.color('Disk', :bold),
       ]
 
       self.connection.servers.sort_by(&:name).each do |s|
         servers << s.id.to_s
         servers << s.name
-        servers << s.state
+
+        servers << case s.state
+        when 'running'
+          ui.color(s.state, :green)
+        when 'stopping'
+        when 'provisioning'
+          ui.color(s.state, :yellow)
+        when 'stopped'
+          ui.color(s.state, :red)
+        end
+
         servers << s.type
         servers << s.dataset
         servers << s.ips.join(" ")
-        servers << s.memory.to_s
-        servers << s.disk.to_s
+        servers << "#{s.memory/1024} GB".to_s
+        servers << "#{s.disk/1024} GB".to_s
       end
 
-      puts ui.list(servers, :columns_across, 8)
+      puts ui.list(servers, :uneven_columns_across, 8)
     end
   end
 end

data/lib/knife-joyent/joyent_snapshot_list.rb

@@ -36,7 +36,7 @@ module KnifeJoyent
         snapshots << s.created.to_s
       end
 
-      puts ui.list(snapshots, :columns_across, 3)
+      puts ui.list(snapshots, :uneven_columns_across, 3)
     rescue Fog::Compute::Joyent::Errors::NotFound
       puts ui.error("Server #{server} not found.")
     end

data/lib/knife-joyent/joyent_tag_create.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/base')
+
+module KnifeJoyent
+  class JoyentTagCreate < Chef::Knife
+
+    include KnifeJoyent::Base
+
+    banner "knife joyent tag create <server_id> <tag> <value>"
+
+    def run
+      server = name_args[0]
+      tagkey = name_args[1]
+      tagvalue = name_args[2]
+
+      unless server || tagkey || tagvalue
+        show_usage
+        exit 1
+      end
+
+      tags = [
+        ui.color('Name', :bold),
+        ui.color('Value', :bold),
+      ]
+
+      self.connection.servers.get(server).add_tags({tagkey => tagvalue}).each do |k, v|
+        tags << k
+        tags << v
+      end
+
+      puts ui.color("Updated tags for #{server}", :cyan)
+      puts ui.list(tags, :uneven_columns_across, 2)
+      exit 0
+    rescue Excon::Errors::NotFound => e
+      puts ui.error("Server #{server} not found")
+      exit 1
+    end
+  end
+end

data/lib/knife-joyent/joyent_tag_delete.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.dirname(__FILE__) + '/base')
+
+module KnifeJoyent
+  class JoyentTagDelete < Chef::Knife
+
+    include KnifeJoyent::Base
+
+    banner ["knife joyent tag delete <server_id> <tag>",
+            "knife joyent tag delete <server_id> -A"].join("\n")
+
+
+    option :all,
+      :short => "-A",
+      :long => "--all",
+      :boolean => true,
+      :description => "delete all tags on the machine"
+
+    def run
+      server_id = name_args[0]
+      tagname = name_args[1]
+      all = config[:all]
+
+      if !server_id || (all == false && !tagname) || (all && tagname)
+        show_usage
+        exit 1
+      end
+
+      begin
+        server = self.connection.servers.get(server_id)
+      rescue Excon::Errors::NotFound => e
+        puts ui.error("Server #{server_id} not found")
+        exit 1
+      end
+
+      if all
+        server.delete_all_tags
+        puts ui.color("Deleted all tags for #{server_id}", :cyan)
+        exit 0
+      else
+        begin
+          server.delete_tag(tagname)
+        rescue Excon::Errors::NotFound => e
+          puts ui.error("Tag #{tagname} on server #{server_id} not found")
+          exit 1
+        end
+
+        tags = [
+          ui.color('Name', :bold),
+          ui.color('Value', :bold),
+        ]
+
+        server.reload.tags.each do |k, v|
+          tags << k
+          tags << v
+        end
+        puts ui.color("Deleted tag #{tagname} for #{server_id}", :cyan)
+        puts ui.list(tags, :uneven_columns_across, 2)
+      end
+      exit 0
+    end
+  end
+end

data/lib/knife-joyent/joyent_tag_list.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/base')
+
+module KnifeJoyent
+  class JoyentTagList < Chef::Knife
+
+    include KnifeJoyent::Base
+
+    banner "knife joyent tag list <server>"
+
+    def run
+      server = name_args.first
+
+      unless server
+        show_usage
+        exit 1
+      end
+
+      tags = [
+        ui.color('Name', :bold),
+        ui.color('Value', :bold),
+      ]
+
+      self.connection.servers.get(server).tags.each do |k, v|
+        tags << k
+        tags << v
+      end
+
+      puts ui.list(tags, :uneven_columns_across, 2)
+      exit 0
+    rescue Excon::Errors::NotFound => e
+      puts ui.error("Server #{server} not found")
+      exit 1
+    end
+  end
+end

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: knife-joyent
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kevin Chan
@@ -67,6 +67,9 @@ files:
 - lib/knife-joyent/joyent_snapshot_create.rb
 - lib/knife-joyent/joyent_snapshot_delete.rb
 - lib/knife-joyent/joyent_snapshot_list.rb
+- lib/knife-joyent/joyent_tag_create.rb
+- lib/knife-joyent/joyent_tag_delete.rb
+- lib/knife-joyent/joyent_tag_list.rb
 - lib/knife-joyent/version.rb
 has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef