dpl 1.9.0 → 1.9.1.travis.2589.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5559ec0b1676e226cc48c665aa2f2f67340b823a
-  data.tar.gz: 4a50e86c2e043afbe4456f8fa000217471bba279
+SHA256:
+  metadata.gz: 9963fc0cc331944d4404b6ff5b3e8108e3cfc771a74e11415bffd84c9831c660
+  data.tar.gz: ae28c51d143484d4043fa7fde66a64a3eb05b49fb412943e5ae92e5a353c283f
 SHA512:
-  metadata.gz: 0e90a5fe54aa6d568c758d4f02a7ed51bed0ba540933c3f3b97b351cafb21aaedea047c797d566f6d70dc2a128d5323d71657cc4d20f91b69d11165dfd136e55
-  data.tar.gz: ea4fdc47ed409b854e02f26e02ec9d931a61131f8a84246f9da2dbaaa53732f60cf605201b2e554fd32a5c72a1b1b2655a8eec14f745b79291ae2b77f30f826f
+  metadata.gz: 2e8d554bb41072da1da36cdd671e5dfc458ea1fe5836310d7cd45c646a105a90fe71f1a24da247894f5f6b1eb51a20396dc2a15c30e99a123f27dc4b2c252340
+  data.tar.gz: 987bce9e42a9a95bca543d9b891e8692c0acd691e66d041a08d69995b254ba8a3df2f1d74fd4a6acd1d99c6f6b32383905553a35eb4845f6c2459e1f7eada4e3

data/.travis.yml

@@ -8,25 +8,22 @@ rvm:
 jobs:
   include:
     - 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"
+      rvm: "2.3.6"
+      install: true
+      script: true
+      cache:
       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)
+        provider: rubygems
+        api_key:
+          secure: ZmZoDL1tilWvQrqRWDm2K4xQ5Grt9eRJzYVZPLANR0P1TM5BJBLk+UhWCWCPkkDVIBWMa5ANsiFYBxtH65Lw+uqMztSpVusk0l0LQXZGv9jMpT9445A8008U3vvfS0ke7IG8Q4bMAC7Sd6VGaiHDyZC7zmNvnqMpmVX7ShcgBME=
+        gem: dpl
+        edge:
+          branch: v1.9
+        gemspec_glob: 'dpl*.gemspec'
+        on:
+          repo: travis-ci/dpl
+          rvm: 2.3.6
+          branch: v1.9
 
 env:
   global:
@@ -34,24 +31,40 @@ env:
 
 sudo: false
 
-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
+    - install
 
 before_install:
   - gem update bundler
 
-before_script:
-  - rm -f $(ruby -r rubygems -e "puts Gem.bindir")/dpl
-
 script:
