Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0.5.beta.2.1.2 #1290

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
4 changes: 2 additions & 2 deletions dpl.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion lib/dpl/ctx/bash.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion lib/dpl/providers/chef_supermarket.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -64,7 +67,7 @@ def upload
end

def params
{ cookbook: json(category: category), tarball: tarball}
{ cookbook: json(category:), tarball: }
end

def tarball
Expand Down
3 changes: 2 additions & 1 deletion lib/dpl/providers/git_push.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/dpl/providers/pages/api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Api < Pages
open_timeout: 180
}.freeze

gem 'logger', '~> 1.6.0'
gem 'octokit', '~> 7'

full_name 'GitHub Pages (API)'
Expand Down
3 changes: 2 additions & 1 deletion lib/dpl/providers/pages/git.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Git < Pages
tbd
STR

gem 'logger', '~> 1.6.0'
gem 'octokit', '~> 7'
gem 'public_suffix', '~> 5'

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/dpl/providers/releases.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/dpl/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Dpl
VERSION = '2.0.5'
VERSION = '2.0.5.beta.2.1.2'
end