dpl 1.9.1.travis.2639.5 → 1.9.1.travis.2660.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99069235c38eac07596815a15cb8c6a60ffb8db5fb16acd2717d8460983cb91a
-  data.tar.gz: 6beeed06a1d6109e4cb0cef144fbc786aa547aedc2f940afa92687a436b7fc8c
+  metadata.gz: 7494a96a838bdb9db9a0b0042cb001e9fd1a0ac1fbdb2c7ae97fcbb19986155e
+  data.tar.gz: a5ab9c1124ea55f1d4af111b983896904591041bd2bb01653dfa8ce380fe2565
 SHA512:
-  metadata.gz: a67e49c94385ea8ecb0e2ffd8f201c1bbcc907df2c72cc23df848d5dfd90c7c8430379394c5286ac2dc05decd47d163bde3c8d8121c485e8514c692ca88003bd
-  data.tar.gz: a315fe6c0bb8eb0fa22eea54716790d8f74d75346907a26648f306f230e32a65fe8a62909120ce815b409d04537178dca90bd7d7ad5069bc23cc620652860332
+  metadata.gz: c1eac4ca1809c551e8a576cba99f7fffd25097bdafa187fc81be660cd15a369848b0fe714f53dfb4c55479a6e956d24c9fadedf19f9009122103d9aec85ca69d
+  data.tar.gz: 8e23bda53945418170fd2132c2b6d23ebf944d528d6244d4dd2cabb1938f8e8865ef339546052d73126c7c5996d7736e52228d8670015bffb83dae31150b5830

data/lib/dpl/provider.rb

@@ -67,21 +67,20 @@ module DPL
         begin
           opt_lower = super.option(:provider).to_s.downcase
           opt = opt_lower.gsub(/[^a-z0-9]/, '')
-          name = PROVIDERS.keys.detect { |p| p.to_s.downcase == opt }
-          raise Error, "could not find provider %p" % opt unless name
-
-          require "dpl/provider/#{PROVIDERS[name]}"
-          provider = const_get(name).new(context, options)
+          class_name = PROVIDERS.keys.detect { |p| p.to_s.downcase == opt }
+          raise Error, "could not find provider %p" % opt unless class_name
+          require "dpl/provider/#{PROVIDERS[class_name]}"
+          provider = const_get(class_name).new(context, options)
         rescue NameError, LoadError => e
-          if /uninitialized constant DPL::Provider::(?<provider_wanted>\S+)/ =~ e.message ||
+          if /uninitialized constant DPL::Provider::(?<provider_wanted>\S+)/ =~ e.message
             provider_gem_name = PROVIDERS[provider_wanted]
           elsif %r(cannot load such file -- dpl/provider/(?<provider_file_name>\S+)) =~ e.message
-            provider_gem_name = provider_file_name
+            provider_gem_name = PROVIDERS[class_name]
           else
             # don't know what to do with this error
             raise e
           end
-          install_cmd = "gem install dpl-#{PROVIDERS[provider_gem_name] || opt} -v #{ENV['DPL_VERSION'] || DPL::VERSION}"
+          install_cmd = "gem install dpl-#{provider_gem_name || opt} -v #{ENV['DPL_VERSION'] || DPL::VERSION}"
 
           if File.exist?(local_gem = File.join(Dir.pwd, "dpl-#{PROVIDERS[provider_gem_name] || opt_lower}-#{ENV['DPL_VERSION'] || DPL::VERSION}.gem"))
             install_cmd = "gem install #{local_gem}"
@@ -90,8 +89,8 @@ module DPL
           context.shell(install_cmd)
           Gem.clear_paths
 
-          require "dpl/provider/#{PROVIDERS[name]}"
-          provider = const_get(name).new(context, options)
+          require "dpl/provider/#{PROVIDERS[class_name]}"
+          provider = const_get(class_name).new(context, options)
         rescue DPL::Error
           if opt_lower
             provider = const_get(opt.capitalize).new(context, options)

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.9.1.travis.2639.5'
+  VERSION = '1.9.1.travis.2660.5'
 end

data/spec/provider_spec.rb

@@ -3,22 +3,32 @@ require 'dpl/provider'
 
 describe DPL::Provider do
   let(:example_provider) { Class.new(described_class)}
-  subject(:provider) { example_provider.new(DummyContext.new, :app => 'example', :key_name => 'foo', :run => ["foo", "bar"]) }
+  let(:context) { DummyContext.new }
+  subject(:provider) { example_provider.new(context, :app => 'example', :key_name => 'foo', :run => ["foo", "bar"]) }
 
   before { stub_const "DPL::Provider::Example", example_provider }
 
   describe "#new" do
-    example { expect(described_class.new(DummyContext.new, :provider => "example")) .to be_an(example_provider) }
-    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 { expect(described_class.new(DummyContext.new, :provider => "scri_pt")).to be_an(DPL::Provider::Script) }
-    example { expect(described_class.new(DummyContext.new, :provider => "scri _pt")).to be_an(DPL::Provider::Script) }
+    example { expect(described_class.new(context, :provider => "example")) .to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "Example")) .to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "exa_mple")).to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "exa-mple")).to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "scri_pt")).to be_an(DPL::Provider::Script) }
+    example { expect(described_class.new(context, :provider => "scri _pt")).to be_an(DPL::Provider::Script) }
+    example { expect(described_class.new(context, :provider => "cloudfoundry")).to be_an(DPL::Provider::CloudFoundry) }
     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")
+      described_class.new(context, :provider => "example")
     end
+
+    it "installs correct gem when provider name does not match" do
+      expect(context).to receive(:shell).with("gem install dpl-cloud_foundry -v #{ENV['DPL_VERSION'] || DPL::VERSION}")
+      expect(described_class).to receive(:require).with("dpl/provider/cloud_foundry").and_raise LoadError.new("cannot load such file -- dpl/provider/cloud_foundry")
+      expect(described_class).to receive(:require).with("dpl/provider/cloud_foundry").and_call_original
+      described_class.new(context, :provider => 'cloudfoundry')
+    end
+
   end
 
   describe "#pip" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.9.1.travis.2639.5
+  version: 1.9.1.travis.2660.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec