dpl 1.7.20.travis.951.4 → 1.7.20.travis.952.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzcyY2JjZDdjODU0MjRmMDc4OWQ0YjAxZTdlZjZmYjY4NGM3NjJkMQ==
+    YmY2YmUyZTkxZTM5ZjY0ZjlmZjhiMTE5MGZkYzc3YjRhNThmMzg5NQ==
   data.tar.gz: !binary |-
-    MzY4NTYzMDAwMmU2OWU1MTA5Y2FmNWY5MDUwNmQyMjhlMTNkNGYyOQ==
+    ZDk3N2M3YTZiZGExZTM5NTJhZGEwNTIyNzVhNjA4OWJlZmIzM2Q5NQ==
 SHA512:
   metadata.gz: !binary |-
-    N2ExYWQ1M2JkYmIyMzgyYjE2NDhlMmM0ODM2YWZiYzQxNDFmMGMwNDVhNTI4
-    Mjc5MGQ2YzVhNjIzMmU4YTdmMDM1YzE1NTk1YzNmYTQzZDMxMDUwOWRlMDA5
-    Y2M0MTE2YmZiMTFiZjRjZTk3OGNhZDVmNzY4NjdjNzJjM2NmNTQ=
+    YjdjMWQxNmEzMDdiM2UwYTNhOTc0YjllOTUzYjBmZTA4ZGMwMTRjYzEwOWQ1
+    MTE2NDJiY2ZiYzIxMjJkNTQ2NjUwZmRmZWE4Yzc3MTYxM2RiZTM4OTg3MDAz
+    ZTllNmMwZTU2OWY2Nzk2YjJmNDhjZjcwZTA5MTBiOGJmMzdiODI=
   data.tar.gz: !binary |-
-    MGU5ODQyZmU4YWU5NDY4NjJlM2JhNjVmZDlmNmQzOGYwZDZmYTNlNWVkMDdm
-    NTFhZjEwNDA2YzIwNWJlYWE4ODI4NWI0NGFjNTNkMDQyMTEyNGE1ZWM5ZWY4
-    NDM5Njk3NDA0Zjc2NWRjM2VjYmI4ZTYwNTUzYzFmM2NjMjY5NTY=
+    MWQzNmI1NWE0YWQ0YjEzNmU2NDIzNTVmNmUwMWRkYjUwN2QyYjZkY2FhZDVh
+    ZDM3MDgzNmQ5MmI0N2NhMTU5MTE4ODBkYWU1NjY3NjU2OWJmZjllNDIzOWE2
+    YTgyYTk0MDJkNmQ2Nzc0ZWFlOTQ4MDllODI0M2E3YjA0Y2NkNGI=

data/lib/dpl/provider.rb

@@ -196,7 +196,7 @@ module DPL
 
       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 -i #{key_path} -- \"$@\"\n"
+        file.write "exec ssh -o StrictHostKeychecking=no -o CheckHostIP=no -o UserKnownHostsFile=/dev/null -i #{key_path} \"$@\"\n"
       end
 
       chmod(0740, path)

data/lib/dpl/provider/deis.rb

@@ -1,10 +1,8 @@
 module DPL
   class Provider
     class Deis < Provider
-      experimental 'Deis'
-
       def install_deploy_dependencies
-        self.class.pip 'deis', 'deis', options[:cli_version]
+        context.shell "curl -sSL http://deis.io/deis-cli/install.sh | sh -s #{option(:client_version)}"
       end
 
       def needs_key?
@@ -12,7 +10,7 @@ module DPL
       end
 
       def check_auth
-        unless context.shell "deis login #{controller_url}" \
+        unless context.shell "./deis login #{option(:controller)}" \
                       " --username=#{option(:username)}" \
                       " --password=#{option(:password)}"
           error 'Login failed.'
@@ -20,89 +18,42 @@ module DPL
       end
 
       def check_app
-        unless context.shell "deis apps:info --app=#{option(:app)}"
+        unless context.shell "./deis apps:info --app=#{option(:app)}"
           error 'Application could not be verified.'
         end
       end
 
       def setup_key(file)
-        unless context.shell "deis keys:add #{file}"
+        unless context.shell "./deis keys:add #{file}"
           error 'Adding keys failed.'
         end
       end
 
       def setup_git_ssh(path, key_path)
         super(path, key_path)
-        # Deis uses a non-standard port, so we need to create a
-        # ssh config shortcut
-        key_path = File.expand_path(key_path)
-        add_ssh_config_entry(key_path)
-        # A git remote is required for running commands
-        # https://github.com/deis/deis/issues/1086
-        add_git_remote
+
+        unless context.shell "./deis git:remote --app=#{option(:app)}"
+          error 'Adding git remote failed.'
+        end
       end
 
       def remove_key
-        unless context.shell "deis keys:remove #{option(:key_name)}"
+        unless context.shell "./deis keys:remove #{option(:key_name)}"
           error 'Removing keys failed.'
         end
       end
 
       def push_app
-        wait_until_key_is_set
-        unless context.shell "git push #{git_push_url} HEAD:refs/heads/master -f"
+        unless context.shell "git push deis HEAD:refs/heads/master -f"
           error 'Deploying application failed.'
         end
       end
 
       def run(command)
-        unless context.shell "deis apps:run #{command}"
+        unless context.shell "deis run -- #{command}"
           error 'Running command failed.'
         end
       end
-
-      private
-
-      def wait_until_key_is_set
-        sleep 5
-      end
-
-      def ssh_config_entry(key_file)
-        "\nHost deis-repo\n" \
-        "  Hostname #{option(:controller)}\n" \
-        "  Port 2222\n" \
-        "  User git\n" \
-        "  IdentityFile #{key_file}\n"
-      end
-
-      def add_ssh_config_entry(key_file)
-        FileUtils.mkdir_p(ssh_config_dir)
-        File.open(ssh_config, 'a') { |f| f.write(ssh_config_entry(key_file)) }
-      end
-
-      def ssh_config
-        File.join(ssh_config_dir, 'config')
-      end
-
-      def ssh_config_dir
-        File.join(Dir.home, '.ssh')
-      end
-
-      def add_git_remote
-        context.shell "git remote add deis #{git_remote_url}"
-      end
-
-      def git_push_url
-        "deis-repo:#{option(:app)}.git"
-      end
-
-      def git_remote_url
-        "ssh://git@#{option(:controller)}:2222/#{option(:app)}.git"
-      end
-
-      def controller_url
-        "http://#{option(:controller)}"
-      end
     end
   end
 end

data/spec/provider/deis_spec.rb

@@ -6,9 +6,10 @@ describe DPL::Provider::Deis do
     {
       :app => 'example',
       :key_name => 'key',
-      :controller => 'deis.deisapps.com',
+      :controller => 'https://deis.deisapps.com',
       :username => 'travis',
-      :password => 'secret'
+      :password => 'secret',
+      :client_version => '1.0'
     }
   end
 
@@ -17,14 +18,10 @@ describe DPL::Provider::Deis do
   end
 
   describe "#install_deploy_dependencies" do
-    example 'without version specified' do
-      expect(provider.class).to receive(:pip).with('deis', 'deis', nil)
-      provider.install_deploy_dependencies
-    end
-
-    example 'with version specified' do
-      options[:cli_version] = '1.0'
-      expect(provider.class).to receive(:pip).with('deis', 'deis', '1.0')
+    example do
+      expect(provider.context).to receive(:shell).with(
+        'curl -sSL http://deis.io/deis-cli/install.sh | sh -s 1.0'
+      ).and_return(true)
       provider.install_deploy_dependencies
     end
   end
@@ -38,7 +35,7 @@ describe DPL::Provider::Deis do
   describe "#check_auth" do
     example do
       expect(provider.context).to receive(:shell).with(
-        'deis login http://deis.deisapps.com --username=travis --password=secret'
+        './deis login https://deis.deisapps.com --username=travis --password=secret'
       ).and_return(true)
       provider.check_auth
     end
@@ -47,7 +44,7 @@ describe DPL::Provider::Deis do
   describe "#check_app" do
     example do
       expect(provider.context).to receive(:shell).with(
-        'deis apps:info --app=example'
+        './deis apps:info --app=example'
       ).and_return(true)
       provider.check_app
     end
@@ -59,31 +56,17 @@ describe DPL::Provider::Deis do
     let(:identity_file) { File.join(Dir.pwd, 'key_file') }
     example do
       expect(provider.context).to receive(:shell).with(
-        'deis keys:add key_file'
+        './deis keys:add key_file'
       ).and_return(true)
       provider.setup_key('key_file')
     end
   end
 
   describe "#setup_git_ssh" do
-    let(:ssh_config_handle) { double 'ssh_config_handle' }
-    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 provider.context.env.delete('GIT_SSH') }
-
     example do
-      expect(File).to receive(:open).with(git_ssh, 'w').and_call_original
-      expect(File).to receive(:open).with(ssh_config, 'a')
-        .and_yield(ssh_config_handle)
-
-      expect(ssh_config_handle).to receive(:write).with(
-        "\nHost deis-repo\n  Hostname deis.deisapps.com\n  Port 2222\n" \
-        "  User git\n  IdentityFile #{identity_file}\n"
-      )
       expect(provider.context).to receive(:shell).with(
-        'git remote add deis ssh://git@deis.deisapps.com:2222/example.git'
-      )
+        './deis git:remote --app=example'
+      ).and_return(true)
       provider.setup_git_ssh('foo', 'key_file')
     end
   end
@@ -91,7 +74,7 @@ describe DPL::Provider::Deis do
   describe "#remove_key" do
     example do
       expect(provider.context).to receive(:shell).with(
-        'deis keys:remove key'
+        './deis keys:remove key'
       ).and_return(true)
       provider.remove_key
     end
@@ -100,7 +83,7 @@ describe DPL::Provider::Deis do
   describe "#push_app" do
     example do
       expect(provider.context).to receive(:shell).with(
-        'git push deis-repo:example.git HEAD:refs/heads/master -f'
+        'git push deis HEAD:refs/heads/master -f'
       ).and_return(true)
       provider.push_app
     end
@@ -109,7 +92,7 @@ describe DPL::Provider::Deis do
   describe "#run" do
     example do
       expect(provider.context).to receive(:shell).with(
-        'deis apps:run shell command'
+        'deis run -- shell command'
       ).and_return(true)
       provider.run('shell command')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.20.travis.951.4
+  version: 1.7.20.travis.952.4
 platform: ruby
 authors:
 - Konstantin Haase