dpl 1.9.1.travis.2660.5 → 1.9.1.travis.2666.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7494a96a838bdb9db9a0b0042cb001e9fd1a0ac1fbdb2c7ae97fcbb19986155e
-  data.tar.gz: a5ab9c1124ea55f1d4af111b983896904591041bd2bb01653dfa8ce380fe2565
+  metadata.gz: 8997fbbf6eb43dcb503cf4a1bf17e09f100a932ece178c0b5b060a09ba142b2d
+  data.tar.gz: 21d597381e3b2ba19c5c58905e6abecb28a96f60d16ca587dccb6e2e9fbd2cc4
 SHA512:
-  metadata.gz: c1eac4ca1809c551e8a576cba99f7fffd25097bdafa187fc81be660cd15a369848b0fe714f53dfb4c55479a6e956d24c9fadedf19f9009122103d9aec85ca69d
-  data.tar.gz: 8e23bda53945418170fd2132c2b6d23ebf944d528d6244d4dd2cabb1938f8e8865ef339546052d73126c7c5996d7736e52228d8670015bffb83dae31150b5830
+  metadata.gz: 6f0634b3006d58f72dd5ffe9da623f5a7c279efda96f2d535ff33dee527deae92eb6e48de24ce17aa35e50cd8199fb146dc803f8caccf85510f95714b72fa987
+  data.tar.gz: fc0822828ec9e4cc9bbb22e9f7fbf3856610fabda0d57fe42b147f91233b7e916a4079bbb017489ac98f381b8c71556e18b8dcc6b449ea86611a98c2a05e291b

data/.travis.yml

@@ -38,6 +38,7 @@ 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:
@@ -48,38 +49,11 @@ cache:
 before_install:
   - gem update bundler
 
-script:
-  - 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
-      if [[ $? -ne 0 ]]; then
-        echo -e "${ANSI_RED}${name} specs failed${ANSI_RESET}" && let spec_errors=$spec_errors+1
-      fi
-    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 --no-post-install-message dpl-${name}-*.gem && ( dpl --provider=${name} --no-deploy )
-      if [[ $? -ne 0 ]]; then
-        echo -e "${ANSI_RED}${name} invocation failed${ANSI_RESET}" && let no_err=$no_err+1
-      fi
-    done
-    test $no_err -eq 0
-  # - bundle exec rake && gem build dpl.gemspec && gem install dpl-*.gem && dpl --provider=script --script='echo foo'
+before_script:
+  - rm -f $(ruby -r rubygems -e "puts Gem.bindir")/dpl
 
+script:
+  - rake
 
 notifications:
   webhooks: "http://requestb.in/1guaq7t1"

data/Rakefile

@@ -1,12 +1,108 @@
 require 'bundler'
+require 'term/ansicolor'
+require 'pathname'
+require 'logger'
+require './lib/dpl/version'
 
-task(:default) { ruby '-S rspec' }
+include Term::ANSIColor
 
-desc "Test provider"
-task :test_provider, [:provider] do |t, args|
-  provider = args.provider
+def logger
+  @logger ||= Logger.new($stdout)
+end
 
-  Bundler.setup(provider.to_sym)
+def top
+  @top ||= Pathname.new File.expand_path(File.dirname(__FILE__))
+end
+
+def gem_version
+  ENV['DPL_VERSION'] || DPL::VERSION
+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
+
+task :spec_providers do
+  providers.each do |provider|
+    Rake::Task["spec-#{provider}"].invoke
+  end
+end
+
+task :check_providers do
+  providers.each do |provider|
+    Rake::Task["check-#{provider}"].invoke
+  end
+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
+  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
+
+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 |t|
+    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"
+  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
+
+end
 
-  `bundle exec rspec spec/provider/#{provider}_spec.rb`
-end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.9.1.travis.2660.5'
+  VERSION = '1.9.1.travis.2666.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.9.1.travis.2660.5
+  version: 1.9.1.travis.2666.5
 platform: ruby
 authors:
 - Konstantin Haase