heroku_deploy 0.1.4 → 0.1.5

data/README.markdown

@@ -47,6 +47,9 @@ or
 
     rake heroku_deploy:backup:production
 
+To skip the backup when deploying to staging or production run:
+
+    rake heroku_deploy:staging backup=false
+
 ###Coming Soon
 * Before and after hooks that allow you to arbitrarily execute code before and after deploy
-* a --nobackup option that skips the backup when deploying to production or staging

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/heroku_deploy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{heroku_deploy}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   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

@@ -98,7 +98,7 @@ class HerokuDeploy
   end
 
   def staging
-    backup staging_app
+    backup staging_app unless no_backup
 
     puts "Deploying to Staging"
     merge "master", "staging"
@@ -110,7 +110,7 @@ class HerokuDeploy
   end
 
   def production
-    backup production_app
+    backup production_app unless no_backup
 
     puts "Deploying to Production"
     merge "staging", "production"
@@ -149,7 +149,7 @@ class HerokuDeploy
 
     `heroku maintenance:on --app #{app}`
 
-    puts "Waiting for slug to re-compile..."
+    print "Waiting for slug to re-compile..."
     wait_for_maintenance_page( app )
     puts ""
     
@@ -172,7 +172,6 @@ class HerokuDeploy
 
   end
 
-
   def backup( app )
     puts ""
     puts "Beginning Backup"
@@ -222,6 +221,8 @@ class HerokuDeploy
     `heroku bundles --app #{app}`.include?(" complete ")
   end
 
-  
+  def no_backup
+    ENV['BACKUP'] == "false" || ENV['backup'] == "false"
+  end
 
 end

data/test/heroku_deploy_test.rb

@@ -40,14 +40,6 @@ class HerokuDeployTest < Test::Unit::TestCase
         @heroku_deploy.setup
       end
 
-      should "invoke staging" do
-        @heroku_deploy.staging
-      end
-
-      should "invoke production" do
-        @heroku_deploy.production
-      end
-
       should "invoke backup_staging" do
         @heroku_deploy.backup_staging
       end
@@ -56,6 +48,34 @@ class HerokuDeployTest < Test::Unit::TestCase
         @heroku_deploy.backup_production
       end
 
+      context "with backup" do
+
+        should "invoke staging and backup" do
+          mock.proxy(@heroku_deploy).backup("example-staging")
+          @heroku_deploy.staging
+        end
+
+        should "invoke production and backup" do
+          mock.proxy(@heroku_deploy).backup("example")
+          @heroku_deploy.production
+        end
+      end
+
+      context "without backup" do
+
+        should "invoke staging and skip backup" do
+          ENV['BACKUP'] = "false"
+          dont_allow(@heroku_deploy).backup("example-staging")
+          @heroku_deploy.staging
+        end
+
+        should "invoke production and skip backup" do
+          ENV['backup'] = "false"
+          dont_allow(@heroku_deploy).backup("example")
+          @heroku_deploy.production
+        end
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_deploy
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ross Hale