opsicle 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c70b5f91d3917104411e5e0b6cc183406b1b8016
-  data.tar.gz: 61418c77bb81f7adccd36dfed093ea482e59077c
+  metadata.gz: 0baf2ced70ed7f2d668ef04fd18e666c3c1e0b52
+  data.tar.gz: 74431df218528ff5e3e3a75cc4106537149ca150
 SHA512:
-  metadata.gz: 39ceb8570c356e6a74411a4f5307771ee7cfc1bddb9ddb958d26209a3a8366225c8f5e8d695b075be0b2744a472acd35cb74eade46841f29bd5cd65b98d8a5b4
-  data.tar.gz: d1322f7a77cfb0c3e5e416fe9a7d3632a13908704f9a0e1d32adcdb8969705d4c50c04de01653f19c6aedb0bfcda659ec1c1b1be0db89f4034c545979996b869
+  metadata.gz: d88d1230288fb6adcb4c18a0a6d23742043bf8561955af051ada5fc33d35181633b8e714d3ab8d2bb5e1272f91cc0d96a572e71752564b6a6c2fa99e288980fc
+  data.tar.gz: 9054a81eb6a19777f1424c9f961604b464c9aa64d65d5cd888d090fa22174177269f29032a1a870d5461cde5b6629547225373b8f23770a054301eccd9846b36

data/lib/opsicle/monitor/app.rb

@@ -29,25 +29,33 @@ module Opsicle
 
         # Make client with correct configuration available to monitor spies
         App.client = Client.new(environment)
-        @deploy = Opsicle::Deployment.new(@deployment_id, App.client) if @deployment_id
+        if @deployment_id
+          # `deploy`, `chef-update`, `execute-recipes` command, which is no-tty compatible so these can be automated via cron, etc.
+          @deploy = Opsicle::Deployment.new(@deployment_id, App.client)
+        else
+          # `monitor` command, which requires a TTY.
+          raise "Monitor requires a TTY." unless $stdout.tty?
+        end
       end
 
       def start
         begin
           @running = true
 
-          setup
+          if $stdout.tty?
+            setup
 
-          @threads[:command] ||= Thread.new do
-            command_loop # listen for commands
-          end
+            @threads[:command] ||= Thread.new do
+              command_loop # listen for commands
+            end
 
-          @threads[:refresh_screen] ||= Thread.new do
-            refresh_screen_loop # refresh frequently
-          end
+            @threads[:refresh_screen] ||= Thread.new do
+              refresh_screen_loop # refresh frequently
+            end
 
-          @threads[:refresh_data] ||= Thread.new do
-            refresh_data_loop # refresh not so frequently
+            @threads[:refresh_data] ||= Thread.new do
+              refresh_data_loop # refresh not so frequently
+            end
           end
 
           if @deploy
@@ -67,7 +75,7 @@ module Opsicle
 
         @running = false
         wakey_wakey
-        @screen.close
+        @screen.close unless @screen.nil?
         @screen = nil # Ruby curses lib doesn't have closed?(), so we set to nil, just in case
 
         options[:error] ? raise(options[:error]) : raise(QuitMonitor, options[:message])
@@ -159,7 +167,7 @@ module Opsicle
       # to the spies would get ugly.
       def refresh_deploy_status_loop
         while @running do
-          next unless @screen # HACK: only certain test scenarios?
+          next unless @screen || !$stdout.tty?# HACK: only certain test scenarios?
 
           check_deploy_status
 
@@ -168,7 +176,9 @@ module Opsicle
       end
 
       def check_deploy_status
-        unless deploy.running?
+        if deploy.running?
+          Output.say(". ") unless $stdout.tty?
+        else
           if deploy.failed?
             stop(error: Opsicle::Errors::DeployFailed.new(deploy.command))
           elsif deploy.successful?

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/spec/opsicle/commands/update_spec.rb

@@ -49,7 +49,8 @@ module Opsicle
       it "should print changes with table" do
         allow(HashDiff).to receive(:diff) { [%w[- nyan 1], %w[+ cat 2],%w[~ taco 3 4]] }
         expect(Output).to receive(:say).with("Changes: 3") { nil }
-        expect(Output).to receive_message_chain("terminal.say")
+        allow(Output).to receive_message_chain("terminal.say")
+        allow(Output).to receive_message_chain("terminal.color")
         subject.print(nil, nil)
       end
     end

data/spec/opsicle/monitor/app_spec.rb

@@ -30,6 +30,11 @@ describe Opsicle::Monitor::App do
       expect(@app.restarting).to equal(false)
     end
 
+    it "raises error without a tty" do
+      expect($stdout).to receive(:tty?) { false }
+      expect { Opsicle::Monitor::App.new("staging", {}) }.to raise_error(RuntimeError, "Monitor requires a TTY.")
+    end
+
     context "when the app is montoring a deploy" do
       before do
         @app = Opsicle::Monitor::App.new("staging", {:deployment_id => 123})
@@ -42,6 +47,11 @@ describe Opsicle::Monitor::App do
       it "assigns a deploy" do
         expect(@app.deploy).to be_an_instance_of(Opsicle::Deployment)
       end
+
+      it "works without a tty for a deployment" do
+        allow($stdout).to receive(:tty?) { false }
+        Opsicle::Monitor::App.new("staging", {:deployment_id => 123})
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk