dpl-scalingo 1.9.6.travis.2795.5 → 1.9.6.travis.2827.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cee51114f7ce2ec934ecd5158a9cfcaaf7af0a755bd5e0bf72db06c9df56152d
-  data.tar.gz: aa32d19e0005af56e072dda89c2113ddbc1ddabdb1cf1f9e6262a80e1a6beb2c
+  metadata.gz: 967ba70c710d6abba14dfc264fee3bb6db6933e42e824782c1f281bc11d48819
+  data.tar.gz: 93789fb47a8c7efa42ea6adaf6c73cc706f6f307b267f8b19de273e1ab212ca6
 SHA512:
-  metadata.gz: 06c21d0e9042127ba2d1c70cc45e552de8890b7a47fe54b21a1e14d489e9b9d374def9a922f1c4a8bccae0a5db2d61222a06f000fc52556b35e313eb4f660fd3
-  data.tar.gz: bef144ea6ed01a3bf84e14657b31951ea77361b39c66055f647410d676946dfcbe7a7f6ada1a1eb5a7fa5dc76bcb4c95916298faf8674a083d66300caa291a1f
+  metadata.gz: 315945bf1c66e4c57d640dbaf37387e2e5e4bec63ad01f931fd1557eb0265ef156bcadfee3114a284683be20c2a4471d6451f66eb1a639d1df926083452606e4
+  data.tar.gz: 5929f9fd676b59cd58151daf3c058607374476c2a3ffb7548bb1cdebac5413ca2eeffc78955ab3bb183fae28f2df173155b7cd22254ba7ebb21045e039aaca5c

data/lib/dpl/provider/scalingo.rb

@@ -25,38 +25,9 @@ module DPL
       end
 
       def check_auth
-        if @options[:api_key]
-          unless context.shell "mkdir -p ~/.config/scalingo"
-            error "Couldn't create authentication file."
-          end
-          url = URI.parse('http://api.scalingo.com/v1/users/self')
-          http = Net::HTTP.new(url.host, url.port)
-          request = Net::HTTP::Get.new(url.request_uri)
-          request.basic_auth("", @options[:api_key])
-          request["Accept"] = "application/json"
-          request["Content-type"] = "application/json"
-          response = http.request(request)
-          data = {}
-          if File.exist?("#{Dir.home}/.config/scalingo/auth")
-            data = JSON.parse(File.read("#{Dir.home}/.config/scalingo/auth"))
-          end
-          begin
-            user = JSON.parse(response.body)
-          rescue
-            error "Invalid API token."
-          end
-          data["auth_config_data"] = {}
-          data["auth_config_data"]["api.scalingo.com"] = {}
-          data["auth_config_data"]["api.scalingo.com"]["id"] = user["user"]["id"]
-          data["auth_config_data"]["api.scalingo.com"]["last_name"] = user["user"]["last_name"]
-          data["auth_config_data"]["api.scalingo.com"]["username"] = user["user"]["username"]
-          data["auth_config_data"]["api.scalingo.com"]["email"] = user["user"]["email"]
-          data["auth_config_data"]["api.scalingo.com"]["first_name"] = user["user"]["first_name"]
-          data["auth_config_data"]["api.scalingo.com"]["auth_token"] = @options[:api_key]
-          data["last_update"] = DateTime.now
-          f = File.open("#{Dir.home}/.config/scalingo/auth", "w+") {
-            |f| f.write(data.to_json)
-          }
+        token = @options[:api_key] || @options[:api_token]
+        if token
+          context.shell "timeout 2 ./scalingo login --api-token #{token} 2> /dev/null > /dev/null"
         elsif @options[:username] && @options[:password]
           context.shell "echo -e \"#{@options[:username]}\n#{@options[:password]}\" | timeout 2 ./scalingo login 2> /dev/null > /dev/null"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-scalingo
 version: !ruby/object:Gem::Version
-  version: 1.9.6.travis.2795.5
+  version: 1.9.6.travis.2827.6
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.6.travis.2795.5
+        version: 1.9.6.travis.2827.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.6.travis.2795.5
+        version: 1.9.6.travis.2827.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement