dpl 1.9.1.travis.2669.5 → 1.9.1.travis.2689.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb7250f5239fe35747ef65cec136e5a2ad9c4adbafc6abfb553f52eff321daf
-  data.tar.gz: 069ff8003d2f263cd7d371c14d14f5451a99b7c48eff376d159b9392601d1f21
+  metadata.gz: 1d57a4757298450c261675de95dbfec3c872654f5a9254cb37421bee9bf2a90e
+  data.tar.gz: 65af2a43706237c712d1b49289691f1745dbcaa44c5155538a4835a7db287039
 SHA512:
-  metadata.gz: c9d0d6debaaa1c977aaa02a577601737703f33eceb29ed746ba40209d1cab8093cbb3a2be7598b95b3ee51a38ee96e26dde8da1285843813fabf3b353deca09b
-  data.tar.gz: c662ca678fca7543961f6abf1bda9c0f66142e2a741449054477910391c1b245a1305bfd6644914eb14c89b1a4c53899a8ae12be5ef773c3d0bb53301c0e9b04
+  metadata.gz: 19fcd00cec99be64611cc80b5edc507a829899c22355307335c3b2b375379cc3d243221fdb81f1e4d888da7e75931a7ceae461118bbad8d622f4b3e1b32ab19c
+  data.tar.gz: c82543adcf7c164777a9b40138e37dbb8882dd3f779e037fe3cb6a50d208f4bdf18f287da1078cb75d1c7f6ecb078b427f5324031f1fba9c0e06e4d911922799

data/.travis.yml

@@ -8,8 +8,6 @@ rvm:
 jobs:
   include:
     - stage: deploy
-      install: true
-      script: true
       cache: false
       before_deploy:
         - sed -i.bak "s/VERSION = '.*'/VERSION = '${DPL_VERSION}'/g" lib/dpl/version.rb
@@ -19,16 +17,16 @@ jobs:
         - git commit -m "Update DPL::Version"
       deploy:
         - provider: rubygems
+          script: skip
+          edge:
+            branch: master
           api_key:
             secure: ZmZoDL1tilWvQrqRWDm2K4xQ5Grt9eRJzYVZPLANR0P1TM5BJBLk+UhWCWCPkkDVIBWMa5ANsiFYBxtH65Lw+uqMztSpVusk0l0LQXZGv9jMpT9445A8008U3vvfS0ke7IG8Q4bMAC7Sd6VGaiHDyZC7zmNvnqMpmVX7ShcgBME=
           gem: dpl
-          edge:
-            branch: v1.9
           gemspec_glob: 'dpl*.gemspec'
           on:
             repo: travis-ci/dpl
-            branch: v1.9
-          if: NOT type IN (pull_request)
+          if: branch = master AND NOT type IN (pull_request)
 
 env:
   global:

data/Rakefile

@@ -3,9 +3,16 @@ 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
@@ -18,29 +25,68 @@ 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 }
 
-dpl_bin = File.join(Gem.bindir, "dpl")
-
 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"
@@ -64,10 +110,6 @@ end
 
 desc "Install dpl gem"
 task :install => "dpl-#{gem_version}.gem" do
-  Rake::FileTask[dpl_bin].invoke
-end
-
-file dpl_bin do
   logger.info green("Installing dpl gem")
   ruby "-S gem install dpl-#{gem_version}.gem"
 end
@@ -81,10 +123,9 @@ providers.each do |provider|
   end
 
   desc %Q(Run dpl-#{provider} specs)
-  task "spec-#{provider}" => [:install, "Gemfile-#{provider}"] do |t|
+  task "spec-#{provider}" => [:install, "Gemfile-#{provider}"] do
+    sh "rm -f $HOME/.npmrc"
     logger.info green("Running `bundle install` for #{provider}")
-    # rm_rf 'stubs'
-    # rm_rf '.bundle'
     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"
@@ -104,5 +145,16 @@ providers.each do |provider|
     ruby "-S dpl --provider=#{provider} --skip-cleanup=true --no-deploy"
   end
 
-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/gemspec_helper.rb

@@ -33,6 +33,7 @@ def gemspec_for(provider_name=nil, runtime_dependencies=[])
     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

@@ -10,7 +10,7 @@ module DPL
     # file names. There is no simple rule to map them automatically
     # (camel-cases, snake-cases, call-caps, etc.), so we need an explicit
     # map.
-    PROVIDERS = {
+    GEM_NAME_OF = {
       'Anynines'            => 'anynines',
       'Appfog'              => 'appfog',
       'Atlas'               => 'atlas',
@@ -61,35 +61,35 @@ module DPL
       # 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 PROVIDERS map.
+      # 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 = PROVIDERS.keys.detect { |p| p.to_s.downcase == opt }
+          class_name = class_of(opt)
           raise Error, "could not find provider %p" % opt unless class_name
-          require "dpl/provider/#{PROVIDERS[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 = PROVIDERS[provider_wanted]
+            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 = PROVIDERS[class_name]
+            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-#{PROVIDERS[provider_gem_name] || opt_lower}-#{ENV['DPL_VERSION'] || DPL::VERSION}.gem"))
+          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/#{PROVIDERS[class_name]}"
+          require "dpl/provider/#{GEM_NAME_OF[class_name]}"
           provider = const_get(class_name).new(context, options)
         rescue DPL::Error
           if opt_lower
@@ -149,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)

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.9.1.travis.2669.5'
+  VERSION = '1.9.1.travis.2689.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.9.1.travis.2669.5
+  version: 1.9.1.travis.2689.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,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: