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

Update dependencies #322

Merged
merged 3 commits into from
Sep 25, 2023
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.7', '3.0', '3.1', '3.2', 'jruby-9.4']
ruby: ['3.0', '3.1', '3.2', '3.3', 'jruby-9.4']
env:
BUNDLE_WITHOUT: optional
steps:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.7
3.0.6
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
java adoptopenjdk-18.0.1+10
ruby 2.7.7
ruby 3.0.6
83 changes: 50 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ GEM
specs:
ast (2.4.2)
backport (1.2.0)
base64 (0.1.1)
benchmark (0.2.1)
coderay (1.1.3)
debug (1.7.2)
debug (1.8.0)
irb (>= 1.5.0)
reline (>= 0.3.1)
diff-lcs (1.5.0)
docile (1.4.0)
e2mmap (0.1.0)
ffi (1.15.5)
ffi (1.15.5-java)
ffi (1.16.1)
ffi (1.16.1-java)
formatador (1.1.0)
guard (2.18.0)
guard (2.18.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
Expand All @@ -35,94 +36,109 @@ GEM
rspec (>= 2.99.0, < 4.0)
io-console (0.6.0)
io-console (0.6.0-java)
irb (1.6.4)
reline (>= 0.3.0)
jaro_winkler (1.5.4)
jaro_winkler (1.5.4-java)
irb (1.8.1)
rdoc
reline (>= 0.3.8)
jar-dependencies (0.4.1)
jaro_winkler (1.5.6)
jaro_winkler (1.5.6-java)
json (2.6.3)
json (2.6.3-java)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.2.8)
lumberjack (1.2.9)
method_source (1.0.0)
nenv (0.3.0)
nokogiri (1.14.3-arm64-darwin)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.14.3-java)
nokogiri (1.15.4-java)
racc (~> 1.4)
nokogiri (1.14.3-x86_64-darwin)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.14.3-x86_64-linux)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
parallel (1.22.1)
parser (3.2.2.0)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry (0.14.2-java)
coderay (~> 1.1)
method_source (~> 1.0)
spoon (~> 0.0)
racc (1.6.2)
racc (1.6.2-java)
psych (5.1.0)
stringio
psych (5.1.0-java)
jar-dependencies (>= 0.1.7)
racc (1.7.1)
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rbs (2.8.4)
rdoc (6.5.0)
psych (>= 4.0.0)
redcarpet (3.6.0)
regexp_parser (2.7.0)
reline (0.3.3)
regexp_parser (2.8.1)
reline (0.3.8)
io-console (~> 0.5)
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.5)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rubocop (1.50.2)
rspec-support (3.12.1)
rubocop (1.56.3)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.17.1)
rubocop-capybara (2.19.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.19.0)
rubocop-rspec (2.24.1)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-maven (3.3.13)
ruby-maven-libs (~> 3.3.9)
ruby-maven-libs (3.3.9)
ruby-prof (1.6.1)
ruby-prof (1.6.3)
ruby-progressbar (1.13.0)
shellany (0.0.1)
simplecov (0.22.0)
Expand All @@ -149,10 +165,11 @@ GEM
yard (~> 0.9, >= 0.9.24)
spoon (0.0.6)
ffi
stringio (3.0.8)
terminal-notifier (2.0.0)
terminal-notifier-guard (1.7.0)
thor (1.2.1)
tilt (2.1.0)
thor (1.2.2)
tilt (2.3.0)
unicode-display_width (2.4.2)
webrick (1.8.1)
yard (0.9.34)
Expand Down
12 changes: 6 additions & 6 deletions spec/ruby_units/unit_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1680,15 +1680,15 @@
# see #203
context 'when the unit scalar is an Integer' do
it 'the conversion is done accurately' do
expect(RubyUnits::Unit.new('1610610000 bytes').convert_to('GiB').scalar).to eql 100663125/67108864r
expect(RubyUnits::Unit.new('1610610000 bytes').convert_to('GiB').scalar).to be === 100663125/67108864r
end

it 'the converted unit has an Integer scalar if the initial unit has an Integer scalar and the scalar is equivalent to an integer' do
expect(RubyUnits::Unit.new('2 m').convert_to('mm').scalar).to eql 2000
expect(RubyUnits::Unit.new('2 m').convert_to('mm').scalar).to be === 2000
end

it 'the scalar becomes a Rational when necessary to preserve accuracy' do
expect(RubyUnits::Unit.new(2, 'm').convert_to('ft').scalar).to eql 2500/381r
expect(RubyUnits::Unit.new(2, 'm').convert_to('ft').scalar).to be === 2500/381r
end
end

Expand All @@ -1698,23 +1698,23 @@
# even though the result is numerically equivalent to an Integer, we leave
# it alone
it 'preserves the scalar type' do
expect(unit.convert_to('mm').scalar).to be 2000.0
expect(unit.convert_to('mm').scalar).to be === 2000.0
end
end

context 'when the unit scalar is Complex' do
subject(:unit) { RubyUnits::Unit.new(2.0 + 1.0i, 'm') }

it 'preserves the scalar type' do
expect(unit.convert_to('mm').scalar).to eql 2000.0 + 1000.0i
expect(unit.convert_to('mm').scalar).to be === 2000.0 + 1000.0i
end
end

context 'when the unit scalar is Rational' do
subject(:unit) { RubyUnits::Unit.new(2r, 'm') }

it 'preserves the scalar type' do
expect(unit.convert_to('mm').scalar).to eql 2000r
expect(unit.convert_to('mm').scalar).to be === 2000r
end
end

Expand Down
Loading