opsicle 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjljYjQ5NzE0M2NhZDU3MWM2MTdjYjFjNzY2NzQ4MmU1MzU2YmE3OA==
+    NWMyN2Q2YjBkN2FiMTgwNjhjZjg2N2IwZTI3ZGVkYTFjYTdjY2NlMQ==
   data.tar.gz: !binary |-
-    NzQxZmI2NTY1MGVjZjIzMjA2NzdjNWRhZjFkMDQxMDUzZTFhZDYyOQ==
+    YzJhOGM3MzMwNDBmNDczMTcwYWRkNjFlYTM2NDJmNjVhMWY4OTM4Ng==
 SHA512:
   metadata.gz: !binary |-
-    OTAzMjJiODFkMjVjZDc5MTYyMGU4NTg4YzdlMjM2YmJjNmRjMTcyYTBlZDY1
-    MjVhNWNiOWU1NjljZjAzOGZhZTk5NjBhMDE0NThkNDkwOGNhZDk5ZGFjNmUw
-    ZjQ1ZmYwNjQzYzU2OWZhY2M4NjUwMmYzN2U2NWY1YzRlMmRiY2E=
+    ZTRjZDg3ZjQ4MjQwYTBkZDEzOWZjMTE4ZWU5MGE1NWE1ZTI2OTg0ZjFhNGQ4
+    ZGQ4MmUwMzJjMzllZDc4Y2M4NjE0YzI3MzA0MzM2ODBjYWFjZGJmMDYwYWE2
+    YWQ0Y2EwMzI4ZDdjY2NjNTEyZTFlYjM1MTFlYjQ3Mjc3Yjc5YzQ=
   data.tar.gz: !binary |-
-    OTdiNDgwZmM3MjQxNmM0MWE3NTJiMzlmZDY1NTIyYTg2NDcxOTBiNmJmOGE4
-    ZjIxNzIyZGIyMDc5Y2IyNTkxYTI4ZDVjMGE2YmZkYTk5OTljOTVhMjUxZmE4
-    YzRkNzM4ZmNiMTlkMWEyZGU4MDRjMTJkZGJmYmFhNWRlMzQzNjQ=
+    Y2I5OWMyMTI1YjhkMjg4NjczYjc4YzU5OTQ0MGQ3YzI1MDY3ZDAzY2NmYTkx
+    MDk3MTc3NzI4NzJiMDUwZWU4MDg1NzRkNTcyODM1MDZjMDY3ODI4NGI1ZWJi
+    MWQ1MWQyZmNlNmE0YmE0MWEzNzdkOGM5NGMzOWRiMDY1ZjM0MTI=

data/bin/opsicle

@@ -101,7 +101,7 @@ long_desc """
 """
 arg_name '<environment>'
 command 'opsworks-url' do |c|
-  opsworks_pages = %w[stack, layers, instances, apps, deployments, monitoring, resources, permissions]
+  opsworks_pages = %w(stack layers instances apps deployments monitoring resources permissions)
   c.flag [:p, :page],
          :desc => 'Request a specific page in the OpsWorks web interface',
          :must_match => opsworks_pages,

data/lib/opsicle/commands/deploy.rb

@@ -28,7 +28,7 @@ module Opsicle
         Output.say_verbose "Executing shell command: #{command}"
         %x(#{command})
       else
-        Output.say "Deploy failed. No deployment_id was received from OpsWorks", "RED"
+        Output.say "Deploy failed. No deployment_id was received from OpsWorks", :error
       end
     end
   end

data/lib/opsicle/commands/ssh.rb

@@ -14,7 +14,7 @@ module Opsicle
         instances.each_index do |x|
           Output.say "#{x+1}) #{instances[x][:hostname]}"
         end
-        choice = ask("? ", Integer) { |q| q.in = 1..instances.length }
+        choice = Output.ask("? ", Integer) { |q| q.in = 1..instances.length }
       end
 
       instance_ip = instances[choice-1][:elastic_ip] || instances[choice-1][:public_ip]

data/lib/opsicle/monitor/app.rb

@@ -64,10 +64,10 @@ module Opsicle
       end
 
       def do_command(key)
-        command = { q: :stop,
-                    h: [:set_screen, :help],
-                    b: :open_opsworks_browser,
-                    d: [:set_screen, :deployments] }[key.to_sym]
+        command = { 'q' => :stop,
+                    'h' => [:set_screen, :help],
+                    'b' => :open_opsworks_browser,
+                    'd' => [:set_screen, :deployments] }[key]
         command ||= :invalid_input
 
         send *command unless command == :invalid_input

data/lib/opsicle/output.rb

@@ -1,17 +1,37 @@
-require 'highline/import'
+require 'highline'
 
 module Opsicle
   module Output
-    def self.say(msg, color_requested=nil)
-      if $color && color_requested
-        super "<%= color('#{msg}', #{color_requested}) %>"
+    def self.terminal
+      HighLine.color_scheme = color_scheme
+      @terminal ||= HighLine.new
+    end
+
+    def self.color_scheme
+      @color_scheme ||= HighLine::ColorScheme.new(
+          :normal => [],
+          :error => [:bold, :red],
+          :warning => [:bold, :yellow],
+          :verbose => [:bold, :magenta],
+          :debug => [:bold, :cyan],
+          :success => [:bold, :green],
+      )
+    end
+
+    def self.say(msg, log_style=:normal)
+      if $color
+        terminal.say "<%= color('#{msg}', '#{log_style}') %>"
       else
-        super msg
+        terminal.say msg
       end
     end
 
-    def self.say_verbose(msg, color="MAGENTA")
-      self.say "<%= color('#{msg}', #{color}) %>" if $verbose
+    def self.say_verbose(msg)
+      terminal.say "<%= color('#{msg}', 'verbose') %>" if $verbose
+    end
+
+    def self.ask(*args)
+      terminal.ask(*args)
     end
   end
 end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/opsicle/commands/ssh_spec.rb

@@ -14,7 +14,7 @@ module Opsicle
       before do
         allow(Output).to receive(:say)
         allow(Output).to receive(:say_verbose)
-        allow(subject).to receive(:ask).and_return(2)
+        allow(Output).to receive(:ask).and_return(2)
         allow(subject).to receive(:ssh_username) {"mrderpyman2014"}
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk