swa 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b98869bb46cdaa1706e8e104f235b08d0e716b3f
-  data.tar.gz: 906a6c395ca7356437a299e168cdeaf34211326c
+  metadata.gz: 53fd1347fd3e98e99e87890483f9f9ef694ee50d
+  data.tar.gz: ebc63134ad5f40ce5ca77abae5d0edc31c5a53bf
 SHA512:
-  metadata.gz: c906663672e41e702ae0b2e95bb533e05fe85c40a85759b25a529784eda5f111a5beff66a937e45399038561a74829f57d5cea0bf861f2681561c8ec57200fad
-  data.tar.gz: 9bf329852348b044046a3d45178b460122195074389738d28765ae68cf401f925902b2a716c2070036704eaef12a3614664294a42885c6386b10346923b5797e
+  metadata.gz: 36450fa49aa02109b6498ad048cea74d8a8b39ae7123e5ce4be31e4155c4e72a59c0bac24466b3131ebca4b9ee9e17eae4fb703d49368fadbd8aee21b52e9917
+  data.tar.gz: b806497adeb681d53be9a7eaaf6d49b059593bae45c0fd78dbf23b636841eed86374dca59e1c4d8e54cb7b674f27c3f44c01d2bcf46e3d28ef5c5455fabe4015

data/lib/swa/cli/ec2_command.rb

@@ -103,20 +103,33 @@ module Swa
 
       subcommand ["instances", "is"], "list instances" do
 
-        option "--named", "NAME", "with matching name"
+        option ["--state"], "STATE", "with specified status",
+               :default => "running"
+
+        option "--named", "NAME", "with matching name" do |name|
+          add_tag_filter("Name", name)
+        end
+
+        option ["--image", "--ami"], "IMAGE-ID", "with specified AMI" do |image_id|
+          add_filter("image-id", image_id)
+        end
+
+        option ["--group", "--sg"], "GROUP-ID", "in specified security-group" do |group|
+          if group =~ /^sg-/
+            add_filter("instance.group-id", group)
+          else
+            add_filter("instance.group-name", group)
+          end
+        end
 
         include TagFilterOptions
         include CollectionBehaviour
 
         private
 
-        def named=(name)
-          add_tag_filter("Name", name)
-        end
-
         def instances
-          options = {}
-          options[:filters] = filters unless filters.empty?
+          add_filter("instance-state-name", state)
+          options = {:filters => filters}
           Swa::EC2::Instance.list(ec2.instances(options))
         end
 

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mike Williams