paratrooper 2.4.1 → 3.0.0.beta1

data/spec/paratrooper/heroku_wrapper_spec.rb

@@ -45,76 +45,46 @@ describe Paratrooper::HerokuWrapper do
 
   describe '#app_restart' do
     it "calls down to heroku api" do
-      heroku_api.should_receive(:post_ps_restart).with(app_name)
+      expect(heroku_api).to receive(:post_ps_restart).with(app_name)
       wrapper.app_restart
     end
   end
 
   describe '#app_maintenance_off' do
     it "calls down to heroku api" do
-      heroku_api.should_receive(:post_app_maintenance).with(app_name, '0')
+      expect(heroku_api).to receive(:post_app_maintenance).with(app_name, '0')
       wrapper.app_maintenance_off
     end
   end
 
   describe '#app_maintenance_on' do
     it "calls down to heroku api" do
-      heroku_api.should_receive(:post_app_maintenance).with(app_name, '1')
+      expect(heroku_api).to receive(:post_app_maintenance).with(app_name, '1')
       wrapper.app_maintenance_on
     end
   end
 
   describe '#run_migrations' do
     it 'calls into the heroku api' do
-      heroku_api.should_receive(:post_ps).with(app_name, 'rake db:migrate', attach: 'true').and_return(double(body: ''))
+      expect(heroku_api).to receive(:post_ps).with(app_name, 'rake db:migrate', attach: 'true').and_return(double(body: ''))
       wrapper.run_migrations
     end
 
     it 'uses waits for db migrations to run using rendezvous' do
       data = { 'rendezvous_url' => 'the_url' }
-      heroku_api.stub_chain(:post_ps, :body).and_return(data)
-      rendezvous.should_receive(:start).with(:url => data['rendezvous_url'])
+      allow(heroku_api).to receive_message_chain(:post_ps, :body).and_return(data)
+      expect(rendezvous).to receive(:start).with(:url => data['rendezvous_url'])
       wrapper.run_migrations
     end
   end
 
-  describe '#app_url' do
-    context 'when custom domains are available' do
-      let(:response) { double(:response, body: [{'domain' => 'APP_URL'}]) }
-
-      it "calls down to heroku api" do
-        heroku_api.should_receive(:get_domains).with(app_name).and_return(response)
-        wrapper.app_url
-      end
-    end
-
-    context 'when custom urls are not available' do
-      let(:response) do
-        double(:response, body: { 'domain_name' => { 'domain' => 'APP_URL' } })
-      end
-
-      let(:domain_response) do
-        double(:domain_response, body: [])
-      end
-
-      before do
-        heroku_api.stub(:get_domains).and_return(domain_response)
-      end
-
-      it "makes call to get default heroku app url" do
-        heroku_api.should_receive(:get_app).with(app_name).and_return(response)
-        expect(wrapper.app_url).to eq('APP_URL')
-      end
-    end
-  end
-
   describe "#last_deploy_commit" do
     context "when deploy data is returned" do
       let(:response) do
         double(:response, body: [{ 'commit' => 'SHA' }])
       end
       it "returns string of last deployed commit" do
-        heroku_api.should_receive(:get_releases).with(app_name)
+        expect(heroku_api).to receive(:get_releases).with(app_name)
           .and_return(response)
         expect(wrapper.last_deploy_commit).to eq('SHA')
       end
@@ -126,7 +96,7 @@ describe Paratrooper::HerokuWrapper do
       end
 
       it "returns nil" do
-        heroku_api.should_receive(:get_releases).with(app_name)
+        expect(heroku_api).to receive(:get_releases).with(app_name)
           .and_return(response)
         expect(wrapper.last_deploy_commit).to eq(nil)
       end

data/spec/paratrooper/local_api_key_extractor_spec.rb

@@ -33,7 +33,7 @@ describe Paratrooper::LocalApiKeyExtractor do
 
     context 'when environment variable is set' do
       before do
-        ENV.stub(:[]).with('HEROKU_API_KEY').and_return('ENV_API_KEY')
+        allow(ENV).to receive(:[]).with('HEROKU_API_KEY').and_return('ENV_API_KEY')
       end
 
       it 'returns credentials' do
@@ -43,8 +43,7 @@ describe Paratrooper::LocalApiKeyExtractor do
 
     context 'when environment variable is not set' do
       before do
-        ENV.stub(:[])
-        ENV.stub(:[]).with('HEROKU_API_KEY').and_return(nil)
+        allow(ENV).to receive(:[]).with('HEROKU_API_KEY').and_return(nil)
       end
 
       it 'returns credentials from local file' do

data/spec/paratrooper/notifier_spec.rb

@@ -5,7 +5,7 @@ describe Paratrooper::Notifier do
   let(:notifier) { described_class.new }
   describe '#notify' do
     it 'sends correct method options' do
-      notifier.should_receive(:update_repo_tag).with(test: 'blah')
+      expect(notifier).to receive(:update_repo_tag).with(test: 'blah')
       notifier.notify(:update_repo_tag, test: 'blah')
     end
   end

data/spec/paratrooper/pending_migration_check_spec.rb

@@ -16,22 +16,29 @@ describe Paratrooper::PendingMigrationCheck do
     let(:last_deployed_commit) { "LAST_DEPLOYED_COMMIT" }
 
     it "calls out to heroku for latest deploy's commit" do
-      system_caller.stub(:execute).and_return("")
-      heroku_wrapper.should_receive(:last_deploy_commit)
+      allow(system_caller).to receive(:execute).and_return("")
+      expect(heroku_wrapper).to receive(:last_deploy_commit)
       migration_check.migrations_waiting?
     end
 
     it "memoizes the git diff" do
-      system_caller.should_receive(:execute).exactly(1).times.and_return("DIFF")
+      expect(system_caller).to receive(:execute).exactly(1).times.and_return("DIFF")
+      migration_check.migrations_waiting?
+      migration_check.migrations_waiting?
+    end
+
+    it "memoizes the git diff when empty" do
+      expect(system_caller).to receive(:execute).exactly(1).times.and_return("")
+      migration_check.migrations_waiting?
       migration_check.migrations_waiting?
     end
 
     context "and migrations are in diff" do
       it "returns true" do
         expected_call = %Q[git diff --shortstat LAST_DEPLOYED_COMMIT MATCH -- db/migrate]
-        system_caller.should_receive(:execute).with(expected_call)
+        expect(system_caller).to receive(:execute).with(expected_call)
           .and_return("DIFF")
-        expect(migration_check.migrations_waiting?).to be_true
+        expect(migration_check.migrations_waiting?).to be(true)
       end
     end
 
@@ -41,9 +48,9 @@ describe Paratrooper::PendingMigrationCheck do
 
       it "returns false" do
         expected_call = %Q[git diff --shortstat LAST_DEPLOYED_COMMIT master -- db/migrate]
-        system_caller.should_receive(:execute).with(expected_call)
+        expect(system_caller).to receive(:execute).with(expected_call)
           .and_return("")
-        expect(migration_check.migrations_waiting?).to be_false
+        expect(migration_check.migrations_waiting?).to be(false)
       end
     end
   end

data/spec/paratrooper/source_control_spec.rb

@@ -0,0 +1,233 @@
+require 'spec_helper'
+require 'paratrooper/configuration'
+require 'paratrooper/source_control'
+
+describe Paratrooper::SourceControl do
+  describe "remote" do
+    it "returns string of git representing remote repo" do
+      config = instance_double(Paratrooper::Configuration,
+        deployment_host: 'HOST', app_name: 'APP'
+      )
+      source_control = described_class.new(config)
+
+      expect(source_control.remote).to eq("git@HOST:APP.git")
+    end
+  end
+
+  describe "force_flag" do
+    context "when force_push is truthy" do
+      it "returns string representing a force flag in git" do
+        config = instance_double(Paratrooper::Configuration, force_push: true)
+        source_control = described_class.new(config)
+
+        expect(source_control.force_flag).to eq("-f ")
+      end
+    end
+
+    context "when force_push is falsey" do
+      it "returns nil" do
+        config = instance_double(Paratrooper::Configuration, force_push: false)
+        source_control = described_class.new(config)
+
+        expect(source_control.force_flag).to be_nil
+      end
+    end
+  end
+
+  describe "branch_name" do
+    context "when branch name is available" do
+      context "and is the symbol :head" do
+        it "returns string representing HEAD" do
+          config = instance_double(Paratrooper::Configuration,
+            branch_name?: true, branch_name: :head
+          )
+          source_control = described_class.new(config)
+
+          expect(source_control.branch_name).to eq("HEAD")
+        end
+      end
+
+      context "and is the string head" do
+        it "returns string representing HEAD" do
+          config = instance_double(Paratrooper::Configuration,
+            branch_name?: true, branch_name: 'head'
+          )
+          source_control = described_class.new(config)
+
+          expect(source_control.branch_name).to eq("HEAD")
+        end
+      end
+
+      context "and contains any string name" do
+        it "returns string representing fully qualified branch path" do
+          config = instance_double(Paratrooper::Configuration,
+            branch_name?: true, branch_name: 'BRANCH_NAME'
+          )
+          source_control = described_class.new(config)
+
+          expect(source_control.branch_name).to eq("refs/heads/BRANCH_NAME")
+        end
+      end
+    end
+
+    context "when branch name is not available" do
+      it "returns nil" do
+        config = instance_double(Paratrooper::Configuration,
+          branch_name?: false
+        )
+        source_control = described_class.new(config)
+
+        expect(source_control.branch_name).to be_nil
+      end
+    end
+  end
+
+  describe "deployment_sha" do
+    it "returns sha" do
+      system_caller = double(:system_caller)
+      allow(system_caller).to receive(:execute).and_return("SHA\n")
+      config = instance_double(Paratrooper::Configuration,
+        branch_name?: false, system_caller: system_caller
+      )
+      source_control = described_class.new(config)
+      expect(source_control.deployment_sha).to eq("SHA")
+    end
+
+    context "when branch_name is available" do
+      it "requests git to find sha from branch" do
+        system_caller = double(:system_caller)
+        allow(system_caller).to receive(:execute).and_return("SHA\n")
+        config = instance_double(Paratrooper::Configuration,
+          branch_name?: true, branch_name: "BRANCH_NAME",
+          system_caller: system_caller
+        )
+        source_control = described_class.new(config)
+
+        source_control.deployment_sha
+        expected_cmd = ["git rev-parse refs/heads/BRANCH_NAME", false]
+        expect(system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+
+    context "when branch_name is unavailable" do
+      it "requests git to find sha from branch" do
+        system_caller = double(:system_caller)
+        allow(system_caller).to receive(:execute).and_return("SHA\n")
+        config = instance_double(Paratrooper::Configuration,
+          branch_name?: false, system_caller: system_caller
+        )
+        source_control = described_class.new(config)
+
+        source_control.deployment_sha
+        expected_cmd = ["git rev-parse HEAD", false]
+        expect(system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+  end
+
+  describe "push_to_deploy" do
+    let(:system_caller) { double(:system_caller) }
+
+    before do
+      allow(system_caller).to receive(:execute)
+    end
+
+    context "when branch_name is a string" do
+      it 'pushes branch_name' do
+        config = instance_double(Paratrooper::Configuration, force_push: false,
+          deployment_host: "HOST", app_name: "APP", branch_name?: true,
+          branch_name: "BRANCH_NAME", system_caller: system_caller
+        )
+        source_control = described_class.new(config)
+        source_control.push_to_deploy
+
+        expected_cmd = ['git push git@HOST:APP.git refs/heads/BRANCH_NAME:refs/heads/master', :exit_code]
+        expect(system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+
+    context "when branch_name is a symbol" do
+      it 'pushes branch_name' do
+        config = instance_double(Paratrooper::Configuration, force_push: false,
+          deployment_host: "HOST", app_name: "APP", branch_name?: true,
+          branch_name: :BRANCH_NAME, system_caller: system_caller
+        )
+        source_control = described_class.new(config)
+        source_control.push_to_deploy
+
+        expected_cmd = ['git push git@HOST:APP.git refs/heads/BRANCH_NAME:refs/heads/master', :exit_code]
+        expect(system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+
+    context "when branch_name is :head" do
+      it 'pushes HEAD' do
+        config = instance_double(Paratrooper::Configuration, force_push: false,
+          deployment_host: "HOST", app_name: "APP", branch_name?: true,
+          branch_name: :head, system_caller: system_caller
+        )
+        source_control = described_class.new(config)
+        source_control.push_to_deploy
+
+        expected_cmd = ['git push git@HOST:APP.git HEAD:refs/heads/master', :exit_code]
+        expect(system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+
+    context "when branch_name is the string HEAD" do
+      it 'pushes HEAD' do
+        config = instance_double(Paratrooper::Configuration, force_push: false,
+          deployment_host: "HOST", app_name: "APP", branch_name?: true,
+          branch_name: "HEAD", system_caller: system_caller
+        )
+        source_control = described_class.new(config)
+        source_control.push_to_deploy
+
+        expected_cmd = ['git push git@HOST:APP.git HEAD:refs/heads/master', :exit_code]
+        expect(system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+
+    context "when choosing to force push" do
+      it "issues command to forcefully push to remote" do
+        config = instance_double(Paratrooper::Configuration,
+          system_caller: system_caller, force_push: true,
+          deployment_host: 'HOST', app_name: 'APP', branch_name?: false
+        )
+        source_control = described_class.new(config)
+        source_control.push_to_deploy
+
+        expected_cmd = ["git push -f git@HOST:APP.git HEAD:refs/heads/master", :exit_code]
+        expect(config.system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+
+    context "when branch_name is available" do
+      it "pushes branch_name" do
+        config = instance_double(Paratrooper::Configuration, force_push: false,
+          deployment_host: "HOST", app_name: "APP", branch_name?: true,
+          branch_name: "BRANCH_NAME", system_caller: system_caller
+        )
+        source_control = described_class.new(config)
+        source_control.push_to_deploy
+
+        expected_cmd = ['git push git@HOST:APP.git refs/heads/BRANCH_NAME:refs/heads/master', :exit_code]
+        expect(system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+
+    context "when no reference is defined" do
+      it "pushes HEAD" do
+        config = instance_double(Paratrooper::Configuration, force_push: false,
+          deployment_host: "HOST", app_name: "APP", branch_name?: false,
+          system_caller: system_caller
+        )
+        source_control = described_class.new(config)
+        source_control.push_to_deploy
+
+        expected_cmd = ['git push git@HOST:APP.git HEAD:refs/heads/master', :exit_code]
+        expect(system_caller).to have_received(:execute).with(*expected_cmd)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paratrooper
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Matt Polito
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !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: '2.12'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   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: heroku-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rendezvous
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Library to create task for deployment to Heroku
@@ -117,10 +117,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .bundle/config
-- .gitignore
-- .rspec
-- .ruby-version
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -128,19 +125,23 @@ files:
 - Rakefile
 - lib/paratrooper.rb
 - lib/paratrooper/callbacks.rb
+- lib/paratrooper/configuration.rb
 - lib/paratrooper/deploy.rb
+- lib/paratrooper/error.rb
 - lib/paratrooper/heroku_wrapper.rb
 - lib/paratrooper/http_client_wrapper.rb
 - lib/paratrooper/local_api_key_extractor.rb
 - lib/paratrooper/notifier.rb
 - lib/paratrooper/notifiers/screen_notifier.rb
 - lib/paratrooper/pending_migration_check.rb
+- lib/paratrooper/source_control.rb
 - lib/paratrooper/system_caller.rb
 - lib/paratrooper/version.rb
 - paratrooper.gemspec
 - script/bootstrap
 - script/test
 - spec/fixtures/netrc
+- spec/paratrooper/configuration_spec.rb
 - spec/paratrooper/deploy_spec.rb
 - spec/paratrooper/heroku_wrapper_spec.rb
 - spec/paratrooper/http_client_wrapper_spec.rb
@@ -148,6 +149,7 @@ files:
 - spec/paratrooper/notifier_spec.rb
 - spec/paratrooper/notifiers/screen_notifier_spec.rb
 - spec/paratrooper/pending_migration_check_spec.rb
+- spec/paratrooper/source_control_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/mattpolito/paratrooper
 licenses:
@@ -159,22 +161,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library to create task for deployment to Heroku
 test_files:
 - spec/fixtures/netrc
+- spec/paratrooper/configuration_spec.rb
 - spec/paratrooper/deploy_spec.rb
 - spec/paratrooper/heroku_wrapper_spec.rb
 - spec/paratrooper/http_client_wrapper_spec.rb
@@ -182,4 +185,5 @@ test_files:
 - spec/paratrooper/notifier_spec.rb
 - spec/paratrooper/notifiers/screen_notifier_spec.rb
 - spec/paratrooper/pending_migration_check_spec.rb
+- spec/paratrooper/source_control_spec.rb
 - spec/spec_helper.rb