aerosol 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f88639e8e26f2fbd0e6d084dc7cf892fe64a64
-  data.tar.gz: 1900da4e6336f5ddcc1f5afc25c749983697bf22
+  metadata.gz: 31c767638dd285ff3db576f4dacdaff662ca52e8
+  data.tar.gz: 4052d794ed7b58ab82fd571a28ce9e9c52255458
 SHA512:
-  metadata.gz: 110a201822e5fb9f48de030db928065630d9a11c183854c93e0862b628f1a567e36b8d1342bebbb5ce0b5ef722ef86c2aa02bc38f716063b1fd41282e410d0c8
-  data.tar.gz: a1397e305836e09a0cf8022c5fdc69cde103e39c3e1f2ebaaf9a62275a8a7ba7e6e4a1892fbdfde456d7a09c3ee50d9c808955645807202c3f0fecba61bc697d
+  metadata.gz: f4b7fcfcb3958c646d6c2707a91fb9cff4b72186f679d63129872cb5d2dcfb4694282c6b0fb3b73d211dabb33cfaf77e2ddd54357c95d4aa37fd8ff2a652d92d
+  data.tar.gz: f1240b253337fd73fd9316808ceb08d0d12676905f539c6d25469ae5431b6be43453d25a4647f080593bf0e5c948616b17f4f4c8cca0b5b11441107bed0c575a

data/lib/aerosol/deploy.rb

@@ -36,8 +36,10 @@ class Aerosol::Deploy
     @live_check
   end
 
-  def is_alive?(&block)
-    @is_alive = block unless block.nil?
+  def is_alive?(command = nil, &block)
+    fail 'Command and block specified' if command && block
+    @is_alive = block if block
+    @is_alive = command if command
     @is_alive
   end
 

data/lib/aerosol/runner.rb

@@ -106,13 +106,18 @@ class Aerosol::Runner
     ssh.with_connection(instance) do |session|
       start_tailing_logs(ssh, instance) if log_pids[instance.instance_id].nil?
       debug "checking if #{instance.instance_id} is healthy"
-      success = if is_alive?.nil?
-        debug 'Using default site live check'
-        check_site_live(session)
-      else
-        debug 'Using custom site live check'
-        is_alive?.call(session, self)
-      end
+      success =
+        case is_alive?
+        when Proc
+          debug 'Using custom site live check'
+          is_alive?.call(session, self)
+        when String
+          debug "Using custom site live check: #{is_alive?}"
+          check_live_with(session, is_alive?)
+        else
+          debug 'Using default site live check'
+          check_site_live(session)
+        end
     end
 
     if success
@@ -136,7 +141,10 @@ class Aerosol::Runner
       '-O',
       '/dev/null'
     ].compact.join(' ')
+    check_live_with(session, command)
+  end
 
+  def check_live_with(session, command)
     debug "running #{command}"
     ret = ssh_exec!(session, command)
     debug "finished running #{command}"

data/lib/aerosol/version.rb

@@ -1,5 +1,5 @@
 # Copyright Swipely, Inc.  All rights reserved.
 
 module Aerosol
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/spec/aerosol/deploy_spec.rb

@@ -180,7 +180,24 @@ describe Aerosol::Deploy do
       end
     end
 
-    context 'when an argument is given' do
+    context 'when a command and block are given' do
+      it 'fails' do
+        expect { subject.is_alive?('true', &check) }.to raise_error
+      end
+    end
+
+    context 'when a command is given' do
+      let(:command) { 'bash -lc "[[ -e /tmp/up ]]"' }
+
+      it 'sets is_alive? to that value' do
+        expect { subject.is_alive?(command) }
+          .to change { subject.is_alive? }
+          .from(nil)
+          .to(command)
+      end
+    end
+
+    context 'when a block is given' do
       it 'sets is_alive? to that value' do
         expect { subject.is_alive?(&check) }
           .to change { subject.is_alive? }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerosol
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Instance-based deploys made easy
@@ -293,3 +293,4 @@ test_files:
 - spec/aerosol_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr.rb
+has_rdoc: