dpl 1.7.4.travis.600.1 → 1.7.4.travis.619.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTdlODdlMDM1NmNkODg4YzRiMjc1ZWNhODU2OTQ3NDEwMzFiYTE4Mw==
+    ZTdkMTFmMTFjMmQ4ZGJhYzI0M2NiN2EzYzk2MjVlZTQ1MjU1NGUxOQ==
   data.tar.gz: !binary |-
-    ZjdiZGRjNWE2MWZlMjBmMWI4ZjExNDQ1Mzc4MGEwOTc4YzQwMmNlNw==
+    MTg4YjllYzYzZjJmNjQ4YWY4YTdhMzVhNGM1Mzk1ZGY0ZWY2YWI1Yg==
 SHA512:
   metadata.gz: !binary |-
-    ZjYwOWIzZjFhYmIxM2RlMzM3NzQ5MTk2Zjg0ZGE1ZDJhODljNDg2YWNmMWU0
-    MzhiYmJmYTM3OGQ2ZTIzZjJiY2U1Zjc1N2U0YmU3ZDdiYjA2MWE0OTEyMmYx
-    NmI5MDUwZjcyYmEyZDZlNmIyNGRkNjhkMDA3MTdlZDdhZWRiODM=
+    N2I3MGI2NDA1ZTE0ZjUwOTViOWE5ZDVhZTQwMjljOTZkYjE5ODEwNDViOTRj
+    ZTQ5M2ZiOWIwZDE1Y2ExZTU2MmEzNjY0YmM4YjhmY2Q3Mjc3YjM1YWJhOWVj
+    NjNkOWI2MzFmNDlkNjQzODQ3M2U4MjI5MzU4MDllMjYyM2RlYTE=
   data.tar.gz: !binary |-
-    MzYwM2JiNmNkMWNlOWQzODkwYzJlYjVhM2Q3OGIwZWU4YzcxYWM0ZDllZWFh
-    NDY5ZWMwMTVmODExNWU3NmMyOTViNzExMGExZDk5MzE1ZjYzNDhjNGVkZTc2
-    NmRhYWMxMzAwZmYxYWE0Zjc4YWNlYjFjZTdlM2Y0OGMzY2MzZWE=
+    MzU3NjI4Y2Y3ZDdhNDliZmU5ZWEyYTUzYTQyM2Y2YzIzMDA1YjMxZTFkODMy
+    NjUyYTVlOGZiNzA1YzQ2ZWVmODYxZjUwYzk3NmYyM2FkZjkyOTRjMTdiZjg5
+    ZjQ0NTAyNTljZjViZDhlODU2NGI0MDMzMWRiMWE4MzNiYTQzNTA=

data/lib/dpl/cli.rb

@@ -58,5 +58,9 @@ module DPL
       $stderr.puts(message)
       exit 1
     end
+
+    def env
+      ENV
+    end
   end
 end

data/lib/dpl/provider.rb

@@ -1,4 +1,5 @@
 require 'dpl/error'
+require 'dpl/version'
 require 'fileutils'
 
 module DPL
@@ -84,6 +85,14 @@ module DPL
 
     def initialize(context, options)
       @context, @options = context, options
+      context.env['GIT_HTTP_USER_AGENT'] = user_agent(git: `git --version`[/[\d\.]+/])
+    end
+
+    def user_agent(*strings)
+      strings.unshift "dpl/#{DPL::VERSION}"
+      strings.unshift "travis/0.1.0" if context.env['TRAVIS']
+      strings = strings.flat_map { |e| Hash === e ? e.map { |k,v| "#{k}/#{v}" } : e }
+      strings.join(" ").gsub(/\s+/, " ").strip
     end
 
     def option(name, *alternatives)
@@ -127,7 +136,7 @@ module DPL
     end
 
     def sha
-      @sha ||= ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
+      @sha ||= context.env['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
     end
 
     def commit_msg
@@ -172,7 +181,7 @@ module DPL
       end
 
       chmod(0740, path)
-      ENV['GIT_SSH'] = path
+      context.env['GIT_SSH'] = path
     end
 
     def detect_encoding?

data/lib/dpl/provider/code_deploy.rb

@@ -49,8 +49,8 @@ module DPL
         {
           revision_type: 'GitHub',
           git_hub_location: {
-            commit_id:  options[:commit_id]  || ENV['TRAVIS_COMMIT']    || `git rev-parse HEAD`.strip,
-            repository: options[:repository] || ENV['TRAVIS_REPO_SLUG'] || option(:repository)
+            commit_id:  options[:commit_id]  || context.env['TRAVIS_COMMIT']    || `git rev-parse HEAD`.strip,
+            repository: options[:repository] || context.env['TRAVIS_REPO_SLUG'] || option(:repository)
           }
         }
       end
@@ -80,7 +80,7 @@ module DPL
       end
 
       def default_description
-        "Deploy build #{ENV['TRAVIS_BUILD_NUMBER']} via Travis CI"
+        "Deploy build #{context.env['TRAVIS_BUILD_NUMBER']} via Travis CI"
       end
 
       def check_auth

data/lib/dpl/provider/gae.rb

@@ -53,7 +53,7 @@ module DPL
       end
 
       def app_dir
-        options[:app_dir] || ENV['TRAVIS_BUILD_DIR'] || Dir.pwd
+        options[:app_dir] || context.env['TRAVIS_BUILD_DIR'] || Dir.pwd
       end
 
       def push_app

data/lib/dpl/provider/heroku.rb

@@ -3,15 +3,17 @@ module DPL
     module Heroku
       autoload :Anvil,        'dpl/provider/heroku/anvil'
       autoload :API,          'dpl/provider/heroku/api'
+      autoload :Generic,      'dpl/provider/heroku/generic'
       autoload :Git,          'dpl/provider/heroku/git'
+      autoload :GitSSH,       'dpl/provider/heroku/git_ssh'
       autoload :GitDeployKey, 'dpl/provider/heroku/git_deploy_key'
 
       extend self
 
       def new(context, options)
-        strategy = options[:strategy] || 'anvil'
-        constant = constants.detect { |c| c.to_s.downcase == strategy }
-        raise Error, 'unknown strategy %p' % strategy unless constant
+        strategy = options[:strategy] || 'api'
+        constant = constants.detect { |c| c.to_s.downcase == strategy.downcase.gsub(/\W/, '') }
+        raise Error, 'unknown strategy %p' % strategy unless constant and constant != Generic
         const_get(constant).new(context, options)
       end
     end

data/lib/dpl/provider/heroku/anvil.rb

@@ -13,10 +13,6 @@ module DPL
           super
         end
 
-        def needs_key?
-          false
-        end
-
         def deploy
           warn ''
           if options[:strategy]
@@ -34,7 +30,7 @@ module DPL
         end
 
         def push_app
-          sha = ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
+          sha = context.env['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
           response = Excon.post release_url,
             :body    => { "slug_url" => slug_url, "description" => "Deploy #{sha} via Travis CI" }.to_json,
             :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }

data/lib/dpl/provider/heroku/api.rb

@@ -4,15 +4,7 @@ require 'shellwords'
 module DPL
   class Provider
     module Heroku
-      class API < Git
-        def needs_key?
-          false
-        end
-
-        def user
-          @user ||= api.get_user.body["email"]
-        end
-
+      class API < Generic
         def push_app
           pack_archive
           upload_archive
@@ -20,7 +12,7 @@ module DPL
         end
 
         def archive_file
-          Shellwords.escape("#{ENV['HOME']}/.dpl.#{option(:app)}.tgz")
+          Shellwords.escape("#{context.env['HOME']}/.dpl.#{option(:app)}.tgz")
         end
 
         def pack_archive
@@ -53,7 +45,7 @@ module DPL
         end
 
         def version
-          @version ||= options[:version] || ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
+          @version ||= options[:version] || context.env['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
         end
 
         def post(subpath, body = nil, options = {})

data/lib/dpl/provider/heroku/generic.rb

@@ -0,0 +1,63 @@
+module DPL
+  class Provider
+    module Heroku
+      class Generic < Provider
+        requires 'heroku-api'
+        requires 'rendezvous'
+
+        def needs_key?
+          false
+        end
+
+        def api
+          @api ||= ::Heroku::API.new(api_options)
+        end
+
+        def api_options
+          api_options = { headers: { 'User-Agent' => user_agent(::Heroku::API::HEADERS.fetch('User-Agent')) } }
+          if options[:user] and options[:password]
+            api_options[:user]     = options[:user]
+            api_options[:password] = options[:password]
+          else
+            api_options[:api_key]  = option(:api_key)
+          end
+          api_options
+        end
+
+        def user
+          @user ||= api.get_user.body["email"]
+        end
+
+        def check_auth
+          log "authenticated as %s" % user
+        end
+
+        def check_app
+          log "checking for app '#{option(:app)}'"
+          info = api.get_app(option(:app)).body
+          log "found app '#{info['name']}'"
+        rescue ::Heroku::API::Errors::Forbidden => error
+          raise Error, "#{error.message} (does the app '#{option(:app)}' exist and does your account have access to it?)", error.backtrace
+        end
+
+        def run(command)
+          data           = api.post_ps(option(:app), command, :attach => true).body
+          rendezvous_url = data['rendezvous_url']
+          Rendezvous.start(:url => rendezvous_url) unless rendezvous_url.nil?
+        end
+
+        def restart
+          api.post_ps_restart option(:app)
+        end
+
+        def deploy
+          super
+        rescue ::Heroku::API::Errors::NotFound => error
+          raise Error, "#{error.message} (wrong app #{options[:app].inspect}?)", error.backtrace
+        rescue ::Heroku::API::Errors::Unauthorized => error
+          raise Error, "#{error.message} (wrong API key?)", error.backtrace
+        end
+      end
+    end
+  end
+end

data/lib/dpl/provider/heroku/git.rb

@@ -1,60 +1,23 @@
 module DPL
   class Provider
     module Heroku
-      class Git < Provider
-        requires 'heroku-api'
-        requires 'rendezvous'
+      class Git < Generic
+        require 'netrc'
 
-        def api
-          @api ||= ::Heroku::API.new(:api_key => option(:api_key)) unless options[:user] and options[:password]
-          @api ||= ::Heroku::API.new(:user => options[:user], :password => options[:password])
-        end
-
-        def user
-          @user ||= api.get_user.body["email"]
-        end
-
-        def check_auth
-          log "authenticated as %s" % user
-        end
-
-        def check_app
-          log "checking for app '#{option(:app)}'"
-          info = api.get_app(option(:app)).body
-          options[:git] ||= info['git_url']
-          log "found app '#{info['name']}'"
-        rescue ::Heroku::API::Errors::Forbidden => error
-          raise Error, "#{error.message} (does the app '#{option(:app)}' exist and does your account have access to it?)", error.backtrace
-        end
-
-        def setup_key(file)
-          api.post_key File.read(file)
-        end
-
-        def remove_key
-          api.delete_key(option(:key_name))
+        def git_url
+          "https://git.heroku.com/#{option(:app)}.git"
         end
 
         def push_app
-          context.shell "git push #{option(:git)} HEAD:refs/heads/master -f"
-        end
-
-        def run(command)
-          data           = api.post_ps(option(:app), command, :attach => true).body
-          rendezvous_url = data['rendezvous_url']
-          Rendezvous.start(:url => rendezvous_url) unless rendezvous_url.nil?
-        end
-
-        def restart
-          api.post_ps_restart option(:app)
+          git_remote = options[:git] || git_url
+          write_netrc if git_remote.start_with?("https://")
+          context.shell "git push #{git_remote} HEAD:refs/heads/master -f"
         end
 
-        def deploy
-          super
-        rescue ::Heroku::API::Errors::NotFound => error
-          raise Error, "#{error.message} (wrong app #{options[:app].inspect}?)", error.backtrace
-        rescue ::Heroku::API::Errors::Unauthorized => error
-          raise Error, "#{error.message} (wrong API key?)", error.backtrace
+        def write_netrc
+          n = Netrc.read
+          n['git.heroku.com'] = [user, option(:api_key)]
+          n.save
         end
       end
     end

data/lib/dpl/provider/heroku/git_deploy_key.rb

@@ -1,7 +1,7 @@
 module DPL
   class Provider
     module Heroku
-      class GitDeployKey < Git
+      class GitDeployKey < GitSSH
         def needs_key?
           false
         end
@@ -20,7 +20,7 @@ module DPL
           end
 
           chmod(0740, path)
-          ENV['GIT_SSH'] = path
+          context.env['GIT_SSH'] = path
         end
       end
     end

data/lib/dpl/provider/heroku/git_ssh.rb

@@ -0,0 +1,23 @@
+module DPL
+  class Provider
+    module Heroku
+      class GitSSH < Git
+        def git_url
+          info['git_url']
+        end
+
+        def needs_key?
+          true
+        end
+
+        def setup_key(file)
+          api.post_key File.read(file)
+        end
+
+        def remove_key
+          api.delete_key(option(:key_name))
+        end
+      end
+    end
+  end
+end

data/lib/dpl/provider/ops_works.rb

@@ -101,7 +101,7 @@ module DPL
       end
 
       def travis_deploy_comment
-        "Deploy build #{ENV['TRAVIS_BUILD_NUMBER'] || current_sha} via Travis CI"
+        "Deploy build #{context.env['TRAVIS_BUILD_NUMBER'] || current_sha} via Travis CI"
       end
 
       def deploy

data/lib/dpl/provider/releases.rb

@@ -8,10 +8,10 @@ module DPL
 
       def travis_tag
         # Check if $TRAVIS_TAG is unset or set but empty
-        if ENV.fetch('TRAVIS_TAG','') == ''
+        if context.env.fetch('TRAVIS_TAG','') == ''
           nil
         else
-          ENV['TRAVIS_TAG']
+          context.env['TRAVIS_TAG']
         end
       end
 
@@ -32,7 +32,7 @@ module DPL
       end
 
       def slug
-        options.fetch(:repo) { ENV['TRAVIS_REPO_SLUG'] }
+        options.fetch(:repo) { context.env['TRAVIS_REPO_SLUG'] }
       end
 
       def releases

data/spec/provider/deis_spec.rb

@@ -51,7 +51,7 @@ describe DPL::Provider::Deis do
     let(:ssh_config) { File.join(Dir.home, '.ssh', 'config') }
     let(:identity_file) { File.join(Dir.pwd, 'key_file') }
     let(:git_ssh) { File.join(Dir.pwd, 'foo') }
-    after { FileUtils.rm ENV.delete('GIT_SSH') }
+    after { FileUtils.rm provider.context.env.delete('GIT_SSH') }
 
     example do
       expect(File).to receive(:open).with(git_ssh, 'w').and_call_original

data/spec/provider/gae_spec.rb

@@ -10,7 +10,7 @@
 #
 #   describe '#push_app' do
 #     example 'with default app_dir' do
-#       ENV['TRAVIS_BUILD_DIR'] = Dir.pwd
+#       provider.context.env['TRAVIS_BUILD_DIR'] = Dir.pwd
 #       provider.options.update(:oauth_refresh_token => token)
 #       expect(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::APPCFG_BIN} --oauth2_refresh_token=#{token} update #{Dir.pwd}").and_return(true)
 #       provider.push_app

data/spec/provider/heroku_anvil_spec.rb

@@ -44,7 +44,7 @@ describe DPL::Provider::Heroku do
 
         allow(provider).to receive_messages(:slug_url => "http://slug-url")
 
-        expect(ENV).to receive(:[]).with('TRAVIS_COMMIT').and_return('123')
+        expect(provider.context.env).to receive(:[]).with('TRAVIS_COMMIT').and_return('123')
         expect(::Excon).to receive(:post).with(provider.release_url,
                                         :body => {"slug_url" => "http://slug-url", "description" => "Deploy 123 via Travis CI" }.to_json,
                                          :headers => {"Content-Type" => 'application/json', 'Accept' => 'application/json'}).and_return(response)

data/spec/provider/heroku_api_spec.rb

@@ -7,6 +7,10 @@ describe DPL::Provider::Heroku do
     described_class.new(DummyContext.new, :app => 'example', :key_name => 'key', :api_key => "foo", :strategy => "api")
   end
 
+  let(:expected_headers) do
+    { "User-Agent" => "dpl/#{DPL::VERSION} heroku-rb/#{Heroku::API::VERSION}" }
+  end
+
   describe "#ssh" do
     it "doesn't require an ssh key" do
       expect(provider.needs_key?).to eq(false)
@@ -16,14 +20,14 @@ describe DPL::Provider::Heroku do
   describe "#api" do
     it 'accepts an api key' do
       api = double(:api)
-      expect(::Heroku::API).to receive(:new).with(:api_key => "foo").and_return(api)
+      expect(::Heroku::API).to receive(:new).with(:api_key => "foo", :headers => expected_headers).and_return(api)
       expect(provider.api).to eq(api)
     end
 
     it 'accepts a user and a password' do
       api = double(:api)
       provider.options.update(:user => "foo", :password => "bar")
-      expect(::Heroku::API).to receive(:new).with(:user => "foo", :password => "bar").and_return(api)
+      expect(::Heroku::API).to receive(:new).with(:user => "foo", :password => "bar", :headers => expected_headers).and_return(api)
       expect(provider.api).to eq(api)
     end
   end

data/spec/provider/heroku_git_spec.rb

@@ -4,20 +4,24 @@ require 'dpl/provider/heroku'
 
 describe DPL::Provider::Heroku do
   subject :provider do
-    described_class.new(DummyContext.new, :app => 'example', :key_name => 'key', :api_key => "foo", :strategy => "git")
+    described_class.new(DummyContext.new, :app => 'example', :key_name => 'key', :api_key => "foo", :strategy => "git-ssh")
+  end
+
+  let(:expected_headers) do
+    { "User-Agent" => "dpl/#{DPL::VERSION} heroku-rb/#{Heroku::API::VERSION}" }
   end
 
   describe "#api" do
     it 'accepts an api key' do
       api = double(:api)
-      expect(::Heroku::API).to receive(:new).with(:api_key => "foo").and_return(api)
+      expect(::Heroku::API).to receive(:new).with(:api_key => "foo", :headers => expected_headers).and_return(api)
       expect(provider.api).to eq(api)
     end
 
     it 'accepts a user and a password' do
       api = double(:api)
       provider.options.update(:user => "foo", :password => "bar")
-      expect(::Heroku::API).to receive(:new).with(:user => "foo", :password => "bar").and_return(api)
+      expect(::Heroku::API).to receive(:new).with(:user => "foo", :password => "bar", :headers => expected_headers).and_return(api)
       expect(provider.api).to eq(api)
     end
   end
@@ -47,7 +51,6 @@ describe DPL::Provider::Heroku do
       example do
         expect(provider).to receive(:log).at_least(1).times.with(/example/)
         provider.check_app
-        expect(provider.options[:git]).to eq("GIT URL")
       end
     end
 
@@ -71,6 +74,7 @@ describe DPL::Provider::Heroku do
         provider.options[:git] = "git://something"
         expect(provider.context).to receive(:shell).with("git push git://something HEAD:refs/heads/master -f")
         provider.push_app
+        expect(provider.context.env['GIT_HTTP_USER_AGENT']).to include("dpl/#{DPL::VERSION}")
       end
     end
 

data/spec/provider/ops_works_spec.rb

@@ -40,7 +40,7 @@ describe DPL::Provider::OpsWorks do
     before do
       expect(provider).to receive(:current_sha).and_return('sha')
       expect(provider.api).to receive(:client).and_return(client)
-      expect(ENV).to receive(:[]).with('TRAVIS_BUILD_NUMBER').and_return('123')
+      expect(provider.context.env).to receive(:[]).with('TRAVIS_BUILD_NUMBER').and_return('123')
     end
 
     let(:custom_json) { "{\"deploy\":{\"app\":{\"migrate\":false,\"scm\":{\"revision\":\"sha\"}}}}" }

data/spec/provider/releases_spec.rb

@@ -9,19 +9,19 @@ describe DPL::Provider::Releases do
 
   describe "#travis_tag" do
     example "When $TRAVIS_TAG is nil" do
-      ENV['TRAVIS_TAG'] = nil
+      provider.context.env['TRAVIS_TAG'] = nil
 
       expect(provider.travis_tag).to eq(nil)
     end
 
     example "When $TRAVIS_TAG if set but empty" do
-      ENV['TRAVIS_TAG'] = nil
+      provider.context.env['TRAVIS_TAG'] = nil
 
       expect(provider.travis_tag).to eq(nil)
     end
 
     example "When $TRAVIS_TAG if set" do
-      ENV['TRAVIS_TAG'] = "foo"
+      provider.context.env['TRAVIS_TAG'] = "foo"
 
       expect(provider.travis_tag).to eq("foo")
     end

data/spec/provider_spec.rb

@@ -118,11 +118,11 @@ describe DPL::Provider do
   end
 
   describe "#setup_git_ssh" do
-    after { FileUtils.rm ENV.delete('GIT_SSH') }
+    after { FileUtils.rm provider.context.env.delete('GIT_SSH') }
 
     example do
       provider.setup_git_ssh('foo', 'bar')
-      expect(ENV['GIT_SSH']).to eq(File.expand_path('foo'))
+      expect(provider.context.env['GIT_SSH']).to eq(File.expand_path('foo'))
     end
   end
 

data/spec/spec_helper.rb

@@ -17,4 +17,8 @@ class DummyContext
   def fold(message)
     yield
   end
+
+  def env
+    @env ||= {}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.4.travis.600.1
+  version: 1.7.4.travis.619.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -119,8 +119,10 @@ files:
 - lib/dpl/provider/heroku.rb
 - lib/dpl/provider/heroku/anvil.rb
 - lib/dpl/provider/heroku/api.rb
+- lib/dpl/provider/heroku/generic.rb
 - lib/dpl/provider/heroku/git.rb
 - lib/dpl/provider/heroku/git_deploy_key.rb
+- lib/dpl/provider/heroku/git_ssh.rb
 - lib/dpl/provider/modulus.rb
 - lib/dpl/provider/ninefold.rb
 - lib/dpl/provider/nodejitsu.rb