dpl 1.8.17 → 1.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72fde1a2ab1ae2bf50c0c5e2eb98c087c31395b4
-  data.tar.gz: 26f261efe42bdb31caeb5de0ac8e05fc951d87fd
+  metadata.gz: b4fb4f547a3dc5586a67a2c85c345841cbbed212
+  data.tar.gz: d6258b907be13d012d916e4f40a4a6434806b4ac
 SHA512:
-  metadata.gz: 486de17ed6f9d995b239480460ee1612cf7a765b8a696621678c95b064baeacea8906765ab91c540a961533953f5d3ed6b803e3e6bae00152b2437de64f06145
-  data.tar.gz: 87acea2989c14e18d6f716c6e36a06e102eee5bf772c5543d3e61dd676b3b2eb32fbcdf890920e61a424a12aff6aa0d0eae812733f971a2175dcc6b42d8fa1c5
+  metadata.gz: 7eaf5e117543923831ea3cab7b21f2f93c5cc41ba33321937b79e9bd04bbc2d14b44cdf2754feefc957812f2487c85eea30ea95180d172fee53d8e02f65ca6ce
+  data.tar.gz: 689d6ad8a93a3f848df543b87d9e502bdd15e09a52ee1451b6df9c53b496a3a9a5a4948c366fc3735e7296c9ed15b727709f990c08bd98119de6f94080bcaab1

data/.travis.yml

@@ -2,18 +2,22 @@ language: ruby
 rvm:
 - 1.9.3
 - 2.0.0
-- 2.1.0
 - 2.1.5
-- "2.2"
+- "2.2.5"
+- "2.3.1"
 
 matrix:
   allow_failures:
-    - rvm: "2.2"
+    - rvm: "2.2.5"
+    - rvm: "2.3.1"
 
 sudo: false
 
 cache: bundler
 
+script:
+  - bundle exec rake && gem build dpl.gemspec && gem install dpl-*.gem && dpl --provider=script --script='echo foo'
+
 deploy:
   provider: rubygems
   api_key:

data/Gemfile

@@ -21,6 +21,7 @@ group :openshift do
 end
 
 group :appfog do
+  gem 'json_pure'
   gem 'af'
 end
 
@@ -39,7 +40,7 @@ end
 
 group :lambda do
   gem 'aws-sdk', '>= 2.0.18.pre'
-  gem 'rubyzip'
+  gem 'rubyzip', '~> 1.1'
 end
 
 group :cloud_files do
@@ -57,7 +58,7 @@ group :gcs do
 end
 
 group :elastic_beanstalk do
-  gem 'rubyzip'
+  gem 'rubyzip', '~> 1.1'
   gem 'aws-sdk-v1'
 end
 
@@ -67,11 +68,13 @@ group :bitballoon do
 end
 
 group :puppet_forge do
+  gem 'json_pure'
   gem 'puppet'
   gem 'puppet-blacksmith'
 end
 
 group :packagecloud do
+  gem 'json_pure'
   gem 'packagecloud-ruby', '= 0.2.17'
 end
 
@@ -86,3 +89,7 @@ end
 group :deis do
   gem 'git'
 end
+
+group :opsworks do
+  gem 'aws-sdk', '>= 2.0.18.pre'
+end

data/README.md

@@ -11,18 +11,20 @@ Dpl supports the following providers:
 * [AppFog](#appfog)
 * [Atlas by HashiCorp](#atlas)
 * [AWS CodeDeploy](#aws-codedeploy)
+* [AWS Elastic Beanstalk](#elastic-beanstalk)
 * [AWS OpsWorks](#opsworks)
 * [Azure Web Apps](#azure-web-apps)
 * [Bintray](#bintray)
 * [BitBalloon](#bitballoon)
 * [Boxfuse](#boxfuse)
+* [Catalyze](#catalyze)
 * [Chef Supermarket](#chef-supermarket)
 * [Cloud 66](#cloud-66)
 * [Cloud Foundry](#cloud-foundry)
 * [Deis](#deis)
 * [Divshot.io](#divshotio)
-* [Elastic Beanstalk](#elastic-beanstalk)
 * [Engine Yard](#engine-yard)
+* [ExoScale](#exoscale)
 * [Firebase](#firebase)
 * [Github Releases](#github-releases)
 * [Google App Engine (experimental)](#google-app-engine)
@@ -343,6 +345,30 @@ It is possible to set file-specific `Cache-Control` and `Expires` headers using
     dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --detect-encoding --cache_control=max-age=99999 --expires="2012-12-21 00:00:00 -0000"
     dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --region=us-west-2 --local-dir= BUILD --upload-dir=BUILDS
 
+### Elastic Beanstalk:
+
+#### Options:
+
+ * **access-key-id**: AWS Access Key ID. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
+ * **secret-access-key**: AWS Secret Key. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
+ * **region**: AWS Region the Elastic Beanstalk app is running in. Defaults to 'us-east-1'. Please be aware that this must match the region of the elastic beanstalk app.
+ * **app**: Elastic Beanstalk application name.
+ * **env**: Elastic Beanstalk environment name which will be updated.
+ * **zip_file**: The zip file that you want to deploy. _**Note:**_ you also need to use the `skip_cleanup` or the zip file you are trying to upload will be removed during cleanup.
+ * **bucket_name**: Bucket name to upload app to.
+ * **bucket_path**: Location within Bucket to upload app to.
+ * **only_create_app_version**: only create the app version, don't actually deploy it.
+
+#### Environment variables:
+
+ * **ELASTIC_BEANSTALK_ENV**: Elastic Beanstalk environment name which will be updated. Is only used if `env` option is omitted.
+ * **ELASTIC_BEANSTALK_LABEL**: Label name of the new version.
+ * **ELASTIC_BEANSTALK_DESCRIPTION**: Description of the new version. Defaults to the last commit message.
+
+#### Examples:
+
+    dpl --provider=elasticbeanstalk --access-key-id=<access-key-id> --secret-access-key="<secret-access-key>" --app="example-app-name" --env="example-app-environment" --region="us-west-2"
+
 ### OpsWorks:
 
 #### Options:
@@ -350,9 +376,11 @@ It is possible to set file-specific `Cache-Control` and `Expires` headers using
 * **access-key-id**: AWS Access Key ID. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
 * **secret-access-key**: AWS Secret Key. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
 * **app-id**: The app ID.
+* **instance-ids**: An instance id. (Use this option multiple times to specify multiple instance ids. Default: [])
+* **layer-ids**: A layer id. (Use this option multiple times to specify multiple layer ids. Default: [])
 * **migrate**: Migrate the database. (Default: false)
 * **wait-until-deployed**: Wait until the app is deployed and return the deployment status. (Default: false)
-* **custom_json**: Override custom_json options. If using this, default configuration will be overriden. See the code [here](https://github.com/travis-ci/dpl/blob/master/lib/dpl/provider/ops_works.rb#L34). More about `custom_json` [here](http://docs.aws.amazon.com/opsworks/latest/userguide/workingcookbook-json.html).
+* **custom_json**: Override custom_json options. If using this, default configuration will be overriden. See the code [here](https://github.com/travis-ci/dpl/blob/master/lib/dpl/provider/ops_works.rb#L43). More about `custom_json` [here](http://docs.aws.amazon.com/opsworks/latest/userguide/workingcookbook-json.html).
 
 #### Environment variables:
 
@@ -362,6 +390,7 @@ It is possible to set file-specific `Cache-Control` and `Expires` headers using
 #### Examples:
 
     dpl --provider=opsworks --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --app-id=<app-id> --migrate --wait-until-deployed
+    dpl --provider=opsworks --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --app-id=<app-id> --layer-ids=<layer-id>
 
 ### Anynines:
 
@@ -557,30 +586,6 @@ For accounts using two factor authentication, you have to use an oauth token as
     dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --detect-encoding --cache_control=max-age=99999
     dpl --provider=gcs --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --local-dir=BUILD --upload-dir=BUILDS
 
-### Elastic Beanstalk:
-
-#### Options:
-
- * **access-key-id**: AWS Access Key ID. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
- * **secret-access-key**: AWS Secret Key. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
- * **region**: AWS Region the Elastic Beanstalk app is running in. Defaults to 'us-east-1'. Please be aware that this must match the region of the elastic beanstalk app.
- * **app**: Elastic Beanstalk application name.
- * **env**: Elastic Beanstalk environment name which will be updated.
- * **zip_file**: The zip file that you want to deploy. _**Note:**_ you also need to use the `skip_cleanup` or the zip file you are trying to upload will be removed during cleanup.
- * **bucket_name**: Bucket name to upload app to.
- * **bucket_path**: Location within Bucket to upload app to.
- * **only_create_app_version**: only create the app version, don't actually deploy it.
-
-#### Environment variables:
-
- * **ELASTIC_BEANSTALK_ENV**: Elastic Beanstalk environment name which will be updated. Is only used if `env` option is omitted.
- * **ELASTIC_BEANSTALK_LABEL**: Label name of the new version.
- * **ELASTIC_BEANSTALK_DESCRIPTION**: Description of the new version. Defaults to the last commit message.
-
-#### Examples:
-
-    dpl --provider=elasticbeanstalk --access-key-id=<access-key-id> --secret-access-key="<secret-access-key>" --app="example-app-name" --env="example-app-environment" --region="us-west-2"
-
 ### BitBalloon:
 
 #### Options:
@@ -622,6 +627,37 @@ For accounts using two factor authentication, you have to use an oauth token as
     dpl --provider=packagecloud --username=packageuser --token=t0k3n --repository=myrepo --dist=ubuntu/precise
     dpl --provider=packagecloud --username=packageuser --token=t0k3n --repository=myrepo --local-dir="${TRAVIS_BUILD_DIR}/pkgs" --dist=ubuntu/precise
 
+### Catalyze:
+
+#### Options:
+
+ * **target**: Required. The git remote repository to deploy to.
+ * **path**: Optional. If using the skip_cleanup option to deploy from current file state, you can optionally specify the pathspec for the files to deploy. If not specified then all files are deployed.
+
+#### Examples:
+
+    dpl --provider=catalyze --target=ssh://git@git.catalyzeapps.com:2222/app1234.git
+    dpl --provider=catalyze --target=ssh://git@git.catalyzeapps.com:2222/app1234.git --skip_cleanup=true
+    dpl --provider=catalyze --target=ssh://git@git.catalyzeapps.com:2222/app1234.git --skip_cleanup=true --path=build
+
+
+#### Setup:
+
+1. Get the deployment target for Catalyze:
+a. Make sure your catalyze environment is [associated](https://resources.catalyze.io/paas/paas-cli-reference/#associate).
+b. Get the git remote by running ```git remote -v``` from within the associated repo.
+2. Setup a deployment key to Catalyze for Travis CI:
+a. Install the travis-ci cli.
+b. Get the public SSH key for your travis project and save it to a file by running ```travis pubkey > travis.pub```
+c. Add the key as a deploy key using the catalyze cli within the associated repo. For example:  ```catalyze deploy-keys add travisci ./travis.pub code-1```
+3. Setup Catalyze as a known host for Travis CI:
+a. List your known hosts by running ```cat ~/.ssh/known_hosts```
+b. Find and copy the line from known_hosts that includes the git remote found in step #1. It'll look something like "[git.catalyzeapps.com]:2222 ecdsa-sha2-nistp256 BBBB12abZmKlLXNo..."
+c. Update your `before_deploy` step in `.travis.yml` to update the `known_hosts` file:
+```
+    before_deploy:  echo "[git.catalyzeapps.com]:2222 ecdsa-sha2-nistp256 BBBB12abZmKlLXNo..." >> ~/.ssh/known_hosts
+```
+
 ### Chef Supermarket:
 
 #### Options:
@@ -741,6 +777,18 @@ 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>
 
+### ExoScale:
+
+#### Options:
+
+* **email**: ExoScale email or Organization ID.
+* **password**: ExoScale password.
+* **deployment**: ExoScale Deployment. Follows the format "APP_NAME/DEP_NAME".
+
+#### Examples:
+
+    dpl --provider=exoscale --email=<email> --password<password> --deployment=`APP_NAME/DEP_NAME`
+
 ### Scalingo:
 
 #### Options:
@@ -818,7 +866,7 @@ In order to use this provider, please make sure you have the [App Engine Admin A
 #### Examples:
 
     dpl --provider=firebase --token=<token> --project=<project>
-    
+
 
 
 ### Surge.sh
@@ -826,9 +874,9 @@ In order to use this provider, please make sure you have the [App Engine Admin A
 #### Options:
 
 * **project** Path to project folder relative to repo root. Defaults to repo root if not set.
-* **domain** Domain to publish to. Can be omitted if domain is set in the `CNAME` file in the project folder. 
+* **domain** Domain to publish to. Can be omitted if domain is set in the `CNAME` file in the project folder.
+
 
- 
 #### Environment variables:
 
 * **SURGE_LOGIN**: Set it to the email address you use with Surge
@@ -836,4 +884,4 @@ In order to use this provider, please make sure you have the [App Engine Admin A
 
 #### Example:
     dpl --provider=surge --project=<project-path> --domain=<domain-name>
-    
+

data/dpl.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'json', '1.8.1'
+  s.add_development_dependency 'tins', '~> 1.6.0', '>= 1.6.0'
   s.add_development_dependency 'coveralls'
 
-
   # prereleases from Travis CI
   if ENV['CI']
     digits = s.version.to_s.split '.'

data/lib/dpl/provider/appfog.rb

@@ -1,6 +1,7 @@
 module DPL
   class Provider
     class Appfog < Provider
+      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
       requires 'af', :load => 'vmc'
 
       def check_auth

data/lib/dpl/provider/catalyze.rb

@@ -0,0 +1,49 @@
+module DPL
+  class Provider
+    class Catalyze < Provider
+      def config
+        {
+            # the git repository to deploy to
+            "target" => options[:target] || context.env['CATALYZE_TARGET'],
+            # the pathspec for files to add to git for deployment e.g. your build directory. defaults to all files.
+            "path" => options[:path] || context.env['CATALYZE_PATH'] || '.'
+        }
+      end
+
+      def needs_key?
+        false
+      end
+
+      def check_app
+      end
+
+      def check_auth
+        error "Missing Catalyze target" unless config['target']
+      end
+
+      def push_app
+        log "Deploying to Catalyze '#{config['target']}'"
+
+        if options[:skip_cleanup]
+          # create commit message
+          build_num = context.env["TRAVIS_BUILD_NUMBER"]
+          commit = context.env["TRAVIS_COMMIT"]
+          repo_slug = context.env["TRAVIS_REPO_SLUG"]
+          branch = context.env["TRAVIS_BRANCH"]
+          if build_num && commit && repo_slug && branch
+            commit_message = "Build ##{build_num} (#{commit}) of #{repo_slug}@#{branch}"
+          else
+            commit_message = "Local build"
+          end
+
+          log "Using build files for deployment"
+          context.shell "git checkout HEAD"
+          context.shell "git add #{config["path"]} --all --force"
+          context.shell "git commit -m \"#{commit_message}\" --quiet"
+        end
+
+        context.shell "git push --force #{config['target']} HEAD:master"
+      end
+    end
+  end
+end

data/lib/dpl/provider/chef_supermarket.rb

@@ -6,6 +6,8 @@ module DPL
       # https://github.com/opscode/chef/blob/11.16.4/lib/chef/knife/cookbook_site_share.rb
 
       # Compatibility with ruby 1.9
+      requires 'rack', version: '< 2.0'
+      requires 'mime-types', version: '~> 1.16'
       requires 'chef', version: '< 12.0'
       requires 'chef', load: 'chef/config'
       requires 'chef', load: 'chef/cookbook_loader'

data/lib/dpl/provider/deis.rb

@@ -81,7 +81,7 @@ module DPL
       end
 
       def push_app
-        unless context.shell "git push #{verbose_flag} deis HEAD:refs/heads/master -f 2>&1 | tr -dc '[:alnum:][:space:][:punct:]' | sed -E 's/remote: (\\[1G)+//' | sed 's/\\[K$//'"
+        unless context.shell "git push #{verbose_flag} deis HEAD:refs/heads/master -f 2>&1 | tr -dc '[:alnum:][:space:][:punct:]' | sed -E 's/remote: (\\[1G)+//' | sed 's/\\[K$//'; exit ${PIPESTATUS[1]}"
           error 'Deploying application failed.'
         end
       end

data/lib/dpl/provider/exoscale.rb

@@ -0,0 +1,100 @@
+require 'json'
+require 'net/http'
+require 'net/https'
+
+module DPL
+  class Provider
+    class ExoScale < Provider
+      attr_accessor :app_name
+      attr_accessor :dep_name
+
+      def initialize(context, options)
+        super
+        option(:email) && option(:password) && option(:deployment)
+        @app_name, @dep_name = options[:deployment].split('/')
+
+        @http = Net::HTTP.new('api.app.exo.io', 443)
+        @http.use_ssl = true
+
+        @tokenHttp = Net::HTTP.new('portal.exoscale.ch', 443)
+        @tokenHttp.use_ssl = true
+      end
+
+      def check_auth
+        headers_with_token
+      end
+
+      def check_app
+        response = api_call('GET', "/app/#{ app_name }/deployment/#{ dep_name }")
+        error('application check failed') if response.code != '200'
+        @repository = JSON.parse(response.body)["branch"]
+      end
+
+      def setup_key(file)
+        data = { 'key' => File.read(file).chomp }
+        response = api_call('POST', "/user/#{ user['username'] }/key", JSON.dump(data))
+        error('adding key failed') if response.code != '200'
+        key = JSON.parse response.body
+        @ssh_key_id = key['key_id']
+      end
+
+      def remove_key
+        response = api_call('DELETE', "/user/#{ user['username']}/key/#{ @ssh_key_id }")
+        error('key removal failed') if response.code != '204'
+      end
+
+      def push_app
+        branch = (dep_name == 'default') ? 'master' : dep_name
+        context.shell "git push #{ @repository } HEAD:#{ branch } -f"
+        deploy_app
+      end
+
+      private
+
+      def get_token
+        request = Net::HTTP::Post.new '/api/apps/token'
+        request.basic_auth options[:email], options[:password]
+        response = @tokenHttp.request(request)
+        error('authorization failed') if response.code != '200'
+        return JSON.parse response.body
+      end
+
+      def headers_with_token(options = {})
+        @token = get_token if options[:new_token] || @token.nil?
+        return {
+          'Authorization' => %Q|cc_auth_token="#{ @token['token'] }"|,
+          'Content-Type' => 'application/json'
+        }
+      end
+
+      def get_headers
+        headers = headers_with_token
+        response = api_call('GET', '/user/', nil, headers)
+        return headers if response.code == '200'
+
+        return headers_with_token :new_token => true
+      end
+
+      def api_call(method, path, data = nil, headers = nil)
+        return @http.send_request(method, path, data, headers || get_headers)
+      end
+
+      def deploy_app
+        data = {'version' => -1}
+        response = api_call('PUT', "/app/#{ app_name }/deployment/#{ dep_name }", JSON.dump(data))
+        error('deployment failed - the deployment is already deploying') if response.code != '200'
+      end
+
+      def user
+        if @user.nil?
+          response = api_call('GET', '/user/')
+          error('can not find the user') if response.code != '200'
+          users = JSON.parse response.body
+          @user = users[0]
+        end
+        return @user
+      end
+
+    end
+  end
+end

data/lib/dpl/provider/openshift.rb

@@ -2,6 +2,7 @@ module DPL
   class Provider
     class Openshift < Provider
       requires 'httpclient', version: '~> 2.4.0'
+      requires 'net-ssh',    load: 'net/ssh',    version: '~> 2.9.2' # Anything higher requires Ruby 2.x
       requires 'rhc'
 
       def initialize(context, options)

data/lib/dpl/provider/ops_works.rb

@@ -3,15 +3,18 @@ require 'timeout'
 module DPL
   class Provider
     class OpsWorks < Provider
-      requires 'aws-sdk-v1'
+      requires 'aws-sdk', version: '~> 2'
       experimental 'AWS OpsWorks'
 
-      def api
-        @api ||= AWS::OpsWorks.new
+      def opsworks
+        @opsworks ||= Aws::OpsWorks::Client.new(opsworks_options)
       end
 
-      def client
-        @client ||= api.client
+      def opsworks_options
+        {
+          region:      region || 'us-east-1',
+          credentials: ::Aws::Credentials.new(access_key_id, secret_access_key)
+        }
       end
 
       def needs_key?
@@ -22,6 +25,10 @@ module DPL
 
       end
 
+      def region
+        options[:region] || context.env['AWS_DEFAULT_REGION']
+      end
+
       def access_key_id
         options[:access_key_id] || context.env['AWS_ACCESS_KEY_ID'] || raise(Error, "missing access_key_id")
       end
@@ -30,13 +37,8 @@ module DPL
         options[:secret_access_key] || context.env['AWS_SECRET_ACCESS_KEY'] || raise(Error, "missing secret_access_key")
       end
 
-      def setup_auth
-        AWS.config(access_key_id: access_key_id, secret_access_key: secret_access_key)
-      end
-
       def check_auth
-        setup_auth
-        log "Logging in with Access Key: #{option(:access_key_id)[-4..-1].rjust(20, '*')}"
+        log "Logging in with Access Key: #{access_key_id[-4..-1].rjust(20, '*')}"
       end
 
       def custom_json
@@ -61,7 +63,7 @@ module DPL
       end
 
       def fetch_ops_works_app
-        data = client.describe_apps(app_ids: [option(:app_id)])
+        data = opsworks.describe_apps(app_ids: [option(:app_id)])
         unless data[:apps] && data[:apps].count == 1
           raise Error, "App #{option(:app_id)} not found.", error.backtrace
         end
@@ -87,7 +89,11 @@ module DPL
         if !options[:instance_ids].nil?
           deployment_config[:instance_ids] = Array(option(:instance_ids))
         end
-        data = client.create_deployment(deployment_config)
+        if !options[:layer_ids].nil?
+          deployment_config[:layer_ids] = Array(option(:layer_ids))
+        end
+        log "creating deployment #{deployment_config.to_json}"
+        data = opsworks.create_deployment(deployment_config)
         log "Deployment created: #{data[:deployment_id]}"
         return unless options[:wait_until_deployed]
         print "Deploying "
@@ -103,7 +109,7 @@ module DPL
       def wait_until_deployed(deployment_id)
         deployment = nil
         loop do
-          result = client.describe_deployments(deployment_ids: [deployment_id])
+          result = opsworks.describe_deployments(deployment_ids: [deployment_id])
           deployment = result[:deployments].first
           break unless deployment[:status] == "running"
           print "."
@@ -118,10 +124,8 @@ module DPL
 
       def deploy
         super
-      rescue AWS::Errors::ClientError => error
-        raise Error, "Stopping Deploy, OpsWorks error: #{error.message}", error.backtrace
-      rescue AWS::Errors::ServerError => error
-        raise Error, "Stopping Deploy, OpsWorks server error: #{error.message}", error.backtrace
+      rescue Aws::Errors::ServiceError => error
+        raise Error, "Stopping Deploy, OpsWorks service error: #{error.message}", error.backtrace
       end
     end
   end

data/lib/dpl/provider/packagecloud.rb

@@ -1,6 +1,7 @@
 module DPL
   class Provider
     class Packagecloud < Provider
+      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
       requires 'packagecloud-ruby', :version => "0.2.17", :load => 'packagecloud'
 
       def check_auth

data/lib/dpl/provider/puppet_forge.rb

@@ -3,6 +3,7 @@ module DPL
     class PuppetForge < Provider
       require 'pathname'
 
+      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
       requires 'puppet', :load => 'puppet/face'
       requires 'puppet-blacksmith', :load => 'puppet_blacksmith'
 

data/lib/dpl/provider/s3.rb

@@ -52,7 +52,8 @@ module DPL
             opts[:expires]       = get_option_value_by_filename(options[:expires], filename) if options[:expires]
             unless File.directory?(filename)
               log "uploading #{filename.inspect} with #{opts.inspect}"
-              api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
+              result = api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
+              warn "error while uploading #{filename.inspect}" unless result
             end
           end
         end

data/lib/dpl/provider.rb

@@ -13,6 +13,7 @@ module DPL
     autoload :Bintray,          'dpl/provider/bintray'
     autoload :BitBalloon,       'dpl/provider/bitballoon'
     autoload :Boxfuse,          'dpl/provider/boxfuse'
+    autoload :Catalyze,         'dpl/provider/catalyze'
     autoload :ChefSupermarket,  'dpl/provider/chef_supermarket'
     autoload :Cloud66,          'dpl/provider/cloud66'
     autoload :CloudFiles,       'dpl/provider/cloud_files'

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.8.17'
+  VERSION = '1.8.18'
 end

data/spec/provider/catalyze_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'dpl/provider/catalyze'
+
+describe DPL::Provider::Catalyze do
+  subject :provider do
+    described_class.new(DummyContext.new, :target => 'test-target', :path => 'test-path')
+  end
+
+  describe "#check_auth" do
+    it 'should require a target' do
+      provider.options.update(:target => nil)
+      expect{ provider.check_auth }.to raise_error("Missing Catalyze target")
+    end
+  end
+
+  describe "#push_app" do
+    it 'should push the current branch to the target' do
+      expect(provider.context).to receive(:shell).with("git push --force test-target HEAD:master")
+      provider.push_app
+    end
+    it 'should add and commit local build files if skip_cleanup is true' do
+      provider.options.update(:skip_cleanup => true)
+      expect(provider.context).to receive(:shell).with("git checkout HEAD")
+      expect(provider.context).to receive(:shell).with("git add test-path --all --force")
+      expect(provider.context).to receive(:shell).with("git commit -m \"Local build\" --quiet")
+      expect(provider.context).to receive(:shell).with("git push --force test-target HEAD:master")
+      provider.push_app
+    end
+    it 'should use a path of "." if the path is not specified' do
+      provider.options.update(:path => nil)
+      provider.options.update(:skip_cleanup => true)
+      expect(provider.context).to receive(:shell).with("git checkout HEAD")
+      expect(provider.context).to receive(:shell).with("git add . --all --force")
+      expect(provider.context).to receive(:shell).with("git commit -m \"Local build\" --quiet")
+      expect(provider.context).to receive(:shell).with("git push --force test-target HEAD:master")
+      provider.push_app
+    end
+  end
+end

data/spec/provider/deis_spec.rb

@@ -98,7 +98,7 @@ describe DPL::Provider::Deis do
   describe "#push_app" do
     example do
       expect(provider.context).to receive(:shell).with(
-        "git push  deis HEAD:refs/heads/master -f 2>&1 | tr -dc '[:alnum:][:space:][:punct:]' | sed -E 's/remote: (\\[1G)+//' | sed 's/\\[K$//'"
+        "git push  deis HEAD:refs/heads/master -f 2>&1 | tr -dc '[:alnum:][:space:][:punct:]' | sed -E 's/remote: (\\[1G)+//' | sed 's/\\[K$//'; exit ${PIPESTATUS[1]}"
       ).and_return(true)
       provider.push_app
     end

data/spec/provider/exoscale_spec.rb

@@ -0,0 +1,191 @@
+require 'spec_helper'
+require 'dpl/provider/exoscale'
+
+describe DPL::Provider::ExoScale do
+  subject :provider do
+    described_class.new(DummyContext.new, :deployment => 'foo_app/default', :email => 'foo@test.com', :password => 'password')
+  end
+
+  its(:app_name) { should == 'foo_app' }
+  its(:dep_name) { should == 'default' }
+
+  its(:needs_key?) { should be true }
+
+  describe 'constructor' do
+    it 'with wrong arguments' do
+      expect {
+        described_class.new(DummyContext.new, :foo_dep => 'foo_app/default', :email => 'foo@test.com', :password => 'password')
+      }.to raise_error(DPL::Error)
+    end
+  end
+
+  it '#check_auth should call #headers_with_token' do
+    expect(provider).to receive(:headers_with_token)
+    provider.check_auth
+  end
+
+  describe '#check_app' do
+    it 'on deployment found' do
+      expect(provider).to receive(:api_call).and_return double(
+        :code => '200',
+        :body => '{"branch":"foo_repo.git"}'
+      )
+      expect(provider.instance_variable_get(:@repository)).to be_nil
+      provider.check_app
+      expect(provider.instance_variable_get(:@repository)).to eq('foo_repo.git')
+    end
+
+    it 'on deployment not found' do
+      expect(provider).to receive(:api_call).and_return double(:code => '410')
+      expect { provider.check_app }.to raise_error(DPL::Error)
+    end
+  end
+
+  describe '#setup_key' do
+    before do
+      expect(File).to receive(:read).with('file').and_return('foo_key')
+      expect(provider).to receive(:user).and_return({ 'username' => 'foo_user' })
+    end
+
+    it 'on api success' do
+      expect(provider).to receive(:api_call).with('POST', '/user/foo_user/key', '{"key":"foo_key"}').and_return double(
+          :code => '200',
+          :body => '{ "key": "foo_key", "key_id": "foo_key_id"}'
+        )
+
+      expect(provider.instance_variable_get(:@ssh_key_id)).to be_nil
+      provider.setup_key 'file'
+      expect(provider.instance_variable_get(:@ssh_key_id)).to eq('foo_key_id')
+    end
+
+    it 'on api failure' do
+      expect(provider).to receive(:api_call).with('POST', '/user/foo_user/key', '{"key":"foo_key"}').and_return double(:code => '401')
+
+      expect { provider.setup_key 'file' }.to raise_error(DPL::Error)
+    end
+  end
+
+  describe '#remove_key' do
+    before do
+      provider.instance_variable_set(:@ssh_key_id, 'foo_key_id')
+      expect(provider).to receive(:user).and_return({ 'username' => 'foo_user' })
+    end
+
+    it 'on api success' do
+      expect(provider).to receive(:api_call).with('DELETE', '/user/foo_user/key/foo_key_id').and_return double(:code => '204')
+      provider.remove_key
+    end
+
+    it 'on api failure' do
+      expect(provider).to receive(:api_call).with('DELETE', '/user/foo_user/key/foo_key_id').and_return double(:code => '410')
+      expect { provider.remove_key }.to raise_error(DPL::Error)
+    end
+  end
+
+  it '#push_app shuld deploy the app' do
+    provider.instance_variable_set(:@repository, 'foo_repo.git')
+    context = double(:shell)
+    expect(context).to receive(:shell).with("git push foo_repo.git HEAD:master -f")
+    expect(provider).to receive(:context).and_return context
+    expect(provider).to receive(:deploy_app)
+
+    provider.push_app
+  end
+
+  describe 'private method' do
+    describe '#get_token' do
+      it 'on api success' do
+        request = double()
+        expect(request).to receive(:basic_auth).with('foo@test.com', 'password')
+        expect(Net::HTTP::Post).to receive(:new).with('/api/apps/token').and_return request
+
+        expect(provider.instance_variable_get(:@tokenHttp)).to receive(:request).and_return double(
+          :code => '200',
+          :body => '{ "token": "foo_token"}'
+        )
+
+        expect(provider.instance_eval { get_token }).to eq({ 'token' => 'foo_token' })
+      end
+
+      it 'on api failure' do
+        expect(provider.instance_variable_get(:@tokenHttp)).to receive(:request).and_return double(:code => '401')
+
+        expect do
+          provider.instance_eval { get_token }
+        end.to raise_error(DPL::Error)
+      end
+    end
+
+    it '#headers_with_token should return headers' do
+      expect(provider).to receive(:get_token).and_return({ 'token' => 'foo_token' })
+      expected_return = {
+        'Authorization' => 'cc_auth_token="foo_token"',
+        'Content-Type' => 'application/json'
+      }
+
+      expect(provider.instance_eval { headers_with_token }).to eq(expected_return)
+    end
+
+    describe '#get_headers' do
+      let(:expected_args) { [ 'GET', '/user/', nil, {'foo' => 'headers'} ] }
+
+      before do
+        expect(provider).to receive(:headers_with_token).and_return({ 'foo' => 'headers' })
+      end
+
+      it 'on token valid' do
+        expect(provider).to receive(:api_call).with(*expected_args).and_return double(:code => '200')
+        expect(provider.instance_eval { get_headers }).to eq({ 'foo' => 'headers' })
+      end
+
+      it 'on token expired' do
+        expect(provider).to receive(:api_call).with(*expected_args).and_return double(:code => '401')
+        expect(provider).to receive(:headers_with_token).with({ :new_token => true})
+
+        provider.instance_eval { get_headers }
+      end
+    end
+
+    it '#api_call should send request' do
+      expected_args = [ "foo_method", "foo_path", "\"foo\":\"data\"", {"foo"=>"headers"} ]
+      expect(provider.instance_variable_get(:@http)).to receive(:send_request).with(*expected_args)
+
+      provider.instance_eval do
+        api_call('foo_method', 'foo_path', '"foo":"data"', { 'foo' => 'headers'})
+      end
+    end
+
+    describe '#deploy_app' do
+      it 'on api success' do
+        expect(provider).to receive(:api_call).with('PUT', '/app/foo_app/deployment/default', '{"version":-1}').and_return double(:code => '200')
+        provider.instance_eval { deploy_app }
+      end
+
+      it 'on api failure' do
+        expect(provider).to receive(:api_call).with('PUT', '/app/foo_app/deployment/default', '{"version":-1}').and_return double(:code => '410')
+        expect do
+          provider.instance_eval { deploy_app }
+        end.to raise_error(DPL::Error)
+      end
+    end
+
+    describe '#user' do
+      it 'on api success' do
+        expect(provider).to receive(:api_call).with('GET', '/user/').and_return double(
+          :code => '200',
+          :body => '["foo_user"]'
+        )
+
+        expect(provider.instance_eval { user }).to eq('foo_user')
+      end
+
+      it 'on api failure' do
+        expect(provider).to receive(:api_call).with('GET', '/user/').and_return double(:code => '410')
+
+        expect do
+          provider.instance_eval { user }
+        end.to raise_error(DPL::Error)
+      end
+    end
+  end
+end

data/spec/provider/ops_works_spec.rb

@@ -1,91 +1,127 @@
 require 'spec_helper'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'dpl/provider'
 require 'dpl/provider/ops_works'
 
 describe DPL::Provider::OpsWorks do
 
-  before (:each) do
-    AWS.stub!
+  subject :provider do
+    described_class.new(DummyContext.new, :access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz')
   end
 
-  subject :provider do
-    described_class.new(DummyContext.new, :access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz', :bucket => 'my-bucket')
+  describe '#opsworks_options' do
+    context 'without region' do
+      example do
+        options = provider.opsworks_options
+        expect(options[:region]).to eq('us-east-1')
+      end
+    end
+
+    context 'with region' do
+      example do
+        region = 'us-west-1'
+        provider.options.update(:region => region)
+        options = provider.opsworks_options
+        expect(options[:region]).to eq(region)
+      end
+    end
   end
 
   describe "#check_auth" do
     example do
-      expect(provider).to receive(:setup_auth)
       expect(provider).to receive(:log).with('Logging in with Access Key: ****************jklz')
       provider.check_auth
     end
   end
 
-  describe "#setup_auth" do
-    example do
-      expect(AWS).to receive(:config).with(:access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz').once.and_call_original
-      provider.setup_auth
-    end
-  end
-
   describe "#needs_key?" do
     example do
       expect(provider.needs_key?).to eq(false)
     end
   end
 
-  describe "#push_app" do
-    let(:client) { double(:ops_works_client) }
-    let(:ops_works_app) { {shortname: 'app', stack_id: 'stack-id'} }
-    before do
-      expect(provider).to receive(:current_sha).and_return('sha')
-      expect(provider.api).to receive(:client).and_return(client)
-      expect(provider.context.env).to receive(:[]).with('TRAVIS_BUILD_NUMBER').and_return('123')
-    end
+  describe DPL::Provider::OpsWorks do
+    access_key_id = 'someaccesskey'
+    secret_access_key = 'somesecretaccesskey'
+    region = 'us-east-1'
 
-    let(:custom_json) { "{\"deploy\":{\"app\":{\"migrate\":false,\"scm\":{\"revision\":\"sha\"}}}}" }
-    example 'without :migrate option' do
-      provider.options.update(app_id: 'app-id')
-      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]}
-      )
-      expect(client).to receive(:create_deployment).with(
-        stack_id: 'stack-id', app_id: 'app-id', command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
-      ).and_return({})
-      provider.push_app
-    end
+    client_options = {
+      stub_responses: true,
+      region: region,
+      credentials: Aws::Credentials.new(access_key_id, secret_access_key)
+    }
 
-    let(:custom_json_with_migrate) { "{\"deploy\":{\"app\":{\"migrate\":true,\"scm\":{\"revision\":\"sha\"}}}}" }
-    example 'with :migrate option' do
-      provider.options.update(app_id: 'app-id', migrate: true)
-      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
-      expect(client).to receive(:create_deployment).with(
-        stack_id: 'stack-id', app_id: 'app-id', command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json_with_migrate
-      ).and_return({})
-      provider.push_app
+    subject :provider do
+      described_class.new(DummyContext.new, {
+        access_key_id: access_key_id,
+        secret_access_key: secret_access_key
+      })
     end
 
-    example 'with :wait_until_deployed' do
-      provider.options.update(app_id: 'app-id', wait_until_deployed: true)
-      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
-      expect(client).to receive(:create_deployment).and_return({deployment_id: 'deployment_id'})
-      expect(client).to receive(:describe_deployments).with({deployment_ids: ['deployment_id']}).and_return({deployments: [status: 'running']}, {deployments: [status: 'successful']})
-      provider.push_app
+    before :each do
+      expect(provider).to receive(:opsworks_options).and_return(client_options)
     end
 
-    example 'with :instance-ids' do
-      provider.options.update(app_id: 'app-id', instance_ids: ['instance-id'])
-      expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
-      expect(client).to receive(:create_deployment).with(
-        stack_id: 'stack-id', app_id: 'app-id', instance_ids:['instance-id'], command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
-      ).and_return({})
-      provider.push_app
+    describe '#opsworks' do
+      example do
+        expect(Aws::OpsWorks::Client).to receive(:new).with(client_options).once
+        provider.opsworks
+      end
     end
-  end
 
-  describe "#api" do
-    example do
-      expect(AWS::OpsWorks).to receive(:new)
-      provider.api
+    describe "#push_app" do
+      let(:client) { provider.opsworks }
+      let(:ops_works_app) { {shortname: 'app', stack_id: 'stack-id'} }
+      before do
+        expect(provider).to receive(:current_sha).and_return('sha')
+        expect(provider.context.env).to receive(:[]).with('TRAVIS_BUILD_NUMBER').and_return('123')
+      end
+
+      let(:custom_json) { "{\"deploy\":{\"app\":{\"migrate\":false,\"scm\":{\"revision\":\"sha\"}}}}" }
+      example 'without :migrate option' do
+        provider.options.update(app_id: 'app-id')
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).with(
+          stack_id: 'stack-id', app_id: 'app-id', command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
+        ).and_return({})
+        provider.push_app
+      end
+
+      let(:custom_json_with_migrate) { "{\"deploy\":{\"app\":{\"migrate\":true,\"scm\":{\"revision\":\"sha\"}}}}" }
+      example 'with :migrate option' do
+        provider.options.update(app_id: 'app-id', migrate: true)
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).with(
+          stack_id: 'stack-id', app_id: 'app-id', command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json_with_migrate
+        ).and_return({})
+        provider.push_app
+      end
+
+      example 'with :wait_until_deployed' do
+        provider.options.update(app_id: 'app-id', wait_until_deployed: true)
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).and_return({deployment_id: 'deployment_id'})
+        expect(client).to receive(:describe_deployments).with({deployment_ids: ['deployment_id']}).and_return({deployments: [status: 'running']}, {deployments: [status: 'successful']})
+        provider.push_app
+      end
+
+      example 'with :instance-ids' do
+        provider.options.update(app_id: 'app-id', instance_ids: ['instance-id'])
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).with(
+          stack_id: 'stack-id', app_id: 'app-id', instance_ids:['instance-id'], command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
+        ).and_return({})
+        provider.push_app
+      end
+
+      example 'with :layer-ids' do
+        provider.options.update(app_id: 'app-id', layer_ids: ['layer-id'])
+        expect(client).to receive(:describe_apps).with(app_ids: ['app-id']).and_return({apps: [ops_works_app]})
+        expect(client).to receive(:create_deployment).with(
+          stack_id: 'stack-id', app_id: 'app-id', layer_ids:['layer-id'], command: {name: 'deploy'}, comment: 'Deploy build 123 via Travis CI', custom_json: custom_json
+        ).and_return({})
+        provider.push_app
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'json/pure'
 require 'dpl/error'
 require 'dpl/provider'
 require 'rspec/its'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.17
+  version: 1.8.18
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +128,7 @@ files:
 - lib/dpl/provider/bintray.rb
 - lib/dpl/provider/bitballoon.rb
 - lib/dpl/provider/boxfuse.rb
+- lib/dpl/provider/catalyze.rb
 - lib/dpl/provider/chef_supermarket.rb
 - lib/dpl/provider/cloud66.rb
 - lib/dpl/provider/cloud_files.rb
@@ -117,6 +138,7 @@ files:
 - lib/dpl/provider/divshot.rb
 - lib/dpl/provider/elastic_beanstalk.rb
 - lib/dpl/provider/engine_yard.rb
+- lib/dpl/provider/exoscale.rb
 - lib/dpl/provider/firebase.rb
 - lib/dpl/provider/gae.rb
 - lib/dpl/provider/gcs.rb
@@ -156,6 +178,7 @@ files:
 - spec/provider/bintray_spec.rb
 - spec/provider/bitballoon_spec.rb
 - spec/provider/boxfuse_spec.rb
+- spec/provider/catalyze_spec.rb
 - spec/provider/chef_supermarket_spec.rb
 - spec/provider/cloud66_spec.rb
 - spec/provider/cloud_files_spec.rb
@@ -164,6 +187,7 @@ files:
 - spec/provider/deis_spec.rb
 - spec/provider/divshot_spec.rb
 - spec/provider/elastic_beanstalk_spec.rb
+- spec/provider/exoscale_spec.rb
 - spec/provider/firebase_spec.rb
 - spec/provider/gae_spec.rb
 - spec/provider/gcs_spec.rb
@@ -223,6 +247,7 @@ test_files:
 - spec/provider/bintray_spec.rb
 - spec/provider/bitballoon_spec.rb
 - spec/provider/boxfuse_spec.rb
+- spec/provider/catalyze_spec.rb
 - spec/provider/chef_supermarket_spec.rb
 - spec/provider/cloud66_spec.rb
 - spec/provider/cloud_files_spec.rb
@@ -231,6 +256,7 @@ test_files:
 - spec/provider/deis_spec.rb
 - spec/provider/divshot_spec.rb
 - spec/provider/elastic_beanstalk_spec.rb
+- spec/provider/exoscale_spec.rb
 - spec/provider/firebase_spec.rb
 - spec/provider/gae_spec.rb
 - spec/provider/gcs_spec.rb