awful 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bddbf8cc43381e35767b345e27342b0eef5d7d6
-  data.tar.gz: 89d85092fba21d2ba2ed58391fb75b5701750c01
+  metadata.gz: ff4da95e3c0f20638173ed7fb22ee8e55708ff6c
+  data.tar.gz: a8f8d60efa566e0575c56be0c07ba6f8ad7451de
 SHA512:
-  metadata.gz: 7250389da22f30bf96cbfe66c1bd0531e6c3bf4aeece59b1bf98d00dd565d72a9afef6c00532956555d35680606fd34ee272b5bf77a48f12b044a250828e52d1
-  data.tar.gz: b86ff5574c2ffa74bd8e976c38fbb94306f6a9a7219eb246faf4c4939fb64e7797a7c68a83e0f47759cda2bae204298dc91a15381eb90f73e6b9d8fb9a62ae51
+  metadata.gz: 2908b7accf1edae0464a5fa48859559911db58ec7dcac5fbc901d06fa3367a619ce3309e0da7f90a92d04bdb8652d70ad0659b4f31bcfa292a31156462bbb9f3
+  data.tar.gz: 5870345390e1c1bf2a9df53c20ac899e28336a0833ff09fbde0de70d683a6b53fd9d62b2b52dc7578a8a5417b5e296e57d4aa2abf2ad90c0e202178604699eaa

data/lib/awful/auto_scaling.rb

@@ -265,35 +265,41 @@ module Awful
     def old_instances(*names)
       asgs = autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: names).map(&:auto_scaling_groups).flatten
 
-      asgs.each_with_object({}) do |asg, hash|
+      ## get hash of old instances by ASG name
+      olds = asgs.each_with_object({}) do |asg, hash|
         outdated = asg.instances.select do |instance|
           instance.launch_configuration_name != asg.launch_configuration_name
         end
         hash[asg.auto_scaling_group_name] = outdated unless outdated.empty?
-      end.tap do |olds|
-        if olds.empty?
-          # noop
-        elsif options[:detach]
-          autoscaling.detach_instances(auto_scaling_group_name: name, instance_ids: olds.values.flatten.map(&:instance_id), should_decrement_desired_capacity: options[:decrement])
-        elsif options[:deregister]
-          asg.load_balancer_names.map do |elb_name|
-            elb.deregister_instances_from_load_balancer(load_balancer_name: elb_name, instances: olds.values.flatten.map { |i| { instance_id: i.instance_id } })
-          end.tap { puts "Deregistered: #{olds.map(&:instance_id).join(',')}" }
-        elsif options[:terminate]
-          olds.values.flatten.map do |instance|
-            autoscaling.terminate_instance_in_auto_scaling_group(instance_id: instance.instance_id, should_decrement_desired_capacity: options[:decrement] && true)
-            instance.instance_id
-          end.tap { |ids| say("Terminated: #{ids.join(',')}", :yellow) }
-        elsif options[:groups]
-          puts olds.keys
-        elsif options[:long]
-          print_table olds.map { |asg, ins| ins.map { |i| [i.instance_id, asg, i.launch_configuration_name] }.flatten }
-        else
-          puts olds.values.flatten.map(&:instance_id)
+      end
+
+      if olds.empty?
+        # noop
+      elsif options[:detach]
+        autoscaling.detach_instances(auto_scaling_group_name: name, instance_ids: olds.values.flatten.map(&:instance_id), should_decrement_desired_capacity: options[:decrement])
+      elsif options[:deregister]
+        asgs.select do |asg|
+          olds.has_key?(asg.auto_scaling_group_name)
+        end.each do |asg|
+          instance_ids = olds[asg.auto_scaling_group_name].flatten.map(&:instance_id)
+          asg.load_balancer_names.each do |elb_name|
+            say "Deregistering #{instance_ids.join(',')} from ELB #{elb_name}", :yellow
+            elb.deregister_instances_from_load_balancer(load_balancer_name: elb_name, instances: instance_ids.map { |id| {instance_id: id} })
+          end
         end
+      elsif options[:terminate]
+        olds.values.flatten.map do |instance|
+          autoscaling.terminate_instance_in_auto_scaling_group(instance_id: instance.instance_id, should_decrement_desired_capacity: options[:decrement] && true)
+          instance.instance_id
+        end.tap { |ids| say("Terminated: #{ids.join(',')}", :yellow) }
+      elsif options[:groups]
+        puts olds.keys
+      elsif options[:long]
+        print_table olds.map { |asg, ins| ins.map { |i| [i.instance_id, asg, i.launch_configuration_name] }.flatten }
+      else
+        puts olds.values.flatten.map(&:instance_id)
       end
     end
-
   end
 
 end

data/lib/awful/s3.rb

@@ -2,11 +2,31 @@ module Awful
 
   class S3 < Cli
 
-    desc 'list_buckets [PATTERN]', 'list buckets'
+    no_commands do
+
+      ## resource interface to S3 commands
+      def s3_resource
+        Aws::S3::Resource.new(client: s3)
+      end
+
+    end
+
+    desc 'ls PATTERN', 'list buckets or objects'
+    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    def ls(name = '.')
+      if name.include?('/')
+        bucket, prefix = name.split('/', 2)
+        invoke 'objects', [bucket, prefix], options
+      else
+        invoke 'buckets', [name], options
+      end
+    end
+
+    desc 'buckets [PATTERN]', 'list buckets'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
-    def list_buckets(name = /./)
+    def buckets(name = /./)
       s3.list_buckets.buckets.select do |bucket|
-        bucket.name.match(name)
+        bucket.name.match(/#{name}/)
       end.tap do |list|
         if options[:long]
           print_table list.map { |b| [ b.name, b.creation_date ] }
@@ -16,12 +36,9 @@ module Awful
       end
     end
 
-    desc 'list_objects BUCKET [PATTERN]', 'list objects in bucket'
-    def list_objects(bucket, prefix = nil)
-      # s3.list_objects(bucket: bucket, prefix: prefix, delimiter: '').contents.map(&:key).tap do |list|
-      #   puts list
-      # end
-      Aws::S3::Resource.new(client: s3).bucket(bucket).objects(delimiter: '', prefix: prefix).map do |object|
+    desc 'objects BUCKET [PATTERN]', 'list objects in bucket'
+    def objects(bucket, prefix = nil)
+      s3_resource.bucket(bucket).objects(prefix: prefix).map do |object|
         object.key
       end.tap { |list| puts list }
     end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = "0.0.38"
+  VERSION = "0.0.39"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler