jumpup-heroku 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c31d2c9aa6f35da153e9f7a632c4a6a609c96acc
-  data.tar.gz: 947acb21f4f2d079f486005536d73230041c4072
+  metadata.gz: 1138bd5883940e7d6c8ebbe05eeed5168a684078
+  data.tar.gz: 7222d1259b990b16981e38ca4e008f9776b625dc
 SHA512:
-  metadata.gz: 372c4b33cd75739c43f2f74af77bfab74f36353f8c6a6452db317961d1e5dda01f372dd8cf7f188e6c37b19ed70fecc0069c465cad1a5bfa10612286baf8eafd
-  data.tar.gz: e1a0360be22f61d9897be8696d22e2cb6b6f5e8994847e1dcb15fcecc725efb0624f21915bb72d8d7070180bdd4cc5b4bc64a060a91069ca9ab93aef631f4f08
+  metadata.gz: 74e2825fe8e235c3258f3edb51de1e977bff25b1edee1b32d1770a5139cfa5e350de7e30470adfa155119b82c0fda947864911f2449ed17ddb404ae69fdfb260
+  data.tar.gz: a2bf33ba4f153b5469460f894861d29c6597689f0006464d90ac847aaca9fe1878901f9bda99f7e153e4a0a27b8e4038dfd89bd66ee3c3f3a76e8bc61a88a6f7

data/README.md

@@ -1,6 +1,6 @@
 # Jumpup-heroku
 
