dpl 1.8.38.travis.2151.5 → 1.8.38.travis.2156.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24293ddfd492bdb0f3aed9499dc46dde00717fcc
-  data.tar.gz: 1ab65c8ede72ae4f0091adcd944126e067919fee
+  metadata.gz: b9332b37a095fa6f216f3ca5f7557ef69ed81bff
+  data.tar.gz: d5b4ac4956afc9d74c24fc25706c8ed566b7d347
 SHA512:
-  metadata.gz: bd9f2ef59eeea5446d8f07203d8191961739d997b13277a5e6caf1615d8d23545c8de6b4ccd97c740f03c3b9830aa2cbc1e8ac80b341f045705b1c4fb3af22dd
-  data.tar.gz: f1d7d3bc44906a2ea6bd5feb445e1b04998e413e027647862260f1fb68d136e1ee5ca64d7f3ac92f877d0f393c107dae6adc05ba3744f5705f82672632b81932
+  metadata.gz: 965365fe4aa5c096f231bf3df3d9089a4d69d6b5a5efc5654b057b7757be343b15ec5822355e2248091b4842eeb4283b66d0cdca42bdaa430dcc599da52f48a5
+  data.tar.gz: d60281cadfafb0953e3ea8ca27e720f87ef9aec46d7d5da722de6ea0e46e89f637640dbace49f9b8123c38c189d6398db64e612cde13aba0d47a1059380f3331

data/README.md

@@ -70,15 +70,14 @@ Running dpl in a terminal that saves history is insecure as your password/api ke
 
 #### Options:
 * **api-key**: Heroku API Key
-* **strategy**: Deployment strategy for Dpl. Defaults to `api`. Other options are `git`, `git ssh`, and `git deploykey`.
+* **strategy**: Deployment strategy for Dpl. Defaults to `api`. The other option is `git`.
 * **app**: Heroku app name. Defaults to the name of your git repo.
 * **username**: heroku username. Not necessary if api-key is used. Requires git strategy.
 * **password**: heroku password. Not necessary if api-key is used. Requires git strategy.
 
-#### API vs Git vs Anvil Deploy:
+#### API vs Git Deploy:
 * API deploy will tar up the current directory (minus the git repo) and send it to Heroku.
 * Git deploy will send the contents of the git repo only, so may not contain any local changes.
-* Anvil deploys are no longer supported since Heroku shut down the Anvil service.
 * The Git strategy allows using *user* and *password* instead of *api-key*.
 * When using Git, Heroku might send you an email for every deploy, as it adds a temporary SSH key to your account.
 

data/lib/dpl/provider/heroku.rb

@@ -4,8 +4,6 @@ module DPL
       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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.38.travis.2151.5
+  version: 1.8.38.travis.2156.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -147,8 +147,6 @@ files:
 - 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/lambda.rb
 - lib/dpl/provider/launchpad.rb
 - lib/dpl/provider/modulus.rb
@@ -192,8 +190,6 @@ files:
 - spec/provider/gae_spec.rb
 - spec/provider/gcs_spec.rb
 - spec/provider/hackage_spec.rb
-- spec/provider/heroku_git_deploy_key_spec.rb
-- spec/provider/heroku_git_ssh_spec.rb
 - spec/provider/heroku_spec.rb
 - spec/provider/lambda_spec.rb
 - spec/provider/launchpad_spec.rb

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

@@ -1,33 +0,0 @@
-module DPL
-  class Provider
-    module Heroku
-      class GitDeployKey < GitSSH
-        deprecated(
-          "git-deploy-key strategy is deprecated, and will be shut down on June 26, 2017.",
-          "Please consider moving to the \`api\` or \`git\` strategy."
-        )
-
-        def needs_key?
-          false
-        end
-
-        def check_auth
-          super
-          setup_git_ssh
-        end
-
-        def setup_git_ssh
-          path = File.expand_path(".dpl/git-ssh")
-
-          File.open(path, 'w') do |file|
-            file.write "#!/bin/sh\n"
-            file.write "exec ssh -o StrictHostKeychecking=no -o CheckHostIP=no -o UserKnownHostsFile=/dev/null -- \"$@\"\n"
-          end
-
-          chmod(0740, path)
-          context.env['GIT_SSH'] = path
-        end
-      end
-    end
-  end
-end

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

@@ -1,103 +0,0 @@
-module DPL
-  class Provider
-    module Heroku
-      class GitSSH < Provider
-        deprecated(
-          "git-ssh strategy is deprecated, and will be shut down on June 26, 2017.",
-          "Please consider moving to the \`api\` or \`git\` strategy."
-        )
-
-        requires 'heroku-api'
-        requires 'rendezvous'
-        requires 'netrc'
-
-        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 info
-          @info ||= api.get_app(option(:app)).body
-        end
-
-        def check_app
-          log "checking for app '#{option(:app)}'"
-          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
-
-        def push_app
-          git_remote = options[:git] || git_url
-          write_netrc if git_remote.start_with?("https://")
-          log "$ git fetch origin $TRAVIS_BRANCH --unshallow"
-          context.shell "git fetch origin $TRAVIS_BRANCH --unshallow"
-          log "$ git push #{git_remote} HEAD:refs/heads/master -f"
-          context.shell "git push #{git_remote} HEAD:refs/heads/master -f"
-        end
-
-        def write_netrc
-          n = Netrc.read
-          n['git.heroku.com'] = [user, option(:api_key)]
-          n.save
-        end
-
-        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/spec/provider/heroku_git_deploy_key_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-require 'heroku-api'
-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 => "gitdeploykey")
-  end
-
-  describe "#ssh" do
-    it "doesn't require an ssh key" do
-      expect(provider.needs_key?).to eq(false)
-    end
-  end
-end

data/spec/provider/heroku_git_ssh_spec.rb

@@ -1,110 +0,0 @@
-require 'spec_helper'
-require 'heroku-api'
-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-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", :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", :headers => expected_headers).and_return(api)
-      expect(provider.api).to eq(api)
-    end
-  end
-
-  context "with fake api" do
-    let :api do
-      double "api",
-        :get_user => double("get_user", :body => { "email" => "foo@bar.com" }),
-        :get_app  => double("get_app",  :body => { "name"  => "example", "git_url" => "GIT URL" })
-    end
-
-    before do
-      expect(::Heroku::API).to receive(:new).and_return(api)
-      provider.api
-    end
-
-    its(:api) { should be == api }
-
-    describe "#check_auth" do
-      example do
-        expect(provider).to receive(:log).with("authenticated as foo@bar.com")
-        provider.check_auth
-      end
-    end
-
-    describe "#check_app" do
-      example do
-        expect(provider).to receive(:log).at_least(1).times.with(/example/)
-        provider.check_app
-      end
-    end
-
-    describe "#setup_key" do
-      example do
-        expect(File).to receive(:read).with("the file").and_return("foo")
-        expect(api).to receive(:post_key).with("foo")
-        provider.setup_key("the file")
-      end
-    end
-
-    describe "#remove_key" do
-      example do
-        expect(api).to receive(:delete_key).with("key")
-        provider.remove_key
-      end
-    end
-
-    describe "#push_app" do
-      example do
-        provider.options[:git] = "git://something"
-        expect(provider.context).to receive(:shell).with("git fetch origin $TRAVIS_BRANCH --unshallow")
-        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
-
-    describe "#run" do
-      example do
-        data = double("data", :body => { "rendezvous_url" => "rendezvous url" })
-        expect(api).to receive(:post_ps).with("example", "that command", :attach => true).and_return(data)
-        expect(Rendezvous).to receive(:start).with(:url => "rendezvous url")
-        provider.run("that command")
-      end
-    end
-
-    describe "#restart" do
-      example do
-        expect(api).to receive(:post_ps_restart).with("example")
-        provider.restart
-      end
-    end
-
-    describe "#deploy" do
-      example "not found error" do
-        expect(provider).to receive(:api) { raise ::Heroku::API::Errors::NotFound.new("the message", nil) }.at_least(:once)
-        expect { provider.deploy }.to raise_error(DPL::Error, 'the message (wrong app "example"?)')
-      end
-
-      example "unauthorized error" do
-        expect(provider).to receive(:api) { raise ::Heroku::API::Errors::Unauthorized.new("the message", nil) }.at_least(:once)
-        expect { provider.deploy }.to raise_error(DPL::Error, 'the message (wrong API key?)')
-      end
-    end
-  end
-end