dpl 1.8.48.travis.2486.5 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a9ef2c858a7cb05e5849e17725dcc50a92b76cf7a37dd8cbf0ed210778b8df5f
-  data.tar.gz: b196610f780ee03258b53ac07955a7b03ece0cca990fe77661e7f5ea833e7030
+SHA1:
+  metadata.gz: 5559ec0b1676e226cc48c665aa2f2f67340b823a
+  data.tar.gz: 4a50e86c2e043afbe4456f8fa000217471bba279
 SHA512:
-  metadata.gz: 370501bef326007a49dffcc531806023ec8071ae94d7f7bb08d2e09f50c9d0925c8c68a999f1eff3d49e8151068e2d727689ebf6fd9e55145d00ea3591267625
-  data.tar.gz: b85abcdd51d54008906762baab5fc5eaab04a259d97452a8264089cad25696572ab500b9009d73c8eafdc9511f53d641dfa4780cdc2c44d2b17b2f62567bae38
+  metadata.gz: 0e90a5fe54aa6d568c758d4f02a7ed51bed0ba540933c3f3b97b351cafb21aaedea047c797d566f6d70dc2a128d5323d71657cc4d20f91b69d11165dfd136e55
+  data.tar.gz: ea4fdc47ed409b854e02f26e02ec9d931a61131f8a84246f9da2dbaaa53732f60cf605201b2e554fd32a5c72a1b1b2655a8eec14f745b79291ae2b77f30f826f

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile-*
 Gemfile.lock
 .coverage
 coverage
@@ -6,3 +7,4 @@ setuptools*.zip
 google_appengine_*.zip
 google_appengine/*
 npm-debug.log
+*.gem

data/.travis.yml

@@ -1,36 +1,57 @@
 language: ruby
 rvm:
-- 1.9.3
-- 2.0.0
-- 2.1.5
-- "2.2.5"
-- "2.3.1"
+- "2.2.9"
+- "2.3.6"
+- "2.4"
+- "2.5"
 
-matrix:
+jobs:
   include:
-    - rvm: "2.2.6"
-      sudo: required
-  allow_failures:
-    - rvm: "2.3.1"
+    - stage: deploy
+      cache: false
+      before_deploy:
+        - sed -i.bak "s/VERSION = '.*'/VERSION = '${DPL_VERSION}'/g" lib/dpl/version.rb
+        - git config user.name "travisbot"
+        - git config user.email "deploy@travis-ci.org"
+        - git add lib/dpl/version.rb
+        - git commit -m "Update DPL::Version"
+      deploy:
+        - provider: rubygems
+          script: skip
+          edge:
+            branch: master
+          api_key:
+            secure: ZmZoDL1tilWvQrqRWDm2K4xQ5Grt9eRJzYVZPLANR0P1TM5BJBLk+UhWCWCPkkDVIBWMa5ANsiFYBxtH65Lw+uqMztSpVusk0l0LQXZGv9jMpT9445A8008U3vvfS0ke7IG8Q4bMAC7Sd6VGaiHDyZC7zmNvnqMpmVX7ShcgBME=
+          gem: dpl
+          gemspec_glob: 'dpl*.gemspec'
+          on:
+            repo: travis-ci/dpl
+          if: branch = master AND NOT type IN (pull_request)
+
+env:
+  global:
+    - DPL_VERSION=$(ruby -I lib -r dpl/version.rb -e "puts DPL::VERSION.succ + \".travis.#{ENV['TRAVIS_JOB_NUMBER']}\"")
 
 sudo: false
 
-cache: bundler
+before_cache:
+  - rm -rf $GEM_HOME/cache/dpl-*.travis.*.gem $GEM_HOME/gems/dpl-*.travis.* $GEM_HOME/specifications/dpl-*.travis.*
+  - git checkout bin/dpl
+
+cache:
+  directories:
+    - vendor/cache
+    - $GEM_HOME
+    - node_modules
 
 before_install:
   - gem update bundler
 
+before_script:
+  - rm -f $(ruby -r rubygems -e "puts Gem.bindir")/dpl
+
 script:
-  - bundle exec rake && gem build dpl.gemspec && gem install dpl-*.gem && dpl --provider=script --script='echo foo'
-
-deploy:
-  provider: rubygems
-  api_key:
-    secure: ZmZoDL1tilWvQrqRWDm2K4xQ5Grt9eRJzYVZPLANR0P1TM5BJBLk+UhWCWCPkkDVIBWMa5ANsiFYBxtH65Lw+uqMztSpVusk0l0LQXZGv9jMpT9445A8008U3vvfS0ke7IG8Q4bMAC7Sd6VGaiHDyZC7zmNvnqMpmVX7ShcgBME=
-  gem: dpl
-  on:
-    repo: travis-ci/dpl
-    ruby: 2.2.6
+  - rake
 
 notifications:
   webhooks: "http://requestb.in/1guaq7t1"

data/Gemfile

@@ -1,100 +1,5 @@
 source 'https://rubygems.org'
-gemspec
+ruby '> 2.1' # 2.2 and up
+gemspec :name => 'dpl'
 
-gem 'term-ansicolor', '~> 1.3.2'
-
-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
-  gem 'rendezvous', '~> 0.0.2'
-  gem 'heroku-api', '= 0.3.16'
-  gem 'anvil-cli', '~> 0.16.1'
-  gem 'netrc'
-  gem 'faraday'
-end
-
-group :openshift do
-  gem 'rhc'
-  gem 'httpclient'
-end
-
-group :appfog do
-  gem 'json_pure'
-  gem 'af'
-end
-
-group :rubygems do
-  gem 'gems', '~> 0.8.3'
-end
-
-group :sss do
-  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
-  gem 'mime-types'
-end
-
-group :code_deploy do
-  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
-end
-
-group :lambda do
-  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
-  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'
-  gem 'nokogiri', '~> 1.6.8.1'
-end
-
-group :releases do
-  gem 'octokit', '~> 4.3.0'
-end
-
-group :gcs do
-  gem 'gstore'
-  gem 'mime-types'
-end
-
-group :elastic_beanstalk do
-  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
-  gem 'rubyzip', '~> 1.1'
-end
-
-group :bitballoon do
-  gem 'bitballoon'
-  gem 'jwt', '< 1.5.3', platforms: :mri_19
-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
-
-group :testfairy do
-  gem 'multipart-post'
-end
-
-group :chef_supermarket do
-  gem 'chef'
-end
-
-group :deis do
-  gem 'git'
-end
-
-group :opsworks do
-  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
-end
+gem 'term-ansicolor'

data/README.md

@@ -8,7 +8,6 @@ See [CONTRIBUTING.md](.github/CONTRIBUTING.md).
 Dpl supports the following providers:
 
 * [Anynines](#anynines)
-* [AppFog](#appfog)
 * [Atlas by HashiCorp](#atlas)
 * [AWS CodeDeploy](#aws-codedeploy)
 * [AWS Elastic Beanstalk](#elastic-beanstalk)
@@ -268,6 +267,9 @@ For authentication you can also use Travis CI secure environment variable:
 #### Options:
 
 * **api-key**: Rubygems Api Key.
+* **gemspec**: Optional. The name of the `gemspec` file to use to build the gem.
+* **gemspec_glob**: Optional. A glob pattern to search for gemspec files when multiple gems are generated in the repository.
+This _overrides_ the `gemspec` option.
 
 #### Examples:
 
@@ -412,19 +414,6 @@ It is possible to set file-specific `Cache-Control` and `Expires` headers using
 
     dpl --provider=anynines --username=<username> --password=<password> --organization=<organization> --space=<space>
 
-### Appfog:
-
-#### Options:
-
-* **email**: Appfog Email.
-* **password**: Appfog Password.
-* **app**: Appfog App. Defaults to git repo's name.
-
-#### Examples:
-
-    dpl --provider=appfog --email=<email> --password=<password>
-    dpl --provider=appfog --email=<email> --password=<password> --app=<app>
-
 ### Atlas:
 
 The Atlas provider uses the [`atlas-upload-cli`](https://github.com/hashicorp/atlas-upload-cli) command. The [Atlas Upload CLI](https://github.com/hashicorp/atlas-upload-cli) is a lightweight command line interface for uploading application code to [Atlas](https://atlas.hashicorp.com/homepage?utm_source=github&utm_medium=travis-ci&utm_campaign=dpl) to kick off Atlas-based deployment processes from Travis CI.
@@ -723,12 +712,12 @@ For accounts using two factor authentication, you have to use an oauth token as
  * **security_group_ids**: Optional. List of security group IDs to be added to the function. Needs the `ec2:DescribeSecurityGroups` and `ec2:DescribeVpcs` permission for the user of the access/secret key to work.
  * **dead_letter_arn**: Optional. ARN to an SNS or SQS resource used for the dead letter queue. [More about DLQs here](https://docs.aws.amazon
  .com/lambda/latest/dg/dlq.html).
- * **tracing_mode**: Optional. "Active" or "PassThrough" only. Default is "PassThrough".  Needs the `xray:PutTraceSegments` and `xray:PutTelemetryRecords` on the role for this to work. [More on 
+ * **tracing_mode**: Optional. "Active" or "PassThrough" only. Default is "PassThrough".  Needs the `xray:PutTraceSegments` and `xray:PutTelemetryRecords` on the role for this to work. [More on
  Active Tracing here](https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html).
  * **environment_variables**: Optional. List of Environment Variables to add to the function, needs to be in the format of `KEY=VALUE`. Can be encrypted for added security.
  * **kms_key_arn**: Optional. KMS key ARN to use to encrypt `environment_variables`.
  * **function_tags**: Optional. List of tags to add to the function, needs to be in the format of `KEY=VALUE`. Can be encrypted for added security.
- 
+
  For a list of all [permissions for Lambda, please refer to the documentation](https://docs.aws.amazon.com/lambda/latest/dg/lambda-api-permissions-ref.html).
 
 #### Examples:

data/Rakefile

@@ -1 +1,160 @@
-task(:default) { ruby '-S rspec' }
+require 'bundler'
+require 'term/ansicolor'
+require 'pathname'
+require 'logger'
+require './lib/dpl/version'
+require 'highline'
+
+include Term::ANSIColor
+
+def cli
+  @cli ||= HighLine.new
+end
+
+@ready = false
+
+def logger
+  @logger ||= Logger.new($stdout)
+end
+
+def top
+  @top ||= Pathname.new File.expand_path(File.dirname(__FILE__))
+end
+
+def gem_version
+  ENV['DPL_VERSION'] || DPL::VERSION
+end
+
+def confirm(verb = "release")
+  unless @ready
+    answer = cli.ask "Ready to #{verb} `dpl` version #{gem_version}? (y/n)"
+    if answer !~ /^y/i
+      abort red("Aborting #{verb}")
+    end
+
+    @ready = true
+  end
+end
+
+gemspecs = FileList[File.join(top, "dpl-*.gemspec")]
+
+providers = gemspecs.map { |f| /dpl-(?<provider>.*)\.gemspec/ =~ f && provider }
+
+task :default => [:spec, :install] do
+  Rake::Task["spec_providers"].invoke
+  Rake::Task["check_providers"].invoke
+end
+
+desc "Run spec on all providers"
+task :spec_providers do
+  providers.each do |provider|
+    Rake::Task["spec-#{provider}"].invoke
+  end
+end
+
+desc "Check all provider gems install correctly"
+task :check_providers do
+  providers.each do |provider|
+    Rake::Task["check-#{provider}"].invoke
+  end
+end
+
+desc "Build all gems"
+task :build => "dpl-#{gem_version}.gem" do
+  providers.each do |provider|
+    Rake::Task["dpl-#{provider}-#{gem_version}.gem"].invoke
+  end
+end
+
+desc "Release all gems"
+task :release do
+  confirm
+  threads = []
+  providers.each { |provider| threads << Thread.new { Rake::Task["release-#{provider}"].invoke } }
+  threads.each { |thr| thr.join }
+  logger.info green("Pushing dpl-#{gem_version}.gem")
+  sh "gem push dpl-#{gem_version}.gem"
+end
+
+desc "Yank all gems"
+task :yank, [:version] do |t, args|
+  version = args.version
+  confirm "yank"
+  logger.info green("Yanking `dpl` version #{version}")
+  sh "gem yank dpl -v #{version}"
+  threads = []
+  providers.each { |provider| threads << Thread.new { Rake::Task["yank-#{provider}"].invoke } }
+  threads.each { |thr| thr.join }
+end
+
+task :deep_clean do
+  Rake::Task[:clean].invoke
+  sh "git clean -dfx"
+end
+
+task :clean do
+  rm_rf "stubs"
+  rm_rf "vendor"
+end
+
+desc "Run dpl specs"
+task :spec do
+  ruby '-S rspec spec/cli_spec.rb spec/provider_spec.rb'
+end
+
+desc "Build dpl gem"
+file "dpl-#{gem_version}.gem" do
+  logger.info green("Building dpl gem")
+  ruby "-S gem build dpl.gemspec"
+end
+
+desc "Install dpl gem"
+task :install => "dpl-#{gem_version}.gem" do
+  logger.info green("Installing dpl gem")
+  ruby "-S gem install dpl-#{gem_version}.gem"
+end
+
+providers.each do |provider|
+  desc "Write Gemfile-#{provider}"
+  file "Gemfile-#{provider}" do |t|
+    gemfile = top + t.name
+    logger.info green("Writing #{gemfile}")
+    gemfile.write %Q(source 'https://rubygems.org'\ngemspec :name => "dpl-#{provider}"\n)
+  end
+
+  desc %Q(Run dpl-#{provider} specs)
+  task "spec-#{provider}" => [:install, "Gemfile-#{provider}"] do
+    sh "rm -f $HOME/.npmrc"
+    logger.info green("Running `bundle install` for #{provider}")
+    sh 'bash', '-cl', "bundle install --gemfile=Gemfile-#{provider} --path=vendor/cache/dpl-#{provider} --retry=3 --binstubs=stubs"
+    logger.info green("Running specs for #{provider}")
+    sh "env BUNDLE_GEMFILE=Gemfile-#{provider} ./stubs/rspec spec/provider/#{provider}_spec.rb"
+  end
+
+  desc "Build dpl-#{provider} gem"
+  file "dpl-#{provider}-#{gem_version}.gem" do
+    logger.info green("Building dpl-#{provider} gem")
+    ruby "-S gem build --silent dpl-#{provider}.gemspec"
+  end
+
+  desc "Test dpl-#{provider} gem"
+  task "check-#{provider}" => [:install, "dpl-#{provider}-#{gem_version}.gem"] do
+    logger.info green("Installing dpl-#{provider} gem")
+    sh "gem install --no-post-install-message dpl-#{provider}-#{gem_version}.gem"
+    logger.info green("Testing dpl-#{provider} loads correctly")
+    ruby "-S dpl --provider=#{provider} --skip-cleanup=true --no-deploy"
+  end
+
+  desc "Release dpl-#{provider} gem"
+  task "release-#{provider}" => "dpl-#{provider}-#{gem_version}.gem" do
+    confirm
+    logger.info green("Pushing dpl-#{provider}-#{gem_version}.gem")
+    sh "gem push dpl-#{provider}-#{gem_version}.gem"
+  end
+
+  desc "Yank dpl-#{provider}"
+  task "yank-#{provider}" do
+    logger.info green("Yanking dpl-#{provider} version #{gem_version}")
+    sh "gem yank dpl-#{provider} -v #{gem_version}"
+  end
+end

data/dpl-anynines.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'anynines'

data/dpl-atlas.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'atlas'

data/dpl-azure_webapps.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'azure_webapps'

data/dpl-bintray.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'bintray'

data/dpl-bitballoon.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'bitballoon', [['bitballoon']]

data/dpl-bluemix_cloud_foundry.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'bluemix_cloud_foundry'