paratrooper 1.2.2 → 1.3.1

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p374

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    paratrooper (1.1.3)
+    paratrooper (1.3.1)
       heroku-api (~> 0.3)
       netrc (~> 0.7)
+      rendezvous (~> 0.0.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     coderay (1.0.8)
     diff-lcs (1.1.3)
-    excon (0.16.10)
-    heroku-api (0.3.8)
-      excon (~> 0.16.10)
+    excon (0.20.1)
+    heroku-api (0.3.9)
+      excon (~> 0.20.1)
     method_source (0.8.1)
     netrc (0.7.7)
     pry (0.9.10)
@@ -20,6 +21,7 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.3.1)
     rake (10.0.3)
+    rendezvous (0.0.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)

data/README.md

@@ -67,6 +67,20 @@ Paratrooper::Deploy.new('app')
 
 This method works via a local Netrc file handled via the [Heroku Toolbelt][] and is the default and preferred method for providing authentication keys.
 
+## Git SSH key configuration
+
+If you use multiple SSH keys for managing multiple accounts, for example in your `.ssh/config`, you can set the `ssh_host` option:
+
+```ruby
+Paratrooper::Deploy.new('app', ssh_host: 'HOST')
+```
+
+This also works if you're using the [heroku-accounts](https://github.com/ddollar/heroku-accounts) plugin:
+
+```ruby
+Paratrooper::Deploy.new('app', ssh_host: 'heroku.ACCOUNT_NAME')
+```
+
 ## Tag Management
 
 By providing tag options for Paratrooper, your code can be tagged and deployed from various reference points.

data/bin/autospec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'autospec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'autospec')

data/bin/coderay

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'coderay' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('coderay', 'coderay')

data/bin/htmldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/pry

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('pry', 'pry')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/paratrooper/deploy.rb

@@ -8,28 +8,41 @@ module Paratrooper
   #
   class Deploy
     attr_reader :app_name, :notifiers, :system_caller, :heroku, :tag_name,
-      :match_tag
+      :match_tag, :protocol, :repo_host, :repo_name, :deployment_host
 
     # Public: Initializes a Deploy
     #
     # app_name - A String naming the Heroku application to be interacted with.
     # options  - The Hash options is used to provide additional functionality.
-    #            :notifiers     - Array of objects responsible for handling
-    #                             notifications (optional).
-    #            :heroku        - Object wrapper around heroku-api (optional).
-    #            :tag           - String name to be used as a git reference
-    #                             point (optional).
-    #            :match_tag_to  - String name of git reference point to match
-    #                             :tag to (optional).
-    #            :system_caller - Object responsible for calling system
-    #                             commands (optional).
+    #            :notifiers       - Array of objects interested in being
+    #                               notified of steps in deployment process
+    #                               (optional).
+    #            :heroku          - Object wrapper around heroku-api (optional).
+    #            :tag             - String name to be used as a git reference
+    #                               point (optional).
+    #            :match_tag_to    - String name of git reference point to match
+    #                               :tag to (optional).
+    #            :system_caller   - Object responsible for calling system
+    #                               commands (optional).
+    #            :protocol        - String web protocol to be used when pinging
+    #                               application (optional, default: 'http').
+    #            :repo_host       - String host name of of git repository
+    #                               (optional, default: 'github.com').
+    #            :repo_name       - String repository name (optional,
+    #                               default: '#app_name).
+    #            :deployment_host - String host name to be used in git URL
+    #                               (optional, default: 'heroku.com').
     def initialize(app_name, options = {})
-      @app_name      = app_name
-      @notifiers     = options[:notifiers] || [Notifiers::ScreenNotifier.new]
-      @heroku        = options[:heroku] || HerokuWrapper.new(app_name, options)
-      @tag_name      = options[:tag]
-      @match_tag     = options[:match_tag_to] || 'master'
-      @system_caller = options[:system_caller] || SystemCaller.new
+      @app_name        = app_name
+      @notifiers       = options[:notifiers] || [Notifiers::ScreenNotifier.new]
+      @heroku          = options[:heroku] || HerokuWrapper.new(app_name, options)
+      @tag_name        = options[:tag]
+      @match_tag       = options[:match_tag_to] || 'master'
+      @system_caller   = options[:system_caller] || SystemCaller.new
+      @protocol        = options[:protocol] || 'http'
+      @repo_host       = options[:repo_host] || 'github.com'
+      @repo_name       = options[:repo_name] || app_name
+      @deployment_host = options[:deployment_host] || 'heroku.com'
     end
 
     def setup
@@ -66,7 +79,7 @@ module Paratrooper
       unless tag_name.nil? || tag_name.empty?
         notify(:update_repo_tag)
         system_call "git tag #{tag_name} #{match_tag} -f"
-        system_call "git push -f #{git_remote} #{tag_name}"
+        system_call "git push -f #{repo_remote} #{tag_name}"
       end
     end
 
