swa 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f67b72cbe913a6388331d39a0712396b0860ed53
-  data.tar.gz: ba6e2d45513837f958df812a219a752fd4cc823b
+  metadata.gz: 857543d35465a009440daac9909f96f0e4c67f06
+  data.tar.gz: b0d79ccc8a742c1e31813646b1949d565b74d84d
 SHA512:
-  metadata.gz: 6c52a78603d824cbcfc1c2326b573d333e1feda685fa3059daf2f90a0463e1365886c8810255e82d111ce4957fe347574ea958cad2f21d4ea0e58fabaf7834c8
-  data.tar.gz: c229d344051e47fde3ba951a30eb0c0c638f7616d8bd4c0fe88fb1d32f6d2c22beb82bedbbdf5cfc7de20ee3646aedd3411013c0a7b5fc7cb150d790c3e9377f
+  metadata.gz: 9a3839446038c98f7de200cfc06a390ce6c556c2d5a3aa59d2a96b53a736172a48cb7912bb1a231a08d314944564f4c78e4a8adf86493fba509c9cfa667b5752
+  data.tar.gz: 3dec6acb79cda9077a2e02e0736b360c5de968fe0edd761eba2dbe9e4d6235b3fb3a85a0024daeb2810c3214c8e55a79ea6424cb6c8f775ecf66c7a1ce360c21

data/README.md

@@ -2,7 +2,9 @@
 
 SWA is AWS, backwards.
 
-It's an alternative CLI for AWS. "Backwards" because commands put verbs at the end:
+It's an alternative CLI for AWS.
+
+"Backwards" because it puts verbs at the end:
 
     $ swa ec2 instance i-9336f049 terminate
 
@@ -65,7 +67,7 @@ The "item" sub-command can be ommitted, when it can be inferred from the resourc
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/swa.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mdub/swa.
 
 ## License
 

data/lib/swa/cli/base_command.rb

@@ -3,6 +3,7 @@ require "clamp"
 require "console_logger"
 require "jmespath"
 require "multi_json"
+require "swa/cli/data_output"
 require "yaml"
 
 module Swa
@@ -18,18 +19,7 @@ module Swa
       option "--session-token", "KEY", "AWS security token",
              :attribute_name => :session_token
 
-      option "--format", "FORMAT", "format for data output",
-             :attribute_name => :output_format,
-             :environment_variable => "SWA_OUTPUT_FORMAT",
-             :default => "YAML"
-
-      option ["--json", "-J"], :flag, "output data in JSON format" do
-        self.output_format = "JSON"
-      end
-
-      option ["--yaml", "-Y"], :flag, "output data in YAML format" do
-        self.output_format = "YAML"
-      end
+      include DataOutput
 
       option ["--debug"], :flag, "enable debugging"
 
@@ -70,34 +60,6 @@ module Swa
         super(arguments)
       end
 
-      def output_format=(arg)
-        arg = arg.upcase
-        unless %w(JSON YAML).member?(arg)
-          raise ArgumentError, "unrecognised data format: #{arg.inspect}"
-        end
-        @output_format = arg
-      end
-
-      def format_data(data)
-        case output_format
-        when "JSON"
-          MultiJson.dump(data, :pretty => true)
-        when "YAML"
-          YAML.dump(data)
-        else
-          raise "bad output format: #{output_format}"
-        end
-      end
-
-      def display_data(data, jmespath_expression = nil)
-        unless jmespath_expression.nil?
-          data = JMESPath.search(jmespath_expression, data)
-        end
-        puts format_data(data)
-      rescue JMESPath::Errors::SyntaxError => e
-        signal_error("invalid JMESPath expression")
-      end
-
       def parse_datetime(datetime_string)
         result = Chronic.parse(datetime_string, :guess => false, :endian_precedence => :little)
         raise ArgumentError, "unrecognised date/time #{datetime_string.inspect}" unless result

data/lib/swa/cli/data_output.rb

@@ -0,0 +1,56 @@
+require "clamp"
+
+module Swa
+  module CLI
+
+    module DataOutput
+
+      extend Clamp::Option::Declaration
+
+      option "--format", "FORMAT", "format for data output",
+             :attribute_name => :output_format,
+             :environment_variable => "SWA_OUTPUT_FORMAT",
+             :default => "YAML"
+
+      option ["--json", "-J"], :flag, "output data in JSON format" do
+        self.output_format = "JSON"
+      end
+
+      option ["--yaml", "-Y"], :flag, "output data in YAML format" do
+        self.output_format = "YAML"
+      end
+
+      def output_format=(arg)
+        arg = arg.upcase
+        unless %w(JSON YAML).member?(arg)
+          raise ArgumentError, "unrecognised data format: #{arg.inspect}"
+        end
+        @output_format = arg
+      end
+
+      protected
+
+      def format_data(data)
+        case output_format
+        when "JSON"
+          MultiJson.dump(data, :pretty => true)
+        when "YAML"
+          YAML.dump(data)
+        else
+          raise "bad output format: #{output_format}"
+        end
+      end
+
+      def display_data(data, jmespath_expression = nil)
+        unless jmespath_expression.nil?
+          data = JMESPath.search(jmespath_expression, data)
+        end
+        puts format_data(data)
+      rescue JMESPath::Errors::SyntaxError => e
+        signal_error("invalid JMESPath expression")
+      end
+
+    end
+
+  end
+end

