heroku_deploy 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/heroku_deploy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{heroku_deploy}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ross Hale"]
-  s.date = %q{2010-09-09}
+  s.date = %q{2010-09-10}
   s.description = %q{Deploy strategy and scripts for Heroku.}
   s.email = %q{rosshale@gmail.com}
   s.extra_rdoc_files = [

data/lib/heroku_deploy/tasks.rb

@@ -150,7 +150,7 @@ class HerokuDeploy
     `heroku maintenance:on --app #{app}`
 
     print "Waiting for slug to re-compile..."
-    wait_for_maintenance_page( app )
+    wait_for_maintenance_on( app )
     puts ""
     
     puts "Pushing to #{app}"
@@ -170,6 +170,9 @@ class HerokuDeploy
 
     `heroku maintenance:off --app #{app}`
 
+    print "Waiting for app to go live..."
+    wait_for_maintenance_off(app)
+    puts ""
   end
 
   def backup( app )
@@ -204,10 +207,23 @@ class HerokuDeploy
 
   end
 
-  def wait_for_maintenance_page(app)
-    response_code = 200
-    while (response_code != 422)
-      response_code = HTTParty.get("http://#{app}.heroku.com").code
+  def maintenance_off(app)
+    HTTParty.get("http://#{app}.heroku.com").code != 422
+  end
+
+  def wait_for_maintenance_on(app)
+    while (maintenance_off(app))
+      print "."
+      STDOUT.flush
+    end
+  end
+
+  def maintenance_on(app)
+    HTTParty.get("http://#{app}.heroku.com").code != 200
+  end
+
+  def wait_for_maintenance_off(app)
+    while (maintenance_on(app))
       print "."
       STDOUT.flush
     end

data/test/heroku_deploy_test.rb

@@ -25,7 +25,8 @@ class HerokuDeployTest < Test::Unit::TestCase
         stub(@heroku_deploy).puts
         stub(@heroku_deploy).bundle_not_yet_captured? { false }
         stub(@heroku_deploy).bundle_captured? { true }
-        stub.any_instance_of(HTTParty::Response).code { 422 }
+        stub(@heroku_deploy).maintenance_off { false }
+        stub(@heroku_deploy).maintenance_on { false }
       end
 
       should "assign staging_app" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_deploy
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Ross Hale
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -07:00
+date: 2010-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: []