dpl-scalingo 1.10.13 → 1.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc173dd27fa38fe214eefc25456e027a6b827276e96133905a649093fdcb7e63
-  data.tar.gz: 805831e0b0baab56e2fb2bf32e92938c0145824fd747be53527b56691db211ab
+  metadata.gz: a98920686365ad61fac32a15e0060703d489ba9e0a46d6b05aa6ddbd52bbcca2
+  data.tar.gz: f4ba4bd7266f5116d6fbdffab4c30f42d710ad48f21e3bfbc5d0fbbb7cc96642
 SHA512:
-  metadata.gz: efc1273c9fa58d4ee8066c771b389cb029ff3dcfbd2c7a5dca7af62f376861f94e8ec1df7fcc5252a4919cd6931766f0bc9076da9acbcccf06f7f997378139dc
-  data.tar.gz: 8765b21e9266b586c4411bd1cf6d1ef25ce97320f70f61618faa1d919cc94f9f1bcd01de4bf36d03712747bff796db8429a64cc0656c019b75afa35ba7c219ac
+  metadata.gz: d6d6f3bf4039d9cf58f43d635a8084f0cfeea5238bcad81e58cba14517bee407022f193e5d8cad3cc98907763f906df9534a118a522f7e5a6344abadb8e05158
+  data.tar.gz: 3c5d12104a1677f085c46c5cf1c0ef2300f5bfe94f0ab6479dedeeb405763e23388420a14891f0d61acb2d6d35ffa6f0744c37f9d062e55de2b7e353212db20a

data/lib/dpl/provider/scalingo.rb

@@ -32,11 +32,10 @@ module DPL
       end
 
       def check_auth
-        token = @options[:api_key] || @options[:api_token]
         if token
           scalingo("login --api-token #{token}")
-        elsif @options[:username] && @options[:password]
-          scalingo('login', [], "echo -e \"#{@options[:username]}\n#{@options[:password]}\"")
+        elsif username && @options[:password]
+          scalingo('login', [], "echo -e \"#{username}\n#{@options[:password]}\"")
         end
       end
 
@@ -66,6 +65,14 @@ module DPL
         end
       end
 
+      def username
+        @options[:username] || @options[:user]
+      end
+
+      def token
+        @options[:api_key] || @options[:api_token]
+      end
+
       def scalingo(command, env = [], input = '')
         env << "SCALINGO_REGION=#{@region}" if !@region.empty?
 

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.10.13'
+  VERSION = '1.10.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-scalingo
 version: !ruby/object:Gem::Version
-  version: 1.10.13
+  version: 1.10.14
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.13
+        version: 1.10.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.13
+        version: 1.10.14
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement