Skip to content

Commit

Permalink
Merge pull request #1181 from minimum2scp/fix/sid-ruby-3.3.6-1.1
Browse files Browse the repository at this point in the history
ruby, ruby-full: fixed spec (switched system ruby to 3.3)
  • Loading branch information
minimum2scp authored Jan 25, 2025
2 parents 759030c + e6aaece commit cf507df
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
14 changes: 8 additions & 6 deletions ruby-full/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# about minimum2scp/ruby-full image

* based on minimum2scp/ruby (see https://github.com/minimum2scp/dockerfiles/tree/master/ruby)
* ruby ruby 2.6.10, ruby 2.7.6, ruby 3.0.4, ruby 3.1.2 is installed by rbenv
* ruby 3.1.2 is installed by debian package
* ruby 2.7.8, 3.0.7, 3.1.6, 3.2.5, 3.3.4 is installed by rbenv
* ruby 3.3.6 is installed by debian package

## ssh login to container

Expand Down Expand Up @@ -50,11 +50,13 @@ rbenv gloabl (/opt/rbenv/version) is not defined, and some rubies are built.
```
% docker run --rm -t minimum2scp/ruby-full:latest /bin/bash -l -c "rbenv versions"
* system (set by /opt/rbenv/version)
2.7.6
3.0.4
3.1.2
2.7.8
3.0.7
3.1.6
3.2.5
3.3.4
% docker run --rm -t minimum2scp/ruby-full:latest /bin/bash -l -c "ruby -v"
ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) [x86_64-linux-gnu]
ruby 3.3.6 (2024-11-05 revision 75015d4c1f) [x86_64-linux-gnu]
```


6 changes: 3 additions & 3 deletions spec/ruby-full/00base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@
end
end

%w[ruby3.1 ruby3.1-dev].each do |pkg|
%w[ruby3.3 ruby3.3-dev].each do |pkg|
describe package(pkg) do
it { should be_installed }
end
end

describe command('ruby3.1 -v') do
its(:stdout) { should start_with('ruby 3.1.2p') }
describe command('ruby3.3 -v') do
its(:stdout) { should start_with('ruby 3.3.6 ') }
end
end
end
8 changes: 4 additions & 4 deletions spec/ruby/00base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@

describe file('/usr/bin/ruby') do
it { should be_symlink }
it { should be_linked_to('ruby3.1') }
it { should be_linked_to('ruby3.3') }
end

describe command('ruby3.1 -v') do
its(:stdout) { should start_with('ruby 3.1.2p') }
describe command('ruby3.3 -v') do
its(:stdout) { should start_with('ruby 3.3.6 ') }
end

describe file('/opt/rbenv') do
Expand Down Expand Up @@ -87,7 +87,7 @@
end

describe package('bundler') do
it { should be_installed.with_version('2.4.20-1') }
it { should be_installed.with_version('2.6.3-1') }
end
end
end

0 comments on commit cf507df

Please sign in to comment.