swa 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa99633a7562065e12b0eda658a5eb0cb500298
-  data.tar.gz: bcf698098737d8e568952ed7db966abf9bc28b75
+  metadata.gz: f67b72cbe913a6388331d39a0712396b0860ed53
+  data.tar.gz: ba6e2d45513837f958df812a219a752fd4cc823b
 SHA512:
-  metadata.gz: c364ab568630bd03aca0d497db0bf6d3e292f9558764e9f3242ea8b8cf044290e5c6be28abd1fd8b11ac991578073fcfd01e082ecb6192837417d89c17ee0044
-  data.tar.gz: 04a8bf044e19cecbd4825a9c505eadd35c3b7d1076a9c7733ebf983d403504f56c154ef82f0dc5403eb5336c649590d0353d642f636b55d1bf8630d283c8f179
+  metadata.gz: 6c52a78603d824cbcfc1c2326b573d333e1feda685fa3059daf2f90a0463e1365886c8810255e82d111ce4957fe347574ea958cad2f21d4ea0e58fabaf7834c8
+  data.tar.gz: c229d344051e47fde3ba951a30eb0c0c638f7616d8bd4c0fe88fb1d32f6d2c22beb82bedbbdf5cfc7de20ee3646aedd3411013c0a7b5fc7cb150d790c3e9377f

data/lib/swa/cli/base_command.rb

@@ -1,3 +1,4 @@
+require "chronic"
 require "clamp"
 require "console_logger"
 require "jmespath"
@@ -97,6 +98,12 @@ module Swa
         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
+        result
+      end
+
     end
 
   end

data/lib/swa/cli/collection_behaviour.rb

@@ -1,3 +1,5 @@
+require "swa/cli/selector"
+
 module Swa
   module CLI
 
@@ -27,6 +29,14 @@ module Swa
 
       end
 
+      def selector
+        context[:selector] ||= Selector.new
+      end
+
+      def query_options
+        context[:query_options] ||= {}
+      end
+
     end
 
   end

data/lib/swa/cli/ec2_command.rb

@@ -3,9 +3,9 @@ require "swa/cli/base_command"
 require "swa/cli/collection_behaviour"
 require "swa/cli/item_behaviour"
 require "swa/cli/tag_filter_options"
-require "swa/ec2/key_pair"
 require "swa/ec2/image"
 require "swa/ec2/instance"
+require "swa/ec2/key_pair"
 require "swa/ec2/security_group"
 require "swa/ec2/snapshot"
 require "swa/ec2/volume"
@@ -33,12 +33,16 @@ module Swa
 
       subcommand ["key-pairs", "kps"], "List key-pairs" do
 
+        self.description = <<-EOF
+          List key-pairs.
+        EOF
+
         include CollectionBehaviour
 
         private
 
         def key_pairs
-          Swa::EC2::KeyPair.list(ec2.key_pairs)
+          query_for(:key_pairs, Swa::EC2::KeyPair)
         end
 
         alias_method :collection, :key_pairs
@@ -63,9 +67,19 @@ module Swa
 
       subcommand ["images", "amis"], "List images" do
 
+        self.description = <<-EOF
+          List images (AMIs).
+
+          By default only AMIs owned by the current account are listed;
+          use `--owned-by` to select a different scope.
+        EOF
+
         option "--owned-by", "OWNER", "with specified owner", :default => "self"
         option "--named", "PATTERN", "with matching name"
 
+        option ["--created-after", "--after"], "WHEN", "earliest creation-date"
+        option ["--created-before", "--before"], "WHEN", "latest creation-date"
+
         include TagFilterOptions
         include CollectionBehaviour
 
@@ -75,12 +89,23 @@ module Swa
           add_filter("name", name_pattern)
         end
 
+        def created_after=(datetime_string)
+          min_creation_date = parse_datetime(datetime_string).max
+          selector.add do |image|
+            Time.parse(image.creation_date) > min_creation_date
+          end
+        end
+
+        def created_before=(datetime_string)
+          max_creation_date = parse_datetime(datetime_string).min
+          selector.add do |image|
+            Time.parse(image.creation_date) < max_creation_date
+          end
+        end
+
         def images
-          options = {
-            :owners => [owned_by]
-          }
-          options[:filters] = filters unless filters.empty?
-          Swa::EC2::Image.list(ec2.images(options))
+          query_options[:owners] = [owned_by]
+          query_for(:images, Swa::EC2::Image)
         end
 
         alias_method :collection, :images
@@ -123,6 +148,13 @@ module Swa
 
       subcommand ["instances", "is"], "List instances" do
 
+        self.description = <<-EOF
+          List images (AMIs).
+
+          By default only runnning instances are listed;
+          use `--state` to override ('*' for all states).
+        EOF
+
         option ["--state"], "STATE", "with specified status",
                :default => "running"
 
@@ -142,6 +174,9 @@ module Swa
           end
         end
 
+        option ["--launched-after", "--after"], "WHEN", "earliest launch-time"
+        option ["--launched-before", "--before"], "WHEN", "latest launch-time"
+
         include TagFilterOptions
         include CollectionBehaviour
 
@@ -157,12 +192,25 @@ module Swa
           RUBY
         end
 
+        def launched_after=(datetime_string)
+          min_launch_time = parse_datetime(datetime_string).max
+          selector.add do |instance|
+            instance.launch_time > min_launch_time
+          end
+        end
+
+        def launched_before=(datetime_string)
+          max_launch_time = parse_datetime(datetime_string).min
+          selector.add do |instance|
+            instance.launch_time < max_launch_time
+          end
+        end
+
         private
 
         def instances
           add_filter("instance-state-name", state)
-          options = {:filters => filters}
-          Swa::EC2::Instance.list(ec2.instances(options))
+          query_for(:instances, Swa::EC2::Instance)
         end
 
         alias_method :collection, :instances
@@ -193,9 +241,7 @@ module Swa
         private
 
         def security_groups
-          options = {}
-          options[:filters] = filters unless filters.empty?
-          Swa::EC2::SecurityGroup.list(ec2.security_groups(options))
+          query_for(:security_groups, Swa::EC2::SecurityGroup)
         end
 
         alias_method :collection, :security_groups
@@ -220,6 +266,13 @@ module Swa
 
       subcommand ["snapshots", "snaps"], "List snapshots" do
 
+        self.description = <<-EOF
+          List EBS snapshots.
+
+          By default only snapshots owned by the current account are listed;
+          use `--owned-by` to select a different scope.
+        EOF
+
         option "--owned-by", "OWNER", "with specified owner", :default => "self"
 
         include TagFilterOptions
@@ -228,11 +281,8 @@ module Swa
         private
 
         def snapshots
-          options = {
-            :owner_ids => [owned_by]
-          }
-          options[:filters] = filters unless filters.empty?
-          Swa::EC2::Snapshot.list(ec2.snapshots(options))
+          query_options[:owner_ids] = [owned_by]
+          query_for(:snapshots, Swa::EC2::Snapshot)
         end
 
         alias_method :collection, :snapshots
@@ -257,15 +307,17 @@ module Swa
 
       subcommand ["volumes", "vols"], "List volumes" do
 
+        self.description = <<-EOF
+          List EBS volumes.
+        EOF
+
         include TagFilterOptions
         include CollectionBehaviour
 
         private
 
         def volumes
-          options = {}
-          options[:filters] = filters unless filters.empty?
-          Swa::EC2::Volume.list(ec2.volumes(options))
+          query_for(:volumes, Swa::EC2::Volume)
         end
 
         alias_method :collection, :volumes
@@ -278,6 +330,12 @@ module Swa
         ::Aws::EC2::Resource.new(aws_config)
       end
 
+      def query_for(query_method, resource_model)
+        aws_resources = ec2.public_send(query_method, query_options)
+        wrapped_resources = resource_model.list(aws_resources)
+        selector.apply(wrapped_resources)
+      end
+
     end
 
   end

data/lib/swa/cli/filter_options.rb

@@ -13,7 +13,7 @@ module Swa
       protected
 
       def filters
-        @filters ||= []
+        query_options[:filters] ||= []
       end
 
       def add_filter(name, *values)

data/lib/swa/cli/selector.rb

@@ -0,0 +1,27 @@
+module Swa
+  module CLI
+
+    class Selector
+
+      def initialize
+        @predicates = []
+      end
+
+      def add(&block)
+        @predicates << block
+      end
+
+      def call(subject)
+        @predicates.all? do |predicate|
+          predicate.call(subject)
+        end
+      end
+
+      def apply(collection)
+        collection.lazy.select(&method(:call))
+      end
+
+    end
+
+  end
+end

data/lib/swa/cli/tag_filter_options.rb

@@ -11,6 +11,9 @@ module Swa
 
       option "--tagged", "KEY[=VALUE]", "with matching tag",
              :multivalued => true, :attribute_name => :tag_list
+      option "--not-tagged", "KEY[=VALUE]", "WITHOUT matching tag",
+             :multivalued => true, :attribute_name => :tag_blacklist
+
       option "--stack", "NAME", "from the named CloudFormation stack"
 
       protected
@@ -20,6 +23,20 @@ module Swa
         add_tag_filter(key, value_pattern)
       end
 
+      def append_to_tag_blacklist(arg)
+        key, value_pattern = arg.split("=", 2)
+        if value_pattern
+          selector.add do |resource|
+            value = resource.tags[key]
+            value.nil? || !File.fnmatch(value_pattern, value)
+          end
+        else
+          selector.add do |resource|
+            resource.tags[key].nil?
+          end
+        end
+      end
+
       def stack=(name)
         add_tag_filter("aws:cloudformation:stack-name", name)
       end

data/lib/swa/ec2/image.rb

@@ -20,6 +20,8 @@ module Swa
         ami.name
       end
 
+      delegate :creation_date
+
       private
 
       alias_method :ami, :aws_resource

data/lib/swa/ec2/instance.rb

@@ -1,4 +1,4 @@
-require "forwardable"
+require "base64"
 require "swa/resource"
 require "swa/ec2/tagged_resource"
 
@@ -26,12 +26,11 @@ module Swa
       end
 
       def console_output
-        i.console_output.output
+        Base64.decode64(i.console_output.output)
       end
 
-      extend Forwardable
-
-      def_delegators :i, :stop, :start, :reboot, :terminate
+      delegate :launch_time
+      delegate :stop, :start, :reboot, :terminate
 
       private
 

data/lib/swa/ec2/key_pair.rb

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

data/lib/swa/ec2/snapshot.rb

@@ -1,4 +1,3 @@
-require "forwardable"
 require "swa/resource"
 require "swa/ec2/tagged_resource"
 
@@ -20,9 +19,7 @@ module Swa
         ].join("  ")
       end
 
-      extend Forwardable
-
-      def_delegators :s, :delete
+      delegate :delete
 
       private
 

data/lib/swa/ec2/volume.rb

@@ -1,4 +1,3 @@
-require "forwardable"
 require "swa/resource"
 require "swa/ec2/tagged_resource"
 
@@ -29,9 +28,7 @@ module Swa
         v.attachments.first || OpenStruct.new
       end
 
-      extend Forwardable
-
-      def_delegators :v, :delete
+      delegate :delete
 
       private
 

data/lib/swa/resource.rb

@@ -1,3 +1,4 @@
+require "forwardable"
 require "swa/data_presentation"
 
 module Swa
@@ -21,6 +22,12 @@ module Swa
       camelize_keys(_resource_.data.to_h)
     end
 
+    extend Forwardable
+
+    def self.delegate(*methods)
+      def_delegators :aws_resource, *methods
+    end
+
   end
 
 end

data/lib/swa/version.rb

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

data/swa.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_runtime_dependency "aws-sdk-resources"
+  spec.add_runtime_dependency "chronic"
   spec.add_runtime_dependency "clamp"
   spec.add_runtime_dependency "console_logger"
   spec.add_runtime_dependency "multi_json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +147,7 @@ files:
 - lib/swa/cli/filter_options.rb
 - lib/swa/cli/item_behaviour.rb
 - lib/swa/cli/main_command.rb
+- lib/swa/cli/selector.rb
 - lib/swa/cli/tag_filter_options.rb
 - lib/swa/data_presentation.rb
 - lib/swa/ec2/image.rb