@@ -75,14 +88,14 @@ module Paratrooper
     def push_repo
       reference_point = tag_name || 'master'
       notify(:push_repo, reference_point: reference_point)
-      system_call "git push -f #{git_remote} #{reference_point}:master"
+      system_call "git push -f #{deployment_remote} #{reference_point}:master"
     end
 
     # Public: Runs rails database migrations on your application.
     #
     def run_migrations
       notify(:run_migrations)
-      system_call "heroku run rake db:migrate --app #{app_name}"
+      heroku.run_migrations
     end
 
     # Public: Restarts application on Heroku.
@@ -97,7 +110,7 @@ module Paratrooper
     def warm_instance(wait_time = 3)
       sleep wait_time
       notify(:warm_instance)
-      system_call "curl -Il http://#{app_url}"
+      system_call "curl -Il #{protocol}://#{app_url}"
     end
 
     # Public: Execute common deploy steps.
@@ -134,14 +147,23 @@ module Paratrooper
       {
         app_name: app_name,
         app_url: app_url,
-        git_remote: git_remote,
+        repo_remote: repo_remote,
+        deployment_remote: deployment_remote,
         tag_name: tag_name,
         match_tag: match_tag
       }
     end
 
-    def git_remote
-      "git@heroku.com:#{app_name}.git"
+    def git_remote(host, name)
+      "git@#{host}:#{name}.git"
+    end
+
+    def deployment_remote
+      git_remote(deployment_host, app_name)
+    end
+
+    def repo_remote
+      git_remote(repo_host, repo_name)
     end
 
     # Internal: Calls commands meant to go to system

data/lib/paratrooper/heroku_wrapper.rb

@@ -1,15 +1,17 @@
 require 'heroku-api'
+require 'rendezvous'
 require 'paratrooper/local_api_key_extractor'
 
 module Paratrooper
   class HerokuWrapper
-    attr_reader :api_key, :app_name, :heroku_api, :key_extractor
+    attr_reader :api_key, :app_name, :heroku_api, :key_extractor, :rendezvous
 
     def initialize(app_name, options = {})
       @app_name      = app_name
       @key_extractor = options[:key_extractor] || LocalApiKeyExtractor
       @api_key       = options[:api_key] || key_extractor.get_credentials
       @heroku_api    = options[:heroku_api] || Heroku::API.new(api_key: api_key)
+      @rendezvous    = options[:rendezvous] || Rendezvous
     end
 
     def app_restart
@@ -28,6 +30,11 @@ module Paratrooper
       app_domain_name
     end
 
+    def run_migrations
+      data = heroku_api.post_ps(app_name, 'rake db:migrate', attach: 'true').body
+      rendezvous.start(:url => data['rendezvous_url'])
+    end
+
     private
     def app_domain_name
       if custom_domain_response

data/lib/paratrooper/version.rb

@@ -1,3 +1,3 @@
 module Paratrooper
-  VERSION = "1.2.2"
+  VERSION = "1.3.1"
 end

data/paratrooper.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.12'
   gem.add_development_dependency 'pry'
   gem.add_dependency 'heroku-api', '~> 0.3'
+  gem.add_dependency 'rendezvous', "~> 0.0.1"
   gem.add_dependency 'netrc', '~> 0.7'
 end

data/spec/paratrooper/deploy_spec.rb

@@ -20,6 +20,7 @@ describe Paratrooper::Deploy do
       app_restart: true,
       app_maintenance_on: true,
       app_maintenance_off: true,
+      run_migrations: true
     )
   end
   let(:system_caller) { double(:system_caller) }
@@ -53,6 +54,63 @@ describe Paratrooper::Deploy do
         expect(deployer.notifiers).to eq([notifiers])
       end
     end
+
+    describe "protocol" do
+      context "accepts :protocol" do
+        let(:options) { { protocol: 'https' } }
+
+        it "and responds to #protocol" do
+          expect(deployer.protocol).to eq('https')
+        end
+      end
+
+      context "no value passed" do
+        it "and responds to #protocol with default value" do
+          expect(deployer.protocol).to eq('http')
+        end
+      end
+    end
+
+    describe "repo_host" do
+      context "accepts :repo_host" do
+        let(:options) { { repo_host: 'repo_host_name' } }
+
+        it "and responds to #repo_host" do
+          expect(deployer.repo_host).to eq('repo_host_name')
+        end
+      end
+
+      context "no value passed" do
+        it "and responds to #repo_host with default value" do
+          expect(deployer.repo_host).to eq('github.com')
+        end
+      end
+    end
+
+    describe "repo_name" do
+      context "accepts :repo_name" do
+        let(:options) { { repo_name: 'repo_name_name' } }
+
+        it "and responds to #repo_name" do
+          expect(deployer.repo_name).to eq('repo_name_name')
+        end
+      end
+
+      context "no value passed" do
+        let(:app_name) { 'REPO_MAN' }
+        it "and responds to #repo_name with default value" do
+          expect(deployer.repo_name).to eq('REPO_MAN')
+        end
+      end
+    end
+
+    context "accepts :deployment_host" do
+      let(:options) { { deployment_host: 'host_name' } }
+
+      it "and responds to #notifiers" do
+        expect(deployer.deployment_host).to eq('host_name')
+      end
+    end
   end
 
   describe "#activate_maintenance_mode" do
