Merge branch 'master' into patch-1

.travis.yml

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

dpl-chef_supermarket.gemspec

@@ -1,10 +1,17 @@
 require './gemspec_helper'
 
+deps = [
+  ['rack'],
+  ['mime-types'],
+]
+
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0")
-    gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['net-telnet', '~> 0.1.0'], ['chef', '~> 12.0']]
+    deps << ['net-telnet', '~> 0.1.0'] << ['chef', '~> 12.0'] << ['public_suffix', '< 3.1.0']
+    gemspec_for 'chef_supermarket', deps
 elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4.0")
-  gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '~> 13.0']]
+  gemspec_for 'chef_supermarket', (deps << ['chef', '~> 13.0'])
+elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5.0")
+  gemspec_for 'chef_supermarket', (deps << ['chef', '~> 14.0'])
 else
-  gemspec_for 'chef_supermarket', [['rack'], ['mime-types'], ['chef', '>= 14']]
+  gemspec_for 'chef_supermarket', (deps << ['chef', '>= 14'])
 end
-

dpl-pages.gemspec

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

lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.10.8'
+  VERSION = '1.10.10'
 end