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.

Sign up for GitHub

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

Update gemfile and dependencies #22

Merged
merged 9 commits into from
Aug 20, 2024
Merged

Update gemfile and dependencies #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e700dc2
updated actionmailer
i7an Aug 14, 2024
fbb0214
updated dev dependencies
i7an Aug 14, 2024
064a2b5
updated gitignore
i7an Aug 14, 2024
3e20eec
updated github workflow ruby versions
i7an Aug 14, 2024
c60e07c
fixed rubocop errors
i7an Aug 14, 2024
6e45f37
added `rubocop-rake`
i7an Aug 14, 2024
4eee3ab
Dropped ruby 2.7 support
i7an Aug 19, 2024
fa40292
Updated nokogiri
i7an Aug 19, 2024
0911476
Release version 1.1.0
i7an Aug 19, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
strategy:
matrix:
ruby:
- '2.7.6'
- '3.0.4'
- '3.1.2'
- '3.2.2'
- '3.0.7'
- '3.1.6'
- '3.2.5'
- '3.3.4'
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@

# rspec failure tracking
.rspec_status

.ruby-gemset
.ruby-version

.vscode
.idea
6 changes: 4 additions & 2 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
require: rubocop-rspec
require:
- rubocop-rake
- rubocop-rspec

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
NewCops: enable

Layout/LineLength:
Expand Down
1 change: 0 additions & 1 deletion .ruby-version
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [1.1.0] - 2024-08-19

- Dropped Ruby 2.7 support
- Updated dependencies

## [1.0.0] - 2022-10-07

- Initial release
13 changes: 8 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ source 'https://rubygems.org'

gemspec

gem 'mail'
gem 'rake', '~> 13.0'
gem 'rspec', '~> 3.0'
gem 'rubocop', '~> 1.21'
gem 'rubocop-rspec', require: false
group :development do
gem 'mail'
gem 'rake', '~> 13.0'
gem 'rspec', '~> 3.0'
gem 'rubocop', '~> 1.21'
gem 'rubocop-rake', require: false
gem 'rubocop-rspec', require: false
end
97 changes: 50 additions & 47 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
actionmailer-balancer (1.0.0)
actionmailer-balancer (1.1.0)
actionmailer (> 4.0, < 8.0)

GEM
Expand Down Expand Up @@ -49,19 +49,20 @@ GEM
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
builder (3.2.4)
concurrent-ruby (1.3.1)
builder (3.3.0)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
crass (1.0.6)
date (3.3.3)
diff-lcs (1.5.0)
date (3.3.4)
diff-lcs (1.5.1)
drb (2.2.1)
erubi (1.12.0)
globalid (1.1.0)
activesupport (>= 5.0)
erubi (1.13.0)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.6.3)
json (2.7.2)
language_server-protocol (3.17.0.3)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -70,29 +71,30 @@ GEM
net-imap
net-pop
net-smtp
mini_mime (1.1.2)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.23.1)
minitest (5.25.1)
mutex_m (0.2.0)
net-imap (0.3.4)
net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.3.3)
net-smtp (0.5.0)
net-protocol
nokogiri (1.15.6)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.6-x86_64-darwin)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
parallel (1.23.0)
parser (3.2.2.1)
parallel (1.26.2)
parser (3.3.4.2)
ast (~> 2.4.1)
racc (1.8.0)
rack (3.0.11)
racc
racc (1.8.1)
rack (3.1.7)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
Expand All @@ -105,46 +107,46 @@ GEM
loofah (~> 2.21)
nokogiri (~> 1.14)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.0)
rexml (3.3.3)
rake (13.2.1)
regexp_parser (2.9.2)
rexml (3.3.5)
strscan
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rubocop (1.50.2)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.65.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.1)
parser (>= 3.2.1.0)
rubocop-capybara (2.18.0)
rubocop (~> 1.41)
rubocop-rspec (2.20.0)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
rubocop-ast (1.32.0)
parser (>= 3.3.1.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (3.0.4)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
strscan (3.1.0)
timeout (0.3.2)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)

PLATFORMS
ruby
Expand All @@ -156,6 +158,7 @@ DEPENDENCIES
rake (~> 13.0)
rspec (~> 3.0)
rubocop (~> 1.21)
rubocop-rake
rubocop-rspec

BUNDLED WITH
Expand Down
4 changes: 2 additions & 2 deletions actionmailer-balancer.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ Gem::Specification.new do |spec|
'Distributes emails across multiple delivery methods in the given proportion.'
spec.homepage = 'https://github.com/railsware/actionmailer-balancer'
spec.license = 'MIT'
spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')

spec.metadata['homepage_uri'] = spec.homepage
spec.metadata['source_code_uri'] = 'https://github.com/railsware/actionmailer-balancer'
spec.metadata['changelog_uri'] = 'https://github.com/railsware/actionmailer-balancer/blob/main/CHANGELOG.md'
spec.metadata['rubygems_mfa_required'] = 'true'

spec.add_runtime_dependency 'actionmailer', '> 4.0', '< 8.0'
spec.add_dependency 'actionmailer', '> 4.0', '< 8.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you know why it was add_runtime_dependency before?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add_runtime_dependency is the same thing. apparently back then there were no such rule in Rubocop probably.


# Specify which files should be added to the gem when it is released.
# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
Expand Down
2 changes: 1 addition & 1 deletion lib/actionmailer/balancer/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module ActionMailer
module Balancer
VERSION = '1.0.0'
VERSION = '1.1.0'
end
end
2 changes: 1 addition & 1 deletion spec/actionmailer/balancer/delivery_method_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

RSpec.describe ActionMailer::Balancer::DeliveryMethod do # rubocop:disable RSpec/FilePath
RSpec.describe ActionMailer::Balancer::DeliveryMethod do # rubocop:disable RSpec/SpecFilePathFormat
describe '#deliver!' do
subject(:deliver!) { described_class.new(settings).deliver!(message) }

Expand Down
Loading