dpl 1.7.8.travis.651.1 → 1.7.8.travis.653.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc1ZGUwMTNhYWFlZjY4MTQ1MDQwM2FiYTFiNDJjZjhiNDY2Yjk3Nw==
+    ZDAxNGUxNjUwMTgxOTA1ODI5YWQzMzljZGQwMTViMjFhNGE0OGFlYQ==
   data.tar.gz: !binary |-
-    NGI2YzlhM2M2OGQyMTk3YjI1YjA2ZTI5Y2NiYjBjNWQ2OGRjYzc4Mg==
+    ODkzYTZjMjE3YzczZjhiZWY2ZTI1YjYyMTkwMjAxMzgyYzZjYmFkNQ==
 SHA512:
   metadata.gz: !binary |-
-    N2EyNWM3YWMzOTkzNGM5OGY4OGVjYjQyYzBjZDdkYjdmMmM1N2RjMjkzNmYz
-    NmE2ZDY5ZWVjM2E5M2NiMDk0Mzg5ZDEyY2NhMzdkZWYxOTNjMjM0Yzc3Yjkw
-    MTQ5ZWM0MzI5NmQ2MDE3M2Q1YTFmOTczNTEzMjhmZGFjZWI0ODI=
+    Njk4Y2Q0MWEzYTI5NWUxNzNhYzgzNGMxZTAxNjM1ZTJhYzI4MmQ2ZmViMDk2
+    YTk5NzY3OTUyZWRkZGExZGMwYzdmODk1ZTNmODg2Zjg5MzU2ZDM5ZWY1ZjQ3
+    NDFkYjk0ZmRkOTFkZjgwM2MwYThiMmQ2N2U1MzY3MmE5MjU1MGU=
   data.tar.gz: !binary |-
-    MThjMWRkYmQ3Y2YwZDgzOWUxYzVjOTQyNGNjYzRjZmZjMTIwMmQ5OTJmYjRl
-    OWVkM2I3NjBiZGYxZmE4NGY4MGJmNGFiYzlhMGZkNTY5ODJhMDEwOTdmZGVh
-    ODI3MTU4ZGVjOWQyOTFlNjFkMmI2ZDdmYmIzYTBjMmM1N2E1NGI=
+    Y2Y5NzM1OGFjYmMyMzlmZTNkZDM4MWVhNWJhZDU0M2Q5ZjczNmFjMjk4Njc0
+    YjIzNzRmMWI4YWI1NzhmMTY5Yzk2YjUyMDRiMmQxZTAyYTljN2E4NTBiYWZi
+    NDBiMGNkZGUxOTgwMTUyMDVkMTY1NGNmYjdiM2Q1Y2E1NjA5ZWY=

data/README.md

@@ -349,6 +349,7 @@ For accounts using two factor authentication, you have to use an oauth token as
 * **username**: Deis username
 * **password**: Deis password
 * **app**: Deis app
+* **cli_version**: Install a specific deis cli version
 
 #### Examples:
 

data/lib/dpl/provider.rb

@@ -42,7 +42,9 @@ module DPL
       context.fold("Installing deploy dependencies") do
         name = super.option(:provider).to_s.downcase.gsub(/[^a-z0-9]/, '')
         raise Error, 'could not find provider %p' % options[:provider] unless name = constants.detect { |c| c.to_s.downcase == name }
-        const_get(name).new(context, options)
+        provider = const_get(name).new(context, options)
+        provider.install_deploy_dependencies if provider.respond_to?(:install_deploy_dependencies)
+        provider
       end
     end
 
@@ -73,8 +75,15 @@ module DPL
       context.shell("sudo apt-get -qq install #{name}", retry: true) if `which #{command}`.chop.empty?
     end
 
-    def self.pip(name, command = name)
-      context.shell("sudo pip install #{name}", retry: true) if `which #{command}`.chop.empty?
+    def self.pip(name, command = name, version = nil)
+      if version
+        puts "sudo pip install #{name}==#{version}"
+        context.shell("sudo pip uninstall -y #{name}") unless `which #{command}`.chop.empty?
+        context.shell("sudo pip install #{name}==#{version}", retry: true)
+      else
+        puts "sudo pip install #{name}"
+        context.shell("sudo pip install #{name}", retry: true) if `which #{command}`.chop.empty?
+      end
     end
 
     def self.npm_g(name, command = name)

data/lib/dpl/provider/deis.rb

@@ -2,7 +2,10 @@ module DPL
   class Provider
     class Deis < Provider
       experimental 'Deis'
-      pip 'deis', 'deis'
+
+      def install_deploy_dependencies
+        self.class.pip 'deis', 'deis', options[:cli_version]
+      end
 
       def needs_key?
         true

data/spec/provider/deis_spec.rb

@@ -2,12 +2,31 @@ require 'spec_helper'
 require 'dpl/provider/deis'
 
 describe DPL::Provider::Deis do
+  let(:options) do
+    {
+      :app => 'example',
+      :key_name => 'key',
+      :controller => 'deis.deisapps.com',
+      :username => 'travis',
+      :password => 'secret'
+    }
+  end
+
   subject :provider do
-    described_class.new(DummyContext.new, :app => 'example',
-                                          :key_name => 'key',
-                                          :controller => 'deis.deisapps.com',
-                                          :username => 'travis',
-                                          :password => 'secret')
+    described_class.new(DummyContext.new, options)
+  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')
+      provider.install_deploy_dependencies
+    end
   end
 
   describe "#needs_key?" do

data/spec/provider_spec.rb

@@ -12,6 +12,11 @@ describe DPL::Provider do
     example { expect(described_class.new(DummyContext.new, :provider => "Example")) .to be_an(example_provider) }
     example { expect(described_class.new(DummyContext.new, :provider => "exa_mple")).to be_an(example_provider) }
     example { expect(described_class.new(DummyContext.new, :provider => "exa-mple")).to be_an(example_provider) }
+    example "install deployment dependencies" do
+      expect_any_instance_of(described_class).to receive(:respond_to?).with(:install_deploy_dependencies).and_return(true)
+      expect_any_instance_of(described_class).to receive(:install_deploy_dependencies)
+      described_class.new(DummyContext.new, :provider => "example")
+    end
   end
 
   describe "#requires" do
@@ -57,6 +62,12 @@ describe DPL::Provider do
       expect(example_provider.context).to receive(:shell).with("sudo pip install foo", retry: true)
       example_provider.pip("foo")
     end
+
+    example "specific version" do
+      expect(example_provider).to receive(:`).with("which foo").and_return("")
+      expect(example_provider.context).to receive(:shell).with("sudo pip install foo==1.0", retry: true)
+      example_provider.pip("foo", "foo", "1.0")
+    end
   end
 
   describe "#deploy" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.8.travis.651.1
+  version: 1.7.8.travis.653.1
 platform: ruby
 authors:
 - Konstantin Haase