From 0936dcdb34afccaa91ba7c263981cf6e6d906b64 Mon Sep 17 00:00:00 2001 From: Sebastian Herrera Date: Wed, 28 Dec 2022 17:00:20 -0300 Subject: [PATCH] Upgrade to Ruby 3.2.0 --- .circleci/config.yml | 4 +- .ruby-version | 2 +- .tool-versions | 2 +- Dockerfile | 2 +- Gemfile | 7 +- Gemfile.lock | 192 ++++++++++++++++++++----------------------- circlemator.gemspec | 53 ++++++------ 7 files changed, 123 insertions(+), 139 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53d46b1..0f9601a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 jobs: test: docker: - - image: cimg/ruby:3.1.3 + - image: cimg/ruby:3.2.0 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_TOKEN @@ -48,7 +48,7 @@ jobs: command: bundle exec exe/circlemator test-security --base-branch=master push_to_rubygems: docker: - - image: cimg/ruby:3.1.3 + - image: cimg/ruby:3.2.0 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_TOKEN diff --git a/.ruby-version b/.ruby-version index ff365e0..944880f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.3 +3.2.0 diff --git a/.tool-versions b/.tool-versions index 520a168..c23af94 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.1.3 +ruby 3.2.0 diff --git a/Dockerfile b/Dockerfile index 43832e9..ee346c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.3 +FROM ruby:3.2.0 RUN apt-get update -y && apt-get install -y cmake # Set default locale for Ruby to avoid encoding errors diff --git a/Gemfile b/Gemfile index 2f41afa..1d52fae 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,9 @@ # frozen_string_literal: true -source 'https://rubygems.org' + +source "https://rubygems.org" # Specify your gem's dependencies in circlemator.gemspec gemspec -gem 'rf-stylez', git: 'https://github.com/rainforestapp/rf-stylez.git', branch: 'upgrade_versions' -gem 'rspec_junit_formatter' +gem "rf-stylez" +gem "rspec_junit_formatter" diff --git a/Gemfile.lock b/Gemfile.lock index 210bd41..7cc9b4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,12 @@ -GIT - remote: https://github.com/rainforestapp/rf-stylez.git - revision: 5cddb5b1b9f4164c4bfec412ebd2bab02b87f463 - branch: upgrade_versions - specs: - rf-stylez (0.16.0) - get_env (~> 0.2.0) - reek (~> 6.1) - rubocop (= 1.15.0) - rubocop-rails (= 2.10.1) - rubocop-rspec (= 2.3.0) - unparser (~> 0.6) - PATH remote: . specs: circlemator (0.7.0) httparty (>= 0.13.7, < 0.19.0) - pronto (~> 0.11.0) - pronto-brakeman (~> 0.11.0) + pronto (~> 0.11.1) + pronto-brakeman (~> 0.11.1) pronto-commentator (~> 0) - pronto-rubocop (~> 0.11.0) + pronto-rubocop (~> 0.11.4) pronto-undercover (~> 0.1) GEM @@ -30,48 +17,33 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - brakeman (5.1.1) - coderay (1.1.2) + brakeman (5.4.0) + coderay (1.1.3) concurrent-ruby (1.1.10) crack (0.4.5) rexml - diff-lcs (1.4.4) - docile (1.3.2) - faraday (1.7.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + diff-lcs (1.5.0) + docile (1.4.0) + faraday (2.7.2) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) + faraday-net_http (3.0.2) ffi (1.15.5) - formatador (0.2.5) + formatador (1.1.0) get_env (0.2.0) - gitlab (4.17.0) + gitlab (4.18.0) httparty (~> 0.18) - terminal-table (~> 1.5, >= 1.5.1) - guard (2.15.1) + terminal-table (>= 1.5.1) + guard (2.18.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) - pry (>= 0.9.12) + pry (>= 0.13.0) shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) @@ -87,119 +59,129 @@ GEM concurrent-ruby (~> 1.0) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - json (2.3.0) + json (2.6.3) kwalify (0.7.2) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lumberjack (1.0.13) - method_source (0.9.2) - mime-types (3.3.1) + lumberjack (1.2.8) + method_source (1.0.0) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0704) - minitest (5.16.3) + mime-types-data (3.2022.0105) + minitest (5.17.0) multi_xml (0.6.0) - multipart-post (2.1.1) nenv (0.3.0) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - octokit (4.21.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (6.0.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) parallel (1.22.1) - parser (3.1.2.1) + parser (3.1.3.0) ast (~> 2.4.1) - pronto (0.11.0) - gitlab (~> 4.4, >= 4.4.0) - httparty (>= 0.13.7) - octokit (~> 4.7, >= 4.7.0) + pronto (0.11.1) + gitlab (>= 4.4.0, < 5.0) + httparty (>= 0.13.7, < 1.0) + octokit (>= 4.7.0, < 7.0) rainbow (>= 2.2, < 4.0) - rexml (~> 3.2) - rugged (>= 0.23.0, < 1.1.0) + rexml (>= 3.2.5, < 4.0) + rugged (>= 0.23.0, < 2.0) thor (>= 0.20.3, < 2.0) - pronto-brakeman (0.11.0) + pronto-brakeman (0.11.1) brakeman (>= 3.2.0) pronto (~> 0.11.0) pronto-commentator (0.1.5) pronto (>= 0.9.5, < 0.12.0) - pronto-rubocop (0.11.1) + pronto-rubocop (0.11.4) pronto (~> 0.11.0) rubocop (>= 0.63.1, < 2.0) - pronto-undercover (0.1.6) + pronto-undercover (0.2.0) pronto (>= 0.9, < 0.12) - undercover (~> 0.3.4) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (4.0.6) + undercover (~> 0.4.3) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (5.0.1) rack (3.0.3) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) - reek (6.1.2) + reek (6.1.3) kwalify (~> 0.7.0) parser (~> 3.1.0) rainbow (>= 2.0, < 4.0) - regexp_parser (2.1.1) + regexp_parser (2.6.1) rexml (3.2.5) + rf-stylez (0.16.0) + get_env (~> 0.2.0) + pronto (~> 0.11.1) + pronto-rubocop (~> 0.11.4) + reek (~> 6.1) + rubocop (= 1.41.1) + rubocop-rails (= 2.17.4) + rubocop-rspec (= 2.16.0) + unparser (~> 0.6) rspec (3.10.0) rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) + rspec-core (3.10.2) rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) + rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) + rspec-mocks (3.10.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-support (3.10.0) - rspec_junit_formatter (0.4.1) + rspec-support (3.10.3) + rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.15.0) + rubocop (1.41.1) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.5.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.23.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.11.0) - parser (>= 3.0.1.1) - rubocop-rails (2.10.1) + rubocop-ast (1.24.1) + parser (>= 3.1.1.0) + rubocop-rails (2.17.4) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.3.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) + rubocop (>= 1.33.0, < 2.0) + rubocop-rspec (2.16.0) + rubocop (~> 1.33) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) - rugged (1.0.1) - sawyer (0.8.2) + rugged (1.5.0.1) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) shellany (0.0.1) - simplecov (0.17.1) + simplecov (0.22.0) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) simplecov-lcov (0.8.0) - terminal-table (1.6.0) - thor (1.1.0) + simplecov_json_formatter (0.1.4) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.2.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - undercover (0.3.4) + undercover (0.4.5) imagen (>= 0.1.8) rainbow (>= 2.1, < 4.0) - rugged (>= 0.27, < 1.1) - unicode-display_width (2.0.0) + rugged (>= 0.27, < 1.6) + unicode-display_width (2.3.0) unparser (0.6.5) diff-lcs (~> 1.3) parser (>= 3.1.0) @@ -217,7 +199,7 @@ DEPENDENCIES circlemator! guard-rspec (~> 4.7.3) rake (~> 13.0) - rf-stylez! + rf-stylez rspec (~> 3.10.0) rspec_junit_formatter rubocop @@ -228,4 +210,4 @@ DEPENDENCIES webmock (~> 3.14.0) BUNDLED WITH - 2.1.4 + 2.4.1 diff --git a/circlemator.gemspec b/circlemator.gemspec index 6e1ef9c..82b8d31 100644 --- a/circlemator.gemspec +++ b/circlemator.gemspec @@ -1,41 +1,42 @@ # frozen_string_literal: true -lib = File.expand_path('../lib', __FILE__) + +lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'circlemator/version' +require "circlemator/version" Gem::Specification.new do |spec| - spec.name = 'circlemator' + spec.name = "circlemator" spec.version = Circlemator::VERSION - spec.authors = ['Emanuel Evans'] - spec.email = ['emanuel@rainforestqa.com'] + spec.authors = ["Emanuel Evans"] + spec.email = ["emanuel@rainforestqa.com"] - spec.summary = 'A bucket of tricks for CircleCI and Github.' + spec.summary = "A bucket of tricks for CircleCI and Github." spec.description = <<-EOF.strip A few utilities for CircleCI to improve your CI workflow. EOF - spec.homepage = 'https://github.com/rainforestapp/circlemator' - spec.license = 'MIT' + spec.homepage = "https://github.com/rainforestapp/circlemator" + spec.license = "MIT" spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } - spec.bindir = 'exe' + spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } - spec.require_paths = ['lib'] + spec.require_paths = ["lib"] - spec.add_dependency 'httparty', '>= 0.13.7', '< 0.19.0' - spec.add_dependency 'pronto', '~> 0.11.0' - spec.add_dependency 'pronto-rubocop', '~> 0.11.0' - spec.add_dependency 'pronto-commentator', '~> 0' - spec.add_dependency 'pronto-undercover', '~> 0.1' - spec.add_dependency 'pronto-brakeman', '~> 0.11.0' + spec.add_dependency "httparty", ">= 0.13.7", "< 0.19.0" + spec.add_dependency "pronto", "~> 0.11.1" + spec.add_dependency "pronto-rubocop", "~> 0.11.4" + spec.add_dependency "pronto-commentator", "~> 0" + spec.add_dependency "pronto-undercover", "~> 0.1" + spec.add_dependency "pronto-brakeman", "~> 0.11.1" - spec.add_development_dependency 'bundler', '>= 1.9' - spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop' - spec.add_development_dependency 'vcr', '~> 6.0.0' - spec.add_development_dependency 'webmock', '~> 3.14.0' - spec.add_development_dependency 'rspec', '~> 3.10.0' - spec.add_development_dependency 'guard-rspec', '~> 4.7.3' - spec.add_development_dependency 'simplecov' - spec.add_development_dependency 'simplecov-html' - spec.add_development_dependency 'simplecov-lcov' + spec.add_development_dependency "bundler", ">= 1.9" + spec.add_development_dependency "rake", "~> 13.0" + spec.add_development_dependency "rubocop" + spec.add_development_dependency "vcr", "~> 6.0.0" + spec.add_development_dependency "webmock", "~> 3.14.0" + spec.add_development_dependency "rspec", "~> 3.10.0" + spec.add_development_dependency "guard-rspec", "~> 4.7.3" + spec.add_development_dependency "simplecov" + spec.add_development_dependency "simplecov-html" + spec.add_development_dependency "simplecov-lcov" end