Skip to content

Commit 4ec1cab

Browse files
authored
Merge pull request #6 from oauth-xx/release-prep
Release prep
2 parents 8d34f06 + 1ece5a4 commit 4ec1cab

38 files changed

+1247
-35
lines changed

.github/workflows/coverage.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ jobs:
4949
bundler: latest
5050

5151
steps:
52-
- uses: amancevice/setup-code-climate@v2
53-
name: CodeClimate Install
54-
if: ${{ github.event_name != 'pull_request' }}
55-
with:
56-
cc_test_reporter_id: ${{ secrets.CC_TEST_REPORTER_ID }}
57-
5852
- name: Checkout
5953
uses: actions/checkout@v4
6054

@@ -66,11 +60,6 @@ jobs:
6660
bundler: "${{ matrix.bundler }}"
6761
bundler-cache: false
6862

69-
- name: CodeClimate Pre-build Notification
70-
run: cc-test-reporter before-build
71-
if: ${{ github.event_name != 'pull_request' }}
72-
continue-on-error: ${{ matrix.experimental != 'false' }}
73-
7463
# Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
7564
# We need to do this first to get appraisal installed.
7665
# NOTE: This does not use the main Gemfile at all.
@@ -81,11 +70,6 @@ jobs:
8170
- name: Tests for ${{ matrix.ruby }}@current via ${{ matrix.exec_cmd }}
8271
run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
8372

84-
- name: CodeClimate Post-build Notification
85-
run: cc-test-reporter after-build
86-
if: ${{ github.event_name != 'pull_request' }}
87-
continue-on-error: ${{ matrix.experimental != 'false' }}
88-
8973
- name: Code Coverage Summary Report
9074
uses: irongut/[email protected]
9175
if: ${{ github.event_name == 'pull_request' }}
@@ -119,3 +103,11 @@ jobs:
119103
uses: codecov/codecov-action@v5
120104
with:
121105
token: ${{ secrets.CODECOV_TOKEN }}
106+
107+
- name: Upload results to QLTY
108+
uses: qltysh/qlty-action/coverage@main
109+
with:
110+
coverage-token: {{secrets.QLTY_COVERAGE_TOKEN}}
111+
files: coverage/.resultset.json
112+
if: ${{ github.event_name != 'pull_request' }}
113+
continue-on-error: ${{ matrix.experimental != 'false' }}

.rubocop_gradual.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
"app/controllers/masq/sessions_controller.rb:926273284": [
99
[39, 21, 3, "Style/AndOr: Use `&&` instead of `and`.", 193409806]
1010
],
11+
"bin/bundle:247448467": [
12+
[64, 5, 20, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2485198147]
13+
],
1114
"lib/masq/authenticated_system.rb:2956957840": [
1215
[95, 5, 3, "Lint/IneffectiveAccessModifier: `protected` (on line 3) does not make singleton methods protected. Use `protected` inside a `class << self` block instead.", 193404514],
1316
[95, 5, 111, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 4258707989],
@@ -19,12 +22,12 @@
1922
"lib/tasks/masq_tasks.rake:1483017689": [
2023
[39, 21, 42, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 4054527944]
2124
],
22-
"masq.gemspec:1107948888": [
25+
"masq2.gemspec:491945488": [
2326
[72, 3, 26, "Gemspec/DependencyVersion: Dependency version specification is required.", 1260806891],
2427
[73, 3, 32, "Gemspec/DependencyVersion: Dependency version specification is required.", 855136127],
2528
[76, 3, 33, "Gemspec/DependencyVersion: Dependency version specification is required.", 3159729161],
2629
[78, 3, 30, "Gemspec/DependencyVersion: Dependency version specification is required.", 2010339150],
27-
[89, 3, 72, "Gemspec/DependencyVersion: Dependency version specification is required.", 2491072344]
30+
[92, 3, 72, "Gemspec/DependencyVersion: Dependency version specification is required.", 2491072344]
2831
],
2932
"test/test_helper.rb:2496707493": [
3033
[206, 45, 1, "Lint/AssignmentInCondition: Wrap assignment in parentheses if intentional", 177560]

Gemfile.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ GEM
385385
standard-custom (>= 1.0.2, < 2)
386386
standard-performance (>= 1.3.1, < 2)
387387
version_gem (>= 1.1.4, < 3)
388+
stone_checksums (1.0.0)
389+
version_gem (>= 1.1.5, < 3)
388390
stringio (3.1.6)
389391
terminal-table (4.0.0)
390392
unicode-display_width (>= 1.1.1, < 4)
@@ -439,6 +441,7 @@ DEPENDENCIES
439441
rubocop-packaging (~> 0.5, >= 0.5.2)
440442
sqlite3
441443
standard (>= 1.35.1, != 1.42.0, != 1.41.1)
444+
stone_checksums (~> 1.0)
442445
stringio (~> 3.0)
443446
test-unit (~> 3.6, >= 3.6.7)
444447
yard (~> 0.9, >= 0.9.37)

LICENSE.txt

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1+
The MIT License (MIT)
2+
13
Copyright (c) 2012 Dennis Reimann ([email protected])
4+
Copyright (c) 2024 - 2025 Peter Boling (https://railsbling.com)
25

3-
Permission is hereby granted, free of charge, to any person obtaining
4-
a copy of this software and associated documentation files (the
5-
"Software"), to deal in the Software without restriction, including
6-
without limitation the rights to use, copy, modify, merge, publish,
7-
distribute, sublicense, and/or sell copies of the Software, and to
8-
permit persons to whom the Software is furnished to do so, subject to
9-
the following conditions:
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
1012

11-
The above copyright notice and this permission notice shall be
12-
included in all copies or substantial portions of the Software.
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
1315

14-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
THE SOFTWARE.

0 commit comments

Comments
 (0)