data/lib/swa/cli/ec2_command.rb

@@ -8,7 +8,9 @@ require "swa/ec2/instance"
 require "swa/ec2/key_pair"
 require "swa/ec2/security_group"
 require "swa/ec2/snapshot"
+require "swa/ec2/subnet"
 require "swa/ec2/volume"
+require "swa/ec2/vpc"
 
 module Swa
   module CLI
@@ -289,6 +291,37 @@ module Swa
 
       end
 
+      subcommand ["subnet"], "Show subnet" do
+
+        parameter "SUBNET-ID", "subnet id"
+
+        include ItemBehaviour
+
+        private
+
+        def subnet
+          Swa::EC2::Subnet.new(ec2.subnet(subnet_id))
+        end
+
+        alias_method :item, :subnet
+
+      end
+
+      subcommand ["subnets"], "List subnets" do
+
+        include TagFilterOptions
+        include CollectionBehaviour
+
+        private
+
+        def subnets
+          query_for(:subnets, Swa::EC2::Subnet)
+        end
+
+        alias_method :collection, :subnets
+
+      end
+
       subcommand ["volume", "vol"], "Show volume" do
 
         parameter "VOLUME-ID", "volume id"
@@ -324,6 +357,41 @@ module Swa
 
       end
 
+      subcommand ["vpc"], "Show vpc" do
+
+        parameter "VPC-ID", "vpc id"
+
+        include ItemBehaviour
+
+        private
+
+        def vpc
+          Swa::EC2::Vpc.new(ec2.vpc(vpc_id))
+        end
+
+        alias_method :item, :vpc
+
+      end
+
+      subcommand ["vpcs"], "List vpcs" do
+
+        include TagFilterOptions
+        include CollectionBehaviour
+
+        option "--named", "NAME", "with matching name" do |name|
+          add_tag_filter("Name", name)
+        end
+
+        private
+
+        def vpcs
+          query_for(:vpcs, Swa::EC2::Vpc)
+        end
+
+        alias_method :collection, :vpcs
+
+      end
+
       protected
 
       def ec2

data/lib/swa/ec2/snapshot.rb

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

data/lib/swa/ec2/subnet.rb

@@ -0,0 +1,32 @@
+require "swa/ec2/tagged_resource"
+require "swa/resource"
+
+module Swa
+  module EC2
+
+    class Subnet < Resource
+
+      include TaggedResource
+
+      def summary
+        [
+          pad(subnet.subnet_id, 15),
+          pad(subnet.vpc_id, 12),
+          pad(subnet.availability_zone, 15),
+          pad(subnet.cidr_block, 18),
+          quoted(name)
+        ].join("  ")
+      end
+
+      def name
+        tags["Name"]
+      end
+
+      private
+
+      alias_method :subnet, :aws_resource
+
+    end
+
+  end
+end

data/lib/swa/ec2/volume.rb

@@ -12,7 +12,7 @@ module Swa
         [
           pad(v.volume_id, 12),
           pad(v.snapshot_id, 13),
-          sprintf("%4d", v.size),
+          sprintf("%5d", v.size),
           pad(v.volume_type, 9),
           pad(attachment.instance_id, 10),
           pad(attachment.device, 9),

data/lib/swa/ec2/vpc.rb

@@ -0,0 +1,35 @@
+require "swa/ec2/tagged_resource"
+require "swa/resource"
+
+module Swa
+  module EC2
+
+    class Vpc < Resource
+
+      include TaggedResource
+
+      def summary
+        [
+          pad(vpc.vpc_id, 12),
+          pad(default_marker, 1),
+          pad(vpc.cidr_block, 18),
+          quoted(name)
+        ].join("  ")
+      end
+
+      def name
+        tags["Name"]
+      end
+
+      def default_marker
+        "*" if vpc.is_default
+      end
+
+      private
+
+      alias_method :vpc, :aws_resource
+
+    end
+
+  end
+end

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - lib/swa.rb
 - lib/swa/cli/base_command.rb
 - lib/swa/cli/collection_behaviour.rb
+- lib/swa/cli/data_output.rb
 - lib/swa/cli/ec2_command.rb
 - lib/swa/cli/filter_options.rb
 - lib/swa/cli/item_behaviour.rb
@@ -155,8 +156,10 @@ files:
 - lib/swa/ec2/key_pair.rb
 - lib/swa/ec2/security_group.rb
 - lib/swa/ec2/snapshot.rb
+- lib/swa/ec2/subnet.rb
 - lib/swa/ec2/tagged_resource.rb
 - lib/swa/ec2/volume.rb
+- lib/swa/ec2/vpc.rb
 - lib/swa/resource.rb
 - lib/swa/version.rb
 - swa.gemspec