dpl-scalingo 1.10.12.travis.3794.5 → 1.10.12.travis.4032.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53e740403906427a59bdf8e5f154e0cdb5e15ff8e117b15f1164e672f8db5964
-  data.tar.gz: f29230814590c985f164476f0c9715d2e48197be63b7daecfba436e926fa6003
+  metadata.gz: 2a3376ab88b0f6e1c0c38bd240684f507076f63b40b97d9a93c3fe61b6dd0cb7
+  data.tar.gz: 76e05f8b2be048bb62d2a35def3ae494238632b89c3810b1984f9792b67c6a43
 SHA512:
-  metadata.gz: 8d39c4dcd997e8c6eafdc63a5fe474563f02fe67e9fe1f5e8e2100a8c80d6c76ae57b9afd48c8a844d701be7262c4571a43d016d71a35ac9c51e67f8c3b7b777
-  data.tar.gz: ac52c1140f920282e38a623a24b1301e0d4c14c049885e052641c77dca964f5af3f3c5ef492abe7a02db6c29edac9705cb253ffe9d95745ca4f6399972e32909
+  metadata.gz: 7ca418a0e4254887c7f69e76a9c8f504ce45ebc7ebe54e385c6e2d7b4eb56ab31b436447db83662dbc85d281607d2f427c3835b00a49683f848ed0d5704338bc
+  data.tar.gz: d6e85e896c6fd9d0083e5095bb6b466cd4ff70aa787c52b8015847dcdc2c29c46e66eb3e22b3df652bc4118a3894b8aa489c5b5ecca7aa465c461a79755715f8

data/lib/dpl/provider/scalingo.rb

@@ -6,63 +6,81 @@ require 'date'
 module DPL
   class Provider
     class Scalingo < Provider
-
       def install_deploy_dependencies
-        unless context.shell "curl -OL https://cli-dl.scalingo.io/release/scalingo_latest_linux_amd64.tar.gz && tar -zxvf scalingo_latest_linux_amd64.tar.gz && mv scalingo_*_linux_amd64/scalingo . && rm scalingo_latest_linux_amd64.tar.gz && rm -r scalingo_*_linux_amd64"
-          error "Couldn't install Scalingo CLI."
-        end
+        download_url = 'https://cli-dl.scalingo.io/release/scalingo_latest_linux_amd64.tar.gz'
+        command = 'curl'
+        command = "#{command} --silent" if !@debug
+        command = "#{command} --remote-name --location #{download_url}"
+        tar_options = 'v' if @debug
+        tar_options = "#{tar_options}zxf"
+        command = "#{command} && tar -#{tar_options} scalingo_latest_linux_amd64.tar.gz" \
+                  ' && mv scalingo_*_linux_amd64/scalingo .' \
+                  ' && rm scalingo_latest_linux_amd64.tar.gz' \
+                  ' && rm -r scalingo_*_linux_amd64'
+
+        error "Couldn't install Scalingo CLI." if !context.shell command
       end
 
       def initialize(context, options)
         super
         @options = options
-        @remote = options[:remote] || "scalingo"
-        @branch = options[:branch] || "master"
-      end
-
-      def logged_in
-        context.shell "DISABLE_INTERACTIVE=true ./scalingo login 2> /dev/null > /dev/null"
+        @remote = options[:remote] || 'scalingo-dpl'
+        @branch = options[:branch] || 'master'
+        @region = options[:region] || 'agora-fr1'
+        @timeout = options[:timeout] || '60'
+        @debug = !options[:debug].nil?
       end
 
       def check_auth
         token = @options[:api_key] || @options[:api_token]
         if token
-          context.shell "timeout 2 ./scalingo login --api-token #{token} 2> /dev/null > /dev/null"
+          scalingo("login --api-token #{token}")
         elsif @options[:username] && @options[:password]
-          context.shell "echo -e \"#{@options[:username]}\n#{@options[:password]}\" | timeout 2 ./scalingo login 2> /dev/null > /dev/null"
-        end
-        if !logged_in
-          error "Couldn't connect to Scalingo API."
+          scalingo('login', [], "echo -e \"#{@options[:username]}\n#{@options[:password]}\"")
         end
       end
 
-      def setup_key(file, type = nil)
-        if !logged_in
-          error "Couldn't connect to Scalingo API."
-        end
-        unless context.shell "./scalingo keys-add dpl_tmp_key #{file}"
-          error "Couldn't add ssh key."
+      def setup_key(file, _type = nil)
+        if !scalingo("keys-add dpl_tmp_key #{file}")
+          error "Couldn't add SSH key."
         end
       end
 
       def remove_key
-        if !logged_in
-          error "Couldn't connect to Scalingo API."
-        end
-        unless context.shell "./scalingo keys-remove dpl_tmp_key"
-          error "Couldn't remove ssh key."
+        if !scalingo('keys-remove dpl_tmp_key')
+          error "Couldn't remove SSH key."
         end
       end
 
       def push_app
+        install_deploy_dependencies
+
         if @options[:app]
