dpl 1.8.18.travis.1527.4 → 1.8.18.travis.1529.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjhhNzgwZTViZDliZDU3N2U5NjNkYWVhNmU4MmNkNTFjMGUyMTg1Mg==
+    N2Y2ZjZhZjY0Yjk4YWQwYTJlNjZjMjQ5ZjYxYWU3MDllNDg1YmI1NQ==
   data.tar.gz: !binary |-
-    Y2VmZjkxNmI0M2JiZjQ0ZGVjMjM0NjYyODg2ZGMyYjU3ODExMDUwMA==
+    ZjBlY2YyMjllNmQ0YWExOGQzODA0YzVlNzZmYmI5MjVlZWY2MGVlNw==
 SHA512:
   metadata.gz: !binary |-
-    ZmEzYmIzZTQ4MmY5NzFmOWU5MjA3MDQ5Zjg3M2IwOGFhYzA1NDNjNjg3MDFl
-    OWZiNTNkMjFmN2M2Mjk2ZmJmMmJkYTM2YzZiZDMzZjcwNmU3ZDgxYTczY2Y0
-    ODQ5ZjA2NGE4MTY1N2ZkZTMzNTZiNjJiNzNhMDkxMWU0MjhhNGU=
+    MTM1YTIzYWQ5ZTg0MjE1Nzc3YTY1NDAzN2MxNDk1MjUxZjZiNDVjZThkOTkw
+    ZTY3ZDc3NDk3OTdjZDMxZDI1MDE0Mzc0MjRmNmY1MWRkMzA5NTc0MDA1M2Fh
+    NTEwYjVjYzU0ZjRjODZhZmQyODQwZjk2ZWYzYjY1YTJjNzUzMTY=
   data.tar.gz: !binary |-
-    ZTc4ZGM5MzRhMzBlZjY0ODFjMGU3ZWZiM2RmOWY1ZDQwYzk2ZjVhODY0ZmZi
-    NTE5MGYxMTYyN2VhNjI0NmJmMTg0NWI3YzRjMGYwMDFjZTQ4Y2E5MWY2OWY2
-    OWZlODkwZjZiZjUxOTc3MWUzYjVjOTJhN2ExNTQ4ZTEyZjE1MmU=
+    NTE5ZDc3MzU2MjBkNGZkNjUzZTY3ZDJiZmRkODg3NzNkOGZjYzM2NzRhOGRk
+    ZTg1ODhkNjBkNTRkMDMwN2NmMDgwZmZhM2I1NTg3YTg4NTM5YzJlYTg5N2Nk
+    ZDgwMTcxZTVjZTk2NWNiZmJiMjQxNDg2ZjRmYjJlNGYyZGM3MWE=

data/README.md

@@ -11,17 +11,18 @@ 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)
 * [Firebase](#firebase)
 * [Github Releases](#github-releases)
@@ -343,6 +344,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:
@@ -557,30 +582,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 +623,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:
@@ -818,7 +850,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 +858,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 +868,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/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/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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.18.travis.1527.4
+  version: 1.8.18.travis.1529.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -108,6 +108,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
@@ -156,6 +157,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