awsome 0.0.59 → 0.0.60

data/lib/awsome.rb

@@ -5,10 +5,11 @@ module Awsome
 
   def self.execute(command, options={})
     command = command.join(' ') if command.is_a?(Array)
-    if config.verbose
+    description = options[:task] ? "[#{options[:task]}] #{command}" : command
+    verbose = config.verbose && options[:verbose] != false
+    if verbose
       puts
-      puts command
-      puts '-' * [command.length, 100].min
+      puts description
     end
     if options[:system]
       result = system(command)
@@ -18,10 +19,11 @@ module Awsome
       result = map_table(result, options)
     end
   ensure
-    if config.verbose
+    if verbose && options[:output] != false
+      puts '-' * description.length
       case result
       when String then puts result
-      else ap result
+      else ap result # print a table perhaps..
       end
     end
     if config.stacks
@@ -48,7 +50,10 @@ module Awsome
     retries = opts[:retries] || 5
     interval = opts[:interval] || 5
     while !yield && retries > 0
-      puts "block returned false (#{retries} more retries)..." if Awsome.config.verbose
+      if config.verbose
+        task = opts[:task] || 'block returned false'
+        puts "[#{retries} more retries] #{task}"
+      end
       sleep interval
       retries -= 1
     end

data/lib/awsome/ec2.rb

@@ -44,13 +44,23 @@ module Awsome
         'instance-type'.to_sym => properties['instance_type'], 
         'availability-zone'.to_sym => properties['availability_zone']
       )
-      Awsome::Ec2::Instance.new(Awsome.execute(cmd, columns: @@run_instance_fields, filter: /^INSTANCE/).first)
+      result = Awsome.execute(
+        cmd, 
+        columns: @@run_instance_fields, 
+        filter: /^INSTANCE/, 
+        task: 'creating instance'
+      )
+      Awsome::Ec2::Instance.new(result.first)
     end
 
     def self.create_tags(resource_id, tags)
       tags = tags.collect { |k, v| v ? "--tag #{k}=#{v}" : "--tag #{k}" }
       cmd = command('ec2-create-tags', resource_id, *tags)
-      Awsome.execute(cmd)
+      Awsome.execute(
+        cmd, 
+        task: "tagging #{resource_id}", 
+        output: false
+      )
     end
 
     @@describe_instance_fields = %w( 
@@ -76,7 +86,13 @@ module Awsome
       cmd = [Awsome::Ec2.command('ec2-describe-instances')]
       cmd += filters.collect { |k,v| "--filter \"#{k}=#{v}\"" }
       preprocess = Proc.new { |text| text.gsub("\nINSTANCE", " INSTANCE") }
-      properties = Awsome.execute(cmd, columns: @@describe_instance_fields, filter: /^RESERVATION/, preprocess: preprocess)
+      properties = Awsome.execute(
+        cmd, 
+        columns: @@describe_instance_fields, 
+        filter: /^RESERVATION/, 
+        preprocess: preprocess,
+        verbose: false
+      )
       properties.collect { |p| Awsome::Ec2::Instance.new(p) }
     end
 
@@ -94,7 +110,12 @@ module Awsome
     def self.describe_volumes(*volume_ids)
       return [] if volume_ids.empty?
       cmd = [Awsome::Ec2.command('ec2-describe-volumes')] + volume_ids
-      Awsome.execute(cmd, columns: @@describe_volumes_fields, filter: /^VOLUME/)
+      Awsome.execute(
+        cmd, 
+        columns: @@describe_volumes_fields, 
+        filter: /^VOLUME/,
+        verbose: false
+      )
     end
 
     def self.volume_available?(volume_id)
@@ -127,7 +148,11 @@ module Awsome
         instance.ssh "sudo umount #{dir}"
 
         cmd = Awsome::Ec2.command('ec2-detach-volume', volume_id)
-        Awsome.execute(cmd)
+        Awsome.execute(
+          cmd, 
+          task: 'detaching volume', 
+          output: false
+        )
       end
     end
 
@@ -139,18 +164,32 @@ module Awsome
 
     def self.associate_address(instance_id, ip_address)
       cmd = Awsome::Ec2.command('ec2-associate-address', ip_address, instance: instance_id)
-      Awsome.execute(cmd, columns: @@associate_address_columns, filter: /^ADDRESS/)
+      Awsome.execute(
+        cmd, 
+        columns: @@associate_address_columns, 
+        filter: /^ADDRESS/, 
+        task: 'associating ip', 
+        output: false
+      )
     end
 
     def self.attach_volume(volume_id, instance_id, device)
       cmd = Awsome::Ec2.command('ec2-attach-volume', volume_id, instance: instance_id, device: device)
-      Awsome.execute(cmd)
+      Awsome.execute(
+        cmd, 
+        task: 'attaching volume', 
+        output: false
+      )
     end
 
     def self.terminate_instances(*instance_ids)
       return if instance_ids.empty?
       cmd = Awsome::Ec2.command("ec2-terminate-instances #{instance_ids.join(' ')}") 
-      Awsome.execute(cmd)
+      Awsome.execute(
+        cmd, 
+        task: 'terminating instances', 
+        output: false
+      )
     end
   end
 end

data/lib/awsome/ec2/instance.rb

@@ -23,14 +23,14 @@ module Awsome
       end
 
       def wait_until_running!
-        Awsome.wait_until(interval: 20) do
+        Awsome.wait_until(interval: 20, task: "waiting for instance #{id} 'running' status") do
           reload! 
           @properties['state'] =~ /^running/
         end
       end
 
       def wait_for_ssh!
-        Awsome.wait_until(interval: 20) { has_ssh? }
+        Awsome.wait_until(interval: 20, task: "waiting for instance #{id} ssh access") { has_ssh? }
       end
 
       def ssh(*args)
@@ -58,7 +58,9 @@ module Awsome
       def reattach_volumes(*volumes)
         volumes.each do |info| 
           Awsome::Ec2.detach_volume(info['id'], info['dir'], info['preumount'])
-          Awsome.wait_until(interval: 10) { Awsome::Ec2.volume_available?(info['id']) }
+          Awsome.wait_until(interval: 10, task: "waiting for volume #{info['id']} to become available") do 
+            Awsome::Ec2.volume_available?(info['id'])
+          end
           Awsome::Ec2.attach_volume(info['id'], @properties['instance_id'], info['device']) 
         end
       end

data/lib/awsome/elb.rb

@@ -47,18 +47,33 @@ module Awsome
 
     def self.describe_lbs(*load_balancer_names)
       cmd = Awsome::Elb.command("elb-describe-lbs #{load_balancer_names.join(' ')}")
-      properties = Awsome.execute(cmd, columns: @@describe_lbs_columns, delimiter: @@delimiter)
+      properties = Awsome.execute(
+        cmd, 
+        columns: @@describe_lbs_columns, 
+        delimiter: @@delimiter,
+        verbose: false
+      )
       properties.collect { |p| Awsome::Elb::LoadBalancer.new(p) }
     end
 
     def self.deregister_instance_from_lb(load_balancer_name, instance_id)
       cmd = Awsome::Elb.command('elb-deregister-instances-from-lb', load_balancer_name, instances: instance_id)
-      Awsome.execute(cmd, delimiter: @@delimiter)
+      Awsome.execute(
+        cmd, 
+        delimiter: @@delimiter,
+        task: 'deregistering from elb',
+        output: false
+      )
     end
 
     def self.register_instance_with_lb(load_balancer_name, instance_id)
       cmd = Awsome::Elb.command('elb-register-instances-with-lb', load_balancer_name, instances: instance_id)
-      Awsome.execute(cmd, delimiter: @@delimiter)
+      Awsome.execute(
+        cmd, 
+        delimiter: @@delimiter,
+        task: 'registering with elb',
+        output: false
+      )
     end
   end
 end

data/lib/awsome/ssh.rb

@@ -17,11 +17,11 @@ module Awsome
       else
         from = "#{ENV['SSH_USER']}@#{from}"
       end
-      Awsome.execute("scp -i #{ENV['SSH_KEY']} #{from} #{to}", system: true)
+      Awsome.execute("scp -i #{ENV['SSH_KEY']} #{from} #{to}", system: true, verbose: false)
     end
 
     def self.has_ssh?(host)
-      Awsome.execute("nc -zw 2 #{host} 22 < /dev/null", system: true)
+      Awsome.execute("nc -zw 2 #{host} 22 < /dev/null", system: true, verbose: false)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsome
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.60
   prerelease: 
 platform: ruby
 authors: