swa 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53fd1347fd3e98e99e87890483f9f9ef694ee50d
-  data.tar.gz: ebc63134ad5f40ce5ca77abae5d0edc31c5a53bf
+  metadata.gz: 96696427a2dd6945724b752802f7e041023ef335
+  data.tar.gz: 099a422f4ebf6102bddf91ad7c39ef46e673fae0
 SHA512:
-  metadata.gz: 36450fa49aa02109b6498ad048cea74d8a8b39ae7123e5ce4be31e4155c4e72a59c0bac24466b3131ebca4b9ee9e17eae4fb703d49368fadbd8aee21b52e9917
-  data.tar.gz: b806497adeb681d53be9a7eaaf6d49b059593bae45c0fd78dbf23b636841eed86374dca59e1c4d8e54cb7b674f27c3f44c01d2bcf46e3d28ef5c5455fabe4015
+  metadata.gz: d72ae93fa0a477e5abab21fd018763597ccd1f1042a27c52625f13e6f5d5c1c574181be76251124867181eb5a4c54d2745b0c05d3ec63b3264229f157543427d
+  data.tar.gz: a71e19e5f19ab55af892fd48fbb54fab9037962ae4c4351e9606c4392c1b26e46a9450ea62526595687dfbc74d66dd6b2e6ce5ec0650125da07f0869c0ae6f63

data/lib/swa/cli/base_command.rb

@@ -9,7 +9,7 @@ module Swa
 
     class BaseCommand < Clamp::Command
 
-      option ["--region"], "REGION", "AWS region"
+      option "--region", "REGION", "AWS region"
       option "--access-key", "KEY", "AWS access key",
              :attribute_name => :access_key_id
       option "--secret-key", "KEY", "AWS secret key",
@@ -17,12 +17,37 @@ module Swa
       option "--session-token", "KEY", "AWS security token",
              :attribute_name => :session_token
 
-      option ["-Y", "--yaml"], :flag, "output data in YAML format"
+      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
 
       option ["--debug"], :flag, "enable debugging"
 
+      def run(arguments)
+        super(arguments)
+      rescue Aws::Errors::MissingCredentialsError
+        signal_error "no credentials provided"
+      rescue Aws::Errors::ServiceError => e
+        signal_error e.message
+      end
+
       protected
 
+      def parse_subcommand
+        return false unless self.class.has_subcommands?
+        request_help if subcommand_name == "?"
+        super
+      end
+
       def logger
         @logger ||= ConsoleLogger.new($stderr, debug?)
       end
@@ -44,11 +69,22 @@ 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
+        @format = arg
+      end
+
       def format_data(data)
-        if yaml?
+        case output_format
+        when "JSON"
+          MultiJson.dump(data, :pretty => true)
+        when "YAML"
           YAML.dump(data)
         else
-          MultiJson.dump(data, :pretty => true)
+          raise "bad output format: #{output_format}"
         end
       end
 
@@ -57,6 +93,8 @@ module Swa
           data = JMESPath.search(jmespath_expression, data)
         end
         puts format_data(data)
+      rescue JMESPath::Errors::SyntaxError => e
+        signal_error("invalid JMESPath expression")
       end
 
     end

data/lib/swa/cli/collection_behaviour.rb

@@ -7,7 +7,7 @@ module Swa
 
         target.default_subcommand = "summary"
 
-        target.subcommand ["summary", "s"], "brief summary (one per line)" do
+        target.subcommand ["summary", "s"], "One-line summary" do
           def execute
             collection.each do |i|
               puts i.summary
@@ -15,7 +15,7 @@ module Swa
           end
         end
 
-        target.subcommand ["data", "d"], "full details" do
+        target.subcommand ["data", "d"], "Full details" do
 
           parameter "[QUERY]", "JMESPath expression"
 

data/lib/swa/cli/ec2_command.rb

@@ -7,13 +7,14 @@ require "swa/ec2/key_pair"
 require "swa/ec2/image"
 require "swa/ec2/instance"
 require "swa/ec2/security_group"
+require "swa/ec2/volume"
 
 module Swa
   module CLI
 
     class Ec2Command < BaseCommand
 
-      subcommand ["key-pair", "kp"], "show key-pair" do
+      subcommand ["key-pair", "kp"], "Show key-pair" do
 
         parameter "NAME", "key-pair name"
 
@@ -29,7 +30,7 @@ module Swa
 
       end
 
-      subcommand ["key-pairs", "kps"], "list key-pairs" do
+      subcommand ["key-pairs", "kps"], "List key-pairs" do
 
         include CollectionBehaviour
 
@@ -43,7 +44,7 @@ module Swa
 
       end
 
-      subcommand ["image", "ami"], "show image" do
+      subcommand ["image", "ami"], "Show image" do
 
         parameter "IMAGE-ID", "image id"
 
@@ -59,10 +60,10 @@ module Swa
 
       end
 
-      subcommand ["images", "amis"], "list images" do
+      subcommand ["images", "amis"], "List images" do
 
-        option "--owned-by", "OWNER", "limit to those with selected owner", :default => "self"
-        option "--named", "PATTERN", "limit to those with matching name"
+        option "--owned-by", "OWNER", "with specified owner", :default => "self"
+        option "--named", "PATTERN", "with matching name"
 
         include TagFilterOptions
         include CollectionBehaviour
@@ -85,12 +86,30 @@ module Swa
 
       end
 
-      subcommand ["instance", "i"], "show instance" do
+      subcommand ["instance", "i"], "Show instance" do
 
         parameter "INSTANCE-ID", "instance id"
 
         include ItemBehaviour
 
+        subcommand ["console-output", "console"], "Display console output" do
+
+          def execute
+            puts instance.console_output
+          end
+
+        end
+
+        %w(stop start reboot terminate).each do |action|
+          class_eval <<-RUBY
+            subcommand "#{action}", "#{action.capitalize} the instance" do
+              def execute
+                instance.#{action}
+              end
+            end
+          RUBY
+        end
+
         private
 
         def instance
@@ -101,7 +120,7 @@ module Swa
 
       end
 
-      subcommand ["instances", "is"], "list instances" do
+      subcommand ["instances", "is"], "List instances" do
 
         option ["--state"], "STATE", "with specified status",
                :default => "running"
@@ -125,6 +144,18 @@ module Swa
         include TagFilterOptions
         include CollectionBehaviour
 
+        %w(stop start reboot terminate).each do |action|
+          class_eval <<-RUBY
+            subcommand "#{action}", "#{action.capitalize} all instances" do
+              def execute
+                instances.each do |i|
+                  i.#{action}
+                end
+              end
+            end
+          RUBY
+        end
+
         private
 
         def instances
@@ -137,7 +168,7 @@ module Swa
 
       end
 
-      subcommand ["security-group", "sg"], "show security-group" do
+      subcommand ["security-group", "sg"], "Show security-group" do
 
         parameter "GROUP-ID", "security-group id"
 
@@ -153,7 +184,7 @@ module Swa
 
       end
 
-      subcommand ["security-groups", "sgs"], "list security-groups" do
+      subcommand ["security-groups", "sgs"], "List security-groups" do
 
         include TagFilterOptions
         include CollectionBehaviour
@@ -170,6 +201,39 @@ module Swa
 
       end
 
+      subcommand ["volume", "vol", "v"], "Show volume" do
+
+        parameter "VOLUME-ID", "volume id"
+
+        include ItemBehaviour
+
+        private
+
+        def volume
+          Swa::EC2::Volume.new(ec2.volume(volume_id))
+        end
+
+        alias_method :item, :volume
+
+      end
+
+      subcommand ["volumes", "vs"], "List volumes" do
+
+        include TagFilterOptions
+        include CollectionBehaviour
+
+        private
+
+        def volumes
+          options = {}
+          options[:filters] = filters unless filters.empty?
+          Swa::EC2::Volume.list(ec2.volumes(options))
+        end
+
+        alias_method :collection, :volumes
+
+      end
+
       protected
 
       def ec2

data/lib/swa/cli/item_behaviour.rb

@@ -5,15 +5,13 @@ module Swa
 
       def self.included(target)
 
-        target.default_subcommand = "summary"
-
-        target.subcommand ["summary", "s"], "brief summary (one per line)" do
+        target.subcommand ["summary", "s"], "One-line summary" do
           def execute
             puts item.summary
           end
         end
 
-        target.subcommand ["data", "d"], "full details" do
+        target.subcommand ["data", "d"], "Full details" do
 
           parameter "[QUERY]", "JMESPath expression"
 

data/lib/swa/ec2/instance.rb

@@ -1,3 +1,4 @@
+require "forwardable"
 require "swa/resource"
 require "swa/ec2/tagged_resource"
 
@@ -24,6 +25,14 @@ module Swa
         tags["Name"]
       end
 
+      def console_output
+        i.console_output.output
+      end
+
+      extend Forwardable
+
+      def_delegators :i, :stop, :start, :reboot, :terminate
+
       private
 
       alias_method :i, :aws_resource

data/lib/swa/ec2/volume.rb

@@ -0,0 +1,38 @@
+require "forwardable"
+require "swa/resource"
+require "swa/ec2/tagged_resource"
+
+module Swa
+  module EC2
+
+    class Volume < Resource
+
+      include TaggedResource
+
+      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),
+          quoted(name)
+        ].join(" ")
+      end
+
+      def name
+        tags["Name"]
+      end
+
+      extend Forwardable
+
+      def_delegators :v, :delete
+
+      private
+
+      alias_method :v, :aws_resource
+
+    end
+
+  end
+end

data/lib/swa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,12 +135,12 @@ files:
 - lib/swa/cli/main_command.rb
 - lib/swa/cli/tag_filter_options.rb
 - lib/swa/data_presentation.rb
-- lib/swa/ec2/collection_behaviour.rb
 - lib/swa/ec2/image.rb
 - lib/swa/ec2/instance.rb
 - lib/swa/ec2/key_pair.rb
 - lib/swa/ec2/security_group.rb
 - lib/swa/ec2/tagged_resource.rb
+- lib/swa/ec2/volume.rb
 - lib/swa/resource.rb
 - lib/swa/version.rb
 - swa.gemspec

data/lib/swa/ec2/collection_behaviour.rb

@@ -1,29 +0,0 @@
-module Swa
-  module CLI
-
-    module CollectionBehaviour
-
-      def self.included(target)
-
-        target.default_subcommand = "summary"
-
-        target.subcommand ["summary", "s"], "brief summary (one per line)" do
-          def execute
-            collection.each do |i|
-              puts i.summary
-            end
-          end
-        end
-
-        target.subcommand ["detail", "d"], "full details" do
-          def execute
-            display_data(collection.map(&:data).to_a)
-          end
-        end
-
-      end
-
-    end
-
-  end
-end