Skip to content

Commit

Permalink
Updates ruby (3.2.2) and rails (6.1.7.4)
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Scherz committed Aug 21, 2023
1 parent f139097 commit 7a0d956
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
build:
docker:
# specify the version you desire here
- image: cimg/ruby:3.0.5-browsers
- image: cimg/ruby:3.2.2-browsers
# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.0.5
ruby-3.2.2
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.0.5'
ruby '3.2.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.7.4'
Expand Down
45 changes: 24 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,14 @@ GEM
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.4)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.4.1)
airbrussh (1.4.2)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.2)
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
base64 (0.1.1)
bcrypt (3.1.19)
bindex (0.8.1)
bootsnap (1.16.0)
Expand All @@ -77,7 +78,7 @@ GEM
sassc-rails (>= 2.0.0)
bootstrap-datepicker-rails (1.10.0.1)
railties (>= 3.0)
brakeman (6.0.0)
brakeman (6.0.1)
builder (3.2.4)
bundler-audit (0.9.1)
bundler (>= 1.2.0, < 3)
Expand Down Expand Up @@ -167,11 +168,11 @@ GEM
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.2)
minitest (5.18.1)
msgpack (1.7.1)
mini_mime (1.1.5)
minitest (5.19.0)
msgpack (1.7.2)
mysql2 (0.5.5)
net-imap (0.3.6)
net-imap (0.3.7)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -182,11 +183,11 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.3.3)
net-protocol
net-ssh (7.1.0)
net-ssh (7.2.0)
nio4r (2.5.9)
nokogiri (1.15.3-x86_64-darwin)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-linux)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.23.0)
Expand All @@ -200,7 +201,7 @@ GEM
puma (6.3.1)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.7)
rack (2.2.8)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.4)
Expand All @@ -222,7 +223,7 @@ GEM
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.1.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
Expand All @@ -241,12 +242,12 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
rb-readline (0.5.5)
recaptcha (5.14.0)
recaptcha (5.15.0)
regexp_parser (2.8.1)
responders (3.1.0)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.5)
rexml (3.2.6)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
Expand All @@ -266,15 +267,16 @@ GEM
rspec-support (3.12.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.54.1)
rubocop (1.56.1)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
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.29.0)
Expand All @@ -287,7 +289,7 @@ GEM
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.22.0)
rubocop-rspec (2.23.2)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
Expand All @@ -312,7 +314,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (4.10.0)
selenium-webdriver (4.11.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -364,15 +366,16 @@ GEM
rubyzip (>= 1.3.0)
selenium-webdriver (> 3.141, < 5.0)
websocket (1.2.9)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.8)
zeitwerk (2.6.11)

PLATFORMS
x86_64-darwin-19
x86_64-darwin-22
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -425,7 +428,7 @@ DEPENDENCIES
webdrivers (~> 4.0)

RUBY VERSION
ruby 3.0.5p211
ruby 3.2.2p53

BUNDLED WITH
2.2.33
2 changes: 1 addition & 1 deletion app/helpers/change_requests_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module ChangeRequestsHelper
def sortable(column, title = nil)
title ||= column.titleize
direction = (column == sort_column) && (sort_direction == 'asc' ? 'desc' : 'asc')
link_to title, sort: column, direction: direction, class: 'th-link'
link_to title, sort: column, direction:, class: 'th-link'
end

def sort_column
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/vendor_records_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module VendorRecordsHelper
def sortable(column, title = nil)
title ||= column.titleize
direction = (column == sort_column) && (sort_direction == 'asc' ? 'desc' : 'asc')
link_to title, sort: column, direction: direction, class: 'th-link'
link_to title, sort: column, direction:, class: 'th-link'
end

def sort_column
Expand Down
2 changes: 1 addition & 1 deletion exports/software_records.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def software_records
# server env metadtata
headers += ['QA URL', 'Dev_URL', 'Prod_URL', 'Production Support Servers', 'Last Record Change', 'Track Uptime', 'Monitor Health', 'Monitor Errors']

CSV.open(file, 'w', write_headers: true, headers: headers) do |writer|
CSV.open(file, 'w', write_headers: true, headers:) do |writer|
software_records.each do |software_record|
tech_leads = software_record.tech_leads.to_s.gsub!('---', '').to_s
tech_leads = tech_leads.gsub!(/\n/, '-').to_s
Expand Down
2 changes: 1 addition & 1 deletion exports/software_types.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def software_types

headers = ['SoftwareType ID', 'Created On', 'Software Type', 'Description']

CSV.open(file, 'w', write_headers: true, headers: headers) do |writer|
CSV.open(file, 'w', write_headers: true, headers:) do |writer|
software_types.each do |software_type|
writer << [software_type.id, software_type.created_at, software_type.title,
software_type.description]
Expand Down
2 changes: 1 addition & 1 deletion exports/vendor_records.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def vendor_records

headers = ['VendorRecord ID', 'Created On', 'Vendor Record', 'Description']

CSV.open(file, 'w', write_headers: true, headers: headers) do |writer|
CSV.open(file, 'w', write_headers: true, headers:) do |writer|
vendor_records.each do |vendor_record|
writer << [vendor_record.id, vendor_record.created_at, vendor_record.title,
vendor_record.description]
Expand Down
70 changes: 35 additions & 35 deletions load_records.rb
Original file line number Diff line number Diff line change
Expand Up @@ -197,50 +197,50 @@ def software_records
monitor_health = row['Monitor Health'].to_s.strip
monitor_errors = row['Monitor Errors'].to_s.strip

if !SoftwareRecord.find_by(title: title).nil? && SoftwareRecord.find_by(title: title).title.to_s == title && SoftwareRecord.find_by(title: title).software_type_id == software_type_id && SoftwareRecord.find_by(title: title).vendor_record_id == vendor_record_id
if !SoftwareRecord.find_by(title:).nil? && SoftwareRecord.find_by(title:).title.to_s == title && SoftwareRecord.find_by(title:).software_type_id == software_type_id && SoftwareRecord.find_by(title:).vendor_record_id == vendor_record_id
puts("Software Record '#{title}' is found in the db and hence suppressing it.")
else
SoftwareRecord.new(title: title,
SoftwareRecord.new(title:,
description: desc,
status_id: status_id,
software_type_id: software_type_id,
vendor_record_id: vendor_record_id,
departments: departments,
date_implemented: date_implemented,
developers: developers,
tech_leads: tech_leads,
product_owners: product_owners,
admin_users: admin_users,
status_id:,
software_type_id:,
vendor_record_id:,
departments:,
date_implemented:,
developers:,
tech_leads:,
product_owners:,
admin_users:,
languages_used: lang,
production_url: url,
source_code_url: source_url,
user_seats: user_seats,
annual_fees: annual_fees,
support_contract: support_contract,
hosting_environment_id: hosting_environment_id,
user_seats:,
annual_fees:,
support_contract:,
hosting_environment_id:,
current_version: version,
notes: notes,
notes:,
business_value: bvalue,
it_quality: itquality,
created_by: created_by,
sensitive_information: sensitive_information,
authentication_type: authentication_type,
requires_cm: requires_cm,
last_security_scan: last_security_scan,
last_accessibility_scan: last_accessibility_scan,
last_ogc_review: last_ogc_review,
last_info_sec_review: last_info_sec_review,
cm_stakeholders: cm_stakeholders,
cm_other_notes: cm_other_notes,
date_of_upgrade: date_of_upgrade,
qa_url: qa_url,
dev_url: dev_url,
prod_url: prod_url,
production_support_servers: production_support_servers,
last_record_change: last_record_change,
track_uptime: track_uptime,
monitor_health: monitor_health,
monitor_errors: monitor_errors).save
created_by:,
sensitive_information:,
authentication_type:,
requires_cm:,
last_security_scan:,
last_accessibility_scan:,
last_ogc_review:,
last_info_sec_review:,
cm_stakeholders:,
cm_other_notes:,
date_of_upgrade:,
qa_url:,
dev_url:,
prod_url:,
production_support_servers:,
last_record_change:,
track_uptime:,
monitor_health:,
monitor_errors:).save
created += 1
puts("Created Software Record '#{row['Software Record']}'...")
end
Expand Down

0 comments on commit 7a0d956

Please sign in to comment.