@@ -111,7 +169,8 @@ describe Paratrooper::Deploy do
       end
 
       it 'pushes git tag' do
-        system_caller.should_receive(:execute).with('git push -f git@heroku.com:app.git awesome')
+        expected = 'git push -f git@github.com:app.git awesome'
+        system_caller.should_receive(:execute).with(expected)
         deployer.update_repo_tag
       end
     end
@@ -155,8 +214,7 @@ describe Paratrooper::Deploy do
     end
 
     it 'pushes repo to heroku' do
-      expected_call = 'heroku run rake db:migrate --app app'
-      system_caller.should_receive(:execute).with(expected_call)
+      heroku.should_receive(:run_migrations)
       deployer.run_migrations
     end
   end
@@ -188,5 +246,15 @@ describe Paratrooper::Deploy do
       system_caller.should_receive(:execute).with(expected_call)
       deployer.warm_instance(0)
     end
+
+    context 'with optional protocol' do
+      let(:options) { { protocol: 'https' } }
+
+      it 'pings application url using the protocol' do
+        expected_call = 'curl -Il https://application_url'
+        system_caller.should_receive(:execute).with(expected_call)
+        deployer.warm_instance(0)
+      end
+    end
   end
 end

data/spec/paratrooper/heroku_wrapper_spec.rb

@@ -10,10 +10,12 @@ describe Paratrooper::HerokuWrapper do
   let(:default_options) do
     {
       heroku_api: heroku_api,
-      key_extractor: double(:key_extractor, get_credentials: 'API_KEY')
+      key_extractor: double(:key_extractor, get_credentials: 'API_KEY'),
+      rendezvous: rendezvous
     }
   end
   let(:heroku_api) { double(:heroku_api) }
+  let(:rendezvous) { double(:rendezvous, start: nil) }
 
   describe '#api_key' do
     context 'when api_key is provided as an option' do
@@ -62,6 +64,20 @@ describe Paratrooper::HerokuWrapper do
     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: ''))
+      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'])
+      wrapper.run_migrations
+    end
+  end
+
   describe '#app_url' do
     context 'when custom domains are available' do
       let(:response) { double(:response, body: [{'domain' => 'APP_URL'}]) }

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: paratrooper
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Matt Polito
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,13 +71,31 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rendezvous
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +103,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -85,16 +112,32 @@ description: Library to create task for deployment to Heroku
 email:
 - matt.polito@gmail.com
 - bthesorceror@gmail.com
-executables: []
+executables:
+- autospec
+- coderay
+- htmldiff
+- ldiff
+- pry
+- rake
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
+- .bundle/config
 - .gitignore
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/autospec
+- bin/coderay
+- bin/htmldiff
+- bin/ldiff
+- bin/pry
+- bin/rake
+- bin/rspec
 - lib/paratrooper.rb
 - lib/paratrooper/deploy.rb
 - lib/paratrooper/heroku_wrapper.rb
@@ -113,26 +156,33 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/mattpolito/paratrooper
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2949666579820194565
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2949666579820194565
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Library to create task for deployment to Heroku
 test_files:
 - spec/fixtures/netrc
@@ -142,4 +192,3 @@ test_files:
 - spec/paratrooper/notifier_spec.rb
 - spec/paratrooper/notifiers/screen_notifier_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjZmZGEzYjhjYzkwNjNmOWRhZTkwMTFkOGY5ZGMxNjdjN2UzZDZiYQ==
-  data.tar.gz: !binary |-
-    NWVhZTgyOTg4YTA5OWQ0NDIwMjJmYmRjNDJhNGM5OGM5NDFjZjFkYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZWMzMmYxMjU4MjcwMDRiOWU2NzVhOGE1NDg4NWNiZDJmM2EzYjljN2Y0MGI3
-    ZWMxZTgzOWQ5OGQ4NGJhMmNiOGE4OGE2YjMzZjEzYmJlMTA3ZGVjZjIyM2Fj
-    NGYxNzFhZmU1ODg0ZmE3ZDEwOWM0MzI0MjdhYmZjZjQyZmZiODI=
-  data.tar.gz: !binary |-
-    NjRjMDVkNTk3NWFmZDgzZDhiMWNiNjU0YjZmMTJkZDM2NmI0NTc0OWViN2Jj
-    N2RkMGEyNjU5OTkzYWEwZGI3YzA3YTlhNzQ1NjdhMjg1OWQ1YTliYjU3YWY3
-    Njg1NTY3Y2Y0MTIzYTYzOGZjNTkyZDg0NGViMDQxNTMwMmQ5ZmI=