dpl 1.8.0 → 1.8.18.travis.1472.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c57108aeaaa1455f7772778b4d7bb27d3a04b742
-  data.tar.gz: f1da500a877636ab9ce405a5f16d1cb9cb15f847
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWQ3MjkyNDFkMzQ4NTIxMTUxNGIyNTZhMjdiYThmZThhMzg0OWI5YQ==
+  data.tar.gz: !binary |-
+    ZjRmYmZlYzkwMDFlYzMzYjM3NGE5Zjg2NGY3NjVlNmZmOWIxZmY3NA==
 SHA512:
-  metadata.gz: 279bf83392fe967b010a7084f56682db914a0521e2c45afa259bdf074f979506f1949363dd0fd09dd235b85ff16ccb7e32822c5c2926cb0949af191282942840
-  data.tar.gz: 63bc805f8025e63f100047e41adbb900b05c5286cf554b0c0096fb7d20eb296b979530122e5e574e2ede0b5c1365bad982251f08cde3c49488e242016fc02c70
+  metadata.gz: !binary |-
+    NTNhYjEwMzA4MTg4YTBiM2JmNjk1Y2IxNTg3YWI2OTAyZmZjYzdhNDk3MTAz
+    NGRlOGU4Mjg1ZWY1YTY0MTk4MjQ4MWY4YjE0Y2RjNmQ3NGQzZjRhZmEyYjdj
+    OWE0YjlmMDk0OGRlYWQwMzY0MGVmNjZjYWVlNjgwYzJiNzFlNWY=
+  data.tar.gz: !binary |-
+    YjUxN2EyMWNmM2M0N2FmNmIyY2IxY2E1YTQ3ZDczMmZhZWE5NWY5Yzg2NmM0
+    OTQ2MmI3NGE2ZWRjMjk2OWM3MzlkMzc0YTA3YWExZWFhY2Y4YjZmM2ZhODM2
+    MDdlNTJiNzBmNDY2MDY2NDJkZjczNDNmMTQyMWFlMTRkYjI3NzU=

data/.travis.yml

@@ -8,7 +8,6 @@ rvm:
 
 matrix:
   allow_failures:
-    - rvm: 1.9.3
     - rvm: "2.2"
 
 sudo: false

data/Gemfile

@@ -4,6 +4,8 @@ gemspec
 platforms :mri_19 do
   gem 'slop', '~> 3.6.0'
   gem 'ohai', '~> 7.4.0'
+  gem 'amq-protocol', '~> 1.9.2'
+  gem 'net-ssh', '~> 2.9.2'
 end
 
 group :heroku do
@@ -41,6 +43,7 @@ group :lambda do
 end
 
 group :cloud_files do
+  gem 'fog-google', '< 0.1.1', platforms: :mri_19
   gem 'fog'
 end
 
@@ -60,6 +63,7 @@ end
 
 group :bitballoon do
   gem 'bitballoon'
+  gem 'jwt', '< 1.5.3', platforms: :mri_19
 end
 
 group :puppet_forge do
@@ -78,3 +82,7 @@ end
 group :chef_supermarket do
   gem 'chef'
 end
+
+group :deis do
+  gem 'git'
+end

data/README.md

@@ -10,41 +10,41 @@ Dpl supports the following providers:
 * [Anynines](#anynines)
 * [AppFog](#appfog)
 * [Atlas by HashiCorp](#atlas)
-* [Azure Web Apps](#azurewebapps)
-* [Biicode](#biicode)
+* [AWS CodeDeploy](#aws-codedeploy)
+* [AWS OpsWorks](#opsworks)
+* [Azure Web Apps](#azure-web-apps)
 * [Bintray](#bintray)
 * [BitBalloon](#bitballoon)
 * [Boxfuse](#boxfuse)
+* [Chef Supermarket](#chef-supermarket)
 * [Cloud 66](#cloud-66)
 * [Cloud Foundry](#cloud-foundry)
-* [cloudControl](#cloudcontrol)
-* [dotCloud (experimental)](#dotcloud)
+* [Deis](#deis)
+* [Divshot.io](#divshotio)
+* [Elastic Beanstalk](#elastic-beanstalk)
 * [Engine Yard](#engine-yard)
+* [Firebase](#firebase)
+* [Github Releases](#github-releases)
+* [Google App Engine (experimental)](#google-app-engine)
+* [Google Cloud Storage](#google-cloud-storage)
+* [Hackage](#hackage)
 * [Heroku](#heroku)
+* [Lambda](#lambda)
+* [Launchpad](#launchpad)
+* [Modulus](#modulus)
 * [Nodejitsu](#nodejitsu)
 * [NPM](#npm)
 * [OpenShift](#openshift)
+* [packagecloud](#packagecloud)
+* [Puppet Forge](#puppet-forge)
 * [PyPi](#pypi)
+* [Rackspace Cloud Files](#rackspace-cloud-files)
 * [RubyGems](#rubygems)
 * [S3](#s3)
-* [Divshot.io](#divshotio)
-* [Rackspace Cloud Files](#rackspace-cloud-files)
-* [AWS OpsWorks](#opsworks)
-* [Modulus](#modulus)
-* [Github Releases](#github-releases)
-* [Hackage](#hackage)
-* [Deis](#deis)
-* [Google Cloud Storage](#google-cloud-storage)
-* [Elastic Beanstalk](#elastic-beanstalk)
-* [Puppet Forge](#puppet-forge)
-* [packagecloud](#packagecloud)
-* [Chef Supermarket](#chef-supermarket)
-* [Lambda](#lambda)
-* [TestFairy](#testfairy)
-* [ExoScale](#exoscale)
-* [AWS CodeDeploy](#aws-codedeploy)
+* [Scalingo](#scalingo)
 * [Script](#script)
-* [Google App Engine (experimental)](#google-app-engine)
+* [Surge.sh](#surgesh)
+* [TestFairy](#testfairy)
 
 ## Installation:
 
@@ -130,7 +130,7 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 		"released": "2015-01-04",
 		"vcs_tag": "0.5",
 	 	"attributes": [{"name": "VerAtt1", "values" : ["VerVal1"], "type": "string"},
-  					   {"name": "VerAtt2", "values" : [1, 3.3, 5], "type": "number"},
+  					   {"name": "VerAtt2", "values" : [1, 3.2, 5], "type": "number"},
 					   {"name": "VerAtt3", "values" : ["2015-01-01T19:43:37+0100"], "type": "date"}],
 		"gpgSign": false
 	},
@@ -149,7 +149,7 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 	The files will be uploaded to Bintray under the gems folder.
 	2. All files under build/docs. The files will be uploaded to Bintray under the docs folder.
 
-	Note: Regular expressions defined as part of the includePattern and excludePattern properties must be wrapped with brackets. */
+	Note: Regular expressions defined as part of the includePattern property must be wrapped with brackets. */
 
 	"files":
 		[
@@ -261,18 +261,6 @@ For authentication you can also use Travis CI secure environment variable:
     dpl --provider=openshift --user=<username> --password=<password> --domain=<domain>
     dpl --provider=openshift --user=<username> --password=<password> --domain=<domain> --app=<app>
 
-### cloudControl:
-
-#### Options:
-
-* **email**: cloudControl email.
-* **password**: cloudControl password.
-* **deployment**: cloudControl Deployment. Follows the format "APP_NAME/DEP_NAME".
-
-#### Examples:
-
-    dpl --provider=cloudcontrol --email=<email> --password<password> --deployment=`APP_NAME/DEP_NAME`
-
 ### RubyGems:
 
 #### Options:
@@ -289,9 +277,17 @@ For authentication you can also use Travis CI secure environment variable:
 
 * **user**: PyPI Username.
 * **password**: PyPI Password.
-* **server**: Optional. Only required if you want to release to a different index. Follows the form of "https://mypackageindex.com/index".
-* **distributions**: A space-separated list of distributions to be uploaded to PyPI. Defaults to 'sdist'.
-* **docs_dir**: A path to the directory to upload documentation from. Defaults to 'build/docs'
+* **server**: Optional. Only required if you want to release to a different index. Follows the form of 'https://mypackageindex.com/index'. Defaults to 'https://pypi.python.org/pypi'.
+* **distributions**: Optional. A space-separated list of distributions to be uploaded to PyPI. Defaults to 'sdist'.
+* **docs_dir**: Optional. A path to the directory to upload documentation from. Defaults to 'build/docs'
+
+#### Environment variables:
+
+ * **PYPI_USER**: PyPI Username. Used if the `user` option is omitted.
+ * **PYPI_PASSWORD**: PyPI Password. Used if the `password` option is omitted.
+ * **PYPI_SERVER** Optional. Only required if you want to release to a different index. Used if the `server` option is omitted.
+ * **PYPI_DISTRIBUTIONS** Optional. A space-separated list of distributions to be uploaded to PyPI. Used if the `distributions` option is omitted.
+ * **PYPI_DOCS_DIR** Optional. A path to the directory to upload documentation from. Used if the `docs_dir` option is omitted.
 
 #### Examples:
 
@@ -309,20 +305,6 @@ For authentication you can also use Travis CI secure environment variable:
 
     dpl --provider=npm --email=<email> --api-key=<api-key>
 
-### biicode:
-
-**Requires `sudo`; cannot be used on containers**
-
-#### Options:
-
-* **user**: biicode username.
-* **password**: biicode password.
-
-#### Examples:
-
-    dpl --provider=biicode --user=<user> --password=<password>
-
-
 ### S3:
 
 #### Options:
@@ -339,6 +321,7 @@ For authentication you can also use Travis CI secure environment variable:
 * **acl**: Sets the access control for the uploaded objects. Defaults to `private`. Valid options are `private`, `public_read`, `public_read_write`, `authenticated_read`, `bucket_owner_read`, `bucket_owner_full_control`.
 * **dot_match**: When set to `true`, upload files starting a `.`.
 * **index_document_suffix**: Set the index document of a S3 website.
+* **default_text_charset**: Set the default character set to append to the content-type of text files you are uploading.
 
 #### File-specific `Cache-Control` and `Expires` headers
 
@@ -436,19 +419,21 @@ 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.
-* **quiet**: If passed, Azure's deployment output will not be printed.
+* **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.
 
 #### 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
+    dpl --provider=AzureWebApps --username=depluser --password=deplp@ss --site=dplsite --slot=dplsite-test --verbose
 
 ### Divshot.io:
 
@@ -477,19 +462,6 @@ You first need to create an [Atlas account](https://atlas.hashicorp.com/account/
 
     dpl --provider=cloudfoundry --username=<username> --password=<password> --organization=<organization> --api=<api> --space=<space> --skip-ssl-validation
 
-### dotCloud:
-
-#### Options:
-
-* **api_key**: dotCloud api key.
-* **app**: dotcloud app.
-* **service**: dotcloud service to run commands on. Defaults to 'www'.
-
-#### Examples:
-
-    dpl --provider=dotcloud --api_key=<api_key> --app=<app>
-    dpl --provider=dotcloud --api_key=<api_key> --app=<app> --service=<service>
-
 ### Rackspace Cloud Files:
 
 #### Options:
@@ -514,8 +486,12 @@ You first need to create an [Atlas account](https://atlas.hashicorp.com/account/
 * **repo**: GitHub Repo. Defaults to git repo's name.
 * **file**: File to upload to GitHub Release.
 * **file_glob**: If files should be interpreted as globs (\* and \*\* wildcards). Defaults to false.
+* **overwrite**: If files with the same name should be overwritten. Defaults to false.
 * **release-number**: Overide automatic release detection, set a release manually.
 
+Additionally, options can be passed to [Octokit](https://github.com/octokit/octokit.rb) client.
+These are documented in https://github.com/octokit/octokit.rb/blob/master/lib/octokit/client/releases.rb.
+
 #### GitHub Two Factor Authentication
 
 For accounts using two factor authentication, you have to use an oauth token as a username and password will not work.
@@ -590,9 +566,10 @@ For accounts using two factor authentication, you have to use an oauth token as
  * **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 zipfile you are trying to upload will be removed during cleanup.
+ * **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:
 
@@ -608,7 +585,7 @@ For accounts using two factor authentication, you have to use an oauth token as
 
 #### Options:
 
- * **access_token**: Optinoal. The access_token which can be found in the `.bitballoon` file after a deployment using the bitballoon CLI. Only required if no `.bitballoon` file is present.
+ * **access_token**: Optional. The access_token which can be found in the `.bitballoon` file after a deployment using the bitballoon CLI. Only required if no `.bitballoon` file is present.
  * **site_id**: Optional. The site_id which can be found in the .bitballoon file after a deployment using the bitballoon CLI. Only required if no `.bitballoon` file is present.
  * **local_dir**: Optional. The sub-directory of the built assets for deployment. Default to current path.
 
@@ -669,6 +646,7 @@ For accounts using two factor authentication, you have to use an oauth token as
  * **description**: Optional. The description of the Lambda being created / updated. Defaults to "Deploy build #{context.env['TRAVIS_BUILD_NUMBER']} to AWS Lambda via Travis CI"
  * **timeout**: Optional. The function execution time at which Lambda should terminate the function. Defaults to 3 (seconds).
  * **memory_size**: Optional. The amount of memory in MB to allocate to this Lambda. Defaults to 128.
+ * **runtime**: Optional. The Lambda runtime to use. Defaults to `node`.
 
 #### Examples:
 
@@ -693,6 +671,24 @@ Deploy contents of a specific directory using specific module name:
         --handler_name="handler";
 ```
 
+### Launchpad:
+
+#### Options:
+
+ * **slug**: Required. `~user-name/project-name/branch-name`
+ * **oauth_token**: Required. Your OAUTH token for Launchpad
+ * **oauth_token_secret**: Required. Your OAUTH token secret for Launchpad
+
+#### Example:
+
+Deploy contents of current working directory using default module:
+```
+    dpl --provider="launchpad" \
+        --slug="~user-name/project-name/branch-name" \
+        --oauth_token="${LAUNCHPAD_OAUTH_TOKEN}" \
+        --oauth_token_secret="${LAUNCHPAD_OAUTH_TOKEN_SECRET}";
+```
+
 ### TestFairy:
 
 Your Android(apk)/iOS(ipa) file will be uploaded to TestFairy,
@@ -722,18 +718,6 @@ and your testers can start testing your app.
 
     dpl --provider=testfairy --api-key=<api-key> --app-file="out/Sample.apk" --keystore-file="out/keystore" --storepass=<storepass> --alias=<alias>
 
-### 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`
-
 ### AWS CodeDeploy:
 
 #### Options:
@@ -757,6 +741,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.
@@ -775,6 +787,7 @@ Deployment will be marked a failure if the script exits with nonzero status.
 
 Deploys to Google App Engine and Google App Engine Managed VMs via the Google Cloud SDK and
 it's [`gcloud` tool](https://cloud.google.com/sdk/gcloud/) using a [Service Account](https://developers.google.com/console/help/new/#serviceaccounts).
+In order to use this provider, please make sure you have the [App Engine Admin API](https://developers.google.com/apis-explorer/#p/appengine/v1beta4/) enabled [in the Google Developers Console](https://console.developers.google.com/project/_/apiui/apiview/appengine/overview).
 
 #### Options:
 
@@ -782,9 +795,9 @@ it's [`gcloud` tool](https://cloud.google.com/sdk/gcloud/) using a [Service Acco
 * **keyfile**: Path to the JSON file containing your [Service Account](https://developers.google.com/console/help/new/#serviceaccounts) credentials in [JSON Web Token](https://tools.ietf.org/html/rfc7519) format. To be obtained via the [Google Developers Console](https://console.developers.google.com/project/_/apiui/credential). Defaults to `"service-account.json"`. Note that this file should be handled with care as it contains authorization keys.
 * **config**: Path to your module configuration file. Defaults to `"app.yaml"`. This file is runtime dependent ([Go](https://cloud.google.com/appengine/docs/go/config/appconfig), [Java](https://cloud.google.com/appengine/docs/java/configyaml/appconfig_yaml), [PHP](https://developers.google.com/console/help/new/#projectnumber), [Python](https://cloud.google.com/appengine/docs/python/config/appconfig))
 * **version**: The version of the app that will be created or replaced by this deployment. If you do not specify a version, one will be generated for you. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
-* **default**: Flag to set the deployed version to be the default serving version. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
+* **no_promote**: Flag to not promote the deployed version. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
 * **verbosity**: Let's you adjust the verbosity when invoking `"gcloud"`. Defaults to `"warning"`. See [`gcloud`](https://cloud.google.com/sdk/gcloud/reference/).
-* **docker_build**: If deploying a Managed VM, specifies where to build your image. Typical values are `"remote"` to build on Google Cloud Engine and `"local"` which requires Docker to be set up properly (to utilize this on Travis CI, read [Using Docker on Travis CI](http://blog.travis-ci.com/2015-08-19-using-docker-on-travis-ci/)). Defaults to `"remote"`.
+* **no_stop_previous_version**: Flag to prevent your deployment from stopping the previously promoted version. This is from the future, so might not work (yet). See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
 
 #### Environment variables:
 
@@ -793,4 +806,34 @@ it's [`gcloud` tool](https://cloud.google.com/sdk/gcloud/) using a [Service Acco
 
 #### Example:
 
-    dpl --provider=gae --project=example --default=true
+    dpl --provider=gae --project=example --no_promote=true
+
+### Firebase:
+
+#### Options:
+
+* **token**: Your Firebase CI access token (generate with `firebase login:ci`)
+* **project**: Deploy to a different Firebase project than specified in your `firebase.json` (e.g. `myapp-staging`)
+
+#### Examples:
+
+    dpl --provider=firebase --token=<token> --project=<project>
+    
+
+
+### Surge.sh
+
+#### 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. 
+
+ 
+#### Environment variables:
+
+* **SURGE_LOGIN**: Set it to the email address you use with Surge
+* **SURGE_TOKEN**: Set it to your login token (get it by doing a `surge token`)
+
+#### Example:
+    dpl --provider=surge --project=<project-path> --domain=<domain-name>
+    

data/TESTING.md

@@ -11,6 +11,8 @@ deploy:
   edge:
   	source: myown/dpl
     branch: foo
+  on:
+  	branch: TEST_BRANCH # or all_branches: true
   ⋮ # rest of provider X configuration
 ```
 

data/dpl.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'json', '1.8.1'
   s.add_development_dependency 'coveralls'
 

data/lib/dpl/provider/anynines.rb

@@ -4,8 +4,8 @@ module DPL
 
       def check_auth
         initial_go_tools_install
-        context.shell "cf api https://api.de.a9s.eu"
-        context.shell "cf login --u #{option(:username)} --p #{option(:password)} --o #{option(:organization)} --s #{option(:space)}"
+        context.shell "./cf api https://api.de.a9s.eu"
+        context.shell "./cf login --u #{option(:username)} --p #{option(:password)} --o #{option(:organization)} --s #{option(:space)}"
       end
 
     end

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,12 +28,19 @@ 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[:quiet]
-          context.shell "git push --force --quiet #{git_target} master > /dev/null 2>&1"
+        if !!options[:skip_cleanup]
+          log "Skipping Cleanup"
+          context.shell "git checkout HEAD"
+          context.shell "git add . --all --force"
+          context.shell "git commit -m \"Skip Cleanup Commit\""
+        end
+
+        if !!options[:verbose]
+          context.shell "git push --force --quiet #{git_target} HEAD:master"
         else
-          context.shell "git push --force --quiet #{git_target} master"
+          context.shell "git push --force --quiet #{git_target} HEAD:master > /dev/null 2>&1"
         end
       end
     end

data/lib/dpl/provider/bintray.rb

@@ -88,7 +88,8 @@ module DPL
       def put_file_request(local_file_path, upload_path, matrix_params)
         url = URI.parse(self.url)
 
-        data = File.read(local_file_path)
+        file = File.open(local_file_path, 'rb')
+        data = file.read()
         http = Net::HTTP.new(url.host, url.port)
         http.use_ssl = true
 
@@ -149,6 +150,7 @@ module DPL
         if code == 201 || code == 200
           return true
         end
+        name = descriptor["package"]["name"]
         abort("Unexpected HTTP response code #{code} returned from Bintray while checking if package '#{name}' exists. " +
                   "Response message: #{res.message}")
       end
@@ -179,6 +181,7 @@ module DPL
         if code == 201 || code == 200
           return true
         end
+        version_name = descriptor["version"]["name"]
         abort("Unexpected HTTP response code #{code} returned from Bintray while checking if version '#{version_name}' exists. " +
                   "Response message: #{res.message}")
       end
@@ -366,7 +369,7 @@ module DPL
       def root_path(str)
         index = str.index('(')
         path = nil
-        if index.nil?
+        if index.nil? || str.start_with?('(')
           path = str
         else
           path = str[0, index]
@@ -503,4 +506,4 @@ module DPL
       end
     end
   end
-end
+end

data/lib/dpl/provider/boxfuse.rb

@@ -7,9 +7,9 @@ module DPL
         @secret = options[:secret]
         @configfile = options[:configfile]
         @payload = options[:payload]
-        @app = options[:app]
-        @version = options[:version]
+        @image = options[:image]
         @env = options[:env]
+        @extra_args = options[:extra_args]
 
         @param_user = ''
         if @user.to_s != ''
@@ -31,24 +31,24 @@ module DPL
           @param_payload = ' "' + @payload + '"'
         end
 
-        @param_app = ''
-        if @app.to_s != ''
-          @param_app = " -app=" + @app
+        @param_image = ''
+        if @image.to_s != ''
+          @param_image = " -image=" + @image
         end
 
-        @param_version = ''
-        if @version.to_s != ''
-          @param_version = " -version=" + @version
-        end
-
-        @param_env = ''
+        @param_env = ' -env=test'
         if @env.to_s != ''
           @param_env = " -env=" + @env
         end
 
+        @param_extra_args = ''
+        if @extra_args.to_s != ''
+          @param_extra_args = " " + @extra_args
+        end
+
         context.shell "curl -L https://files.boxfuse.com/com/boxfuse/client/boxfuse-commandline/latest/boxfuse-commandline-latest-linux-x64.tar.gz | tar xz"
 
-        @command = "boxfuse/boxfuse run" + @param_user + @param_secret + @param_configfile + @param_payload + @param_app + @param_version + @param_env
+        @command = "boxfuse/boxfuse run" + @param_user + @param_secret + @param_configfile + @param_payload + @param_image + @param_env + @param_extra_args
         context.fold("Deploying application") { context.shell @command }
       end
 

data/lib/dpl/provider/cloud_files.rb

@@ -3,7 +3,10 @@ require 'dpl/provider'
 module DPL
   class Provider
     class CloudFiles < Provider
-      requires 'fog'
+      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
       experimental 'Rackspace Cloud Files'
 
       def needs_key?

data/lib/dpl/provider/cloud_foundry.rb

@@ -3,14 +3,13 @@ module DPL
     class CloudFoundry < Provider
 
       def initial_go_tools_install
-        context.shell 'wget http://go-cli.s3-website-us-east-1.amazonaws.com/releases/latest/cf-cli_amd64.deb -qO temp.deb && sudo dpkg -i temp.deb'
-        context.shell 'rm temp.deb'
+        context.shell 'wget \'https://cli.run.pivotal.io/stable?release=linux64-binary&source=github\' -qO cf-linux-amd64.tgz && tar -zxvf cf-linux-amd64.tgz && rm cf-linux-amd64.tgz'
       end
 
       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 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)}"
       end
 
       def check_app
@@ -24,8 +23,8 @@ module DPL
       end
 
       def push_app
-        context.shell "cf push#{manifest}"
-        context.shell "cf logout"
+        context.shell "./cf push#{manifest}"
+        context.shell "./cf logout"
       end
 
       def cleanup

data/lib/dpl/provider/code_deploy.rb

@@ -110,7 +110,7 @@ module DPL
       end
 
       def check_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 cleanup