-  - rake
+  - bundle exec rspec spec/cli_spec.rb spec/provider_spec.rb
+  - gem build dpl.gemspec && gem install dpl-*.gem
+  - echo -e "\n${ANSI_GREEN}Run specs${ANSI_RESET}"
+  - |
+    spec_errors=0
+    for f in dpl-*.gemspec; do
+      base=${f%*.gemspec}; name=${base#dpl-*}
+      echo -e "\n${ANSI_GREEN}${base}${ANSI_RESET}\n"
+      echo -e "source 'https://rubygems.org'\ngemspec :name => \"dpl-${name}\"" > Gemfile-${name}
+      export BUNDLE_GEMFILE=Gemfile-${name}
+      bundle install --gemfile Gemfile-${name} --path=vendor/cache/dpl-${name} --binstubs=bin && ./bin/rspec spec/provider/${name}_spec.rb || ( echo -e "${ANSI_RED}${name} specs failed${ANSI_RESET}" && let spec_errors=$spec_errors+1 )
+    done
+    test $spec_errors -eq 0
+  - echo -e "\n${ANSI_GREEN}Install gem and invoke dpl${ANSI_RESET}"
+  - |
+    no_err=0
+    export BUNDLE_GEMFILE=Gemfile
+    for f in dpl-*.gemspec; do
+      base=${f%*.gemspec}; name=${base#dpl-*}
+      echo -e "\n${ANSI_GREEN}${base}${ANSI_RESET}\n"
+      gem build --silent $f && gem install --install-dir=install dpl-${name}-*.gem && ( dpl --provider=${name} --no-deploy ) || ( echo -e "${ANSI_RED}${name} invocation failed${ANSI_RESET}" && let no_err=$no_err+1 )
+    done
+    test $no_err -eq 0
+  # - bundle exec rake && gem build dpl.gemspec && gem install dpl-*.gem && dpl --provider=script --script='echo foo'
+
 
 notifications:
   webhooks: "http://requestb.in/1guaq7t1"

data/Rakefile

@@ -1,160 +1,12 @@
 require 'bundler'
-require 'term/ansicolor'
-require 'pathname'
-require 'logger'
-require './lib/dpl/version'
-require 'highline'
 
-include Term::ANSIColor
+task(:default) { ruby '-S rspec' }
 
-def cli
-  @cli ||= HighLine.new
-end
+desc "Test provider"
+task :test_provider, [:provider] do |t, args|
+  provider = args.provider
 
-@ready = false
+  Bundler.setup(provider.to_sym)
 
-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
+  `bundle exec rspec spec/provider/#{provider}_spec.rb`
+end

data/gemspec_helper.rb

@@ -27,13 +27,12 @@ def gemspec_for(provider_name=nil, runtime_dependencies=[])
       s.add_runtime_dependency *part
     end
 
-    s.add_development_dependency 'rspec'
+    s.add_development_dependency 'rspec', '~> 3.0.0'
     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

data/lib/dpl/provider.rb

@@ -6,11 +6,7 @@ module DPL
   class Provider
     include FileUtils
 
-    # 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 = {
+    PROVIDERS = {
       'Anynines'            => 'anynines',
       'Appfog'              => 'appfog',
       'Atlas'               => 'atlas',
@@ -24,7 +20,7 @@ module DPL
       'Cloud66'             => 'cloud66',
       'CloudFiles'          => 'cloud_files',
       'CloudFoundry'        => 'cloud_foundry',
-      'CodeDeploy'          => 'code_deploy',
+      'CodeDeploy'          => 'cloud_deploy',
       'Deis'                => 'deis',
       'Divshot'             => 'divshot',
       'ElasticBeanstalk'    => 'elastic_beanstalk',
@@ -58,39 +54,30 @@ module DPL
     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
         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)
+          name = PROVIDERS.keys.detect { |p| p.to_s.downcase == opt }
+          raise Error, "could not find provider %p" % opt unless name
+
+          require "dpl/provider/#{opt_lower}"
+          provider = const_get(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
+            provider_name = PROVIDERS[provider_wanted]
           end
-          install_cmd = "gem install dpl-#{provider_gem_name || opt} -v #{ENV['DPL_VERSION'] || DPL::VERSION}"
+          install_cmd = "gem install dpl-#{PROVIDERS[provider_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"))
+          if File.exist?(local_gem = File.join(Dir.pwd, "dpl-#{PROVIDERS[provider_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)
+          require "dpl/provider/#{opt_lower}"
+          provider = const_get(name).new(context, options)
         rescue DPL::Error
           if opt_lower
             provider = const_get(opt.capitalize).new(context, options)
@@ -149,10 +136,6 @@ 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)

data/spec/provider_spec.rb

@@ -3,32 +3,20 @@ require 'dpl/provider'
 
 describe DPL::Provider do
   let(:example_provider) { Class.new(described_class)}
-  let(:context) { DummyContext.new }
-  subject(:provider) { example_provider.new(context, :app => 'example', :key_name => 'foo', :run => ["foo", "bar"]) }
+  subject(:provider) { example_provider.new(DummyContext.new, :app => 'example', :key_name => 'foo', :run => ["foo", "bar"]) }
 
   before { stub_const "DPL::Provider::Example", example_provider }
 
   describe "#new" do
-    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 { 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 "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(context, :provider => "example")
+      described_class.new(DummyContext.new, :provider => "example")
     end
-
-    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
-
   end
 
   describe "#pip" do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1.travis.2589.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ 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:
@@ -191,16 +177,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: deploy tool
-test_files:
-- spec/cli_spec.rb
-- spec/provider_spec.rb
-- spec/spec_helper.rb
+test_files: []