cap-ec2 0.0.15 → 0.0.16

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Cap-EC2 changelog
 
+## 0.0.16
+
+* Don't colorize status table output if STDOUT is not a TTY. [@jcoglan](https://github.com/jcoglan)
+
 ## 0.0.15
 
 * Add `ec2_filter_by_status_ok?` to filter out instances that aren't returning `OK` 

data/lib/cap-ec2/status-table.rb

@@ -9,14 +9,14 @@ module CapEC2
     
     def header_row
       [
-        "Num".bold,
-        "Name".bold,
-        "ID".bold,
-        "Type".bold,
-        "DNS".bold,
-        "Zone".bold,
-        "Roles".bold,
-        "Stages".bold
+        bold("Num"),
+        bold("Name"),
+        bold("ID"),
+        bold("Type"),
+        bold("DNS"),
+        bold("Zone"),
+        bold("Roles"),
+        bold("Stages")
       ]
     end
     
@@ -38,15 +38,28 @@ module CapEC2
     def instance_to_row(instance, index)
       [
         sprintf("%02d:", index),
-        (instance.tags["Name"] || '').green,
-        instance.id.red,
-        instance.instance_type.cyan,
-        CapEC2::Utils.contact_point(instance).blue.bold,
-        instance.availability_zone.magenta,
-        instance.tags[roles_tag].yellow,
-        instance.tags[stages_tag].yellow
+        green(instance.tags["Name"] || ''),
+        red(instance.id),
+        cyan(instance.instance_type),
+        bold(blue(CapEC2::Utils.contact_point(instance))),
+        magenta(instance.availability_zone),
+        yellow(instance.tags[roles_tag]),
+        yellow(instance.tags[stages_tag])
       ]
     end
+
+  private
+
+    (Colored::COLORS.keys + Colored::EXTRAS.keys).each do |format|
+      define_method(format) do |string|
+        if $stdout.tty?
+          string.__send__(format)
+        else
+          string
+        end
+      end
+    end
+
   end
 end
 

data/lib/cap-ec2/version.rb

@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -187489000278530207
+      hash: 2024231783545522986
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -187489000278530207
+      hash: 2024231783545522986
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23