swa 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb6eed402b48a9becd4603b16ce035cbfb4506b
-  data.tar.gz: 01990ca10d51726866bd933ce6b1393f7f5c076e
+  metadata.gz: 5aa99633a7562065e12b0eda658a5eb0cb500298
+  data.tar.gz: bcf698098737d8e568952ed7db966abf9bc28b75
 SHA512:
-  metadata.gz: c94db3dd53d1fd461c2ef75ee64e47db90d8efee0d26ac5547713ffd5c547e6bed0dae2cb4d8ffe5dfd6a07fc694c684a2cef2b11dbfafddf6ecfa4a140c5bea
-  data.tar.gz: fac54c6cef75b2c85d12cb974a4084eb8556b87588ff133a50c1997b915abfdcbdbaf2f944cd9ff588886a54c669863a5526fd8eed7572adb55358963a428262
+  metadata.gz: c364ab568630bd03aca0d497db0bf6d3e292f9558764e9f3242ea8b8cf044290e5c6be28abd1fd8b11ac991578073fcfd01e082ecb6192837417d89c17ee0044
+  data.tar.gz: 04a8bf044e19cecbd4825a9c505eadd35c3b7d1076a9c7733ebf983d403504f56c154ef82f0dc5403eb5336c649590d0353d642f636b55d1bf8630d283c8f179

data/README.md

@@ -1,6 +1,67 @@
 # SWA
 
-It's an alternative CLI for AWS.
+SWA is AWS, backwards.
+
+It's an alternative CLI for AWS. "Backwards" because commands put verbs at the end:
+
+    $ swa ec2 instance i-9336f049 terminate
+
+rather than the front:
+
+    $ aws ec2 terminate-instances --instance-ids i-9336f049
+
+## Listing things
+
+SWA provides sub-commands for listing many types of AWS resource, e.g.
+
+    $ swa ec2 instances
+
+Listing commands typically provide options for refining the search:
+
+    $ swa ec2 instances --tagged purpose=QA --filter availability-zone=ap-southeast-2b
+
+By default you'll get a "summary" view, one line per resource:
+
+    $ swa ec2 instances | head
+    i-bcf48c2b  ami-1e73737d  c3.large   running     10.47.5.16    
+    i-1990d85c  ami-538e7330  t2.micro   running     10.47.7.25    "blarg/room-service"
+    i-f9e6ea27  ami-8bfd7eb1  t2.small   running     10.47.11.54   "blarg/match-feed"
+    i-19155e5c  ami-d5327ab6  c3.large   running     10.47.6.238   "fnord-snarfer"
+    i-26357e63  ami-eded7ed7  t2.micro   running     10.47.6.96    "fnord-dashboard"
+    i-b85f6c87  ami-695a7253  c3.xlarge  running     10.47.5.252   "bam-boozle"
+    i-5627e187  ami-d9d779ba  c4.2xlarge running     10.47.11.201  "pub-batch-42"
+    i-ced5ae59  ami-eded7ed7  t2.micro   running     10.47.6.22    "atlas-hugged"
+    i-63e722b2  ami-8bfd7eb1  t2.small   running     10.47.8.95    "blarg/first-service"
+
+But you can ask for **all** the data, if you wish:
+
+    $ swa ec2 instances data
+    ---
+    - InstanceId: i-bcf48c2b
+      ImageId: ami-1e73537d
+      State:
+        Code: 16
+        Name: running
+      PrivateDnsName: ip-10-48-9-16.ap-southeast-2.compute.internal
+      PublicDnsName: ''
+      ...
+
+Specify `-J` if you like JSON better than YAML.
+
+## Inspecting things
+
+Each "collection" operation has a corresponding "item" operation, e.g.
+
+    $ swa ec2 instance i-bcf48c2b ...
+
+Different resource-types support different sub-commands, but they all implement `data`, which again dumps everything in YAML or JSON format.
+
+    $ swa ec2 instance i-bcf48c2b data
+
+The "item" sub-command can be ommitted, when it can be inferred from the resource-id:
+
+    $ swa ec2 i-bcf48c2b data
+    $ swa ec2 ami-1e73737d data
 
 ## Contributing
 

data/lib/swa/cli/base_command.rb

@@ -74,7 +74,7 @@ module Swa
         unless %w(JSON YAML).member?(arg)
           raise ArgumentError, "unrecognised data format: #{arg.inspect}"
         end
-        @format = arg
+        @output_format = arg
       end
 
       def format_data(data)

data/lib/swa/data_presentation.rb

@@ -5,7 +5,7 @@ module Swa
     protected
 
     def quoted(value)
-      %("#{value}") if value
+      %("#{value}") if value && !value.empty?
     end
 
     def pad(s, width)

data/lib/swa/ec2/image.rb

@@ -10,9 +10,10 @@ module Swa
 
       def summary
         [
-          pad(ami.image_id, 13),
+          pad(ami.image_id, 12),
+          ami.creation_date.sub(".000Z", "Z"),
           quoted(name)
-        ].join(" ")
+        ].join("  ")
       end
 
       def name

data/lib/swa/ec2/instance.rb

@@ -11,14 +11,14 @@ module Swa
 
       def summary
         [
-          pad(i.instance_id, 11),
-          pad(i.image_id, 13),
+          pad(i.instance_id, 10),
+          pad(i.image_id, 12),
           pad(i.instance_type, 10),
-          pad(i.state.name, 11),
-          pad(i.private_ip_address, 15),
-          pad(i.public_ip_address, 15),
+          pad(i.state.name, 10),
+          pad(i.private_ip_address, 14),
+          pad(i.public_ip_address, 14),
           quoted(name)
-        ].join(" ")
+        ].join("  ")
       end
 
       def name

data/lib/swa/ec2/key_pair.rb

@@ -7,9 +7,9 @@ module Swa
 
       def summary
         [
-          pad(name, 45),
+          pad(name, 4),
           aws_resource.key_fingerprint
-        ].join(" ")
+        ].join("  ")
       end
 
       def name

data/lib/swa/ec2/security_group.rb

@@ -8,10 +8,10 @@ module Swa
 
       def summary
         [
-          pad(sg.group_id, 12),
-          pad(sg.vpc_id, 13),
+          pad(sg.group_id, 11),
+          pad(sg.vpc_id, 12),
           quoted(sg.group_name)
-        ].join(" ")
+        ].join("  ")
       end
 
       def name

data/lib/swa/ec2/snapshot.rb

@@ -13,11 +13,11 @@ module Swa
         [
           pad(s.snapshot_id, 13),
           pad(s.volume_id, 12),
-          sprintf("%4d ", s.volume_size),
+          sprintf("%4d", s.volume_size),
           s.start_time.iso8601,
-          rpad(s.progress, 5),
+          rpad(s.progress, 4),
           quoted(s.description)
-        ].join(" ")
+        ].join("  ")
       end
 
       extend Forwardable

data/lib/swa/ec2/volume.rb

@@ -11,19 +11,24 @@ module Swa
 
       def summary
         [
-          pad(v.volume_id, 13),
-          pad(v.snapshot_id, 14),
-          sprintf("%5d", v.size),
-          pad(v.volume_type, 10),
-          pad(v.state, 11),
+          pad(v.volume_id, 12),
+          pad(v.snapshot_id, 13),
+          sprintf("%4d", v.size),
+          pad(v.volume_type, 9),
+          pad(attachment.instance_id, 10),
+          pad(attachment.device, 9),
           quoted(name)
-        ].join(" ")
+        ].join("  ")
       end
 
       def name
         tags["Name"]
       end
 
+      def attachment
+        v.attachments.first || OpenStruct.new
+      end
+
       extend Forwardable
 
       def_delegators :v, :delete

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

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