dpl 1.8.24.travis.1715.3 → 1.8.24.travis.1718.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b3135e482cf2f7504c2951f133ae9f5831bfdf
-  data.tar.gz: 99c97ea4c6854d620c15a2b5320cbae88349ffd8
+  metadata.gz: be01f2299465ff277f29cc38114c79b98c83cb54
+  data.tar.gz: ab01f597381112f18770f025a7837b58e15e4921
 SHA512:
-  metadata.gz: d398341337dbc94830775db1275d4a8a68d62a4673defbdd1dfc0bfaba6e6f4e3a23bcf2d2a1400adb374908599bdfcc9338f1abae41006d18358ecc00bce154
-  data.tar.gz: 55f35d300e12037e1e5684a1b0938283327e350eb8f01f75f50ba47a010d4ce396cdc9890dc1b0678665f292503a036170b446c15e8a66e35d2248b1b26317b8
+  metadata.gz: fd7f6a1c00eb837d2ff2044cfbf67434b19300dadc109fa13305032a6d1c506d0e4ba2dbbedd210e15af5dc2702e57f2d988dc5b5f8958550e97752a59b6a3c7
+  data.tar.gz: f3fcdc4d3ac5308bb884364fcae857543ebd4a04d90d4681fbcd6fc5715ccefff9ed06e78417ce83eb3ede16026243944aef1007004d9f4a6123bc5ab32b0023

data/lib/dpl/provider/deis.rb

@@ -5,7 +5,22 @@ module DPL
       requires 'git'
 
       def install_deploy_dependencies
-        context.shell "curl -sSL http://deis.io/deis-cli/install.sh | sh -s #{option(:cli_version)}"
+        install_url = determine_install_url
+        context.shell "curl -sSL #{install_url} | bash -x -s #{option(:cli_version)}"
+      end
+
+      #Default to installing the default v1 client. Otherwise determine if this is a v2 client
+      def determine_install_url
+         if option(:cli_version).nil?
+           return "http://deis.io/deis-cli/install.sh"
+         else
+           version_arg = Gem::Version.new(option(:cli_version).gsub(/^v?V?/,''))
+           if version_arg >= Gem::Version.new('2.0.0')
+             return "http://deis.io/deis-cli/install-v2.sh"
+           else
+             return "http://deis.io/deis-cli/install.sh"
+           end
+         end
       end
 
       def needs_key?
@@ -87,7 +102,7 @@ module DPL
       end
 
       def run(command)
-        unless context.shell "deis run -- #{command}"
+        unless context.shell "./deis run -- #{command}"
           error 'Running command failed.'
         end
       end

data/spec/provider/deis_spec.rb

@@ -9,7 +9,7 @@ describe DPL::Provider::Deis do
       :controller => 'https://deis.deisapps.com',
       :username => 'travis',
       :password => 'secret',
-      :cli_version => '1.0'
+      :cli_version => 'v2.0.0'
     }
   end
 
@@ -20,7 +20,7 @@ describe DPL::Provider::Deis do
   describe "#install_deploy_dependencies" do
     example do
       expect(provider.context).to receive(:shell).with(
-        'curl -sSL http://deis.io/deis-cli/install.sh | sh -s 1.0'
+        'curl -sSL http://deis.io/deis-cli/install-v2.sh | bash -x -s v2.0.0'
       ).and_return(true)
       provider.install_deploy_dependencies
     end
@@ -107,7 +107,7 @@ describe DPL::Provider::Deis do
   describe "#run" do
     example do
       expect(provider.context).to receive(:shell).with(
-        'deis 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.8.24.travis.1715.3
+  version: 1.8.24.travis.1718.3
 platform: ruby
 authors:
 - Konstantin Haase