knife-joyent 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d785e10606c59d43b4031b90d2b0d0e752db4593
-  data.tar.gz: e703e79ffa5b7e7bc260e38e8fafd316ff9e69ce
+  metadata.gz: 537b18253a6c5569841cd6fb340a0c1b5898c17c
+  data.tar.gz: 8158aeb00642b93a13aaa0326f88d6cfb1cecbc7
 SHA512:
-  metadata.gz: 364b38a35715a43c2cc528b53137d61fa7fbcd361fef0cc653a21a6d857aeaacbd0e639dda9a44cd6f15fada9879c007da62a80a016c0911b22a2898a0b4b38c
-  data.tar.gz: 201c979f3decc2d4c65cb19a4ff02d74fe72c96f8a94c0b0bd255623fb54e0f9e85e116f98f3c4fa968ef03681b3d7df3b543b1c1552b1c7119546f204de7eaf
+  metadata.gz: 4729dcdd8ac015f68a9faf78a8600240f0d34a8e13f88a536c23dfb0da30e86fea219608217da3f24a6bdb5902797be14806f58f95abfdf4e7efe7f0d9cbac34
+  data.tar.gz: ec5427ae0f77163b05153c82b91c6f17779cdb2755a0f3847e5fb078a9e764fea3d30dab26c98333b8294ed3e763ce1ad0dd786fb0a204990bc568d277ffb113

data/lib/chef/knife/joyent_fw_update.rb

@@ -11,13 +11,15 @@ class Chef
 
       option :rule,
         :long => "--rule RULE",
-        :description => "Firewall Rule Content"
+        :description => "Firewall Rule Content",
+        :required => true
 
       option :enabled,
         :long => "--enabled",
         :boolean => true,
         :description => "Enable/Disable Rule"
 
+
       def run
         id = name_args.first
         unless id || (!config.key?(:rule) || !config.key?(:enabled))
@@ -39,7 +41,7 @@ class Chef
         else
           r = res.body
 
-          ui.info "Created Firewall Rule: #{r["id"]}"
+          ui.info ui.color("Updated Firewall Rule: #{r["id"]}", :bold)
           msg_pair "RULE", r["rule"]
           msg_pair "ENABLED", (r["enabled"] ? ui.color("✓ YES", :cyan) : "✗ NO")
         end

data/lib/chef/knife/joyent_image_get.rb

@@ -0,0 +1,33 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentImageGet < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent image get <image_id>"
+
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
+
+        id = name_args.first
+        # puts id
+        res = self.connection.request(
+          :method => "GET",
+          :path => "/my/images/#{id}"
+        )
+
+        if res.status != 200
+          output_error(res)
+        else
+          r = res.body
+          ui.output(res.body)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_image_list.rb

@@ -16,7 +16,15 @@ class Chef
       option :state,
         :long => "--state <all/active/unactivated/disabled>",
         :default => "active",
-        :description => "filter images by state (default: active"
+        :description => "filter images by state (default: active)"
+
+      option :owner,
+        :long => "--owner <owner_uuid>",
+        :description => "filter images by owner (default: none)"
+
+      option :type,
+        :long => "--type <smartmachine/virtualmachine>",
+        :description => "filter images by image type (default: all)"
 
       def run
         images = [
@@ -31,6 +39,8 @@ class Chef
         query = {}
         query[:public] = config[:public] if config[:public]
         query[:state] = config[:state] if config[:state]
+        query[:owner] = config[:owner] if config[:owner]
+        query[:type] = config[:type] if config[:type]
 
         res = self.connection.request(
           :method => "GET",

data/lib/knife-joyent/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Kevin Chan
@@ -106,6 +106,7 @@ files:
 - 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_get.rb
 - lib/chef/knife/joyent_image_list.rb
 - lib/chef/knife/joyent_key_add.rb
 - lib/chef/knife/joyent_key_delete.rb