dpl 1.8.48.travis.2486.5 → 1.9.0

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.8.47'
+  VERSION = '1.9.0'
 end

data/spec/provider_spec.rb

@@ -3,51 +3,32 @@ require 'dpl/provider'
 
 describe DPL::Provider do
   let(:example_provider) { Class.new(described_class)}
-  subject(:provider) { example_provider.new(DummyContext.new, :app => 'example', :key_name => 'foo', :run => ["foo", "bar"]) }
+  let(:context) { DummyContext.new }
+  subject(:provider) { example_provider.new(context, :app => 'example', :key_name => 'foo', :run => ["foo", "bar"]) }
 
   before { stub_const "DPL::Provider::Example", example_provider }
 
   describe "#new" do
-    example { expect(described_class.new(DummyContext.new, :provider => "example")) .to be_an(example_provider) }
-    example { expect(described_class.new(DummyContext.new, :provider => "Example")) .to be_an(example_provider) }
-    example { expect(described_class.new(DummyContext.new, :provider => "exa_mple")).to be_an(example_provider) }
-    example { expect(described_class.new(DummyContext.new, :provider => "exa-mple")).to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "example")) .to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "Example")) .to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "exa_mple")).to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "exa-mple")).to be_an(example_provider) }
+    example { expect(described_class.new(context, :provider => "scri_pt")).to be_an(DPL::Provider::Script) }
+    example { expect(described_class.new(context, :provider => "scri _pt")).to be_an(DPL::Provider::Script) }
+    example { expect(described_class.new(context, :provider => "cloudfoundry")).to be_an(DPL::Provider::CloudFoundry) }
     example "install deployment dependencies" do
       expect_any_instance_of(described_class).to receive(:respond_to?).with(:install_deploy_dependencies).and_return(true)
       expect_any_instance_of(described_class).to receive(:install_deploy_dependencies)
-      described_class.new(DummyContext.new, :provider => "example")
+      described_class.new(context, :provider => "example")
     end
-  end
 
-  describe "#requires" do
-    before do
-      expect(example_provider).to receive(:require).with("foo")
-    end
-
-    example "installed" do
-      expect(example_provider).to receive(:gem).with("foo", "~> 1.4")
-      example_provider.requires("foo", :version => "~> 1.4")
+    it "installs correct gem when provider name does not match" do
+      expect(context).to receive(:shell).with("gem install dpl-cloud_foundry -v #{ENV['DPL_VERSION'] || DPL::VERSION}")
+      expect(described_class).to receive(:require).with("dpl/provider/cloud_foundry").and_raise LoadError.new("cannot load such file -- dpl/provider/cloud_foundry")
+      expect(described_class).to receive(:require).with("dpl/provider/cloud_foundry").and_call_original
+      described_class.new(context, :provider => 'cloudfoundry')
     end
 
-    example "missing" do
-      expect(example_provider).to receive(:gem).with("foo", "~> 1.4").and_raise(LoadError)
-      expect(example_provider.context).to receive(:shell).with('gem install foo -v "~> 1.4" --no-ri --no-rdoc ', retry: true)
-      example_provider.requires("foo", :version => "~> 1.4")
-    end
-  end
-
-  describe "#apt_get" do
-    example "installed" do
-      expect(example_provider).to receive(:`).with("which foo").and_return("/bin/foo\n")
-      expect(example_provider).not_to receive(:system)
-      example_provider.apt_get("foo")
-    end
-
-    example "missing" do
-      expect(example_provider).to receive(:`).with("which foo").and_return("")
-      expect(example_provider.context).to receive(:shell).with("sudo apt-get -qq install foo", retry: true)
-      example_provider.apt_get("foo")
-    end
   end
 
   describe "#pip" do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.48.travis.2486.5
+  version: 1.9.0
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -53,39 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
 - !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
+        version: '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
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: deploy tool abstraction for clients
 email: konstantin.mailinglists@googlemail.com
 executables:
@@ -117,97 +125,55 @@ files:
 - README.md
 - Rakefile
 - bin/dpl
+- dpl-anynines.gemspec
+- dpl-atlas.gemspec
+- dpl-azure_webapps.gemspec
+- dpl-bintray.gemspec
+- dpl-bitballoon.gemspec
+- dpl-bluemix_cloud_foundry.gemspec
+- dpl-boxfuse.gemspec
+- dpl-catalyze.gemspec
+- dpl-chef_supermarket.gemspec
+- dpl-cloud66.gemspec
+- dpl-cloud_files.gemspec
+- dpl-cloud_foundry.gemspec
+- dpl-code_deploy.gemspec
+- dpl-deis.gemspec
+- dpl-divshot.gemspec
+- dpl-elastic_beanstalk.gemspec
+- dpl-engine_yard.gemspec
+- dpl-firebase.gemspec
+- dpl-gae.gemspec
+- dpl-gcs.gemspec
+- dpl-hackage.gemspec
+- dpl-heroku.gemspec
+- dpl-lambda.gemspec
+- dpl-launchpad.gemspec
+- dpl-modulus.gemspec
+- dpl-npm.gemspec
+- dpl-openshift.gemspec
+- dpl-ops_works.gemspec
+- dpl-packagecloud.gemspec
+- dpl-pages.gemspec
+- dpl-puppet_forge.gemspec
+- dpl-pypi.gemspec
+- dpl-releases.gemspec
+- dpl-rubygems.gemspec
+- dpl-s3.gemspec
+- dpl-scalingo.gemspec
+- dpl-script.gemspec
+- dpl-surge.gemspec
+- dpl-testfairy.gemspec
+- dpl-transifex.gemspec
 - dpl.gemspec
+- gemspec_helper.rb
 - lib/dpl/cli.rb
 - lib/dpl/error.rb
 - lib/dpl/provider.rb
-- lib/dpl/provider/anynines.rb
-- lib/dpl/provider/appfog.rb
-- lib/dpl/provider/atlas.rb
-- lib/dpl/provider/azure_webapps.rb
-- lib/dpl/provider/bintray.rb
-- lib/dpl/provider/bitballoon.rb
-- lib/dpl/provider/bluemix_cloud_foundry.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
-- lib/dpl/provider/cloud_foundry.rb
-- lib/dpl/provider/code_deploy.rb
-- lib/dpl/provider/deis.rb
-- lib/dpl/provider/divshot.rb
-- lib/dpl/provider/elastic_beanstalk.rb
-- lib/dpl/provider/engine_yard.rb
-- lib/dpl/provider/firebase.rb
-- lib/dpl/provider/gae.rb
-- lib/dpl/provider/gcs.rb
-- lib/dpl/provider/hackage.rb
-- lib/dpl/provider/heroku.rb
-- lib/dpl/provider/heroku/api.rb
-- lib/dpl/provider/heroku/generic.rb
-- lib/dpl/provider/heroku/git.rb
-- lib/dpl/provider/lambda.rb
-- lib/dpl/provider/launchpad.rb
-- lib/dpl/provider/modulus.rb
-- lib/dpl/provider/npm.rb
-- lib/dpl/provider/openshift.rb
-- lib/dpl/provider/ops_works.rb
-- lib/dpl/provider/packagecloud.rb
-- lib/dpl/provider/pages.rb
-- lib/dpl/provider/puppet_forge.rb
-- lib/dpl/provider/pypi.rb
-- lib/dpl/provider/releases.rb
-- lib/dpl/provider/rubygems.rb
-- lib/dpl/provider/s3.rb
-- lib/dpl/provider/scalingo.rb
-- lib/dpl/provider/script.rb
-- lib/dpl/provider/surge.rb
-- lib/dpl/provider/testfairy.rb
-- lib/dpl/provider/transifex.rb
 - lib/dpl/version.rb
 - notes/engine_yard.md
 - notes/heroku.md
 - spec/cli_spec.rb
-- spec/provider/anynines_spec.rb
-- spec/provider/appfog_spec.rb
-- spec/provider/atlas_spec.rb
-- spec/provider/azure_webapps_spec.rb
-- spec/provider/bintray_spec.rb
-- spec/provider/bitballoon_spec.rb
-- spec/provider/bluemixcloudfoundry_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
-- spec/provider/cloudfoundry_spec.rb
-- spec/provider/code_deploy_spec.rb
-- spec/provider/deis_spec.rb
-- spec/provider/divshot_spec.rb
-- spec/provider/elastic_beanstalk_spec.rb
-- spec/provider/firebase_spec.rb
-- spec/provider/gae_spec.rb
-- spec/provider/gcs_spec.rb
-- spec/provider/hackage_spec.rb
-- spec/provider/heroku_spec.rb
-- spec/provider/lambda_spec.rb
-- spec/provider/launchpad_spec.rb
-- spec/provider/modulus_spec.rb
-- spec/provider/npm_spec.rb
-- spec/provider/openshift_spec.rb
-- spec/provider/ops_works_spec.rb
-- spec/provider/packagecloud_spec.rb
-- spec/provider/puppet_forge_spec.rb
-- spec/provider/pypi_spec.rb
-- spec/provider/releases_spec.rb
-- spec/provider/rubygems_spec.rb
-- spec/provider/s3_spec.rb
-- spec/provider/scalingo_spec.rb
-- spec/provider/script_spec.rb
-- spec/provider/surge_spec.rb
-- spec/provider/testfairy_spec.rb
-- spec/provider/transifex_spec.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/travis-ci/dpl
@@ -222,16 +188,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: deploy tool
-test_files: []
+test_files:
+- spec/cli_spec.rb
+- spec/provider_spec.rb
+- spec/spec_helper.rb

data/lib/dpl/provider/anynines.rb

@@ -1,13 +0,0 @@
-module DPL
-  class Provider
-    class Anynines < CloudFoundry
-
-      def check_auth
-        initial_go_tools_install
-        context.shell "./cf api https://api.aws.ie.a9s.eu"
-        context.shell "./cf login -u #{option(:username)} -p #{option(:password)} -o #{option(:organization)} -s #{option(:space)}"
-      end
-
-    end
-  end
-end

data/lib/dpl/provider/appfog.rb

@@ -1,21 +0,0 @@
-module DPL
-  class Provider
-    class Appfog < Provider
-      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
-      requires 'af', :load => 'vmc'
-
-      def check_auth
-        context.shell "af login --email=#{option(:email)} --password=#{option(:password)}"
-      end
-
-      def needs_key?
-        false
-      end
-
-      def push_app
-        context.shell "af update #{options[:app] || File.basename(Dir.getwd)}"
-        context.shell "af logout"
-      end
-    end
-  end
-end

data/lib/dpl/provider/atlas.rb

@@ -1,108 +0,0 @@
-module DPL
-  class Provider
-    class Atlas < Provider
-      GIMME_URL = 'https://raw.githubusercontent.com/meatballhat/gimme/master/gimme'
-      ATLAS_UPLOAD_CLI_GO_REMOTE = 'github.com/hashicorp/atlas-upload-cli'
-      ATLAS_UPLOAD_BOOL_ARGS = %w(vcs debug).map(&:to_sym).freeze
-      ATLAS_UPLOAD_KV_ARGS = %w(address).map(&:to_sym).freeze
-      ATLAS_UPLOAD_KV_MULTI_ARGS = %w(exclude include metadata).map(&:to_sym).freeze
-      ATLAS_UPLOAD_INSTALL_SCRIPT = <<-EOF.gsub(/^ {8}/, '').strip
-        if ! command -v atlas-upload &>/dev/null ; then
-          mkdir -p $HOME/bin $HOME/gopath/src
-          export PATH="$HOME/bin:$PATH"
-
-          if ! command -v gimme &>/dev/null ; then
-            curl -sL -o $HOME/bin/gimme #{GIMME_URL}
-            chmod +x $HOME/bin/gimme
-          fi
-
-          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}
-          cp $HOME/gopath/bin/atlas-upload-cli $HOME/bin/atlas-upload
-        fi
-      EOF
-
-      experimental 'Atlas'
-
-      def deploy
-        assert_app_present!
-        install_atlas_upload
-        super
-      end
-
-      def check_auth
-        ENV['ATLAS_TOKEN'] = options[:token] if options[:token]
-        error 'Missing ATLAS_TOKEN' unless ENV['ATLAS_TOKEN']
-      end
-
-      def needs_key?
-        false
-      end
-
-      def push_app
-        unless options[:paths]
-          here = Dir.pwd
-          warn "No paths specified.  Using #{here.inspect}."
-          options[:paths] = here
-        end
-
-        Array(options[:paths]).each do |path|
-          context.shell "atlas-upload #{atlas_upload_args} #{atlas_app} #{path}"
-        end
-      end
-
-      private
-
-      def install_atlas_upload
-        without_git_http_user_agent do
-          context.shell ATLAS_UPLOAD_INSTALL_SCRIPT
-        end
-      end
-
-      def assert_app_present!
-        error 'Missing Atlas app name' unless options.key?(:app)
-      end
-
-      def atlas_upload_args
-        return options[:args] if options.key?(:args)
-        return @atlas_upload_args if @atlas_upload_args
-
-        args = []
-
-        ATLAS_UPLOAD_BOOL_ARGS.each do |arg|
-          args << "-#{arg}" if options.key?(arg)
-        end
-
-        ATLAS_UPLOAD_KV_ARGS.each do |arg|
-          args << ["-#{arg}", options[arg].inspect].join('=') if options.key?(arg)
-        end
-
-        ATLAS_UPLOAD_KV_MULTI_ARGS.each do |arg|
-          next unless options.key?(arg)
-          Array(options[arg]).each do |arg_entry|
-            args << ["-#{arg}", arg_entry.inspect].join('=')
-          end
-        end
-
-        @atlas_upload_args = args.join(' ')
-      end
-
-      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