dpl 1.8.18.travis.1472.4 → 1.8.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWQ3MjkyNDFkMzQ4NTIxMTUxNGIyNTZhMjdiYThmZThhMzg0OWI5YQ==
+    ZGI0N2MwNjMwYTMxZDBhYmEyMDg0OThlM2FlNjkzMWRhMGJiZmM2Ng==
   data.tar.gz: !binary |-
-    ZjRmYmZlYzkwMDFlYzMzYjM3NGE5Zjg2NGY3NjVlNmZmOWIxZmY3NA==
+    ODBmY2YxMzE1ODYyYjJhZTI0MGRjOTkyZjdkZjZjZDFkZWFjOGNkYQ==
 SHA512:
   metadata.gz: !binary |-
-    NTNhYjEwMzA4MTg4YTBiM2JmNjk1Y2IxNTg3YWI2OTAyZmZjYzdhNDk3MTAz
-    NGRlOGU4Mjg1ZWY1YTY0MTk4MjQ4MWY4YjE0Y2RjNmQ3NGQzZjRhZmEyYjdj
-    OWE0YjlmMDk0OGRlYWQwMzY0MGVmNjZjYWVlNjgwYzJiNzFlNWY=
+    Yjg1MTIyYTdiOTFlMzA1MjQwYTQyMTUwYTgzZjE3M2I4NjY1MDZhYzJhOTAy
+    MTlmMzk0MDcwNjg1NzFmYzg2MTI5M2JmNDI0Y2YwNzIwYTljZDRmNjE2ZjE5
+    Y2NlYjM2ZGYzNTE1NjcwMWIxY2FlZGFkZmJjOWIzZDg4NzcwOTU=
   data.tar.gz: !binary |-
-    YjUxN2EyMWNmM2M0N2FmNmIyY2IxY2E1YTQ3ZDczMmZhZWE5NWY5Yzg2NmM0
-    OTQ2MmI3NGE2ZWRjMjk2OWM3MzlkMzc0YTA3YWExZWFhY2Y4YjZmM2ZhODM2
-    MDdlNTJiNzBmNDY2MDY2NDJkZjczNDNmMTQyMWFlMTRkYjI3NzU=
+    ZjA5M2IxMjMyYTM2YWE1OWFlZmI5NmEwZjFmZjY1YTc2MTA4YTY5ZWRmMDVk
+    YTAzOTM4ZTQ5MjUzMWIxOTdmMTJjMjRjMTcwNjJmOTIyZWE1OGM0MmI3MTUz
+    MDM0N2MwYjFhYzc1MGU2ZmNhZjBiZjgwMTk3ZjBkMzU1NmFhMjc=

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

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 gemspec
 
+gem 'term-ansicolor', '~> 1.3.2'
+
 platforms :mri_19 do
   gem 'slop', '~> 3.6.0'
   gem 'ohai', '~> 7.4.0'
@@ -21,6 +23,7 @@ group :openshift do
 end
 
 group :appfog do
+  gem 'json_pure'
   gem 'af'
 end
 
@@ -39,11 +42,12 @@ end
 
 group :lambda do
   gem 'aws-sdk', '>= 2.0.18.pre'
-  gem 'rubyzip'
+  gem 'rubyzip', '~> 1.1'
 end
 
 group :cloud_files do
   gem 'fog-google', '< 0.1.1', platforms: :mri_19
+  gem 'fog-profitbricks', '< 2.0', platforms: :mri_19
   gem 'fog'
 end
 
@@ -57,7 +61,7 @@ group :gcs do
 end
 
 group :elastic_beanstalk do
-  gem 'rubyzip'
+  gem 'rubyzip', '~> 1.1'
   gem 'aws-sdk-v1'
 end
 
@@ -67,11 +71,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 +92,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)
@@ -50,7 +52,7 @@ Dpl supports the following providers:
 
 Dpl is published to rubygems.
 
-* Dpl requires ruby with a version greater than 1.8.7
+* Dpl requires ruby with a version greater than 1.9.3
 * To install: `gem install dpl`
 
 ## Usage:
@@ -67,18 +69,18 @@ Running dpl in a terminal that saves history is insecure as your password/api ke
 
 #### Options:
 * **api-key**: Heroku API Key
-* **strategy[git/anvil]**: Deployment strategy for Dpl. Defaults to anvil.
+* **strategy**: Deployment strategy for Dpl. Defaults to `api`. Other options are `git`, `git ssh`, and `git deploykey`.
 * **app**: Heroku app name. Defaults to the name of your git repo.
 * **username**: heroku username. Not necessary if api-key is used. Requires git strategy.
 * **password**: heroku password. Not necessary if api-key is used. Requires git strategy.
 
-#### Git vs Anvil Deploy:
-* Anvil will run the [buildpack](https://devcenter.heroku.com/articles/buildpacks) compilation step on the Travis CI VM, whereas the Git strategy will run it on a Heroku dyno, which provides the same environment the application will then run under and might be slightly faster.
+#### API vs Git vs Anvil Deploy:
+* API deploy will tar up the current directory (minus the git repo) and send it to Heroku.
+* Git deploy will send the contents of the git repo only, so may not contain any local changes.
+* Anvil deploys are no longer supported since Heroku shut down the Anvil service.
 * The Git strategy allows using *user* and *password* instead of *api-key*.
 * When using Git, Heroku might send you an email for every deploy, as it adds a temporary SSH key to your account.
 
-As a rule of thumb, you should switch to the Git strategy if you run into issues with Anvil or if you're using the [user-env-compile](https://devcenter.heroku.com/articles/labs-user-env-compile) plugin.
-
 #### Examples:
 
     dpl --provider=heroku --api-key=`heroku auth:token`
@@ -314,6 +316,7 @@ For authentication you can also use Travis CI secure environment variable:
 * **bucket**: S3 Bucket.
 * **region**: S3 Region. Defaults to us-east-1.
 * **upload-dir**: S3 directory to upload to. Defaults to root directory.
+* **storage-class**: S3 storage class to upload as. Defaults to "STANDARD". Other values are "STANDARD_IA" or "REDUCED_REDUNDANCY". Details can be found [here](https://aws.amazon.com/s3/storage-classes/).
 * **local-dir**: Local directory to upload from. Can be set from a global perspective (~/travis/build) or relative perspective (build) Defaults to project root.
 * **detect-encoding**: Set HTTP header `Content-Encoding` for files compressed with `gzip` and `compress` utilities. Defaults to not set.
 * **cache_control**: Set HTTP header `Cache-Control` to suggest that the browser cache the file. Defaults to `no-cache`. Valid options are `no-cache`, `no-store`, `max-age=<seconds>`,`s-maxage=<seconds>` `no-transform`, `public`, `private`.
@@ -343,6 +346,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 +377,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 +391,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 +587,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 +628,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:
@@ -638,6 +675,9 @@ For accounts using two factor authentication, you have to use an oauth token as
 
 #### 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 Lambda function is running in. Defaults to 'us-east-1'.
  * **function_name**: Required. The name of the Lambda being created / updated.
  * **role**: Required. The ARN of the IAM role to assign to this Lambda function.
  * **handler_name**: Required. The function that Lambda calls to begin execution. For NodeJS, it is exported function for the module.
@@ -741,6 +781,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 +870,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 +878,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 +888,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/atlas.rb

@@ -16,14 +16,15 @@ module DPL
             chmod +x $HOME/bin/gimme
           fi
 
-          export GOPATH="$HOME/gopath:$GOPATH"
-          eval "$(gimme 1.4.2)" &>/dev/null
+          if [ -z $GOPATH ]; then
+            export GOPATH="$HOME/gopath"
+          else
+            export GOPATH="$HOME/gopath:$GOPATH"
+          fi
+          eval "$(gimme 1.6)" &> /dev/null
 
           go get #{ATLAS_UPLOAD_CLI_GO_REMOTE}
-          pushd $HOME/gopath/src/#{ATLAS_UPLOAD_CLI_GO_REMOTE} &>/dev/null
-          make &>/dev/null
-          cp bin/atlas-upload $HOME/bin/atlas-upload
-          popd &>/dev/null
+          cp $HOME/gopath/bin/atlas-upload-cli $HOME/bin/atlas-upload
         fi
       EOF
 
@@ -59,7 +60,9 @@ module DPL
       private
 
       def install_atlas_upload
-        context.shell ATLAS_UPLOAD_INSTALL_SCRIPT
+        without_git_http_user_agent do
+          context.shell ATLAS_UPLOAD_INSTALL_SCRIPT
+        end
       end
 
       def assert_app_present!
@@ -93,6 +96,13 @@ module DPL
       def atlas_app
         @atlas_app ||= options.fetch(:app).to_s
       end
+
+      def without_git_http_user_agent(&block)
+        git_http_user_agent = ENV.delete("GIT_HTTP_USER_AGENT")
+        yield
+        ENV["GIT_HTTP_USER_AGENT"] = git_http_user_agent
+      end
+
     end
   end
 end

data/lib/dpl/provider/azure_webapps.rb

@@ -38,9 +38,9 @@ module DPL
         end
 
         if !!options[:verbose]
-          context.shell "git push --force --quiet #{git_target} HEAD:master"
+          context.shell "git push --force --quiet #{git_target} HEAD:refs/heads/master"
         else
-          context.shell "git push --force --quiet #{git_target} HEAD:master > /dev/null 2>&1"
+          context.shell "git push --force --quiet #{git_target} HEAD:refs/heads/master > /dev/null 2>&1"
         end
       end
     end

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/cloud_files.rb

@@ -5,8 +5,7 @@ module DPL
     class CloudFiles < Provider
       requires 'net-ssh',    load: 'net/ssh',    version: '~> 2.9.2' # Anything higher requires Ruby 2.x
       requires 'mime-types', load: 'mime/types', version: '~> 2.6.2' # Anything higher requires Ruby 2.x
-      requires 'fog-google', load: 'fog/google', version: '< 0.1.1'  # Anything higher requires Ruby 2.x
-      requires 'fog', version: '< 1.35.0' # Anything higher requires fog-google 0.1.1 and up, which, in turn, requires Ruby 2.x
+      requires 'fog-rackspace', load: 'fog/rackspace'
       experimental 'Rackspace Cloud Files'
 
       def needs_key?

data/lib/dpl/provider/cloud_foundry.rb

@@ -9,7 +9,7 @@ module DPL
       def check_auth
         initial_go_tools_install
         context.shell "./cf api #{option(:api)} #{'--skip-ssl-validation' if options[:skip_ssl_validation]}"
-        context.shell "./cf login --u #{option(:username)} --p #{option(:password)} --o #{option(:organization)} --s #{option(:space)}"
+        context.shell "./cf login -u #{option(:username)} -p #{option(:password)} -o #{option(:organization)} -s #{option(:space)}"
       end
 
       def check_app

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 "bash -c '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[0]}'"
           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/firebase.rb

@@ -1,7 +1,7 @@
 module DPL
   class Provider
     class Firebase < Provider
-      npm_g 'firebase-tools@^2.1', 'firebase'
+      npm_g 'firebase-tools@^3.0', 'firebase'
 
       def check_auth
         raise Error, "must supply token option or FIREBASE_TOKEN environment variable" if !options[:token] && !context.env['FIREBASE_TOKEN']
@@ -17,7 +17,7 @@ module DPL
 
       def push_app
         command = "firebase deploy --non-interactive"
-        command << " -f #{options[:project]}" if options[:project]
+        command << " --project #{options[:project]}" if options[:project]
         command << " --token '#{options[:token]}'" if options[:token]
         context.shell command
       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)