dpl 1.8.48.travis.2486.5 → 1.9.0

data/dpl-boxfuse.gemspec

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

data/dpl-catalyze.gemspec

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

data/dpl-chef_supermarket.gemspec

@@ -0,0 +1,8 @@
+require './gemspec_helper'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0")
+  gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '~> 12.0']]
+else
+  gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef']]
+end
+

data/dpl-cloud66.gemspec

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

data/dpl-cloud_files.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'cloud_files', [['net-ssh'], ['mime-types'], ['nokogiri'], ['fog-rackspace']]

data/dpl-cloud_foundry.gemspec

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

data/dpl-code_deploy.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'code_deploy', [['aws-sdk', '~> 2.0']]

data/dpl-deis.gemspec

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

data/dpl-divshot.gemspec

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

data/dpl-elastic_beanstalk.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'elastic_beanstalk', [['aws-sdk', '~> 2.0'], ['rubyzip']]

data/dpl-engine_yard.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'engine_yard', [['engineyard-cloud-client']]

data/dpl-firebase.gemspec

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

data/dpl-gae.gemspec

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

data/dpl-gcs.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'gcs', [['gstore'], ['mime-types', '~> 2.0']]

data/dpl-hackage.gemspec

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

data/dpl-heroku.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'heroku', [['faraday'], ['rendezvous'], ['netrc']]

data/dpl-lambda.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'lambda', [['aws-sdk', '~> 2.0'], ['rubyzip']]

data/dpl-launchpad.gemspec

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

data/dpl-modulus.gemspec

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

data/dpl-npm.gemspec

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

data/dpl-openshift.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'openshift', [['httpclient', '~> 2.4.0'], ['net-ssh'], ['net-ssh-gateway'], ['rhc']]

data/dpl-ops_works.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'ops_works', [['aws-sdk', '~> 2.0']]

data/dpl-packagecloud.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'packagecloud', [['packagecloud-ruby', '1.0.5']]

data/dpl-pages.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'pages', [['octokit', '~> 4.6.2']]

data/dpl-puppet_forge.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'puppet_forge', [['puppet'], ['puppet-blacksmith']]

data/dpl-pypi.gemspec

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

data/dpl-releases.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'releases', [['octokit', '~> 4.6.2'], ['mime-types', '~> 2.0']]

data/dpl-rubygems.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'rubygems', [['gems', '>= 1.1.0']]

data/dpl-s3.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 's3', [['aws-sdk', '~> 2.0'], ['mime-types', '~> 2.0']]

data/dpl-scalingo.gemspec

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

data/dpl-script.gemspec

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

data/dpl-surge.gemspec

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

data/dpl-testfairy.gemspec

@@ -0,0 +1,3 @@
+require './gemspec_helper'
+
+gemspec_for 'testfairy', [['multipart-post', '2.0.0']]

data/dpl-transifex.gemspec

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

data/dpl.gemspec

@@ -1,32 +1,3 @@
-$:.unshift File.expand_path("../lib", __FILE__)
-require "dpl/version"
+require './gemspec_helper'
 
-Gem::Specification.new do |s|
-  s.name                  = "dpl"
-  s.version               = DPL::VERSION
-  s.author                = "Konstantin Haase"
-  s.email                 = "konstantin.mailinglists@googlemail.com"
-  s.homepage              = "https://github.com/travis-ci/dpl"
-  s.summary               = %q{deploy tool}
-  s.description           = %q{deploy tool abstraction for clients}
-  s.license               = 'MIT'
-  s.files                 = `git ls-files`.split("\n")
-  s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_path          = 'lib'
-  s.required_ruby_version = '>= 1.9.3'
-
-  s.add_development_dependency 'rspec', '~> 3.0.0'
-  s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'json', '1.8.3'
-  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 '.'
-    digits[-1] = digits[-1].to_s.succ
-    s.version = digits.join('.') + ".travis.#{ENV['TRAVIS_JOB_NUMBER']}"
-  end
-end
+gemspec_for

data/gemspec_helper.rb

@@ -0,0 +1,49 @@
+$:.unshift File.expand_path("../lib", __FILE__)
+require "dpl/version"
+
+def gemspec_for(provider_name=nil, runtime_dependencies=[])
+  Gem::Specification.new do |s|
+
+    s.name                  = ["dpl", provider_name].compact.join("-")
+    s.author                = "Konstantin Haase"
+    s.email                 = "konstantin.mailinglists@googlemail.com"
+    s.homepage              = "https://github.com/travis-ci/dpl"
+    s.summary               = %q{deploy tool}
+    s.description           = %q{deploy tool abstraction for clients}
+    s.license               = 'MIT'
+
+    s.require_path          = 'lib'
+    s.required_ruby_version = '>= 2.2'
+
+    # set up version
+    s.version = ENV['DPL_VERSION'] || DPL::VERSION
+
+    # dependencies
+    if provider_name
+      s.add_runtime_dependency 'dpl', s.version
+    end
+
+    runtime_dependencies.each do |part|
+      s.add_runtime_dependency *part
+    end
+
+    s.add_development_dependency 'rspec'
+    s.add_development_dependency 'rspec-its'
+    s.add_development_dependency 'rake'
+    s.add_development_dependency 'json_pure'
+    s.add_development_dependency 'tins'
+    s.add_development_dependency 'coveralls'
+    s.add_development_dependency 'highline'
+
+    # set up files
+    if provider_name
+      s.files       = `git ls-files`.split("\n").grep(Regexp.new provider_name.to_s)
+      s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n").grep(Regexp.new provider_name.to_s)
+    else
+      s.files      = `git ls-files`.split("\n").reject {|f| f =~ Regexp.new("provider/")}
+      s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n").reject {|f| f =~ Regexp.new("provider/")}
+    end
+    s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }.grep(Regexp.new provider_name.to_s)
+
+   end
+end

data/lib/dpl/provider.rb

@@ -6,58 +6,105 @@ module DPL
   class Provider
     include FileUtils
 
-    autoload :Anynines,            'dpl/provider/anynines'
-    autoload :Appfog,              'dpl/provider/appfog'
-    autoload :Atlas,               'dpl/provider/atlas'
-    autoload :AzureWebApps,        'dpl/provider/azure_webapps'
-    autoload :Bintray,             'dpl/provider/bintray'
-    autoload :BitBalloon,          'dpl/provider/bitballoon'
-    autoload :BluemixCloudFoundry, 'dpl/provider/bluemix_cloud_foundry'
-    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'
-    autoload :CloudFoundry,        'dpl/provider/cloud_foundry'
-    autoload :CodeDeploy,          'dpl/provider/code_deploy'
-    autoload :Deis,                'dpl/provider/deis'
-    autoload :Divshot,             'dpl/provider/divshot'
-    autoload :ElasticBeanstalk,    'dpl/provider/elastic_beanstalk'
-    autoload :EngineYard,          'dpl/provider/engine_yard'
-    autoload :Firebase,            'dpl/provider/firebase'
-    autoload :GAE,                 'dpl/provider/gae'
-    autoload :GCS,                 'dpl/provider/gcs'
-    autoload :Hackage,             'dpl/provider/hackage'
-    autoload :Heroku,              'dpl/provider/heroku'
-    autoload :Lambda,              'dpl/provider/lambda'
-    autoload :Launchpad,           'dpl/provider/launchpad'
-    autoload :Modulus,             'dpl/provider/modulus'
-    autoload :Nodejitsu,           'dpl/provider/nodejitsu'
-    autoload :NPM,                 'dpl/provider/npm'
-    autoload :Openshift,           'dpl/provider/openshift'
-    autoload :OpsWorks,            'dpl/provider/ops_works'
-    autoload :Packagecloud,        'dpl/provider/packagecloud'
-    autoload :Pages,               'dpl/provider/pages'
-    autoload :PuppetForge,         'dpl/provider/puppet_forge'
-    autoload :PyPI,                'dpl/provider/pypi'
-    autoload :Releases,            'dpl/provider/releases'
-    autoload :RubyGems,            'dpl/provider/rubygems'
-    autoload :S3,                  'dpl/provider/s3'
-    autoload :Scalingo,            'dpl/provider/scalingo'
-    autoload :Script,              'dpl/provider/script'
-    autoload :Surge,               'dpl/provider/surge'
-    autoload :TestFairy,           'dpl/provider/testfairy'
-    autoload :Transifex,           'dpl/provider/transifex'
-
+    # map of DPL provider class name constants to their corresponding
+    # file names. There is no simple rule to map them automatically
+    # (camel-cases, snake-cases, call-caps, etc.), so we need an explicit
+    # map.
+    GEM_NAME_OF = {
+      'Anynines'            => 'anynines',
+      'Appfog'              => 'appfog',
+      'Atlas'               => 'atlas',
+      'AzureWebApps'        => 'azure_webapps',
+      'Bintray'             => 'bintray',
+      'BitBalloon'          => 'bitballoon',
+      'BluemixCloudFoundry' => 'bluemix_cloud_foundry',
+      'Boxfuse'             => 'boxfuse',
+      'Catalyze'            => 'catalyze',
+      'ChefSupermarket'     => 'chef_supermarket',
+      'Cloud66'             => 'cloud66',
+      'CloudFiles'          => 'cloud_files',
+      'CloudFoundry'        => 'cloud_foundry',
+      'CodeDeploy'          => 'code_deploy',
+      'Deis'                => 'deis',
+      'Divshot'             => 'divshot',
+      'ElasticBeanstalk'    => 'elastic_beanstalk',
+      'EngineYard'          => 'engine_yard',
+      'Firebase'            => 'firebase',
+      'GAE'                 => 'gae',
+      'GCS'                 => 'gcs',
+      'Hackage'             => 'hackage',
+      'Heroku'              => 'heroku',
+      'Lambda'              => 'lambda',
+      'Launchpad'           => 'launchpad',
+      'Modulus'             => 'modulus',
+      'Nodejitsu'           => 'nodejitsu',
+      'NPM'                 => 'npm',
+      'Openshift'           => 'openshift',
+      'OpsWorks'            => 'ops_works',
+      'Packagecloud'        => 'packagecloud',
+      'Pages'               => 'pages',
+      'PuppetForge'         => 'puppet_forge',
+      'PyPI'                => 'pypi',
+      'Releases'            => 'releases',
+      'RubyGems'            => 'rubygems',
+      'S3'                  => 's3',
+      'Scalingo'            => 'scalingo',
+      'Script'              => 'script',
+      'Surge'               => 'surge',
+      'TestFairy'           => 'testfairy',
+      'Transifex'           => 'transifex',
+    }
 
     def self.new(context, options)
       return super if self < Provider
 
+      # when requiring the file corresponding to the provider name
+      # given in the options, the general strategy is to normalize
+      # the option to lower-case alphanumeric, then
+      # use that key to find the file name using the GEM_NAME_OF map.
+
       context.fold("Installing deploy dependencies") do
-        name = super.option(:provider).to_s.downcase.gsub(/[^a-z0-9]/, '')
-        raise Error, 'could not find provider %p' % options[:provider] unless name = constants.detect { |c| c.to_s.downcase == name }
-        provider = const_get(name).new(context, options)
-        provider.install_deploy_dependencies if provider.respond_to?(:install_deploy_dependencies)
+        begin
+          opt_lower = super.option(:provider).to_s.downcase
+          opt = opt_lower.gsub(/[^a-z0-9]/, '')
+          class_name = class_of(opt)
+          raise Error, "could not find provider %p" % opt unless class_name
+          require "dpl/provider/#{GEM_NAME_OF[class_name]}"
+          provider = const_get(class_name).new(context, options)
+        rescue NameError, LoadError => e
+          if /uninitialized constant DPL::Provider::(?<provider_wanted>\S+)/ =~ e.message
+            provider_gem_name = GEM_NAME_OF[provider_wanted]
+          elsif %r(cannot load such file -- dpl/provider/(?<provider_file_name>\S+)) =~ e.message
+            provider_gem_name = GEM_NAME_OF[class_name]
+          else
+            # don't know what to do with this error
+            raise e
+          end
+          install_cmd = "gem install dpl-#{provider_gem_name || opt} -v #{ENV['DPL_VERSION'] || DPL::VERSION}"
+
+          if File.exist?(local_gem = File.join(Dir.pwd, "dpl-#{GEM_NAME_OF[provider_gem_name] || opt_lower}-#{ENV['DPL_VERSION'] || DPL::VERSION}.gem"))
+            install_cmd = "gem install #{local_gem}"
+          end
+
+          context.shell(install_cmd)
+          Gem.clear_paths
+
+          require "dpl/provider/#{GEM_NAME_OF[class_name]}"
+          provider = const_get(class_name).new(context, options)
+        rescue DPL::Error
+          if opt_lower
+            provider = const_get(opt.capitalize).new(context, options)
+          else
+            raise Error, 'missing provider'
+          end
+        end
+
+        if options[:no_deploy]
+          def provider.deploy; end
+        else
+          provider.install_deploy_dependencies if provider.respond_to? :install_deploy_dependencies
+        end
+
         provider
       end
     end
@@ -74,17 +121,6 @@ module DPL
       puts ''
     end
 
-    def self.requires(name, options = {})
-      version = options[:version] || '> 0'
-      load    = options[:load]    || name
-      gem(name, version)
-    rescue LoadError
-      context.shell("gem install %s -v %p --no-ri --no-rdoc #{'--pre' if options[:pre]}" % [name, version], retry: true)
-      Gem.clear_paths
-    ensure
-      require load
-    end
-
     def self.context
       self
     end
@@ -113,6 +149,10 @@ module DPL
       context.shell("npm install -g #{name}", retry: true) if `which #{command}`.chop.empty?
     end
 
+    def self.class_of(filename)
+      GEM_NAME_OF.keys.detect { |p| p.to_s.downcase == filename }
+    end
+
     attr_reader :context, :options
 
     def initialize(context, options)
@@ -231,6 +271,9 @@ module DPL
       options[:default_text_charset].downcase
     end
 
+    def install_deploy_dependencies
+    end
+
     def encoding_for(path)
       file_cmd_output = `file '#{path}'`
       case file_cmd_output