knife-joyent 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45293468ec017cf7ebb0f58f4a0d3a95531dad56
-  data.tar.gz: bfe1d3c0b2da13606dc83038fb815ca2e7dd0532
+  metadata.gz: d785e10606c59d43b4031b90d2b0d0e752db4593
+  data.tar.gz: e703e79ffa5b7e7bc260e38e8fafd316ff9e69ce
 SHA512:
-  metadata.gz: 97084d24162cf1f927515cd3b64a097fed154c04b9c4937a1df969aa2f329e5fbdfd69c78f8e07320409a0ced22d26585ab2a41f44c896e55ac199d5216e9784
-  data.tar.gz: 58c05b85366ac511235eb3bd10847694333f0e17ca3bb595254505bcf743c578b1dd515dea310181aa92afe0b6fc46ee247b6ee11a43380354996f8d782d1ef7
+  metadata.gz: 364b38a35715a43c2cc528b53137d61fa7fbcd361fef0cc653a21a6d857aeaacbd0e639dda9a44cd6f15fada9879c007da62a80a016c0911b22a2898a0b4b38c
+  data.tar.gz: 201c979f3decc2d4c65cb19a4ff02d74fe72c96f8a94c0b0bd255623fb54e0f9e85e116f98f3c4fa968ef03681b3d7df3b543b1c1552b1c7119546f204de7eaf

data/lib/chef/knife/joyent_base.rb

@@ -82,13 +82,32 @@ class Chef
         config[key] || Chef::Config[:knife][key]
       end
 
-      def output_error_response(res)
-        if (res.body['message'])
-          ui.error ui.color(res.body["message"], :white)
+      def output_error(e)
+        res = case e
+        when Excon::Response
+          e
+        when Excon::Errors::Error
+          e.response
+        else
+          raise
         end
 
-        if (res.body["errors"])
-          errors = res.body["errors"]
+        if res.headers["Content-Type"] == 'application/json' && res.body.kind_of?(String)
+          body = json_decode(res.body)
+        else
+          body = res.body
+        end
+
+        if body['code']
+          ui.error ui.color("*#{body["code"]}*", :white)
+        end
+
+        if body['message']
+          ui.error ui.color(body["message"], :white)
+        end
+
+        if body["errors"]
+          errors = body["errors"]
           errors.each do |e|
             ui.error("[#{e["field"]}] #{e["message"]}")
           end
@@ -100,6 +119,23 @@ class Chef
           puts "#{ui.color(label, :cyan)}: #{value}"
         end
       end
+
+      def json_decode(body)
+        parsed = Fog::JSON.decode(body)
+        decode_time_attrs(parsed)
+      end
+
+      def decode_time_attrs(obj)
+        if obj.kind_of?(Hash)
+          obj["created"] = Time.parse(obj["created"]) unless obj["created"].nil? or obj["created"] == ''
+          obj["updated"] = Time.parse(obj["updated"]) unless obj["updated"].nil? or obj["updated"] == ''
+        elsif obj.kind_of?(Array)
+          obj.map do |o|
+            decode_time_attrs(o)
+          end
+        end
+        obj
+      end
     end
   end
 end

data/lib/chef/knife/joyent_flavor_list.rb

@@ -26,6 +26,8 @@ class Chef
         end
 
         puts ui.list(flavor_list, :uneven_columns_across, 5)
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_fw_create.rb

@@ -34,7 +34,7 @@ class Chef
         )
 
         unless res.status == 201
-          output_error_response(res)
+          output_error(res)
         else
           r = res.body
 
@@ -42,6 +42,8 @@ class Chef
           msg_pair "RULE", r["rule"]
           msg_pair "ENABLED", (r["enabled"] ? ui.color("✓ YES", :cyan) : "✗ NO")
         end
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_fw_delete.rb

@@ -30,9 +30,11 @@ class Chef
         if res.status == 204
           ui.info "Rule #{id} Deleted."
         else
-          self.output_error_response(res)
+          self.output_error(res)
         end
 
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_fw_get.rb

@@ -28,7 +28,7 @@ class Chef
         ]
 
         if (res.status == 422)
-          output_error_response(res)
+          output_error(res)
         else
           r = res.body
           rules << r["id"]
@@ -36,7 +36,6 @@ class Chef
           rules << r["rule"]
           ui.list(rules, :uneven_columns_across, 3)
         end
-
       end
     end
   end

data/lib/chef/knife/joyent_fw_list.rb

@@ -34,8 +34,9 @@ class Chef
             rules << (r["enabled"] ? ui.color("✓", :cyan) : "✗")
             rules << r["rule"]
           end
+          ui.output ui.list(rules, :uneven_columns_across, 3)
         else
-          output_error_response(res)
+          output_error(res)
         end
       end
     end

data/lib/chef/knife/joyent_fw_update.rb

@@ -35,7 +35,7 @@ class Chef
         )
 
         unless res.status == 200
-          output_error_response(res)
+          output_error(res)
         else
           r = res.body
 

data/lib/chef/knife/joyent_image_create.rb

@@ -0,0 +1,74 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentImageCreate < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent image create <options>"
+
+      option :server,
+        :long => "--server <server_uuid>",
+        :description => "server uuid to create machine from",
+        :required => true
+
+      option :name,
+        :long => "--name <image_name>",
+        :description => "name of custom image",
+        :required => true
+
+      option :version,
+        :long => "--version <image_version>",
+        :description => "version of custom image",
+        :required => true
+
+      option :description,
+        :long => "--description <image description>",
+        :description => "description of custom image (optional)"
+
+      option :homepage,
+        :long => "--homepage <homepage>",
+        :description => "homepage of custom image (optional)"
+
+      option :eula,
+        :long => "--eula <eula>",
+        :description => "EULA of custom image"
+
+      option :acl,
+        :long => "--acl <eula>",
+        :description => "ACL (json) of custom image see: https://images.joyent.com/docs/#manifest-acl"
+
+      option :tags,
+        :long => "--tags <tags>",
+        :description => "tags (json) of custom image"
+
+      def image_create_options
+        opts = {}
+        opts["machine"] = config[:server] if config[:server]
+        opts["name"] = config[:name] if config[:name]
+        opts["version"] = config[:version] if config[:version]
+        opts["description"] = config[:description] if config[:description]
+        opts["eula"] = config[:eula] if config[:eula]
+        opts["acl"] = config[:acl] if config[:acl]
+        opts["tags"] = config[:tags] if config[:tags]
+        opts
+      end
+
+      def run
+        # puts image_create_options.inspect
+        res = self.connection.request(
+          :method => "POST",
+          :path => "/my/images",
+          :body => image_create_options
+        )
+        if (res.status == 201)
+          ui.info ui.color("Creating Image from server #{config[:server]}...", :cyan)
+          ui.output(res.body)
+        else
+          output_error(res)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_image_list.rb

@@ -8,6 +8,16 @@ class Chef
 
       banner "knife joyent image list <options>"
 
+      option :public,
+        :boolean => true,
+        :long => "--public <true/false>",
+        :description => "filter public/private images"
+
+      option :state,
+        :long => "--state <all/active/unactivated/disabled>",
+        :default => "active",
+        :description => "filter images by state (default: active"
+
       def run
         images = [
           ui.color('ID', :bold),
@@ -15,17 +25,41 @@ class Chef
           ui.color('Version', :bold),
           ui.color('OS', :bold),
           ui.color('Type', :bold),
+          ui.color('State', :bold),
         ]
 
-        self.connection.images.sort_by(&:name).each do |i|
-          images << i.id.to_s
-          images << i.name
-          images << i.version
-          images << i.os
-          images << i.type
+        query = {}
+        query[:public] = config[:public] if config[:public]
+        query[:state] = config[:state] if config[:state]
+
+        res = self.connection.request(
+          :method => "GET",
+          :query => query,
+          :path => "/my/images",
+        )
+
+        if res.status == 200
+          data = res.body
+        else
+          output_error(res)
+          exit 1
         end
 