-Rake tasks to deploy on heroku.
+Rake tasks to deploy any Rails application on [Heroku](http://heroku.com) using [Jumpup](https://github.com/Helabs/jumpup).
 
 ## Instalation
 
@@ -21,6 +21,21 @@ Without groups on Gemfile, because of initializer.
   Jumpup::Heroku.configure do |config|
     config.app = 'myapp'
   end
+  ```
+
+	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
   ```
 
   Have production and staging app? Do like this:
@@ -41,23 +56,20 @@ Without groups on Gemfile, because of initializer.
   end
   ```
 
-2. Add to the tasks on integration.rake the tasks to deploy on Heroku:
+2. Add to the tasks on jumpup.rake the tasks to deploy on Heroku:
 
   ```ruby
-  # integration.rake
+  # lib/tasks/jumpup.rake
 
   INTEGRATION_TASKS = %w(
-    jumpup:heroku:add_remote
-    jumpup:heroku:check
-    jumpup:heroku:lock
-    integration:start
-    integration:bundle_install
+    jumpup:heroku:start
+    jumpup:start
+    jumpup:bundle_install
     db:migrate
     spec
-    integration:coverage_verify
-    integration:finish
-    jumpup:heroku:deploy
-    jumpup:heroku:unlock
+    jumpup:coverage_verify
+    jumpup:finish
+    jumpup:heroku:finish
   )
   ```
 
@@ -77,3 +89,7 @@ Please see [CONTRIBUTING.md](https://github.com/Helabs/jumpup-heroku/blob/master
 
 Jumpup-heroku is maintained and funded by [HE:labs](http://helabs.com.br/opensource/).
 Thank you to all the [contributors](https://github.com/Helabs/jumpup-heroku/graphs/contributors).
+
+## License
+
+Jumpup-heroku is Copyright © 2013-2014 HE:labs. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/Rakefile

@@ -1 +1,14 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec

data/lib/jumpup/heroku/configuration.rb

@@ -12,10 +12,18 @@ module Jumpup
 
 
     class Configuration
-      attr_accessor :app, :staging_app, :production_app, :run_database_tasks
+      attr_accessor :app, :staging_app, :production_app, :run_database_tasks, :host
 
       def initialize
         @run_database_tasks ||= true
+        @host ||= 'heroku.com'
+      end
+
+      def account(account_token)
+        if account_token == current_account
+          self.host = "heroku.#{account_token}"
+          yield(self)
+        end
       end
 
       def valid?
@@ -24,6 +32,10 @@ module Jumpup
 
       private
 
+        def current_account
+          (ENV["HEROKU_ACCOUNT"] || %x{ git config heroku.account }.chomp).to_sym
+        end
+
         def only_app?
           app && staging_app.nil? && production_app.nil?
         end

data/lib/jumpup/heroku/env.rb

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

data/lib/jumpup/heroku/integrate.rb

@@ -113,30 +113,30 @@ module Jumpup
 
         def backup
           return unless run_database_tasks?
-          puts "--> Backing up database via Heroku"
+          puts "--> [#{app}] Backing up database"
           run_with_clean_env("heroku pgbackups:capture --expire --app #{app}")
         end
 
         def migrate
           return unless run_database_tasks?
-          puts "--> Migrating"
+          puts "--> [#{app}] Migrating"
           run_with_clean_env("heroku run rake db:migrate --app #{app}")
         end
 
         def seed
           return unless run_database_tasks?
-          puts "--> Seeding"
+          puts "--> [#{app}] Seeding"
           run_with_clean_env("heroku run rake db:seed --app #{app}")
         end
 
         def restart
-          puts "--> Restarting"
+          puts "--> [#{app}] Restarting"
           run_with_clean_env("heroku restart --app #{app}")
         end
 
         def push
-          puts "--> Pushing"
-          run_with_clean_env("git push git@heroku.com:#{app}.git HEAD:master")
+          puts "--> [#{app}] Pushing to #{host}"
+          run_with_clean_env("git push git@#{host}:#{app}.git HEAD:master")
         end
 
         def confirm_deploy
@@ -159,10 +159,10 @@ module Jumpup
 
         def maintenance
           if maintenance?
-            puts "--> Setting Maintenance on"
+            puts "--> [#{app}] Setting Maintenance on"
             run_with_clean_env("heroku maintenance:on --app #{app}")
             restart
-            puts "--> 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
@@ -184,6 +184,10 @@ module Jumpup
             run_with_clean_env("heroku maintenance:off --app #{app}")
           end
         end
+
+        def host
+          Env.all[:host]
+        end
     end
   end
 end

data/lib/jumpup/heroku/version.rb

@@ -1,5 +1,5 @@
 module Jumpup
   module Heroku
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/tasks/integrate.rake

@@ -1,6 +1,9 @@
 namespace :jumpup do
   namespace :heroku do
 
+    task :start => ["add_remote", "check", "lock"]
+    task :finish => ["deploy", "unlock"]
+
     desc "Add Heroku git remotes"
     task add_remote: :environment do
       Jumpup::Heroku::Integrate.add_remote

data/spec/jumpup/heroku/configuration_spec.rb

@@ -1,82 +1,192 @@
 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' }
     end
-
     describe "with configurations" do
-
       before do
         Jumpup::Heroku.configure do |config|
           config.app = 'myapp'
           config.production_app = 'myapp-production'
           config.staging_app = 'myapp-staging'
           config.run_database_tasks = false
+          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') }
+    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|
+            config.run_database_tasks = false
+            config.account(:first) do |first|
+              first.app = 'myapp1'
+              first.production_app = 'myapp1-production'
+              first.staging_app = 'myapp1-staging'
+            end
+            config.account(:second) do |second|
+              second.app = 'myapp2'
+              second.production_app = 'myapp2-production'
+              second.staging_app = 'myapp2-staging'
+            end
+          end
+        end
+        subject do
+          Jumpup::Heroku.configuration
+        end
+        its(:app) { should eq('myapp1') }
+        its(:staging_app) { should eq('myapp1-staging')}
+        its(:production_app) { should eq('myapp1-production') }
+        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|
+            config.app = 'myapp1'
+            config.production_app = 'myapp1-production'
+            config.staging_app = 'myapp1-staging'
+            config.run_database_tasks = true
+            config.account(:second) do |second|
+              second.app = 'myapp2'
+              second.production_app = 'myapp2-production'
+              second.staging_app = 'myapp2-staging'
+              second.run_database_tasks = false
+              second.host = 'mysecondhost.com'
+            end
+          end
+        end
+        subject do
+          Jumpup::Heroku.configuration
+        end
+        its(:app) { should eq('myapp2') }
+        its(:staging_app) { should eq('myapp2-staging')}
+        its(:production_app) { should eq('myapp2-production') }
+        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|
+            config.account(:first) do |first|
+              first.app = 'myapp1'
+              first.production_app = 'myapp1-production'
+              first.staging_app = 'myapp1-staging'
+            end
+            config.account(:second) do |second|
+              second.app = 'myapp2'
+              second.production_app = 'myapp2-production'
+              second.staging_app = 'myapp2-staging'
+            end
+            config.run_database_tasks = false
+          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_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
+          Jumpup::Heroku.configure do |config|
+            config.account(:second) do |second|
+              second.app = 'myapp2'
+              second.production_app = 'myapp2-production'
+              second.staging_app = 'myapp2-staging'
+              config.run_database_tasks = false
+            end
+          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 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
+          Jumpup::Heroku.configure do |config|
+            config.app = 'myapp1'
+            config.production_app = 'myapp1-production'
+            config.staging_app = 'myapp1-staging'
+            config.run_database_tasks = true
+            config.account(:second) do |second|
+              second.app = 'myapp2'
+              second.production_app = 'myapp2-production'
+              second.staging_app = 'myapp2-staging'
+              config.run_database_tasks = false
+            end
+          end
+        end
+        subject do
+          Jumpup::Heroku.configuration
+        end
+        its(:app) { should eq('myapp1') }
+        its(:staging_app) { should eq('myapp1-staging')}
+        its(:production_app) { should eq('myapp1-production') }
+        its(:run_database_tasks) { should be_true }
+      end
     end
   end
-
   describe "#valid?" do
-
     describe "with app" do
-
       before do
         Jumpup::Heroku.configure do |config|
           config.app = 'myapp'
         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'
         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'
@@ -84,126 +194,98 @@ describe Jumpup::Heroku::Configuration do
           config.staging_app = 'myapp-staging'
         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'
         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'
         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'
         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'
         end
       end
-
       it 'not be valid' do
         expect(Jumpup::Heroku.configuration).to_not be_valid
       end
     end
-
     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
-
     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
-
     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
-
     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
@@ -211,4 +293,3 @@ describe Jumpup::Heroku::Configuration do
     end
   end
 end
-

data/spec/jumpup/heroku/env_spec.rb

@@ -1,56 +1,44 @@
 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 })
+      expect(Jumpup::Heroku::Env.all).to eq({ app: 'myapp', run_database_tasks: true, host: 'heroku.com' })
     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 }
+      result = { production_app: 'myapp-production', staging_app: 'myapp-staging', run_database_tasks: true, host: 'heroku.com' }
       expect(Jumpup::Heroku::Env.all).to eq(result)
     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 }
+      result = { app: 'myapp', run_database_tasks: false, host: 'heroku.com' }
       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'
@@ -59,7 +47,6 @@ describe Jumpup::Heroku::Env do
         config.run_database_tasks = 'a'
       end
     end
-
     it 'raise error' do
       expect do
         Jumpup::Heroku::Env.all
@@ -67,4 +54,3 @@ describe Jumpup::Heroku::Env do
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jumpup-heroku
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - HE:labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - jumpup-heroku.gemspec
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Rake tasks to deploy on heroku