Merge pull request #22 from copiousfreetime/maintenance-2024-05

Maintenance 2024 05

.gitignore

@@ -1,7 +1,24 @@
-*.swp
+*.gem
+*.rbc
+*.log
+/.config/
+/coverage/
+/pkg/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+/log/
+
+# documentation
+/doc/
+
+# editor
 *~
-coverage/
-doc/
-pkg/
-tmp/
-.byebug*
+*.swp
+*.swo
+
+# environment normalization
+/.gem/
+/.bundle/
+/vendor/bundle/
+/lib/bundler/man/

.rubocop.yml

@@ -0,0 +1,94 @@
+require:
+  - rubocop-md
+  - rubocop-minitest
+  - rubocop-packaging
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-thread_safety
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.0
+  Exclude:
+    - 'coverage/**/*'
+    - 'doc/**/*'
+    - 'pkg/**/*'
+    - 'tmp/**/*'
+    - '*.gemspec'
+    - 'vendor/bundle/**/*'
+
+Layout/ExtraSpacing:
+  AllowBeforeTrailingComments: true
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: space
+
+Lint/DuplicateBranch:
+  IgnoreLiteralBranches: true
+  IgnoreConstantBranches: true
+
+Metrics/AbcSize:
+  CountRepeatedAttributes: false
+  Max: 25
+  Exclude:
+    - 'spec/**/*'
+    - 'tasks/**/*'
+    - 'lib/heel/server.rb'
+
+Metrics/BlockLength:
+  CountAsOne:
+    - heredoc
+  Exclude:
+    - 'tasks/**/*'
+    - 'spec/**/*'
+    - 'lib/heel/server.rb'
+
+Metrics/ClassLength:
+  Max: 175
+  CountAsOne:
+    - heredoc
+    - array
+  Exclude:
+    - 'lib/heel/server.rb'
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/MethodLength:
+  Max: 20
+  CountAsOne:
+    - heredoc
+    - array
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/heel/server.rb'
+    - 'lib/heel/rackapp.rb'
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+  ConsistentQuotesInMultiline: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Style/TernaryParentheses:
+  EnforcedStyle: require_parentheses_when_complex
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+ThreadSafety/InstanceVariableInClassMethod:
+  Enabled: false
+ThreadSafety/NewThread:
+  Exclude:
+    - 'lib/heel/server.rb'

.ruby-version

@@ -1 +1 @@
-3.2
+3.3.1

.semaphore/semaphore.yml

@@ -28,19 +28,49 @@ blocks:
           matrix:
             - env_var: RUBY_VERSION
               values:
-                - 3.0.6
-                - 3.1.4
-                - 3.2.3
-                - 3.3.0
-                - jruby-9.4.5.0
-                - truffleruby-23.1.2
+                - 3.0.7
+                - 3.1.5
+                - 3.2.4
+                - 3.3.1
+                - jruby-9.4.7.0
+                - truffleruby-24.0.1
           commands:
             - source .semaphore/ensure-ruby-version.sh
             - source .semaphore/ensure-bundle.sh
             - mkdir -p tmp/test-results/
+            - bundle exec rake rubocop
             - export TEST_RESULTS_FILE=tmp/test-results/${RUBY_VERSION}.xml
             - A="--junit --junit-filename=${TEST_RESULTS_FILE}" bundle exec rake test
 
+  - name: Run MacOS Tests
+    dependencies: []
+    task:
+      agent:
+        machine:
+          type: a1-standard-4
+          os_image: macos-xcode14
+      prologue:
+        commands:
+          - checkout
+          - git -C ${HOME}/.rbenv/plugins/ruby-build pull
+      jobs:
+        - name: macos matrix test
+          matrix:
+            - env_var: RUBY_VERSION
+              values:
+                - 3.0.7
+                - 3.1.5
+                - 3.2.4
+                - 3.3.1
+          commands:
+            - source .semaphore/ensure-ruby-version.sh
+            - source .semaphore/ensure-bundle.sh
+            - mkdir -p tmp/test-results/
+            - bundle exec rake rubocop
+            - export TEST_RESULTS_FILE=tmp/test-results/${RUBY_VERSION}.xml
+            - bundle exec rake test
+
+
 after_pipeline:
   task:
     jobs:

Gemfile

@@ -1,4 +1,26 @@
-# DO NOT EDIT - This file is automatically generated
-# Make changes to Manifest.txt and/or Rakefile and regenerate
+# frozen_string_literal: true
+
 source "https://rubygems.org/"
+
 gemspec
+
+# gem "debug", "~> 1.0", require: false
+
+gem "minitest", "~> 5.11"
+gem "minitest-focus", "~> 1.2"
+gem "minitest-junit", "~> 1.0"
+
+gem "rake"
+gem "rdoc", "~> 6.3", require: false
+gem "reek", require: false
+
+gem "rubocop", "~> 1.63", require: false
+gem "rubocop-minitest", "~> 0.35", require: false
+gem "rubocop-packaging", "~> 0.5", require: false
+gem "rubocop-performance", "~> 1.21", require: false
+gem "rubocop-rake", "~> 0.6", require: false
+gem "rubocop-thread_safety", "~> 0.5", require: false
+
+gem "rubocop-md", "~> 1.2", require: false
+
+gem "simplecov", "~> 0.22", require: false

Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     heel (4.0.1)
       launchy (~> 2.5)
-      mime-types (~> 3.4)
+      marcel (~> 1.0)
       puma (~> 6.0)
       rack (~> 3.0)
       rackup (~> 2.1)
@@ -14,59 +14,148 @@ GEM
   specs:
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    bigdecimal (3.1.7)
+    bigdecimal (3.1.7-java)
     builder (3.2.4)
+    concurrent-ruby (1.2.3)
     docile (1.4.0)
+    dry-configurable (1.1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.3)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
     jar-dependencies (0.4.1)
+    json (2.7.2)
+    json (2.7.2-java)
+    language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    mime-types (3.5.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0206)
-    minitest (5.22.2)
+    marcel (1.0.4)
+    minitest (5.22.3)
+    minitest-focus (1.4.0)
+      minitest (>= 4, < 6)
     minitest-junit (1.1.0)
       builder (~> 3.2)
       minitest (~> 5.11)
-    nio4r (2.7.0)
-    nio4r (2.7.0-java)
+    nio4r (2.7.1)
+    nio4r (2.7.1-java)
+    parallel (1.24.0)
+    parser (3.3.1.0)
+      ast (~> 2.4.1)
+      racc
     psych (5.1.2)
       stringio
     psych (5.1.2-java)
       jar-dependencies (>= 0.1.7)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
     puma (6.4.2-java)
       nio4r (~> 2.0)
-    rack (3.0.9.1)
+    racc (1.7.3)
+    racc (1.7.3-java)
+    rack (3.0.10)
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rake (13.1.0)
-    rdoc (6.6.2)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    rouge (4.2.0)
+    reek (6.3.0)
+      dry-schema (~> 1.13.0)
+      parser (~> 3.3.0)
+      rainbow (>= 2.0, < 4.0)
+      rexml (~> 3.1)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rouge (4.2.1)
+    rubocop (1.63.4)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-md (1.2.2)
+      rubocop (>= 1.0)
+    rubocop-minitest (0.35.0)
+      rubocop (>= 1.61, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-packaging (0.5.2)
+      rubocop (>= 1.33, < 2.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-thread_safety (0.5.1)
+      rubocop (>= 0.90.0)
+    ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stringio (3.1.0)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   java
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
   heel!
-  minitest (~> 5.15)
+  minitest (~> 5.11)
+  minitest-focus (~> 1.2)
   minitest-junit (~> 1.0)
-  rake (~> 13.0)
-  rdoc (~> 6.5)
-  simplecov (~> 0.21)
+  rake
+  rdoc (~> 6.3)
+  reek
+  rubocop (~> 1.63)
+  rubocop-md (~> 1.2)
+  rubocop-minitest (~> 0.35)
+  rubocop-packaging (~> 0.5)
+  rubocop-performance (~> 1.21)
+  rubocop-rake (~> 0.6)
+  rubocop-thread_safety (~> 0.5)
+  simplecov (~> 0.22)
 
 BUNDLED WITH
    2.5.6