-        puts ui.list(images, :uneven_columns_across, 5)
+        data.sort_by do |v|
+          v["name"]
+        end.each do |i|
+          images << i["id"]
+          images << i["name"]
+          images << i["version"]
+          images << i["os"]
+          images << i["type"]
+          images << i["state"]
+        end
+
+        ui.output ui.list(images, :uneven_columns_across, 6)
+      rescue => e
+        output_error(e)
+
       end
     end
   end

data/lib/chef/knife/joyent_key_add.rb

@@ -48,7 +48,8 @@ class Chef
         end
 
         puts ui.color('Created key: '+keyname, :cyan)
-        exit 0
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_key_delete.rb

@@ -28,6 +28,9 @@ class Chef
 
         puts ui.color('Deleted key: '+keyname, :cyan)
         exit 0
+      rescue => e
+        output_error(e)
+        exit 1
       end
     end
   end

data/lib/chef/knife/joyent_key_list.rb

@@ -20,6 +20,8 @@ class Chef
         end
 
         puts ui.list(keys, :uneven_columns_across, 2)
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_network_list.rb

@@ -22,6 +22,8 @@ class Chef
 
         puts ui.list(networks, :uneven_columns_across, 3)
         exit 0
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_server_create.rb

@@ -213,23 +213,8 @@ class Chef
 
         bootstrap_for_node(server, bootstrap_ip).run
 
-      rescue Excon::Errors::Conflict => e
-        if e.response && e.response.body.kind_of?(String)
-          error = ::Fog::JSON.decode(e.response.body)
-          print ui.error(error['message'])
-          if error.key?('errors') && error['errors'].kind_of?(Array)
-            error['errors'].each do |err|
-              print ui.error " * [#{err['field']}] #{err['message']}"
-            end
-          end
-          exit 1
-        else
-          puts ui.error(e.message)
-          exit 1
-        end
-
       rescue => e
-        puts ui.error('Unexpected Error Occured:' + e.inspect)
+        output_error(e)
         exit 1
       end
 

data/lib/chef/knife/joyent_server_delete.rb

@@ -19,22 +19,22 @@ class Chef
         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("IPs", server.ips.join(" "))
-       
+
         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?
@@ -47,24 +47,27 @@ class Chef
             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}")
+      rescue => e
+        output_error(e)
+        exit 1
       end
-      
+
       def msg(label, value)
         if value && !value.empty?
           puts "#{ui.color(label, :cyan)}: #{value}"

data/lib/chef/knife/joyent_server_fw_disable.rb

@@ -26,7 +26,7 @@ class Chef
         if (res.status == 202)
           puts ui.color("Firewall Disabled for server #{id}", :cyan)
         else
-          output_error_response(res)
+          output_error(res)
         end
       end
     end

data/lib/chef/knife/joyent_server_fw_enable.rb

@@ -25,7 +25,7 @@ class Chef
         if (res.status === 202)
           ui.info ui.color("Firewall Enabled for server #{id}", :cyan)
         else
-          output_error_response(res)
+          output_error(res)
         end
       end
     end

data/lib/chef/knife/joyent_server_list.rb

@@ -70,6 +70,8 @@ class Chef
                                            price_column_width)
 
         puts ui.list(servers, :uneven_columns_across, columns)
+      rescue => e
+        output_error(e)
       end
 
       def show_tags?

data/lib/chef/knife/joyent_server_metadata_delete.rb

@@ -52,6 +52,9 @@ class Chef
           puts ui.error("Metadata update failed")
           exit 1
         end
+
+      rescue => e
+        output_error(e)
       end
 
       private

data/lib/chef/knife/joyent_server_metadata_update.rb

@@ -41,6 +41,8 @@ class Chef
           puts ui.error("Metadata update failed")
           exit 1
         end
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_server_reboot.rb

@@ -29,6 +29,9 @@ class Chef
           puts ui.error("Reboot server failed")
           exit 1
         end
+
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_server_resize.rb

@@ -39,6 +39,8 @@ class Chef
           puts ui.error("Resize server failed")
           exit 1
         end
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_server_start.rb

@@ -36,6 +36,8 @@ class Chef
           exit 1
         end
       end
-    end 
+    rescue => e
+      output_error(e)
+    end
   end
 end

data/lib/chef/knife/joyent_server_stop.rb

@@ -36,6 +36,8 @@ class Chef
           exit 1
         end
       end
+    rescue => e
+      output_error(e)
     end
   end
 end

data/lib/chef/knife/joyent_snapshot_create.rb

@@ -2,41 +2,32 @@ require 'chef/knife/joyent_base'
 
 class Chef
   class Knife
-  class JoyentSnapshotCreate < Knife
+    class JoyentSnapshotCreate < Knife
 
-    include Knife::JoyentBase
+      include Knife::JoyentBase
 
-    banner 'knife joyent snapshot create <server> <snapshot_name>'
+      banner 'knife joyent snapshot create <server> <snapshot_name>'
 
-    def run
-      unless name_args.size == 2
-        show_usage
-        exit 1
-      end
-
-      server = name_args[0]
-      ssname = name_args[1]
-
-      snapshot = self.connection.snapshots.create(server, ssname)
-      puts ui.color("Created snapshot", :cyan)
-      puts ui.output({
-        :server => snapshot.machine_id,
-        :name => snapshot.name,
-        :state => snapshot.state,
-        :created => snapshot.created
-      })
-      exit 0
-      rescue Excon::Errors::Conflict => e
-        if e.response && e.response.body.kind_of?(String)
-          error = MultiJson.decode(e.response.body)
-          puts ui.error(error['message'])
-          exit 1
-        else
-          puts ui.error(e.message)
+      def run
+        unless name_args.size == 2
+          show_usage
           exit 1
         end
+
+        server = name_args[0]
+        ssname = name_args[1]
+
+        snapshot = self.connection.snapshots.create(server, ssname)
+        puts ui.color("Created snapshot", :cyan)
+        puts ui.output({
+          :server => snapshot.machine_id,
+          :name => snapshot.name,
+          :state => snapshot.state,
+          :created => snapshot.created
+          })
+        exit 0
       rescue => e
-        puts ui.error('Unexpected Error Occured:' + e.message)
+        output_error(e)
         exit 1
       end
     end

data/lib/chef/knife/joyent_snapshot_delete.rb

@@ -21,20 +21,8 @@ class Chef
         snapshot.destroy
         puts ui.color("Deleted snapshot #{snapshot.name}", :cyan)
         exit 0
-      rescue Excon::Errors::NotFound => e
-        puts ui.error("Snapshot #{ssname} on server #{server} not found")
-        exit 1
-      rescue Excon::Errors::Conflict => e
-        if e.response && e.response.body.kind_of?(String)
-          error = MultiJson.decode(e.response.body)
-          puts ui.error(error['message'])
-          exit 1
-        else
-          puts ui.error(e.message)
-          exit 1
-        end
       rescue => e
-        puts ui.error('Unexpected Error Occured:' + e.message)
+        output_error(e)
         exit 1
       end
     end

data/lib/chef/knife/joyent_snapshot_list.rb

@@ -37,8 +37,8 @@ class Chef
         end
 
         puts ui.list(snapshots, :uneven_columns_across, 3)
-      rescue Fog::Compute::Joyent::Errors::NotFound
-        puts ui.error("Server #{server} not found.")
+      rescue e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_tag_create.rb

@@ -31,8 +31,8 @@ class Chef
         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")
+      rescue => e
+        output_error(e)
         exit 1
       end
     end

data/lib/chef/knife/joyent_tag_delete.rb

@@ -58,6 +58,8 @@ class Chef
           puts ui.list(tags, :uneven_columns_across, 2)
         end
         exit 0
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/chef/knife/joyent_tag_list.rb

@@ -31,6 +31,9 @@ class Chef
       rescue Excon::Errors::NotFound => e
         puts ui.error("Server #{server} not found")
         exit 1
+
+      rescue => e
+        output_error(e)
       end
     end
   end

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -105,6 +105,7 @@ files:
 - lib/chef/knife/joyent_fw_get.rb
 - lib/chef/knife/joyent_fw_list.rb
 - lib/chef/knife/joyent_fw_update.rb
+- lib/chef/knife/joyent_image_create.rb
 - lib/chef/knife/joyent_image_list.rb
 - lib/chef/knife/joyent_key_add.rb
 - lib/chef/knife/joyent_key_delete.rb