heroku_deploy 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/heroku_deploy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{heroku_deploy}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ross Hale", "Chris Lemcke"]

data/lib/heroku_deploy/tasks.rb

@@ -47,11 +47,13 @@ class HerokuDeploy
           puts "Creating #{staging_app} Heroku app"
           puts ""
           `heroku app:create #{staging_app}`
+          `heroku addons:add bundles:single --app #{staging_app}`
 
           puts ""
           puts "Creating #{production_app} Heroku app"
           puts ""
           `heroku app:create #{production_app}`
+          `heroku addons:add bundles:single --app #{production_app}`
 
           puts ""
           puts "Setup Complete!"
@@ -151,19 +153,33 @@ class HerokuDeploy
     `heroku bundles:capture backup-#{timestamp} --app #{app}`
     puts "New Bundle Captured on Heroku: backup-#{timestamp}"
 
-    while !`heroku bundles --app #{app}`.include?("complete") do
+    puts "Waiting for Bundle to become available..."
+    while bundle_not_yet_captured?( app ) do
+      print "."
     end
 
-    puts "New Bundle Ready For Download"
+    if bundle_captured?( app )
+      puts "New Bundle Ready For Download"
 
-    `heroku bundles:download backup-#{timestamp} --app #{app}`
-    `mv #{app}.tar.gz #{app}-#{timestamp}.tar.gz`
-
-    puts "New Bundle Downloaded: #{app}-#{timestamp}.tar.gz"
+      `heroku bundles:download backup-#{timestamp} --app #{app}`
+      `mv #{app}.tar.gz #{app}-#{timestamp}.tar.gz`
 
+      puts "New Bundle Downloaded: #{app}-#{timestamp}.tar.gz"
+    end
+    
     puts "Backup Complete!"
     puts ""
 
   end
 
+  protected
+
+  def bundle_not_yet_captured?( app )
+    `heroku bundles --app #{app}`.include?(" capturing ")
+  end
+
+  def bundle_captured?( app )
+    `heroku bundles --app #{app}`.include?(" complete ")
+  end
+
 end

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
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Ross Hale