jumpup-heroku 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 118a1d1cc65a278d3ec2a5c3b74ffaf3a67a8209
-  data.tar.gz: 9dcc7fb2c844f5499f70ef72516be88a1b436e4a
+  metadata.gz: c564b5a44dfbb3effed01ed16bd50745d9c0ec77
+  data.tar.gz: 8daa28ab755bea85c38ddbb4a1d517cfc629e3f4
 SHA512:
-  metadata.gz: d4e8cc321ff6d3be90ebbaed0528ba24b7031ec8bceed934c2943e8b30e73ead58dc2100f6e7fae0b5a8dd6a49c04019e3bafced352d5541553f841f98c8fa20
-  data.tar.gz: d4f9ad4f84115ca9abef1d6f1dcc85cfae9e23b290912c1f6c03bceed48680c91668651fa429b329ac10e34e2f3bb96ab91c0f7c21aeec9397db96b99a8c7f42
+  metadata.gz: f164b39e121324149aeaed39a83f42012fd46e75cca118da23af01ac9d0f071cfbb4d59e3d75e5daed2ca3834cae078c37e5754d7912e47167f498f5ac86feac
+  data.tar.gz: dbd43c7a4726415440e8c7871c9fcd9ea946a87471798001becd1fc4999e68b17145c13a678231020c59693f1c974033b6aa3839e3bdc39d5e70fce454baa35c

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.0

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.0.5 (March 31, 2014)
+
+### features
+
+### improvements
+- Update Ruby version to 2.1.0
+- Send to heroku only the defined branches
+
+### bug fixes
+- Fix check for whether we should run `db:migrate` / `db:seeds` on production [[GH-38](https://github.com/Helabs/jumpup-heroku/issues/38)] / [[GH-40](https://github.com/Helabs/jumpup-heroku/pull/40)]
+
 ## 0.0.4 (February 21, 2014)
 
 ### features
@@ -13,6 +24,7 @@
 - Do not set INTEGRATING_BY again if you're already there
 - Add info about current branch when git push
 - Make sure that git name is setup
+- Skip DB related tasks if nothing has changed since the last deploy [[GH-33](https://github.com/Helabs/jumpup-heroku/pull/33)]
 
 ### bug fixes
 

data/README.md

@@ -22,39 +22,6 @@ Without groups on Gemfile, because of initializer.
   Jumpup::Heroku.configure do |config|
     config.app = 'myapp'
   end if Rails.env.development?
-  ```
-
-	If you use [Heroku Accounts](https://github.com/ddollar/heroku-accounts)
-
-  ```ruby
-  # config/initializers/jumpup-heroku.rb
-  Jumpup::Heroku.configure do |config|
-    config.account(:name_of_account1) do |account1|
-      account1.app = 'myapp1'
-    end
-    config.account(:name_of_account2) do |account2|
-      account2.app = 'myapp2'
-      account2.run_database_tasks = false # Default: true
-    end
-  end if Rails.env.development?
-  ```
-
-  Have production and staging app? Do like this:
-
-  ```ruby
-  Jumpup::Heroku.configure do |config|
-    config.staging_app = 'myapp-staging'
-    config.production_app = 'myapp'
-  end if Rails.env.development?
-  ```
-
-  If you need to disable remote database tasks (backup, migrate and seed):
-
-  ```ruby
-  Jumpup::Heroku.configure do |config|
-    config.app = 'myapp'
-    config.run_database_tasks = false # Default: true
-  end if Rails.env.development?
   ```
 
 2. Add to the tasks on jumpup.rake the tasks to deploy on Heroku:
@@ -74,10 +41,73 @@ Without groups on Gemfile, because of initializer.
   )
   ```
 
+### Production and staging apps
+
+Have production and staging app? Do like this:
+
+```ruby
+Jumpup::Heroku.configure do |config|
+  config.staging_app = 'myapp-staging'
+  config.production_app = 'myapp'
+end if Rails.env.development?
+```
+The branch send to staging app is `master` and the branch send to production is the `production`.
+
+### Using heroku accounts
+
+If you use [Heroku Accounts](https://github.com/ddollar/heroku-accounts)
+
+```ruby
+# config/initializers/jumpup-heroku.rb
+Jumpup::Heroku.configure do |config|
+
+  config.account(:name_of_account1) do |account1|
+    account1.app = 'myapp1'
+  end
+
+  config.account(:name_of_account2) do |account2|
+    account2.app = 'myapp2'
+    account2.run_database_tasks = false # Default: true
+  end
+end if Rails.env.development?
+```
+
+### Database tasks
+
+If you need to disable remote database tasks (backup, migrate and seed):
+
+```ruby
+Jumpup::Heroku.configure do |config|
+config.app = 'myapp'
+config.run_database_tasks = false # Default: true
+end if Rails.env.development?
+```
+
 ### Deploy to production
 
+#### When I have a single app
+
 Run ```rake jumpup:heroku:deploy:production``` or as an alias ```rake integrate:production```
 
+#### When I have staging and production apps
+
+We have the following config
+
+| Branch        | App Environment |
+| ------------- |-----------------|
+| master        | staging         |
+| production    | production      |
+
+So to send to production we need to
+
+```bash
+$ git checkout production
+$ git merge master
+$ git push -u origin production
+```
+
+And send to Heroku with ```rake jumpup:heroku:deploy:production``` or as an alias ```rake integrate:production```
+
 ## Versioning
 
 Jumpup-heroku follow the [Semantic Versioning](http://semver.org/).
@@ -90,6 +120,10 @@ If you have problems, please create a [Github Issue](https://github.com/Helabs/j
 
 Please see [CONTRIBUTING.md](https://github.com/Helabs/jumpup-heroku/blob/master/CONTRIBUTING.md) for details.
 
+## Maintainers
+
+- [Thiago Belem](https://github.com/TiuTalk)
+
 ## Release
 
 Follow this steps to release a new version of the gem.

data/lib/jumpup/heroku/configuration.rb

@@ -31,6 +31,15 @@ module Jumpup
         boolean_run_database_tasks? && (only_app? || only_production_and_staging_apps?)
       end
 
+      def deploy_branch
+        'master'
+      end
+
+      def deploy_to_production_branch
+        return 'production' if production_app
+        'master'
+      end
+
       private
 
         def current_account

data/lib/jumpup/heroku/env.rb

@@ -10,7 +10,9 @@ module Jumpup
             staging_app: Jumpup::Heroku.configuration.staging_app,
             production_app: Jumpup::Heroku.configuration.production_app,
             run_database_tasks: Jumpup::Heroku.configuration.run_database_tasks,
-            host: Jumpup::Heroku.configuration.host
+            host: Jumpup::Heroku.configuration.host,
+            deploy_branch: Jumpup::Heroku.configuration.deploy_branch,
+            deploy_to_production_branch: Jumpup::Heroku.configuration.deploy_to_production_branch,
           }.delete_if { |k, v| v.nil? }
         else
           error_message = 'Check your `/config/initializers/jumpup-heroku.rb` and ' \

data/lib/jumpup/heroku/integrate.rb

@@ -3,29 +3,50 @@ module Jumpup
 
     class Integrate
 
+      attr_reader :app
+
       def self.deploy
-        integrate.deploy
+        message = "Starting to deploy on Heroku app #{integrate.app}"
+        integrate.when_branch_send_to_heroku(message) do
+          integrate.deploy
+        end
       end
 
       def self.deploy_to_production
         app = Env.all[:production_app]
-        new(app).deploy_to_production
+        integrate = new(app)
+        message = "Starting to deploy to production on Heroku app #{integrate.app}"
+        integrate.when_branch_send_to_heroku(message) do
+          integrate.deploy_to_production
+        end
       end
 
       def self.add_remote
-        integrate.add_remote
+        message = "Adding Heroku git remotes for app #{integrate.app}"
+        integrate.when_branch_send_to_heroku(message) do
+          integrate.add_remote
+        end
       end
 
       def self.check
-        integrate.check
+        message = "Checking if there's already someone integrating to #{integrate.app}"
+        integrate.when_branch_send_to_heroku(message) do
+          integrate.check
+        end
       end
 
       def self.lock
-        integrate.lock
+        message = "Locking Heroku integration on app #{integrate.app}"
+        integrate.when_branch_send_to_heroku(message) do
+          integrate.lock
+        end
       end
 
       def self.unlock
-        integrate.unlock
+        message = "Unlocking Heroku integration on app #{integrate.app}"
+        integrate.when_branch_send_to_heroku(message) do
+          integrate.unlock
+        end
       end
 
       def self.integrate
@@ -39,15 +60,27 @@ module Jumpup
         @envs = Env.all
       end
 
+      def when_branch_send_to_heroku(message, &block)
+        puts "--> #{message}"
+        if branches_that_send_to_heroku.include?(actual_branch)
+          block.call
+        else
+          puts "----> Skipping since you are in a feature branch [#{actual_branch}]"
+        end
+      end
+
+      def branches_that_send_to_heroku
+        [Env.all[:deploy_branch], Env.all[:deploy_to_production_branch]]
+      end
+
       def deploy
         if run_database_tasks?
-          run_with_clean_env('git fetch heroku')
           check_if_migration_is_needed
           check_if_seed_is_needed
         end
 
         backup
-        push
+        push(Env.all[:deploy_branch])
         migrate
         seed
         restart
@@ -55,7 +88,6 @@ module Jumpup
 
       def deploy_to_production
         if run_database_tasks?
-          run_with_clean_env('git fetch heroku')
           check_if_migration_is_needed
           check_if_seed_is_needed
         end
@@ -66,7 +98,7 @@ module Jumpup
         maintenance
         backup
         tag
-        push
+        push(Env.all[:deploy_to_production_branch])
         migrate
         seed
         close_maintenance
@@ -74,45 +106,44 @@ module Jumpup
       end
 
       def add_remote
-        puts "--> Adding Heroku git remotes for app #{app}"
         remote = run_with_clean_env("git remote | grep heroku").strip
         exec_with_clean_env("git remote add heroku git@heroku.com:#{app}.git") if remote.blank?
       end
 
       def check
-        puts "--> Checking if there's already someone integrating to #{app}"
-
         return if can_start_integration?(user)
-
-        puts "--> Project is already being integrated by '#{integrating_by}', halting"
+        puts "----> Project is already being integrated by '#{integrating_by}', halting"
         exit 1
       end
 
       def lock
         return if integrating_by?(user)
 
-        puts "--> Locking Heroku integration for you (#{user})"
+        puts "----> Locking Heroku integration for you (#{user})"
         exec_with_clean_env("heroku config:set INTEGRATING_BY='#{user}' --app #{app}")
       end
 
       def unlock
-        puts "--> Unlocking Heroku integration"
         exec_with_clean_env("heroku config:unset INTEGRATING_BY --app #{app}")
       end
 
       private
-        attr_reader :app, :envs, :maintenance_mode
+        attr_reader :envs, :maintenance_mode
 
         def check_if_migration_is_needed
-          files_changed       = run_with_clean_env("git diff HEAD heroku/master --name-only -- db/migrate | wc -l").strip.to_i
+          files_changed       = run_with_clean_env("git diff HEAD #{latest_remote_sha} --name-only -- db/migrate | wc -l").strip.to_i
           @migrations_changed = files_changed > 0
         end
 
         def check_if_seed_is_needed
-          files_changed  = run_with_clean_env("git diff HEAD heroku/master --name-only -- db/seeds* | wc -l").strip.to_i
+          files_changed  = run_with_clean_env("git diff HEAD #{latest_remote_sha} --name-only -- db/seeds* | wc -l").strip.to_i
           @seeds_changed = files_changed > 0
         end
 
+        def latest_remote_sha
+          @latest_remote_sha ||= run_with_clean_env("git ls-remote git@heroku.com:#{app}.git HEAD 2>/dev/null | awk '{ print $1 }'").strip
+        end
+
         def can_start_integration?(user)
           integrating_by.blank? || integrating_by?(user)
         end
@@ -132,7 +163,7 @@ module Jumpup
         def validate_username
           user = run_with_clean_env("git config --get user.name").strip
           if user.blank?
-            puts "--> You must setup your git user name. Use: git config --global user.name 'your name'"
+            puts "----> You must setup your git user name. Use: git config --global user.name 'your name'"
             exit 1
           end
           user
@@ -161,7 +192,7 @@ module Jumpup
 
         def backup
           return unless run_database_tasks?
-          puts "--> [#{app}] Backing up database"
+          puts "----> [#{app}] Backing up database"
           exec_with_clean_env("heroku pgbackups:capture --expire --app #{app}")
         end
 
@@ -169,10 +200,10 @@ module Jumpup
           return unless run_database_tasks?
 
           if @migrations_changed
-            puts "--> [#{app}] Migrating"
+            puts "----> [#{app}] Migrating"
             exec_with_clean_env("heroku run rake db:migrate --app #{app}")
           else
-            puts "--> [#{app}] Skipping migrations"
+            puts "----> [#{app}] Skipping migrations"
           end
         end
 
@@ -180,29 +211,29 @@ module Jumpup
           return unless run_database_tasks?
 
           if @seeds_changed
-            puts "--> [#{app}] Seeding"
+            puts "----> [#{app}] Seeding"
             exec_with_clean_env("heroku run rake db:seed --app #{app}")
           else
-            puts "--> [#{app}] Skipping seeds"
+            puts "----> [#{app}] Skipping seeds"
           end
         end
 
         def restart
-          puts "--> [#{app}] Restarting"
+          puts "----> [#{app}] Restarting"
           exec_with_clean_env("heroku restart --app #{app}")
         end
 
-        def push
-          puts "--> [#{app}] Pushing to #{host} from branch [#{actual_branch}]"
-          exec_with_clean_env("git push git@#{host}:#{app}.git HEAD:master")
+        def push(branch)
+          puts "----> [#{app}] Pushing to #{host} from branch [#{branch}]"
+          exec_with_clean_env("git push git@#{host}:#{app}.git #{branch}:master")
         end
 
         def confirm_deploy
-          confirm("[#{app}] Deploying to production using brach [#{actual_branch}]")
+          confirm("[#{app}] Deploying to production using branch [#{Env.all[:deploy_to_production_branch]}]")
         end
 
         def spec
-          puts "--> Running all specs"
+          puts "----> Running all specs"
           Rake::Task['spec'].invoke
         end
 
@@ -217,10 +248,10 @@ module Jumpup
 
         def maintenance
           if maintenance?
-            puts "--> [#{app}] Setting Maintenance on"
+            puts "----> [#{app}] Setting Maintenance on"
             exec_with_clean_env("heroku maintenance:on --app #{app}")
             restart
-            puts "--> [#{app}] Waiting 20 seconds to app come back (in maintenance mode)"
+            puts "----> [#{app}] Waiting 20 seconds to app come back (in maintenance mode)"
             sleep(20)
           end
         end
@@ -229,10 +260,10 @@ module Jumpup
           iso_date = Time.now.strftime('%Y-%m-%dT%H%M%S')
           tag_name = "production-#{iso_date}"
 
-          puts "--> Tagging as #{tag_name}"
+          puts "----> Tagging as #{tag_name}"
           exec_with_clean_env("git tag #{tag_name} master")
 
-          puts "--> Pushing to origin"
+          puts "----> Pushing to origin"
           exec_with_clean_env("git push origin #{tag_name}")
         end
 

data/lib/jumpup/heroku/version.rb

@@ -1,5 +1,5 @@
 module Jumpup
   module Heroku
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/spec/jumpup/heroku/configuration_spec.rb

@@ -1,25 +1,35 @@
 require 'spec_helper'
 
 describe Jumpup::Heroku::Configuration do
+
   before do
     Jumpup::Heroku.configuration = nil
   end
+
   describe ".configure" do
+
     describe "without configuration" do
+
       before do
         Jumpup::Heroku.configure do |config|
         end
       end
+
       subject do
         Jumpup::Heroku.configuration
       end
+
       its(:app) { should be_nil }
       its(:staging_app) { should be_nil }
       its(:production_app) { should be_nil }
       its(:run_database_tasks) { should be_true }
       its(:host) { should == 'heroku.com' }
+      its(:deploy_branch) { should eq('master') }
+      its(:deploy_to_production_branch) { should eq('master') }
     end
+
     describe "with configurations" do
+
       before do
         Jumpup::Heroku.configure do |config|
           config.app = 'myapp'
@@ -29,17 +39,24 @@ describe Jumpup::Heroku::Configuration do
           config.host = 'myhost.com'
         end
       end
+
       subject do
         Jumpup::Heroku.configuration
       end
+
       its(:app) { should eq('myapp') }
       its(:staging_app) { should eq('myapp-staging')}
       its(:production_app) { should eq('myapp-production') }
       its(:run_database_tasks) { should be_false }
       its(:host) { should eq('myhost.com') }
+      its(:deploy_branch) { should eq('master') }
+      its(:deploy_to_production_branch) { should eq('production') }
     end
+
     describe "with multiple accounts" do
+
       context "first account" do
+
         before { ENV.stub(:[]).with("HEROKU_ACCOUNT").and_return("first") }
         before do
           Jumpup::Heroku.configure do |config|
@@ -55,9 +72,11 @@ describe Jumpup::Heroku::Configuration do
             end
           end
         end
+
         subject do
           Jumpup::Heroku.configuration
         end
+
         its(:valid?) { should be_true }
         its(:app) { should be_nil }
         its(:staging_app) { should eq('myapp1-staging')}
@@ -65,7 +84,9 @@ describe Jumpup::Heroku::Configuration do
         its(:run_database_tasks) { should be_false }
         its(:host) { should eq('heroku.first') }
       end
+
       context "second account with default values" do
+
         before { ENV.stub(:[]).with("HEROKU_ACCOUNT").and_return("second") }
         before do
           Jumpup::Heroku.configure do |config|
@@ -80,9 +101,11 @@ describe Jumpup::Heroku::Configuration do
             end
           end
         end
+
         subject do
           Jumpup::Heroku.configuration
         end
+
         its(:valid?) { should be_true }
         its(:app) { should be_nil }
         its(:staging_app) { should eq('myapp2-staging')}
@@ -90,7 +113,9 @@ describe Jumpup::Heroku::Configuration do
         its(:run_database_tasks) { should be_false }
         its(:host) { should eq('mysecondhost.com') }
       end
+
       context "other account" do
+
         before { ENV.stub(:[]).with("HEROKU_ACCOUNT").and_return("third") }
         before do
           Jumpup::Heroku.configure do |config|
@@ -107,9 +132,11 @@ describe Jumpup::Heroku::Configuration do
             config.run_database_tasks = false
           end
         end
+
         subject do
           Jumpup::Heroku.configuration
         end
+
         its(:valid?) { should be_false }
         its(:app) { should be_nil }
         its(:staging_app) { should be_nil }
@@ -117,6 +144,7 @@ describe Jumpup::Heroku::Configuration do
         its(:run_database_tasks) { should be_false }
         its(:host) { should eq('heroku.com') }
       end
+
       context "without heroku accounts installed" do
         before { Jumpup::Heroku::Configuration.any_instance.stub(:current_account).and_return(:"") }
         before do
@@ -129,9 +157,11 @@ describe Jumpup::Heroku::Configuration do
             end
           end
         end
+
         subject do
           Jumpup::Heroku.configuration
         end
+
         its(:valid?) { should be_false }
         its(:app) { should be_nil }
         its(:staging_app) { should be_nil }
@@ -139,6 +169,7 @@ describe Jumpup::Heroku::Configuration do
         its(:run_database_tasks) { should be_true }
         its(:host) { should eq('heroku.com') }
       end
+
       context "without herou accounts installed and default values" do
         before { Jumpup::Heroku::Configuration.any_instance.stub(:current_account).and_return(:"") }
         before do
@@ -153,9 +184,11 @@ describe Jumpup::Heroku::Configuration do
             end
           end
         end
+
         subject do
           Jumpup::Heroku.configuration
         end
+
         its(:valid?) { should be_true }
         its(:app) { should be_nil }
         its(:staging_app) { should eq('myapp1-staging')}
@@ -164,128 +197,171 @@ describe Jumpup::Heroku::Configuration do
       end
     end
   end
+
   describe "#valid?" do
-    describe "with app" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.app = 'myapp'
+
+    describe 'app configs' do
+
+      describe "with app" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.app = 'myapp'
+          end
         end
-      end
-      it 'be valid' do
-        expect(Jumpup::Heroku.configuration).to be_valid
-      end
-    end
-    describe "with staging_app and production_app" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.production_app = 'myapp-production'
-          config.staging_app = 'myapp-staging'
+
+        it 'be valid' do
+          expect(Jumpup::Heroku.configuration).to be_valid
         end
       end
-      it 'be valid' do
-        expect(Jumpup::Heroku.configuration).to be_valid
-      end
-    end
-    describe "with app, staging_app and production_app" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.app = 'myapp'
-          config.production_app = 'myapp-production'
-          config.staging_app = 'myapp-staging'
+
+      describe "with staging_app and production_app" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.production_app = 'myapp-production'
+            config.staging_app = 'myapp-staging'
+          end
         end
-      end
-      it 'not be valid' do
-        expect(Jumpup::Heroku.configuration).to_not be_valid
-      end
-    end
-    describe "with staging_app" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.staging_app = 'myapp-staging'
+
+        it 'be valid' do
+          expect(Jumpup::Heroku.configuration).to be_valid
         end
       end
-      it 'not be valid' do
-        expect(Jumpup::Heroku.configuration).to_not be_valid
-      end
-    end
-    describe "with production_app" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.production_app = 'myapp-production'
+
+      describe "with app, staging_app and production_app" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.app = 'myapp'
+            config.production_app = 'myapp-production'
+            config.staging_app = 'myapp-staging'
+          end
         end
-      end
-      it 'not be valid' do
-        expect(Jumpup::Heroku.configuration).to_not be_valid
-      end
-    end
-    describe "with app and production_app" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.app = 'myapp'
-          config.production_app = 'myapp-production'
+
+        it 'not be valid' do
+          expect(Jumpup::Heroku.configuration).to_not be_valid
         end
       end
-      it 'not be valid' do
-        expect(Jumpup::Heroku.configuration).to_not be_valid
-      end
-    end
-    describe "with app and staging_app" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.app = 'myapp'
-          config.staging_app = 'myapp-staging'
+
+      describe "with staging_app" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.staging_app = 'myapp-staging'
+          end
+        end
+
+        it 'not be valid' do
+          expect(Jumpup::Heroku.configuration).to_not be_valid
         end
       end
-      it 'not be valid' do
-        expect(Jumpup::Heroku.configuration).to_not be_valid
+
+      describe "with production_app" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.production_app = 'myapp-production'
+          end
+        end
+
+        it 'not be valid' do
+          expect(Jumpup::Heroku.configuration).to_not be_valid
+        end
       end
-    end
-    describe "with true run_database_tasks" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.app = 'myapp'
-          config.run_database_tasks = true
+
+      describe "with app and production_app" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.app = 'myapp'
+            config.production_app = 'myapp-production'
+          end
+        end
+
+        it 'not be valid' do
+          expect(Jumpup::Heroku.configuration).to_not be_valid
         end
       end
-      it 'be valid' do
-        expect(Jumpup::Heroku.configuration).to be_valid
+
+      describe "with app and staging_app" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.app = 'myapp'
+            config.staging_app = 'myapp-staging'
+          end
+        end
+
+        it 'not be valid' do
+          expect(Jumpup::Heroku.configuration).to_not be_valid
+        end
       end
     end
-    describe "with false run_database_tasks" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.app = 'myapp'
-          config.run_database_tasks = false
+
+    describe 'run_database_tasks configs' do
+
+      describe "with true run_database_tasks" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.app = 'myapp'
+            config.run_database_tasks = true
+          end
+        end
+
+        it 'be valid' do
+          expect(Jumpup::Heroku.configuration).to be_valid
         end
       end
-      it 'be valid' do
-        expect(Jumpup::Heroku.configuration).to be_valid
-      end
-    end
-    describe "with invalid run_database_tasks" do
-      before do
-        Jumpup::Heroku.configure do |config|
-          config.app = 'myapp'
-          config.run_database_tasks = 'a'
+
+      describe "with false run_database_tasks" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.app = 'myapp'
+            config.run_database_tasks = false
+          end
+        end
+
+        it 'be valid' do
+          expect(Jumpup::Heroku.configuration).to be_valid
         end
       end
-      it 'be valid' do
-        expect(Jumpup::Heroku.configuration).to_not be_valid
+
+      describe "with invalid run_database_tasks" do
+
+        before do
+          Jumpup::Heroku.configure do |config|
+            config.app = 'myapp'
+            config.run_database_tasks = 'a'
+          end
+        end
+
+        it 'be valid' do
+          expect(Jumpup::Heroku.configuration).to_not be_valid
+        end
       end
     end
+
     describe "without configuration" do
+
       before do
         Jumpup::Heroku.configure do |config|
         end
       end
+
       it 'not be valid' do
         expect(Jumpup::Heroku.configuration).to_not be_valid
       end
     end
+
     describe "with configuration nil" do
+
       before do
         Jumpup::Heroku.configuration = nil
       end
+
       it 'not be valid' do
         pending "The bug is raised when have no config/initialier/heroku-deploy.rb file"
         expect(Jumpup::Heroku.configuration).to_not be_valid

data/spec/jumpup/heroku/env_spec.rb

@@ -1,44 +1,61 @@
 require 'spec_helper'
 
 describe Jumpup::Heroku::Env do
+
   before do
     Jumpup::Heroku.configuration = nil
   end
+
   describe "with app" do
+
     before do
       Jumpup::Heroku.configure do |config|
         config.app = 'myapp'
       end
     end
+
     it "have correct env info" do
-      expect(Jumpup::Heroku::Env.all).to eq({ app: 'myapp', run_database_tasks: true, host: 'heroku.com' })
+      config = { app: 'myapp', run_database_tasks: true, host: 'heroku.com',
+                 deploy_branch: 'master', deploy_to_production_branch: 'master'}
+      expect(Jumpup::Heroku::Env.all).to eq(config)
     end
   end
+
   describe "with staging_app and production_app" do
+
     before do
       Jumpup::Heroku.configure do |config|
         config.production_app = 'myapp-production'
         config.staging_app = 'myapp-staging'
       end
     end
+
     it "have correct env info" do
-      result = { production_app: 'myapp-production', staging_app: 'myapp-staging', run_database_tasks: true, host: 'heroku.com' }
-      expect(Jumpup::Heroku::Env.all).to eq(result)
+      config = { production_app: 'myapp-production', staging_app: 'myapp-staging',
+                 run_database_tasks: true, host: 'heroku.com',
+                 deploy_branch: 'master', deploy_to_production_branch: 'production'}
+      expect(Jumpup::Heroku::Env.all).to eq(config)
     end
   end
+
   describe "with run_database_tasks" do
+
     before do
       Jumpup::Heroku.configure do |config|
         config.app = 'myapp'
         config.run_database_tasks = false
       end
     end
+
     it "have correct env info" do
-      result = { app: 'myapp', run_database_tasks: false, host: 'heroku.com' }
+      result = { app: 'myapp', run_database_tasks: false, host: 'heroku.com',
+                 deploy_branch: 'master', deploy_to_production_branch: 'master' }
       expect(Jumpup::Heroku::Env.all).to eq(result)
     end
   end
+
   describe "with a invalid config env" do
+
     before do
       Jumpup::Heroku.configure do |config|
         config.app = 'myapp'
@@ -47,6 +64,7 @@ describe Jumpup::Heroku::Env do
         config.run_database_tasks = 'a'
       end
     end
+
     it 'raise error' do
       expect do
         Jumpup::Heroku::Env.all

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: jumpup-heroku
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - HE:labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -103,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks to deploy on heroku