Merge remote-tracking branch 'upstream/main' into add-method-coverage-support

Author: tycooon

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/stable.yml

@@ -8,32 +8,22 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2, ruby-head, jruby-9.3]
+        ruby: [2.7, '3.0', 3.1, 3.2, ruby-head, jruby-9.4]
 
     env:
       BUNDLE_WITHOUT: "benchmark"
       JRUBY_OPTS: "--debug"
       SIMPLECOV_HTML_MODE: "methods" # TODO: remove after simplecov-html release
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Get sqlite for Rails test projects
-        run: sudo apt-get install libsqlite3-dev
+      - uses: actions/checkout@v4
 
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          rubygems: latest
           bundler-cache: true # 'bundle install' and cache
 
-      - name: Get the newest rubygems version to rid ourselves of warnings
-        run: gem update --system --no-document
-
-      - name: Install dependencies
-        run: |
-          bundle config set --local without benchmark
-          bundle install --jobs=3
-
       - name: Run tests
         run: bundle exec rake

.github/workflows/unstable.yml

@@ -6,45 +6,24 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
         ruby: [ruby-head, jruby-head]
 
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up RVM
-        run: curl -sSL https://get.rvm.io | bash
-
-      - name: Set up Ruby
-        run: |
-          source $HOME/.rvm/scripts/rvm
-          rvm install ${{ matrix.ruby }} --binary --autolibs=disable
-          rvm --default use ${{ matrix.ruby }}
+    env:
+      BUNDLE_WITHOUT: "benchmark"
+      JRUBY_OPTS: "--debug"
 
-      - name: Install java
-        run: sudo apt-get -y install openjdk-8-jre-headless
-        if: matrix.ruby == 'jruby-head'
-
-      - name: Get sqlite for Rails test projects
-        run: sudo apt-get install libsqlite3-dev
-
-      - name: Install dependencies
-        run: |
-          source $HOME/.rvm/scripts/rvm
-          bundle config set --local without benchmark
-          bundle install --jobs=3
+    steps:
+      - uses: actions/checkout@v4
 
-      - name: Run tests (MRI)
-        run: |
-          source $HOME/.rvm/scripts/rvm
-          bundle exec rake
-        if: matrix.ruby == 'ruby-head'
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # 'bundle install' and cache
 
-      - name: Run tests (JRuby)
-        run: |
-          source $HOME/.rvm/scripts/rvm
-          JRUBY_OPTS=--debug bundle exec rake
-        if: matrix.ruby == 'jruby-head'
+      - name: Run tests
+        run: bundle exec rake

Gemfile

@@ -19,6 +19,7 @@ group :development do
   gem "apparition", github: "twalpole/apparition" # LOCKED: When this is released, use a released version https://github.com/twalpole/apparition/pull/79
   gem "aruba", "~> 1.0"
   gem "capybara", "~> 3.31"
+  gem "rackup"
   gem "cucumber", "~> 4.0"
   gem "minitest"
   gem "rake", "~> 13.0"

Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/umbrellio/simplecov-html.git
-  revision: fc9c7a1beaa75bad3a925d1296b94fcd0c96b126
+  revision: dea7be12fce6364e9d7a7529a4fcd52075c18af8
   branch: add-method-coverage-support
   specs:
     simplecov-html (0.12.3)
@@ -30,8 +30,8 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     aruba (1.1.2)
       bundler (>= 1.17, < 3.0)
       childprocess (>= 2.0, < 5.0)
@@ -42,8 +42,9 @@ GEM
     ast (2.4.2)
     benchmark-ips (2.9.2)
     builder (3.2.4)
-    capybara (3.35.3)
+    capybara (3.39.2)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
@@ -91,20 +92,22 @@ GEM
     ffi (1.15.5-java)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    json (2.6.3-java)
     matrix (0.4.2)
     method_source (1.0.0)
     middleware (0.1.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.4)
     minitest (5.15.0)
     multi_test (0.1.2)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.12.5-java)
+    nokogiri (1.15.4-java)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     power_assert (2.0.1)
     protobuf-cucumber (3.10.8)
@@ -119,15 +122,18 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
       spoon (~> 0.0)
-    public_suffix (4.0.6)
-    racc (1.6.0)
-    racc (1.6.0-java)
-    rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    public_suffix (5.0.3)
+    racc (1.7.1)
+    racc (1.7.1-java)
+    rack (3.0.8)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.0.0)
+      rack (>= 3)
+      webrick
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -142,17 +148,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.24.1)
+    rubocop (1.42.0)
+      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.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     simplecov_json_formatter (0.1.3)
     spoon (0.0.6)
@@ -166,7 +173,7 @@ GEM
     thread_safe (0.3.6-java)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
     webrick (1.7.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -191,6 +198,7 @@ DEPENDENCIES
   matrix
   minitest
   pry
+  rackup
   rake (~> 13.0)
   rspec (~> 3.2)
   rubocop
@@ -200,4 +208,4 @@ DEPENDENCIES
   webrick
 
 BUNDLED WITH
-   2.4.3
+   2.5.3

README.md

@@ -9,7 +9,7 @@ SimpleCov [![Gem Version](https://badge.fury.io/rb/simplecov.svg)](https://badge
   * [Rubygem]
   * [Continuous Integration]
 
-[Coverage]: https://ruby-doc.org/stdlib/libdoc/coverage/rdoc/Coverage.html "API doc for Ruby's Coverage library"
+[Coverage]: https://docs.ruby-lang.org/en/3.2/Coverage.html "API doc for Ruby's Coverage library"
 [Source Code]: https://github.com/simplecov-ruby/simplecov "Source Code @ GitHub"
 [API documentation]: http://rubydoc.info/gems/simplecov/frames "RDoc API Documentation at Rubydoc.info"
 [Configuration]: http://rubydoc.info/gems/simplecov/SimpleCov/Configuration "Configuration options API documentation"
@@ -651,7 +651,7 @@ To configure this, use `.at_fork`.
 ```ruby
 SimpleCov.enable_for_subprocesses true
 SimpleCov.at_fork do |pid|
-  # This needs a unique name so it won't be ovewritten
+  # This needs a unique name so it won't be overwritten
   SimpleCov.command_name "#{SimpleCov.command_name} (subprocess: #{pid})"
   # be quiet, the parent process will be in charge of output and checking coverage totals
   SimpleCov.print_error_status = false

doc/alternate-formatters.md

@@ -64,8 +64,3 @@ t_wada AA formatter for SimpleCov
 *by [Chiefpansancolt](https://github.com/chiefpansancolt)*
 
 A TailwindCSS & TailwindUI Designed HTML formatter with clean and easy search of files with a tabular left Navigation.
-
-#### [simplecov-material](https://github.com/chiefpansancolt/simplecov-material)
-*by [Chiefpansancolt](https://github.com/chiefpansancolt)*
-
-A Material Designed HTML formatter with clean and easy search of files with a tabular left Navigation.

lib/simplecov/configuration.rb

@@ -358,7 +358,7 @@ def refuse_coverage_drop(*criteria)
     #     SimpleCov.add_filter do |src_file|
     #       File.basename(src_file.filename) == 'environment.rb'
     #     end # Will exclude environment.rb files from the results
-    # * as an array of strings that are matched against all sorce files' file
+    # * as an array of strings that are matched against all source files' file
     #   paths and then ignored (basically string filter multiple times)
     #     SimpleCov.add_filter ['app/models', 'app/helpers'] # ignores both dirs
     # * as an instance of a subclass of SimpleCov::Filter. See the documentation there

lib/simplecov/source_file.rb

@@ -87,7 +87,7 @@ def covered_strength
     end
 
     def no_lines?
-      lines.length.zero? || (lines.length == never_lines.size)
+      lines.empty? || (lines.length == never_lines.size)
     end
 
     def relevant_lines

spec/result_merger_spec.rb

@@ -326,24 +326,22 @@
       end
       CODE
 
-      # rubocop:disable Security/Open
-      other_process = open("|ruby -e #{Shellwords.escape(test_script)} 2>/dev/null")
-      # rubocop:enable Security/Open
+      IO.popen("ruby -e #{Shellwords.escape(test_script)} 2>/dev/null") do |other_process|
+        SimpleCov::ResultMerger.synchronize_resultset do
+          # wait until the child process is going, and then wait some more
+          # so we can be sure it blocks on the lock we already have.
+          sleep 0.1 until other_process.gets == "running\n"
+          sleep 1
+
+          # despite the sleeps, this will be written first since we got
+          # the first lock
+          File.open(file.path, "a") { |f| f.write("process 1\n") }
+        end
 
-      SimpleCov::ResultMerger.synchronize_resultset do
-        # wait until the child process is going, and then wait some more
-        # so we can be sure it blocks on the lock we already have.
-        sleep 0.1 until other_process.gets == "running\n"
-        sleep 1
-
-        # despite the sleeps, this will be written first since we got
-        # the first lock
-        File.open(file.path, "a") { |f| f.write("process 1\n") }
+        # wait for it to finish
+        other_process.gets
       end
 
-      # wait for it to finish
-      other_process.gets
-
       expect(file.read).to eq("process 1\nprocess 2\n")
     end
   end