From fe191a3cbeee558e0c9d364b4fc3115cdadfbdf1 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 10 Apr 2025 20:08:29 +0200 Subject: [PATCH 1/6] Add '# frozen_string_literal: true' --- Gemfile | 2 ++ Rakefile | 2 ++ errbit_plugin.gemspec | 2 ++ lib/errbit_plugin.rb | 2 ++ lib/errbit_plugin/issue_tracker.rb | 2 ++ lib/errbit_plugin/issue_trackers/none.rb | 2 ++ lib/errbit_plugin/registry.rb | 2 ++ lib/errbit_plugin/validate_issue_tracker.rb | 2 ++ lib/errbit_plugin/version.rb | 2 ++ spec/errbit_plugin/registry_spec.rb | 2 ++ spec/errbit_plugin/validate_issue_tracker_spec.rb | 2 ++ spec/spec_helper.rb | 2 ++ 12 files changed, 24 insertions(+) diff --git a/Gemfile b/Gemfile index 79d19a1..c343dc8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source 'https://rubygems.org' # Specify your gem's dependencies in errbit_plugin.gemspec diff --git a/Rakefile b/Rakefile index 2995527..5263b58 100644 --- a/Rakefile +++ b/Rakefile @@ -1 +1,3 @@ +# frozen_string_literal: true + require "bundler/gem_tasks" diff --git a/errbit_plugin.gemspec b/errbit_plugin.gemspec index 99d06c7..8c0ab6d 100644 --- a/errbit_plugin.gemspec +++ b/errbit_plugin.gemspec @@ -1,3 +1,5 @@ +# frozen_string_literal: true + lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'errbit_plugin/version' diff --git a/lib/errbit_plugin.rb b/lib/errbit_plugin.rb index fb7699b..4a54ca1 100644 --- a/lib/errbit_plugin.rb +++ b/lib/errbit_plugin.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "errbit_plugin/version" require "errbit_plugin/registry" require "errbit_plugin/issue_tracker" diff --git a/lib/errbit_plugin/issue_tracker.rb b/lib/errbit_plugin/issue_tracker.rb index 83b5131..aaf9200 100644 --- a/lib/errbit_plugin/issue_tracker.rb +++ b/lib/errbit_plugin/issue_tracker.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ErrbitPlugin # abstract class for issue trackers class IssueTracker diff --git a/lib/errbit_plugin/issue_trackers/none.rb b/lib/errbit_plugin/issue_trackers/none.rb index 6726ea5..6bd59a8 100644 --- a/lib/errbit_plugin/issue_trackers/none.rb +++ b/lib/errbit_plugin/issue_trackers/none.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ErrbitPlugin class NoneIssueTracker < IssueTracker def self.label; 'none'; end diff --git a/lib/errbit_plugin/registry.rb b/lib/errbit_plugin/registry.rb index 1ab9519..35b1b88 100644 --- a/lib/errbit_plugin/registry.rb +++ b/lib/errbit_plugin/registry.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ErrbitPlugin class IncompatibilityError < StandardError; end class AlreadyRegisteredError < StandardError; end diff --git a/lib/errbit_plugin/validate_issue_tracker.rb b/lib/errbit_plugin/validate_issue_tracker.rb index 246934d..bbb8c58 100644 --- a/lib/errbit_plugin/validate_issue_tracker.rb +++ b/lib/errbit_plugin/validate_issue_tracker.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ErrbitPlugin class ValidateIssueTracker def initialize(klass) diff --git a/lib/errbit_plugin/version.rb b/lib/errbit_plugin/version.rb index b7829c4..4f5e6c5 100644 --- a/lib/errbit_plugin/version.rb +++ b/lib/errbit_plugin/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ErrbitPlugin VERSION = '0.7.0' end diff --git a/spec/errbit_plugin/registry_spec.rb b/spec/errbit_plugin/registry_spec.rb index 982b193..edd44cb 100644 --- a/spec/errbit_plugin/registry_spec.rb +++ b/spec/errbit_plugin/registry_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe ErrbitPlugin::Registry do diff --git a/spec/errbit_plugin/validate_issue_tracker_spec.rb b/spec/errbit_plugin/validate_issue_tracker_spec.rb index 1b73870..1d3e6a3 100644 --- a/spec/errbit_plugin/validate_issue_tracker_spec.rb +++ b/spec/errbit_plugin/validate_issue_tracker_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe ErrbitPlugin::ValidateIssueTracker do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 92338c7..3c75cb1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + if ENV['COVERAGE'] require 'simplecov' if ENV['CI'] From 88416eff6d2f3205cb3bf0d2fdc19ba8d5da3efa Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 10 Apr 2025 20:21:53 +0200 Subject: [PATCH 2/6] Add simplecov gem --- Gemfile | 1 + Gemfile.lock | 8 ++++++++ spec/spec_helper.rb | 22 ++++++++++------------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index c343dc8..74fd7b4 100644 --- a/Gemfile +++ b/Gemfile @@ -6,3 +6,4 @@ source 'https://rubygems.org' gemspec gem 'rspec' +gem "simplecov", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 7569030..21c40ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,6 +7,7 @@ GEM remote: https://rubygems.org/ specs: diff-lcs (1.6.1) + docile (1.4.1) rake (13.2.1) rspec (3.13.0) rspec-core (~> 3.13.0) @@ -21,6 +22,12 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) PLATFORMS arm64-darwin-24 @@ -29,6 +36,7 @@ DEPENDENCIES errbit_plugin! rake rspec + simplecov BUNDLED WITH 2.6.7 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3c75cb1..0bf6f90 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,19 +1,17 @@ # frozen_string_literal: true -if ENV['COVERAGE'] - require 'simplecov' - if ENV['CI'] - require 'coveralls' - Coveralls.wear! - SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ - SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter - ] - end - - SimpleCov.start +require 'simplecov' +if ENV['CI'] + require 'coveralls' + Coveralls.wear! + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + SimpleCov::Formatter::HTMLFormatter, + Coveralls::SimpleCov::Formatter + ] end +SimpleCov.start + require 'errbit_plugin' RSpec.configure do |config| From 74f6a2fa981dec49bcedc41ba7e424a0da52cf0f Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 10 Apr 2025 20:24:21 +0200 Subject: [PATCH 3/6] Move rake gem from gemspec to Gemfile --- Gemfile | 1 + errbit_plugin.gemspec | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 74fd7b4..74963f6 100644 --- a/Gemfile +++ b/Gemfile @@ -5,5 +5,6 @@ source 'https://rubygems.org' # Specify your gem's dependencies in errbit_plugin.gemspec gemspec +gem "rake" gem 'rspec' gem "simplecov", require: false diff --git a/errbit_plugin.gemspec b/errbit_plugin.gemspec index 8c0ab6d..c5883ad 100644 --- a/errbit_plugin.gemspec +++ b/errbit_plugin.gemspec @@ -18,6 +18,4 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - - spec.add_development_dependency "rake" end From 833533bd5b1493f0c56297f21e20a415b4f3b028 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 10 Apr 2025 20:25:21 +0200 Subject: [PATCH 4/6] Add jruby to test matrix --- .github/workflows/rspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index 2ec973b..2ff4dab 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.1", "3.2", "3.3", "3.4"] + ruby: ["3.1", "3.2", "3.3", "3.4", "jruby-9.4", "jruby-head"] steps: - uses: actions/checkout@v4 From d0ccc4e6452b909553e16f82bdef0d789b487d30 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 10 Apr 2025 20:27:14 +0200 Subject: [PATCH 5/6] Remove dead code --- spec/spec_helper.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0bf6f90..d263a08 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,14 +1,6 @@ # frozen_string_literal: true require 'simplecov' -if ENV['CI'] - require 'coveralls' - Coveralls.wear! - SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ - SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter - ] -end SimpleCov.start From 3ee1de6d5926e0ddb770e743876584adb09550d0 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 10 Apr 2025 20:30:34 +0200 Subject: [PATCH 6/6] Extract jruby --- .envrc | 1 + .github/workflows/jruby.yml | 37 +++++++++++++++++++++++++++++++++++++ .github/workflows/rspec.yml | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 .envrc create mode 100644 .github/workflows/jruby.yml diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..9e13309 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +export JRUBY_OPTS="--debug" diff --git a/.github/workflows/jruby.yml b/.github/workflows/jruby.yml new file mode 100644 index 0000000..0fd08f3 --- /dev/null +++ b/.github/workflows/jruby.yml @@ -0,0 +1,37 @@ +name: RSpec on JRuby + +on: + push: + branches: + - master + pull_request: + branches: + - master + schedule: + - cron: "0 21 * * 6" + +env: + JRUBY_OPTS: "--debug" + +jobs: + rspec: + runs-on: ubuntu-24.04 + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + ruby: ["jruby-9.4", "jruby-head"] + + steps: + - uses: actions/checkout@v4 + - run: rm -f Gemfile.lock + - run: rm -f .ruby-version + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + rubygems: latest + bundler: latest + bundler-cache: true + + - run: bundle exec rspec diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index 2ff4dab..2ec973b 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.1", "3.2", "3.3", "3.4", "jruby-9.4", "jruby-head"] + ruby: ["3.1", "3.2", "3.3", "3.4"] steps: - uses: actions/checkout@v4