Skip to content

Commit 3f65608

Browse files
authored
Merge pull request #30 from ShipEngine/KaseyCantu/chore/update-solargraph
chore: Update solargraph, fix lint, add lint back into CI
2 parents 9c7f53d + 43566d0 commit 3f65608

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2091
-1921
lines changed

.github/workflows/CI.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
with:
2424
bundler-cache: true
2525

26-
# - name: Lint
27-
# run: bundle exec rake lint
26+
- name: Lint
27+
run: bundle exec rake lint
2828

2929
- name: Test
3030
run: bundle exec rake test

.pryrc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# rubocop:disable
22

33
# frozen_string_literal: true
4+
45
# === EDITOR ===
5-
Pry.editor = "vi"
6+
Pry.editor = 'vi'
67

78
# === COLORS ===
8-
unless ENV["PRY_BW"]
9+
unless ENV['PRY_BW']
910
Pry.color = true
10-
Pry.config.theme = "railscasts"
11+
Pry.config.theme = 'railscasts'
1112
end
1213

1314
# === Listing config ===
@@ -25,7 +26,7 @@ Pry.config.ls.private_method_color = :bright_black
2526
# awesome_print gem: great syntax colorized printing
2627
# look at ~/.aprc for more settings for awesome_print
2728
begin
28-
require "awesome_print"
29+
require 'awesome_print'
2930
# The following line enables awesome_print for all pry output,
3031
# and it also enables paging
3132
Pry.config.print = proc { |output, value| Pry::Helpers::BaseHelpers.stagger_output("=> #{value.ai}", output) }
@@ -35,7 +36,7 @@ begin
3536
Formatter.prepend(Module.new do
3637
def awesome_self(object, type)
3738
if type == :string && @options[:string_limit] && object.inspect.to_s.length > @options[:string_limit]
38-
colorize(object.inspect.to_s[0..@options[:string_limit]] + "...", type)
39+
colorize("#{object.inspect.to_s[0..@options[:string_limit]]}...", type)
3940
else
4041
super(object, type)
4142
end
@@ -46,11 +47,11 @@ begin
4647
AwesomePrint.defaults = {
4748
string_limit: 80,
4849
indent: 2,
49-
multiline: true,
50+
multiline: true
5051
}
5152
AwesomePrint.pry!
5253
rescue err
53-
puts "gem install awesome_print # <-- highly recommended"
54+
puts 'gem install awesome_print # <-- highly recommended'
5455
end
5556

5657
# rubocop:enable

.rubocop.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
AllCops:
22
NewCops: enable # https://docs.rubocop.org/rubocop/1.11/versioning.html#pending-cops
33
SuggestExtensions: false
4-
TargetRubyVersion: 2.6
4+
TargetRubyVersion: 3.2.2
55
Exclude:
66
- bin/**/*
77
- tmp/**/*
88
- vendor/**/*
9+
- test/**/*
910
- lib/shipengine/utils/base58.rb
1011
- !ruby/regexp /(foo|bar|baz)\.rb/
1112

CHANGELOG.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +0,0 @@
1-
# Changelog
2-
3-
## 1.0.0 (2023-06-15)
4-
5-
6-
### Bug Fixes
7-
8-
* [SE-119] Get SDK build working and First Gem published :truck: ([dbba243](https://github.com/ShipEngine/shipengine-ruby/commit/dbba243460e85fbe5b644078a933ca36c5f2c57d))
9-
* fixup CD ([fcb16ad](https://github.com/ShipEngine/shipengine-ruby/commit/fcb16ada4628dbb330f3c33f0f5ba58bcfe4d8ed))
10-
11-
## Changelog

Gemfile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
# frozen_string_literal: true
22

3-
source "https://rubygems.org"
3+
source 'https://rubygems.org'
44

55
group :development do
6-
gem "guard"
7-
gem "guard-minitest"
8-
gem "pry"
9-
gem "solargraph", require: false
10-
gem "yard"
11-
gem "ruby-debug-ide", require: false
12-
gem "rubocop-shopify", require: false
13-
gem "awesome_print"
14-
gem "overcommit"
6+
gem 'awesome_print'
7+
gem 'guard'
8+
gem 'guard-minitest'
9+
gem 'overcommit'
10+
gem 'pry'
11+
gem 'rubocop-shopify', require: false
12+
gem 'ruby-debug-ide', require: false
13+
gem 'solargraph', require: false
14+
gem 'yard'
1515
end
1616

1717
group :test do
18-
gem "minitest"
19-
gem "minitest-fail-fast"
20-
gem "minitest-focus"
21-
gem "minitest-hooks"
22-
gem "minitest-line"
23-
gem "minitest-tagz"
24-
gem "minitest-reporters"
25-
gem "simplecov", require: false
26-
gem "webmock"
27-
gem "spy"
18+
gem 'minitest'
19+
gem 'minitest-fail-fast'
20+
gem 'minitest-focus'
21+
gem 'minitest-hooks'
22+
gem 'minitest-line'
23+
gem 'minitest-reporters'
24+
gem 'minitest-tagz'
25+
gem 'simplecov', require: false
26+
gem 'spy'
27+
gem 'webmock'
2828
end
2929

3030
group :test, :development do
31-
gem "rake"
32-
gem "rubocop", require: false
31+
gem 'rake'
32+
gem 'rubocop', require: false
3333
end
3434

3535
gemspec

Gemfile.lock

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
shipengine_sdk (1.0.0)
4+
shipengine_sdk (0.0.0)
55
faraday (>= 1.4)
66
faraday_middleware (>= 1.0)
77
hashie (>= 3.4)
@@ -15,13 +15,13 @@ GEM
1515
ast (2.4.2)
1616
awesome_print (1.9.2)
1717
backport (1.2.0)
18-
benchmark (0.1.1)
18+
benchmark (0.2.1)
1919
builder (3.2.4)
2020
childprocess (4.1.0)
2121
coderay (1.1.3)
2222
crack (0.4.5)
2323
rexml
24-
diff-lcs (1.4.4)
24+
diff-lcs (1.5.0)
2525
docile (1.4.0)
2626
e2mmap (0.1.0)
2727
faraday (1.5.1)
@@ -61,9 +61,9 @@ GEM
6161
hashdiff (1.0.1)
6262
hashie (3.6.0)
6363
iniparse (1.5.0)
64-
jaro_winkler (1.5.4)
64+
jaro_winkler (1.5.6)
6565
json (2.6.3)
66-
kramdown (2.3.1)
66+
kramdown (2.4.0)
6767
rexml
6868
kramdown-parser-gfm (1.1.0)
6969
kramdown (~> 2.0)
@@ -72,7 +72,7 @@ GEM
7272
rb-inotify (~> 0.9, >= 0.9.10)
7373
lumberjack (1.2.8)
7474
method_source (1.0.0)
75-
mini_portile2 (2.5.3)
75+
mini_portile2 (2.8.2)
7676
minitest (5.14.4)
7777
minitest-fail-fast (0.1.0)
7878
minitest (~> 5)
@@ -91,8 +91,8 @@ GEM
9191
minitest (~> 5)
9292
multipart-post (2.1.1)
9393
nenv (0.3.0)
94-
nokogiri (1.11.7)
95-
mini_portile2 (~> 2.5.0)
94+
nokogiri (1.15.2)
95+
mini_portile2 (~> 2.8.2)
9696
racc (~> 1.4)
9797
notiffany (0.1.3)
9898
nenv (~> 0.1)
@@ -115,8 +115,9 @@ GEM
115115
rb-fsevent (0.11.0)
116116
rb-inotify (0.10.1)
117117
ffi (~> 1.0)
118+
rbs (2.8.4)
118119
regexp_parser (2.8.1)
119-
reverse_markdown (2.0.0)
120+
reverse_markdown (2.1.1)
120121
nokogiri
121122
rexml (3.2.5)
122123
rubocop (1.52.1)
@@ -131,8 +132,8 @@ GEM
131132
unicode-display_width (>= 2.4.0, < 3.0)
132133
rubocop-ast (1.29.0)
133134
parser (>= 3.2.1.0)
134-
rubocop-shopify (2.2.0)
135-
rubocop (~> 1.18)
135+
rubocop-shopify (2.14.0)
136+
rubocop (~> 1.51)
136137
ruby-debug-ide (0.7.2)
137138
rake (>= 0.8.1)
138139
ruby-progressbar (1.13.0)
@@ -144,30 +145,31 @@ GEM
144145
simplecov_json_formatter (~> 0.1)
145146
simplecov-html (0.12.3)
146147
simplecov_json_formatter (0.1.3)
147-
solargraph (0.42.4)
148+
solargraph (0.49.0)
148149
backport (~> 1.2)
149150
benchmark
150-
bundler (>= 2.4.14)
151+
bundler (~> 2.0)
151152
diff-lcs (~> 1.4)
152153
e2mmap
153154
jaro_winkler (~> 1.5)
154155
kramdown (~> 2.3)
155156
kramdown-parser-gfm (~> 1.1)
156157
parser (~> 3.0)
157-
reverse_markdown (>= 1.0.5, < 3)
158-
rubocop (>= 0.52)
158+
rbs (~> 2.0)
159+
reverse_markdown (~> 2.0)
160+
rubocop (~> 1.38)
159161
thor (~> 1.0)
160162
tilt (~> 2.0)
161163
yard (~> 0.9, >= 0.9.24)
162164
spy (1.0.1)
163-
thor (1.1.0)
164-
tilt (2.0.10)
165+
thor (1.2.2)
166+
tilt (2.2.0)
165167
unicode-display_width (2.4.2)
166168
webmock (3.13.0)
167169
addressable (>= 2.3.6)
168170
crack (>= 0.3.2)
169171
hashdiff (>= 0.4.0, < 2.0.0)
170-
yard (0.9.26)
172+
yard (0.9.34)
171173

172174
PLATFORMS
173175
ruby

Guardfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
# More info at https://github.com/guard/guard#readme
44
guard :minitest do
5-
watch(%r{^lib/(.*)\.rb$}) { "test" } # run all tests if code is modified
5+
watch(%r{^lib/(.*)\.rb$}) { 'test' } # run all tests if code is modified
66
watch(%r{^test/(.*)_test\.rb$}) # only run specific test file if test is modified
77

88
# configuration
9-
watch(%r{^test/test_helper\.rb$}) { "test" }
10-
watch(%r{^test/test_utility/(.*)\.rb$}) { "test" }
9+
watch(%r{^test/test_helper\.rb$}) { 'test' }
10+
watch(%r{^test/test_utility/(.*)\.rb$}) { 'test' }
1111
end
1212

1313
# https://stackoverflow.com/questions/23571163/clear-previous-tests-in-rspec-while-running-new-tests-using-guard

Rakefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
# frozen_string_literal: true
22

33
begin
4-
require "bundler/setup"
4+
require 'bundler/setup'
55
rescue LoadError
6-
puts "You must `gem install bundler` and `bundle install` to run rake tasks"
6+
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
77
end
88

9-
require "rubocop/rake_task"
10-
require "bundler/gem_tasks"
11-
require "rake/testtask"
9+
require 'rubocop/rake_task'
10+
require 'bundler/gem_tasks'
11+
require 'rake/testtask'
1212

1313
Rake::TestTask.new(:test) do |t|
14-
t.libs << "test"
15-
t.libs << "lib"
14+
t.libs << 'test'
15+
t.libs << 'lib'
1616
t.verbose = true
1717
t.warning = false
18-
t.pattern = "test/**/*_test.rb"
18+
t.pattern = 'test/**/*_test.rb'
1919
end
2020

2121
RuboCop::RakeTask.new(:lint) do |t|
22-
t.options = ["--display-cop-names"]
22+
t.options = ['--display-cop-names']
2323
end
2424

2525
RuboCop::RakeTask.new(:fix) do |t|
26-
t.options = ["--auto-correct-all"]
26+
t.options = ['--auto-correct-all']
2727
end
2828

2929
task :default do
30-
Rake::Task["test"].execute
31-
Rake::Task["lint"].execute
30+
Rake::Task['test'].execute
31+
Rake::Task['lint'].execute
3232
end

0 commit comments

Comments
 (0)