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

Ruby 3.3.6 update #6098

Merged
merged 2 commits into from
Dec 11, 2024
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
4 changes: 2 additions & 2 deletions .devcontainer/post-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
# copy the file only if it doesn't already exist
cp -n .devcontainer/.env.codespaces .env

# If the project's required ruby version changes from 3.2.4, this command
# If the project's required ruby version changes from 3.3.6, this command
# will download and compile the correct version, but it will take a long time.
if [ "$RUBY_VERSION" != "3.2.4" ]; then
if [ "$RUBY_VERSION" != "3.3.6" ]; then
rvm install $RUBY_VERSION
rvm use $RUBY_VERSION
echo "Ruby $RUBY_VERSION installed"
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.4
3.3.6
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ruby 3.2.4
ruby 3.3.6
yarn 1.22.22
nodejs 22.11.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.4-alpine AS builder
FROM ruby:3.3.6-alpine AS builder

RUN apk update && apk upgrade && apk add --update --no-cache \
build-base \
Expand All @@ -14,7 +14,7 @@ RUN bundle install

### BUILD STEP DONE ###

FROM ruby:3.2.4-alpine
FROM ruby:3.3.6-alpine

ARG RAILS_ROOT=/usr/src/app/

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

ruby "3.2.4"
ruby "3.3.6"
gem "rails", "~> 7.2"

gem "after_party" # post-deployment tasks
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ DEPENDENCIES
wicked

RUBY VERSION
ruby 3.2.4p170
ruby 3.3.6p108

BUNDLED WITH
2.5.23
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ The complete [role description of a CASA volunteer](https://pgcasa.org/volunteer

**Ruby**
1. Install a ruby version manager: [rvm](https://rvm.io/) or [rbenv](https://github.com/rbenv/rbenv)
1. when you cd into the project directory, let your version manager install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.4
1. when you cd into the project directory, let your version manager install the ruby version in `.ruby-version`. Right now that's Ruby 3.3.6
1. `gem install bundler`

**node.js**
Expand Down
4 changes: 1 addition & 3 deletions app/services/followup_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ def self.create_followup(case_contact, creator, note)
followup
end

private_class_method

def self.send_notification(followup, creator)
private_class_method def self.send_notification(followup, creator)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this fixed a warning: private_class_method is ignored unless called with a symbol, like:
private_class_method :send_notification
or used this way.

FollowupNotifier
.with(followup: followup, created_by: creator)
.deliver(followup.case_contact.creator)
Expand Down
1 change: 0 additions & 1 deletion app/views/case_contacts/form/details.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
</h3>
<% min_date = CaseContact::MINIMUM_DATE %>
<% current_date = Time.zone.today %>
<% initial_value = @case_contact.occurred_at&.to_date %>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

unused (warning)

Copy link
Collaborator

Choose a reason for hiding this comment

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

it's an erb, so probably used by js somewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, but I only know that because I wrote it haha. I left this straggler.

<%= form.date_field(:occurred_at,
required: true,
max: (current_date + 1.day).to_fs(:iso8601),
Expand Down
8 changes: 4 additions & 4 deletions doc/LINUX_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ rbenv init
mkdir -p "$(rbenv root)"/plugins
git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build

rbenv install 3.2.4
rbenv install 3.3.6
```

If you would like RVM instead of rbenv
Expand All @@ -98,9 +98,9 @@ gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703
\curl -sSL https://get.rvm.io | bash
. ./.bashrc
rvm get head
rvm install 3.2.4
rvm alias create ruby 3.2.4
rvm alias create default ruby-3.2.4
rvm install 3.3.6
rvm alias create ruby 3.3.6
rvm alias create default ruby-3.3.6
```

```# Download the Chrome browser (for RSpec testing):
Expand Down
8 changes: 4 additions & 4 deletions doc/MAC_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ Next, install the version of Ruby that this project uses. This can be found by c
To install the appropriate ruby version, run:

```bash
rbenv install 3.2.4
rbenv install 3.3.6
```

(Do not forget to switch 3.2.4 to the appropriate version)
(Do not forget to switch 3.3.6 to the appropriate version)

Finally, run:

```bash
rbenv local 3.2.4
rbenv local 3.3.6
```
(Do not forget to swtich 3.2.4 to the appropriate version)
(Do not forget to swtich 3.3.6 to the appropriate version)

## Nodejs

Expand Down
8 changes: 4 additions & 4 deletions doc/WSL_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You will need the following local tools installed:

Install a ruby version manager like [rbenv](https://github.com/rbenv/rbenv#installation)

**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.4.**
**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.3.6.**

Instructions for rbenv:

Expand All @@ -48,13 +48,13 @@ Instructions for rbenv:

5. **[Install Ruby](https://github.com/rbenv/rbenv#installing-ruby-versions)**

**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.4.**
**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.3.6.**

`rbenv install 3.2.4`
`rbenv install 3.3.6`

6. **Set a Ruby version to finish installation and start**

`rbenv global 3.2.4` OR `rbenv local 3.2.4`
`rbenv global 3.3.6` OR `rbenv local 3.3.6`

#### Troubleshooting
If you are on Ubuntu in Windows Subsystem for Linux (WSL) and `rbenv install` indicates that the Ruby version is unavailable, you might be using Ubuntu's default install of `ruby-build`, which only comes with old installs of Ruby (ending before 2.6.) You should uninstall rvm and ruby-build's apt packages (`apt remove rvm ruby-build`) and install them with Git like this:
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

gemConfig = { };
# See available versions here: https://github.com/bobvanderlinden/nixpkgs-ruby/blob/master/ruby/versions.json
ruby = pkgs."ruby-3.2.4";
ruby = pkgs."ruby-3.3.6";

bundixcli = bundix.packages.${system}.default;
in rec {
Expand Down
2 changes: 1 addition & 1 deletion gemset.nix
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
type = "gem";
};
version = "3.2.4";
version = "3.3.6";
};
bullet = {
dependencies = ["activesupport" "uniform_notifier"];
Expand Down
2 changes: 1 addition & 1 deletion spec/services/placement_export_csv_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
casa_org = create(:casa_org, name: "Fake Name", display_name: "Fake Display Name")
placement_type = create(:placement_type, casa_org: casa_org)
creator = create(:user)
placement = create(:placement, creator: creator, placement_type: placement_type) # rubocop:disable Lint/UselessAssignment
Copy link
Contributor Author

Choose a reason for hiding this comment

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

unused var (warning)

create(:placement, creator: creator, placement_type: placement_type)

csv_headers = "Casa Org,Casa Case Number,Placement Type,Placement Started At,Created At,Creator Name\n"
result = PlacementExportCsvService.new(casa_org: casa_org).perform
Expand Down
9 changes: 1 addition & 8 deletions spec/support/capybara.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,7 @@
Capybara.disable_animation = true

Capybara::Screenshot.autosave_on_failure = true

module Capybara
module Screenshot
def self.capybara_tmp_path
Rails.root.join("tmp", "screenshots#{ENV["GROUPS_UNDERSCORE"]}")
end
end
end
Capybara.save_path = Rails.root.join("tmp", "screenshots#{ENV["GROUPS_UNDERSCORE"]}")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

method redefined (warning). I'm like 90% sure this is equivalent, but may want to check CI artifacts work.


options = Selenium::WebDriver::Chrome::Options.new
options.add_argument("--disable-gpu")
Expand Down
4 changes: 4 additions & 0 deletions spec/support/pretender_context.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module PretenderContext
def true_user
end
end
5 changes: 0 additions & 5 deletions spec/views/layouts/header.html.erb_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
require "rails_helper"

module PretenderContext
def true_user
end
end

RSpec.describe "layout/header", type: :view do
before do
view.class.include PretenderContext
Expand Down
5 changes: 0 additions & 5 deletions spec/views/layouts/sidebar.html.erb_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
require "rails_helper"

module PretenderContext
def true_user
end
end

RSpec.describe "layout/sidebar", type: :view do
before do
view.class.include PretenderContext
Expand Down
Loading