dpl 1.9.1.travis.2615.5 → 1.9.1.travis.2617.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2525611ba1f6e3c98069d288fb6aecc11b300e2216ac8af1f3295194e9b6c9a2
-  data.tar.gz: 3ad1e3aa9f53f72d7e9f704bb03d550cca7197ba5b14798e9614615e9f7ec599
+  metadata.gz: ee35e0bdea5d7875e3582e35045c179f15474e0bbbde47f66444cde7a2fdd6cc
+  data.tar.gz: 023fea2bca6ae703b7f19000fcc3edd5274427a5b6cffa700099e90ecd1cc2fe
 SHA512:
-  metadata.gz: b2067707814bc04667839e44158080426e038dd74e5777c47d8af2719569fc165148cf11a22f89a5968e141face0b333911800c44cbc4bbd935faf51d7316a2b
-  data.tar.gz: d0f6bf340bd0933c872befbe5cc087f18f94098313d98b6385da8341ab3f10bc10d34642f46b72f66753dafd4dccac96a90a5b00f4cf51d768c4ea6b94809a76
+  metadata.gz: e47e63a19c03adc5445b88eb2104c70d3aa99019ad7d2c2a875ea91cde6520c3380df42419f3792bd345896859c320a967fdb44272fa94bc39d9b1beee15d901
+  data.tar.gz: 659aaf868eb939dfec2d9eae144c98b1599f02c2266ed3a29d0dea2d02152edba4eb7c5ba36c0e29d3b3a43fa06164afc0cd1cb3701118f733cc4a0e347d24e5

data/lib/dpl/provider.rb

@@ -6,6 +6,10 @@ module DPL
   class Provider
     include FileUtils
 
+    # map of DPL provider class name constants to their corresponding
+    # file names. There is no simple rule to map them automatically
+    # (camel-cases, snake-cases, call-caps, etc.), so we need an explicit
+    # map.
     PROVIDERS = {
       'Anynines'            => 'anynines',
       'Appfog'              => 'appfog',
@@ -54,6 +58,11 @@ module DPL
     def self.new(context, options)
       return super if self < Provider
 
+      # when requiring the file corresponding to the provider name
+      # given in the options, the general strategy is to normalize
+      # the option to lower-case alphanumeric, then
+      # use that key to find the file name using the PROVIDERS map.
+
       context.fold("Installing deploy dependencies") do
         begin
           opt_lower = super.option(:provider).to_s.downcase
@@ -61,7 +70,7 @@ module DPL
           name = PROVIDERS.keys.detect { |p| p.to_s.downcase == opt }
           raise Error, "could not find provider %p" % opt unless name
 
-          require "dpl/provider/#{opt_lower}"
+          require "dpl/provider/#{PROVIDERS[name]}"
           provider = const_get(name).new(context, options)
         rescue NameError, LoadError => e
           if /uninitialized constant DPL::Provider::(?<provider_wanted>\S+)/ =~ e.message
@@ -76,7 +85,7 @@ module DPL
           context.shell(install_cmd)
           Gem.clear_paths
 
-          require "dpl/provider/#{opt_lower}"
+          require "dpl/provider/#{PROVIDERS[name]}"
           provider = const_get(name).new(context, options)
         rescue DPL::Error
           if opt_lower

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.9.1.travis.2615.5'
+  VERSION = '1.9.1.travis.2617.5'
 end

data/spec/provider_spec.rb

@@ -12,6 +12,8 @@ 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 { 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 "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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.9.1.travis.2615.5
+  version: 1.9.1.travis.2617.5
 platform: ruby
 authors:
 - Konstantin Haase