Skip to content

Commit a0d978e

Browse files
authored
Merge pull request #252 from EasyPost/bump_deps
chore: drops Ruby 2.5, bumps deps
2 parents 05070c2 + 93cb610 commit a0d978e

File tree

9 files changed

+33
-23
lines changed

9 files changed

+33
-23
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
rubyversion: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
14+
rubyversion: ['2.6', '2.7', '3.0', '3.1', '3.2']
1515
steps:
1616
- name: Checkout Repository
1717
uses: actions/checkout@v3

.rubocop.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ inherit_from: easycop.yml
22

33
AllCops:
44
SuggestExtensions: false
5+
Exclude:
6+
- bin/**/*
7+
- docs/**/*
8+
- examples/**/*
9+
- vendor/bundle/**/*
510
# We are ignoring RSpec/FilePath because Simplecov doesn't play nice with nested spec files
611
RSpec/FilePath:
712
Enabled: false

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGELOG
22

3+
## Next Release (Major)
4+
5+
- Drops support for Ruby 2.5
6+
- Bumps all dev dependencies
7+
38
## v4.13.0 (2023-04-04)
49

510
- Adds `get_next_page` function to each object which retrieves the next page of a collection when the `has_more` key is present in the response

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ docs:
2222

2323
## fix - Fix Rubocop errors
2424
fix:
25-
bundle exec rubocop -A
25+
bundle exec rubocop -a
2626

2727
## install - Install globally from source
2828
install:

easycop.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require:
66
- rubocop-rspec
77
AllCops:
8-
TargetRubyVersion: 2.5
8+
TargetRubyVersion: 2.6
99
NewCops: disable
1010
Layout/BlockAlignment:
1111
Enabled: true
@@ -41,7 +41,7 @@ Layout/FirstMethodArgumentLineBreak:
4141
Enabled: true
4242
Layout/LineLength:
4343
Max: 120
44-
IgnoredPatterns: # deprecated in 1.28
44+
AllowedPatterns:
4545
- "(\\A|\\s)#"
4646
Layout/LineEndStringConcatenationIndentation: # new in 1.18
4747
Enabled: true
@@ -104,7 +104,7 @@ Metrics/ParameterLists:
104104
Enabled: false
105105
Metrics/AbcSize:
106106
Enabled: false
107-
Gemspec/DateAssignment: # new in 1.10
107+
Gemspec/DeprecatedAttributeAssignment:
108108
Enabled: true
109109
Lint/AmbiguousAssignment: # new in 1.7
110110
Enabled: true

easypost.gemspec

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ Gem::Specification.new do |spec|
1919
end
2020
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
2121
spec.require_paths = ['lib']
22-
spec.required_ruby_version = '>= 2.5'
22+
spec.required_ruby_version = '>= 2.6'
2323

24-
spec.add_development_dependency 'brakeman', '~> 5.2'
24+
spec.add_development_dependency 'brakeman', '~> 5.4'
2525
spec.add_development_dependency 'pry', '~> 0.14'
26-
spec.add_development_dependency 'psych', '~> 4.0' # TODO: pinned because rdoc has an optimistic pin of this dep and 5.0 breaks on CI
26+
spec.add_development_dependency 'psych', '~> 5.1'
2727
spec.add_development_dependency 'rake', '~> 13.0'
28-
spec.add_development_dependency 'rdoc', '~> 6.4'
29-
spec.add_development_dependency 'rspec', '~> 3.10'
30-
spec.add_development_dependency 'rubocop', '= 1.27' # rubocop 1.28 requires Ruby 2.6+
31-
spec.add_development_dependency 'rubocop-rspec', '= 2.10' # rubocop-rspec 2.11 requires Ruby 2.6+
32-
spec.add_development_dependency 'simplecov', '~> 0.21'
28+
spec.add_development_dependency 'rdoc', '~> 6.5'
29+
spec.add_development_dependency 'rspec', '~> 3.12'
30+
spec.add_development_dependency 'rubocop', '~> 1.49'
31+
spec.add_development_dependency 'rubocop-rspec', '~> 2.19'
32+
spec.add_development_dependency 'simplecov', '~> 0.22'
3333
spec.add_development_dependency 'simplecov-lcov', '~> 0.8'
34-
spec.add_development_dependency 'vcr', '= 6.0' # VCR 6.1 requires Ruby 2.6+
35-
spec.add_development_dependency 'webmock', '~> 3.14'
34+
spec.add_development_dependency 'vcr', '~> 6.1'
35+
spec.add_development_dependency 'webmock', '~> 3.18'
3636
end

lib/easypost/resource.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class EasyPost::Resource < EasyPost::EasyPostObject
77
# The class name of an EasyPost object.
88
def self.class_name
99
camel = name.split('::')[-1]
10-
snake = camel[0..0] + camel[1..-1].gsub(/([A-Z])/, '_\1')
10+
snake = camel[0..0] + camel[1..].gsub(/([A-Z])/, '_\1')
1111
snake.downcase
1212
end
1313

@@ -19,7 +19,7 @@ def self.url
1919
)
2020
end
2121

22-
if class_name[-1..-1] == 's' || class_name[-1..-1] == 'h'
22+
if class_name[-1..] == 's' || class_name[-1..] == 'h'
2323
"/v2/#{CGI.escape(class_name.downcase)}es"
2424
else
2525
"/v2/#{CGI.escape(class_name.downcase)}s"

lib/easypost/util.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def self.form_encode_params(hash, parent_keys = [], parent_dict = {})
116116
def self.build_dict_key(keys)
117117
result = keys[0].to_s
118118

119-
keys[1..-1].each do |key|
119+
keys[1..].each do |key|
120120
result += "[#{key}]"
121121
end
122122

@@ -187,7 +187,7 @@ def self.get_lowest_object_rate(easypost_object, carriers = [], services = [], r
187187
carriers_copy = carriers.clone
188188
carriers_copy.each do |carrier|
189189
if carrier[0, 1] == '!'
190-
negative_carriers << carrier[1..-1]
190+
negative_carriers << carrier[1..]
191191
carriers.delete(carrier)
192192
end
193193
end
@@ -197,7 +197,7 @@ def self.get_lowest_object_rate(easypost_object, carriers = [], services = [], r
197197
services_copy = services.clone
198198
services_copy.each do |service|
199199
if service[0, 1] == '!'
200-
negative_services << service[1..-1]
200+
negative_services << service[1..]
201201
services.delete(service)
202202
end
203203
end
@@ -239,7 +239,7 @@ def self.get_lowest_stateless_rate(stateless_rates, carriers = [], services = []
239239
carriers_copy = carriers.clone
240240
carriers_copy.each do |carrier|
241241
if carrier[0, 1] == '!'
242-
negative_carriers << carrier[1..-1]
242+
negative_carriers << carrier[1..]
243243
carriers.delete(carrier)
244244
end
245245
end
@@ -249,7 +249,7 @@ def self.get_lowest_stateless_rate(stateless_rates, carriers = [], services = []
249249
services_copy = services.clone
250250
services_copy.each do |service|
251251
if service[0, 1] == '!'
252-
negative_services << service[1..-1]
252+
negative_services << service[1..]
253253
services.delete(service)
254254
end
255255
end

spec/carrier_account_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
describe '.types' do
7979
it 'retrieves the carrier account types available' do
80-
types = described_class.types()
80+
types = described_class.types
8181

8282
expect(types).to be_an_instance_of(Array)
8383
end

0 commit comments

Comments
 (0)