paratrooper 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344399129c3b5b86e4aebdd632e78cdb0715e728
-  data.tar.gz: f2b83ab2a53760295ff5f6f77c2c4532c8b80465
+  metadata.gz: 74b8eb08a58894b414fa18f4606c28d484e33fe3
+  data.tar.gz: 9748e2ca46f3dee5317501278f6b53c1fc57ffa0
 SHA512:
-  metadata.gz: dfd31278c9052ff607afef102fa6ca1d1c6b3bd9929e168b0def36c0d0fd9489e2568c0cfbfcfe64018a7612cd5b66763f7a44903415bb4549c4a9cdff6a3db1
-  data.tar.gz: bfb1b6053309c7ddeceba8c26ab779d9886d7d135955d1b91788c5447598c9066eb287d54785506bf0be9f6f157eadbd534b384709c3beaeed0c8eb17982b7aa
+  metadata.gz: 647ec0a0781443343560a2fcc0339d11da6d28c8c337775519461a84e811fecaea883c26edfb496eb3d7fd382ca2dab23f9bfc1973e59bb2da9fcc24cc30c314
+  data.tar.gz: d0babc17feeab3f6a8350284057de3cffcd0e296ccc5c109f05b90ed9487e6b0656b353373c050fe7d4e0d516c4ec0da6ae9c3a63efe380180a13ff4139c8f67

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+## 2.3.0
+
+- Http calls no longer being made from system cURL
+
 ## 2.2.0
 
-- Allow deploy from specific branch.
+- Allow deploy from specific branch
 
 ## 2.1.0
 

data/lib/paratrooper/deploy.rb

@@ -3,6 +3,7 @@ require 'paratrooper/system_caller'
 require 'paratrooper/notifiers/screen_notifier'
 require 'paratrooper/pending_migration_check'
 require 'paratrooper/callbacks'
+require 'paratrooper/http_client_wrapper'
 
 module Paratrooper
 
@@ -13,7 +14,7 @@ module Paratrooper
 
     attr_accessor :app_name, :notifiers, :system_caller, :heroku, :tag_name,
       :match_tag_name, :protocol, :deployment_host, :migration_check, :debug,
-      :screen_notifier, :branch_name
+      :screen_notifier, :branch_name, :http_client
 
     alias_method :tag=, :tag_name=
     alias_method :match_tag=, :match_tag_name=
@@ -23,30 +24,33 @@ module Paratrooper
     #
     # app_name - A String naming the Heroku application to be interacted with.
     # options  - The Hash options is used to provide additional functionality.
-    #            :screen_notifier  - Object used for outputting to screen
-    #                                (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 for deploying from specific tag
-    #                                (optional).
-    #            :match_tag        - String name of git reference point to match
-    #                                :tag to (optional).
-    #            :branch           - String name to be used as a git reference
-    #                                point for deploying from specific branch
-    #                                (optional).
-    #            :system_caller    - Object responsible for calling system
-    #                                commands (optional).
-    #            :protocol         - String web protocol to be used when pinging
-    #                                application (optional, default: 'http').
-    #            :deployment_host  - String host name to be used in git URL
-    #                                (optional, default: 'heroku.com').
-    #            :migration_check  - Object responsible for checking pending
-    #                                migrations (optional).
-    #            :api_key          - String version of heroku api key.
-    #                                (default: looks in local Netrc file).
+    #            :screen_notifier - Object used for outputting to screen
+    #                               (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 for deploying from specific tag
+    #                               (optional).
+    #            :match_tag       - String name of git reference point to match
+    #                               :tag to (optional).
+    #            :branch          - String name to be used as a git reference
+    #                               point for deploying from specific branch
+    #                               (optional).
+    #            :system_caller   - Object responsible for calling system
+    #                               commands (optional).
+    #            :protocol        - String web protocol to be used when pinging
+    #                               application (optional, default: 'http').
+    #            :deployment_host - String host name to be used in git URL
+    #                               (optional, default: 'heroku.com').
+    #            :migration_check - Object responsible for checking pending
+    #                               migrations (optional).
+    #            :api_key         - String version of heroku api key.
+    #                               (default: looks in local Netrc file).
+    #            :http_client     - Object responsible for making http calls
+    #                               (optional).
+    #
     def initialize(app_name, options = {}, &block)
       @app_name        = app_name
       @screen_notifier = options[:screen_notifier] || Notifiers::ScreenNotifier.new
@@ -60,6 +64,7 @@ module Paratrooper
       @deployment_host = options[:deployment_host] || 'heroku.com'
       @debug           = options[:debug] || false
       @migration_check = options[:migration_check] || PendingMigrationCheck.new(match_tag_name, heroku, system_caller)
+      @http_client     = options[:http_client] || HttpClientWrapper.new
 
       block.call(self) if block_given?
     end
@@ -155,7 +160,7 @@ module Paratrooper
       callback(:warm_instance) do
         notify(:warm_instance)
         sleep wait_time
-        system_call "curl -Il #{protocol}://#{app_url}"
+        http_client.get("#{protocol}://#{app_url}")
       end
     end
 
@@ -168,7 +173,7 @@ module Paratrooper
     # * Running database migrations
     # * Restarting application on Heroku
     # * Deactivating maintenance page
-    # * cURL'ing application URL to warm Heroku dyno
+    # * Accessing application URL to warm Heroku dyno
     #
     # Alias: #deploy
     def default_deploy

data/lib/paratrooper/http_client_wrapper.rb

@@ -0,0 +1,13 @@
+module Paratrooper
+  class HttpClientWrapper
+    attr_reader :http_client
+
+    def initialize(options = {})
+      @http_client= options[:http_client] || Excon
+    end
+
+    def get(url)
+      http_client.get(url)
+    end
+  end
+end

data/lib/paratrooper/version.rb

@@ -1,3 +1,3 @@
 module Paratrooper
-  VERSION = "2.2.0".freeze
+  VERSION = "2.3.0".freeze
 end

data/paratrooper.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'heroku-api', '~> 0.3'
   gem.add_dependency 'rendezvous', '~> 0.0.1'
   gem.add_dependency 'netrc', '~> 0.7'
+  gem.add_dependency 'excon'
 end

data/spec/paratrooper/deploy_spec.rb

@@ -12,7 +12,8 @@ describe Paratrooper::Deploy do
       notifiers: [],
       system_caller: system_caller,
       migration_check: migration_check,
-      screen_notifier: screen_notifier
+      screen_notifier: screen_notifier,
+      http_client: http_client
     }
   end
   let(:options) { Hash.new }
@@ -33,6 +34,7 @@ describe Paratrooper::Deploy do
   let(:domain_response) do
     double(:domain_response, body: [{'domain' => 'application_url'}])
   end
+  let(:http_client) { double(:http_client).as_null_object }
 
   describe "tag=" do
     specify "tag is set and @tag_name holds value" do
@@ -371,8 +373,8 @@ describe Paratrooper::Deploy do
     end
 
     it 'pings application url' do
-      expected_call = 'curl -Il http://application_url'
-      system_caller.should_receive(:execute).with(expected_call)
+      expected_url = 'http://application_url'
+      expect(http_client).to receive(:get).with(expected_url)
       deployer.warm_instance(0)
     end
 
@@ -380,8 +382,8 @@ describe Paratrooper::Deploy 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)
+        expected_url = 'https://application_url'
+        expect(http_client).to receive(:get).with(expected_url)
         deployer.warm_instance(0)
       end
     end

data/spec/paratrooper/http_client_wrapper_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'paratrooper/http_client_wrapper'
+
+describe Paratrooper::HttpClientWrapper do
+  let(:wrapper) { described_class.new(default_options) }
+  let(:default_options) do
+    {
+      http_client: http_client
+    }
+  end
+  let(:http_client) { double(:http_client) }
+
+  describe "GET a url" do
+    it "accepts a string url and makes a GET request for it" do
+      expected_url = "GO GET SOMETHING"
+      expect(http_client).to receive(:get).with(expected_url)
+      wrapper.get(expected_url)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paratrooper
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Matt Polito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,6 +95,20 @@ dependencies:
     - - ~>
       - !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
 email:
 - matt.polito@gmail.com
@@ -116,6 +130,7 @@ files:
 - lib/paratrooper/callbacks.rb
 - lib/paratrooper/deploy.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
@@ -126,6 +141,7 @@ files:
 - spec/fixtures/netrc
 - spec/paratrooper/deploy_spec.rb
 - spec/paratrooper/heroku_wrapper_spec.rb
+- spec/paratrooper/http_client_wrapper_spec.rb
 - spec/paratrooper/local_api_key_extractor_spec.rb
 - spec/paratrooper/notifier_spec.rb
 - spec/paratrooper/notifiers/screen_notifier_spec.rb
@@ -159,6 +175,7 @@ test_files:
 - spec/fixtures/netrc
 - spec/paratrooper/deploy_spec.rb
 - spec/paratrooper/heroku_wrapper_spec.rb
+- spec/paratrooper/http_client_wrapper_spec.rb
 - spec/paratrooper/local_api_key_extractor_spec.rb
 - spec/paratrooper/notifier_spec.rb
 - spec/paratrooper/notifiers/screen_notifier_spec.rb