dpl 1.8.8.travis.1179.4 → 1.8.8.travis.1183.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2U0NzVjOTM4MDE5ZjI4MDJlYTI1ODFiOGRhNjZmZTI3MjUyMWU3Yg==
+    OWIzYjEwOTdlYmQ3NzlhZWU1MTI5MjU4ZTIxYjIxMmIwNzJlMzc2OA==
   data.tar.gz: !binary |-
-    NWZlNjYzMjQ2ZjdhODI3MjYxZjE2YWUyNTdlM2VhNDcyOTZhNmQ3Ng==
+    NDQyNGM5ZTQ4MmQwMmM1ZDQwZDUxYWZhMzk1M2RmMzhkYWYyMmUwMQ==
 SHA512:
   metadata.gz: !binary |-
-    MTIxNWE5OWI2NTA5YmIzOGQ0YzRlMmJhYmQ2MmY5ZDMxN2Y2ZjQ0MTk5YTVm
-    OWQ4NWMwMTNiYzllZTZlODA1ZGY0Zjc2Y2ViYWNhY2VlYmFkMjA5YmMyMGY5
-    ZWVkNGFhOWVkNTA4NTg4NjlmMzY1NGE2ZjE3YzliMjIzMWRmZmE=
+    OWZkNTBhZWQzZTg5MGI3NmJjZmE4MDBjNzI1OWQ3YjM5YjYyMjM3N2NiM2Fm
+    ZDcyZWViNmViZjc2MDQxMjJlYTg1MTRjOTU0ZmM2YTcwMGJiYjNjMWNjMjVh
+    MmIwNjZjNTExYzI4NjIwNTQ2NzdlZDY2ZWU2NzJkNzI3MjMxMmU=
   data.tar.gz: !binary |-
-    YTI2ZDMzYjY2OGMyNjY5OTRiYjA3ZDQwYTgyZjZjYjBlN2JkYTdmNDdjOWFl
-    YTA5Njg2M2FhZWU4YjBlYzI4NjYzMjA0OTM3ODUzMWE0OWVkZTlhMzYwNGY4
-    NDJjZmJmOGQ4NjYzNGViMTg3NjQwNzg3ZWQ3YTNiYWEyNDA3MGQ=
+    MzgyZTU5Y2UwZGQ0ZGU2MzhhNjA2MTE0NDIyYTQ3YjFmMzlhM2NlMDE2MWQ4
+    YWYxYTVmODNjMDVjMmJlNzlhNDU4MDdiNWNkZGQ1OWIwNGVjNDkzYTk2OWQw
+    NWNjZmQyZDViZTJmZmU2YzVhN2NiMzc3NzA5OTkyMWNiZTMwMjc=

data/README.md

@@ -44,6 +44,7 @@ Dpl supports the following providers:
 * [Rackspace Cloud Files](#rackspace-cloud-files)
 * [RubyGems](#rubygems)
 * [S3](#s3)
+* [Scalingo](#scalingo)
 * [Script](#script)
 * [TestFairy](#testfairy)
 
@@ -437,6 +438,7 @@ You first need to create an [Atlas account](https://atlas.hashicorp.com/account/
 #### Options:
 
 * **site**: Web App Name (if your app lives at myapp.azurewebsites.net, the name would be myapp).
+* **slot**: Optional. Slot name if your app uses staging deployment. (e.g. if your slot lives at myapp-test.azurewebsites.net, the slot would be myapp-test).
 * **username**: Web App Deployment Username.
 * **password**: Web App Deployment Password.
 * **verbose**: If passed, Azure's deployment output will be printed. Warning: If you provide incorrect credentials, Git will print those in clear text. Correct authentication credentials will remain hidden.
@@ -444,12 +446,13 @@ You first need to create an [Atlas account](https://atlas.hashicorp.com/account/
 #### Environment variables:
 
  * **AZURE_WA_SITE** Web App Name. Used if the `site` option is omitted.
+ * **AZURE_WA_SLOT** Optional. Slot name if your app uses staging deployment. Used if the `slot` option is omitted.
  * **AZURE_WA_USERNAME**: Web App Deployment Username. Used if the `username` option is omitted.
  * **AZURE_WA_PASSWORD**: Web App Deployment Password. Used if the `password` option is omitted.
 
 #### Examples:
 
-    dpl --provider=AzureWebApps --username=depluser --password=deplp@ss --site=dplsite --verbose
+    dpl --provider=AzureWebApps --username=depluser --password=deplp@ss --site=dplsite --slot=dplsite-test --verbose
 
 ### Divshot.io:
 
@@ -758,6 +761,34 @@ and your testers can start testing your app.
 
     dpl --provider=codedeploy --access-key-id=<aws access key> --secret_access_key=<aws secret access key> --application=<application name> --deployment_group=<deployment group> --revision_type=<s3/github> --commit_id=<commit ID> --repository=<repo name> --region=<AWS availability zone> --wait-until-deployed=<true>
 
+### Scalingo:
+
+#### Options:
+* **api_key**: scalingo API Key. Not necessary if username and password are used.
+* **username**: scalingo username. Not necessary if api_key is used.
+* **password**: scalingo password. Not necessary if api_key is used.
+* **remote**: Remote url or git remote name of your git repository. By default remote name is "scalingo".
+* **branch**: Branch of your git repository. By default branch name is "master".
+* **app**: Only necessary if your repository does not contain the appropriate remote. Specifying the app will add a remote to your local repository: `git remote add <remote> git@scalingo.com:<app>.git`
+
+#### Use:
+
+You can connect to Scalingo using your username/password or your api key.
+It needs [Scalingo CLI](http://cli.scalingo.com/) which will be [downloaded here](http://cli.scalingo.com/).
+Then, it will push your project to Scalingo and deploy it automatically.
+
+Note: You only need to connect once to Scalingo CLI, credentials are stored locally.
+
+#### Examples:
+
+    dpl --provider=scalingo --api_key="aaAAbbBB0011223344"
+    dpl --provider=scalingo --username=<username> --password=<password>
+
+    dpl --provider=scalingo --api_key="aaAAbbBB0011223344" --remote="scalingo-staging"
+    dpl --provider=scalingo --api_key="aaAAbbBB0011223344" --remote="scalingo-staging" branch="master"
+
+    dpl --provider=scalingo
+
 ### Script:
 
 An elementary provider that executes a single command.

data/lib/dpl/provider.rb

@@ -43,6 +43,7 @@ module DPL
     autoload :Releases,         'dpl/provider/releases'
     autoload :RubyGems,         'dpl/provider/rubygems'
     autoload :S3,               'dpl/provider/s3'
+    autoload :Scalingo,         'dpl/provider/scalingo'
     autoload :Script,           'dpl/provider/script'
     autoload :TestFairy,        'dpl/provider/testfairy'
     autoload :Transifex,        'dpl/provider/transifex'

data/lib/dpl/provider/azure_webapps.rb

@@ -5,12 +5,13 @@ module DPL
         {
           "username"     => options[:username] || context.env['AZURE_WA_USERNAME'],
           "password"     => options[:password] || context.env['AZURE_WA_PASSWORD'],
-          "site"         => options[:site] || context.env['AZURE_WA_SITE']
+          "site"         => options[:site] || context.env['AZURE_WA_SITE'],
+          "slot"         => options[:slot] || context.env['AZURE_WA_SLOT']
         }
       end
 
       def git_target
-        "https://#{config['username']}:#{config['password']}@#{config['site']}.scm.azurewebsites.net:443/#{config['site']}.git"
+        "https://#{config['username']}:#{config['password']}@#{config['slot'] || config['site']}.scm.azurewebsites.net:443/#{config['site']}.git"
       end
 
       def needs_key?
@@ -27,7 +28,7 @@ module DPL
       end
 
       def push_app
-        log "Deploying to Azure Web App '#{config['site']}'"
+        log "Deploying to Azure Web App '#{config['slot'] || config['site']}'"
 
         if !!options[:verbose]
           context.shell "git push --force --quiet #{git_target} master"

data/lib/dpl/provider/scalingo.rb

@@ -0,0 +1,97 @@
+require 'net/http'
+require 'uri'
+require 'json'
+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
+      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"
+      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)
+          }
+        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."
+        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."
+        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."
+        end
+      end
+
+      def push_app
+        if @options[:app]
+          context.shell "git remote add #{@remote} git@scalingo.com:#{@options[:app]}.git 2> /dev/null > /dev/null"
+        end
+        unless context.shell "git push #{@remote} #{@branch} -f"
+          error "Couldn't push your app."
+        end
+      end
+
+    end
+  end
+end

data/spec/provider/scalingo_spec.rb

@@ -0,0 +1,64 @@
+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
+
+  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'
+      ).and_return(true)
+      provider.install_deploy_dependencies
+    end
+  end
+
+  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'
+      ).and_return(true)
+      provider.check_auth
+    end
+  end
+
+  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'
+      ).and_return(true)
+      provider.setup_key('key_file')
+    end
+  end
+
+  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'
+      ).and_return(true)
+      provider.remove_key
+    end
+  end
+
+  describe "#push_app" do
+    example do
+      expect(provider.context).to receive(:shell).with(
+        'git push scalingo master -f'
+      ).and_return(true)
+      provider.push_app
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.8.travis.1179.4
+  version: 1.8.8.travis.1183.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -158,6 +158,7 @@ files:
 - lib/dpl/provider/releases.rb
 - lib/dpl/provider/rubygems.rb
 - lib/dpl/provider/s3.rb
+- lib/dpl/provider/scalingo.rb
 - lib/dpl/provider/script.rb
 - lib/dpl/provider/testfairy.rb
 - lib/dpl/provider/transifex.rb
@@ -202,6 +203,7 @@ files:
 - spec/provider/releases_spec.rb
 - spec/provider/rubygems_spec.rb
 - spec/provider/s3_spec.rb
+- spec/provider/scalingo_spec.rb
 - spec/provider/script_spec.rb
 - spec/provider/testfairy_spec.rb
 - spec/provider/transifex_spec.rb