diff --git a/.travis.yml b/.travis.yml index ac210a665..e2a883033 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ jobs: - rvm use 3.3 --install --binary --fuzzy - gem build dpl.gemspec - gem install dpl-*.gem - - gem update --system + # - gem update --system - nvm install 18.20.2 - nvm use 18.20.2 - node --version diff --git a/Gemfile b/Gemfile index f3f26ee02..4a6f7c304 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ gemspec name: 'dpl' # gem 'json_pure', '~> 2.6' # gem 'regstry', path: '../../registry' +gem 'logger', '1.6.0' gems = Dpl::Support::Gems.new('lib/dpl/providers/**/*.rb') gems.each do |name, version, opts| diff --git a/dpl.gemspec b/dpl.gemspec index 15886ae92..6149fb8d6 100644 --- a/dpl.gemspec +++ b/dpl.gemspec @@ -14,13 +14,13 @@ Gem::Specification.new do |s| s.description = 'Dpl (dee-pee-ell) is a tool made for continuous deployment, running deployments at Travis CI.' s.license = 'MIT' s.require_path = 'lib' - s.required_ruby_version = '>= 3' + s.required_ruby_version = '>= 3.1' s.executables = ['dpl'] s.files = Dir['{config/**/*,lib/**/*,[A-Z]*}'].reject { _1.match(/dpl.+\.gem/) } + s.add_runtime_dependency 'net-http', '~> 0.4.1' s.add_runtime_dependency 'travis-cl' s.add_runtime_dependency 'travis-packagecloud-ruby' - s.add_runtime_dependency 'net-http', '~> 0.4.1' s.add_development_dependency 'rake', '~> 13.0' end diff --git a/lib/dpl/ctx/bash.rb b/lib/dpl/ctx/bash.rb index f6bc356a0..c35fd4478 100644 --- a/lib/dpl/ctx/bash.rb +++ b/lib/dpl/ctx/bash.rb @@ -183,7 +183,9 @@ def gems_require(gems) # Gem.loaded_specs.clear gemfile do source 'https://rubygems.org' - gems.each { |g| gem(*g) } + gems.each do |g| + gem(*g) + end end # https://github.com/bundler/bundler/issues/7181 ENV.replace(env) diff --git a/lib/dpl/providers/chef_supermarket.rb b/lib/dpl/providers/chef_supermarket.rb index 72a29ba13..b1a1a0525 100644 --- a/lib/dpl/providers/chef_supermarket.rb +++ b/lib/dpl/providers/chef_supermarket.rb @@ -14,6 +14,9 @@ class ChefSupermarket < Provider tbd STR + gem 'logger', '1.6.0' + gem 'date', '~> 3.3.4' + gem 'time', '0.3.0' gem 'chef', '~> 18', require: %w[ chef/cookbook/cookbook_version_loader chef/cookbook_uploader @@ -64,7 +67,7 @@ def upload end def params - { cookbook: json(category: category), tarball: tarball} + { cookbook: json(category:), tarball: } end def tarball diff --git a/lib/dpl/providers/cloud66.rb b/lib/dpl/providers/cloud66.rb index 3c888ba4b..9aabd9a17 100644 --- a/lib/dpl/providers/cloud66.rb +++ b/lib/dpl/providers/cloud66.rb @@ -11,6 +11,8 @@ class Cloud66 < Provider tbd STR + gem 'logger', '1.6.0' + env :cloud66 opt '--redeployment_hook URL', 'The redeployment hook URL', required: true, secret: true diff --git a/lib/dpl/providers/cloudfiles.rb b/lib/dpl/providers/cloudfiles.rb index a1e7ac978..8fae5297a 100644 --- a/lib/dpl/providers/cloudfiles.rb +++ b/lib/dpl/providers/cloudfiles.rb @@ -13,6 +13,7 @@ class Cloudfiles < Provider tbd STR + gem 'logger', '1.6.0' gem 'nokogiri', '~> 1.15' gem 'fog-core', '~> 2.3', require: 'fog/core' gem 'fog-rackspace', '~> 0.1.6', git: 'https://github.com/travis-oss/fog-rackspace', require: 'fog/rackspace' diff --git a/lib/dpl/providers/engineyard.rb b/lib/dpl/providers/engineyard.rb index 64691b052..40a796c16 100644 --- a/lib/dpl/providers/engineyard.rb +++ b/lib/dpl/providers/engineyard.rb @@ -11,6 +11,7 @@ class Engineyard < Provider tbd STR + gem 'logger', '1.6.0' gem 'ey-core', '~> 3.6' required :api_key, %i[email password] diff --git a/lib/dpl/providers/git_push.rb b/lib/dpl/providers/git_push.rb index b31f66c13..69808b6fa 100644 --- a/lib/dpl/providers/git_push.rb +++ b/lib/dpl/providers/git_push.rb @@ -14,6 +14,7 @@ class GitPush < Provider changes produced by the build, and optionally opening a pull request. STR + gem 'logger', '1.6.0' gem 'octokit', '~> 7' gem 'public_suffix', '~> 5' @@ -127,7 +128,7 @@ def setup_deploy_key path = '~/.dpl/deploy_key' info(:setup_deploy_key, path:) mv deploy_key, path - chmod 0600, path + chmod 0o600, path setup_git_ssh path shell :check_deploy_key, key: path end diff --git a/lib/dpl/providers/gleis.rb b/lib/dpl/providers/gleis.rb index 0e501ffda..20dfa031d 100644 --- a/lib/dpl/providers/gleis.rb +++ b/lib/dpl/providers/gleis.rb @@ -11,6 +11,7 @@ class Gleis < Provider tbd STR + gem 'logger', '1.6.0' gem 'gleis', '~> 0.8.0' env :gleis diff --git a/lib/dpl/providers/pages/api.rb b/lib/dpl/providers/pages/api.rb index 5c8b38384..43ad29e99 100644 --- a/lib/dpl/providers/pages/api.rb +++ b/lib/dpl/providers/pages/api.rb @@ -20,6 +20,7 @@ class Api < Pages open_timeout: 180 }.freeze + gem 'logger', '1.6.0' gem 'octokit', '~> 7' full_name 'GitHub Pages (API)' diff --git a/lib/dpl/providers/pages/git.rb b/lib/dpl/providers/pages/git.rb index 3aa430c79..e6425cc82 100644 --- a/lib/dpl/providers/pages/git.rb +++ b/lib/dpl/providers/pages/git.rb @@ -14,6 +14,7 @@ class Git < Pages tbd STR + gem 'logger', '1.6.0' gem 'octokit', '~> 7' gem 'public_suffix', '~> 5' @@ -120,7 +121,7 @@ def setup_deploy_key path = '~/.dpl/deploy_key' info(:setup_deploy_key, path:) mv deploy_key, path - chmod 0600, path + chmod 0o600, path setup_git_ssh path shell :check_deploy_key, key: path, url: opts[:url] end diff --git a/lib/dpl/providers/puppetforge.rb b/lib/dpl/providers/puppetforge.rb index 66b970191..d8a4bba5c 100644 --- a/lib/dpl/providers/puppetforge.rb +++ b/lib/dpl/providers/puppetforge.rb @@ -13,6 +13,7 @@ class Puppetforge < Provider tbd STR + gem 'logger', '1.6.0' gem 'racc', '~> 1.7' gem 'puppet', '~> 7.25', require: 'puppet/face' gem 'puppet-blacksmith', '~> 7', require: 'puppet_blacksmith' diff --git a/lib/dpl/providers/releases.rb b/lib/dpl/providers/releases.rb index 2d70984a0..41e9439c8 100644 --- a/lib/dpl/providers/releases.rb +++ b/lib/dpl/providers/releases.rb @@ -17,6 +17,7 @@ class Releases < Provider tbd STR + gem 'logger', '1.6.0' gem 'octokit', '~> 7' gem 'mime-types', '~> 3.4.1' gem 'public_suffix', '~> 5' diff --git a/lib/dpl/version.rb b/lib/dpl/version.rb index ec09d50ee..7646e4b9e 100644 --- a/lib/dpl/version.rb +++ b/lib/dpl/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Dpl - VERSION = '2.0.5' + VERSION = '2.0.5.1' end