-          context.shell "git remote add #{@remote} git@scalingo.com:#{@options[:app]}.git 2> /dev/null > /dev/null"
+          if !scalingo("--app #{@options[:app]} git-setup --remote #{@remote}")
+            error 'Failed to add the Git remote.'
+          end
         end
-        unless context.shell "git push #{@remote} #{@branch} -f"
+
+        if !context.shell "git push #{@remote} #{@branch} --force"
           error "Couldn't push your app."
         end
       end
 
+      def scalingo(command, env = [], input = '')
+        env << "SCALINGO_REGION=#{@region}" if !@region.empty?
+
+        if @debug
+          env << 'DEBUG=1'
+        else
+          command += ' > /dev/null'
+        end
+        command = "#{env.join(' ')} timeout #{@timeout} ./scalingo #{command}"
+        command = "#{input} | #{command}" if input != ''
+
+        puts "Execute #{command}" if @debug
+
+        context.shell command
+      end
     end
   end
 end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.10.12.travis.3794.5'
+  VERSION = '1.10.12.travis.4032.5'
 end

data/spec/provider/scalingo_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'dpl/provider/scalingo'
 
 describe DPL::Provider::Scalingo do
-
   subject :provider do
     described_class.new(DummyContext.new, :username => 'travis', :password => 'secret', :remote => 'scalingo', :branch => 'master')
   end
@@ -10,7 +9,7 @@ describe DPL::Provider::Scalingo do
   describe "#install_deploy_dependencies" do
     example do
       expect(provider.context).to receive(:shell).with(
-              'curl -OL https://cli-dl.scalingo.io/release/scalingo_latest_linux_amd64.tar.gz && tar -zxvf scalingo_latest_linux_amd64.tar.gz && mv scalingo_*_linux_amd64/scalingo . && rm scalingo_latest_linux_amd64.tar.gz && rm -r scalingo_*_linux_amd64'
+              'curl --silent --remote-name --location https://cli-dl.scalingo.io/release/scalingo_latest_linux_amd64.tar.gz && tar -zxf scalingo_latest_linux_amd64.tar.gz && mv scalingo_*_linux_amd64/scalingo . && rm scalingo_latest_linux_amd64.tar.gz && rm -r scalingo_*_linux_amd64'
       ).and_return(true)
       provider.install_deploy_dependencies
     end
@@ -19,10 +18,7 @@ describe DPL::Provider::Scalingo do
   describe "#check_auth" do
     example do
       expect(provider.context).to receive(:shell).with(
-        "echo -e \"travis\nsecret\" | timeout 2 ./scalingo login 2> /dev/null > /dev/null"
-      ).and_return(true)
-      expect(provider.context).to receive(:shell).with(
-        'DISABLE_INTERACTIVE=true ./scalingo login 2> /dev/null > /dev/null'
+        "echo -e \"travis\nsecret\" | SCALINGO_REGION=agora-fr1 timeout 60 ./scalingo login > /dev/null"
       ).and_return(true)
       provider.check_auth
     end
@@ -31,10 +27,7 @@ describe DPL::Provider::Scalingo do
   describe "#setup_key" do
     example do
       expect(provider.context).to receive(:shell).with(
-        './scalingo keys-add dpl_tmp_key key_file'
-      ).and_return(true)
-      expect(provider.context).to receive(:shell).with(
-        'DISABLE_INTERACTIVE=true ./scalingo login 2> /dev/null > /dev/null'
+        'SCALINGO_REGION=agora-fr1 timeout 60 ./scalingo keys-add dpl_tmp_key key_file > /dev/null'
       ).and_return(true)
       provider.setup_key('key_file')
     end
@@ -43,10 +36,7 @@ describe DPL::Provider::Scalingo do
   describe "#remove_key" do
     example do
       expect(provider.context).to receive(:shell).with(
-        './scalingo keys-remove dpl_tmp_key'
-      ).and_return(true)
-      expect(provider.context).to receive(:shell).with(
-        'DISABLE_INTERACTIVE=true ./scalingo login 2> /dev/null > /dev/null'
+        'SCALINGO_REGION=agora-fr1 timeout 60 ./scalingo keys-remove dpl_tmp_key > /dev/null'
       ).and_return(true)
       provider.remove_key
     end
@@ -55,10 +45,12 @@ describe DPL::Provider::Scalingo do
   describe "#push_app" do
     example do
       expect(provider.context).to receive(:shell).with(
-        'git push scalingo master -f'
+              'curl --silent --remote-name --location https://cli-dl.scalingo.io/release/scalingo_latest_linux_amd64.tar.gz && tar -zxf scalingo_latest_linux_amd64.tar.gz && mv scalingo_*_linux_amd64/scalingo . && rm scalingo_latest_linux_amd64.tar.gz && rm -r scalingo_*_linux_amd64'
+      ).and_return(true)
+      expect(provider.context).to receive(:shell).with(
+        'git push scalingo master --force'
       ).and_return(true)
       provider.push_app
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-scalingo
 version: !ruby/object:Gem::Version
-  version: 1.10.12.travis.3794.5
+  version: 1.10.12.travis.4032.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-07-10 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.12.travis.3794.5
+        version: 1.10.12.travis.4032.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.12.travis.3794.5
+        version: 1.10.12.travis.4032.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement