knapsack 1.21.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 620ac5f634996f21d32b1c65ac8609a61c47ac6f07b773fe1fa2bf6487f41d88
-  data.tar.gz: e5851433f161642429b11bea40e28ad37a0bd5f7008f34b641750afc7168e8e5
+  metadata.gz: d27f3b6225aefe7c7a2ff1a4071961e65c5e087a5256d7294bca73398ce2c997
+  data.tar.gz: 38f324e2d35800297e8c071caef06100688d1e1617bb8f3339076b9c9c1de828
 SHA512:
-  metadata.gz: edf2dbf2877aa04107e8a62e6ea91426df85288a87954d28068d3bb49dc31006bf61094bff3b564eb7d9b302b5966d2656e418bd83cd5a7ab751f9e2d33763b5
-  data.tar.gz: 14d9e941b65ffad0d5ec9d5120d56a77be8dc30ba4e2bb463a8621fe04947c804e1db41e7b10ae5a9ff87439acda309e1accb0076683e62ab1e25ca86f33718d
+  metadata.gz: 0d635a77401b2d65914edab41f2ac726901d38b937869fb408cc2548d6547114a0d968c06a8c9adfe4f5a2c3d3d7c11bea5bb0c8161d706e17870ea3682b5be0
+  data.tar.gz: b5aa3601e1d7cbdffdfa33a4de64d562782c74371f9e3c58b0754b262a86554c8320e7fb0aff1c84cd6e05755b66c29b61b87f83ffb3a44d4f06eb9c38c8dfd6

data/.github/workflows/ruby.yml

@@ -0,0 +1,117 @@
+name: Ruby
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.2, 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', truffleruby-head]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    # Test for knapsack gem
+    - name: Run specs for Knapsack gem
+      run: bundle exec rspec spec
+
+    # Tests for example rspec test suite
+    - name: Generate knapsack report
+      run: KNAPSACK_GENERATE_REPORT=true bundle exec rspec --default-path spec_examples --tag focus
+
+    - name: Run specs with enabled time offset warning
+      run: bundle exec rspec --default-path spec_examples
+
+    - name: Run rake task for the first CI node
+      run: CI_NODE_TOTAL=2 CI_NODE_INDEX=0 KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
+    - name: Run rake task for the second CI node
+      run: CI_NODE_TOTAL=2 CI_NODE_INDEX=1 KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
+
+    - name: Check passing arguments to rspec. Run only specs with custom_focus tag (1/2)
+      run: KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake "knapsack:rspec[--tag custom_focus]"
+    - name: Check passing arguments to rspec. Run only specs with custom_focus tag (2/2)
+      run: KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bin/knapsack rspec "--tag custom_focus --profile"
+
+    - name: Run specs with custom knapsack logger
+      run: CUSTOM_LOGGER=true KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
+
+    - name: Run specs for custom knapsack report path
+      run: |
+        cp knapsack_rspec_report.json knapsack_custom_rspec_report.json
+        KNAPSACK_REPORT_PATH="knapsack_custom_rspec_report.json" KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
+
+    - name: Run specs when spec file was removed and still exists in knapsack report json
+      run: |
+        rm spec_examples/fast/1_spec.rb
+        KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
+
+    - name: Run specs from multiple directories with manually specified test_dir
+      run: KNAPSACK_TEST_DIR=spec_examples KNAPSACK_TEST_FILE_PATTERN="{spec_examples,spec_engine_examples}/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
+
+    # Tests for example minitest test suite
+    - name: Generate knapsack report
+      run: KNAPSACK_GENERATE_REPORT=true bundle exec rake test
+
+    - name: Run tests with enabled time offset warning
+      run: bundle exec rake test
+
+    - name: Run rake task for the first CI node
+      run: CI_NODE_TOTAL=2 CI_NODE_INDEX=0 KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
+    - name: Run rake task for the second CI node
+      run: CI_NODE_TOTAL=2 CI_NODE_INDEX=1 KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
+
+    - name: Check passing arguments to minitest. Run verbose tests
+      run: |
+        KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake "knapsack:minitest[--verbose]"
+        KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bin/knapsack minitest "--verbose --pride"
+
+    - name: Run tests with custom knapsack logger
+      run: CUSTOM_LOGGER=true KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
+
+    - name: Run tests for custom knapsack report path
+      run: |
+        cp knapsack_minitest_report.json knapsack_custom_minitest_report.json
+        KNAPSACK_REPORT_PATH="knapsack_custom_minitest_report.json" KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
+
+    - name: Run tests when test file was removed and still exists in knapsack report json
+      run: |
+        rm test_examples/fast/unit_test.rb
+        KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
+
+    # Tests for example spinach test suite
+    - name: Generate knapsack report
+      run: KNAPSACK_GENERATE_REPORT=true bundle exec spinach -f spinach_examples
+
+    - name: Run tests with enabled time offset warning
+      run: bundle exec spinach -f spinach_examples
+
+    - name: Run rake task for the first CI node
+      run: CI_NODE_TOTAL=2 CI_NODE_INDEX=0 KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
+    - name: Run rake task for the second CI node
+      run: CI_NODE_TOTAL=2 CI_NODE_INDEX=1 KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
+
+    - name: Run tests with custom knapsack logger
+      run: CUSTOM_LOGGER=true KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
+
+    - name: Run tests for custom knapsack report path
+      run: |
+        cp knapsack_spinach_report.json knapsack_custom_spinach_report.json
+        KNAPSACK_REPORT_PATH="knapsack_custom_spinach_report.json" KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
+
+    - name: Run tests when test file was removed and still exists in knapsack report json
+      run: |
+        rm spinach_examples/scenario1.feature
+        KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"

data/CHANGELOG.md

@@ -2,6 +2,58 @@
 
 * TODO
 
+### 3.1.0
+
+* Sorting Algorithm: round robin to least connections
+
+    https://github.com/KnapsackPro/knapsack/pull/99
+
+https://github.com/KnapsackPro/knapsack/compare/v3.0.0...v3.1.0
+
+### 3.0.0
+
+* __(breaking change)__ Require minimum Ruby 2.2 version
+
+    https://github.com/KnapsackPro/knapsack/pull/115
+
+* __(breaking change)__ Drop support for Minitest 4.x. Force to use minitest 5.x even on CI.
+
+    https://github.com/KnapsackPro/knapsack/pull/114
+
+* Replace Travis CI with GitHub Actions
+
+    https://github.com/KnapsackPro/knapsack/pull/112
+
+https://github.com/KnapsackPro/knapsack/compare/v2.0.0...v3.0.0
+
+### 2.0.0
+
+* __(breaking change)__ Ruby 2.1 is a minimum required version
+
+    https://github.com/KnapsackPro/knapsack/pull/113
+
+* Use Ruby 3 and add small development adjustments in codebase
+
+    https://github.com/KnapsackPro/knapsack/pull/110
+
+https://github.com/KnapsackPro/knapsack/compare/v1.22.0...v2.0.0
+
+### 1.22.0
+
+* Update time offset warning
+
+    https://github.com/KnapsackPro/knapsack/pull/105
+
+https://github.com/KnapsackPro/knapsack/compare/v1.21.1...v1.22.0
+
+### 1.21.1
+
+* Fix a bug with tracking time for pending specs in RSpec
+
+    https://github.com/KnapsackPro/knapsack/pull/109
+
+https://github.com/KnapsackPro/knapsack/compare/v1.21.0...v1.21.1
+
 ### 1.21.0
 
 * Track time in before and after `:context` hooks

data/knapsack.gemspec

@@ -18,17 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.2'
 
   spec.add_dependency 'rake', '>= 0'
 
   spec.add_development_dependency 'bundler', '>= 1.6'
   spec.add_development_dependency 'rspec', '~> 3.0', '>= 2.10.0'
-  spec.add_development_dependency 'rspec-its', '~> 1.2'
+  spec.add_development_dependency 'rspec-its', '~> 1.3'
   spec.add_development_dependency 'cucumber', '>= 0'
   spec.add_development_dependency 'spinach', '>= 0.8'
   spec.add_development_dependency 'minitest', '>= 5.0.0'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 0'
   spec.add_development_dependency 'pry', '~> 0'
-  spec.add_development_dependency 'timecop', '>= 0.1.0'
+  spec.add_development_dependency 'timecop', '>= 0.9.4'
 end

data/lib/knapsack/adapters/minitest_adapter.rb

@@ -23,20 +23,20 @@ module Knapsack
       def bind_time_tracker
         ::Minitest::Test.send(:include, BindTimeTrackerMinitestPlugin)
 
-        add_post_run_callback do
+        Minitest.after_run do
           Knapsack.logger.info(Presenter.global_time)
         end
       end
 
       def bind_report_generator
-        add_post_run_callback do
+        Minitest.after_run do
           Knapsack.report.save
           Knapsack.logger.info(Presenter.report_details)
         end
       end
 
       def bind_time_offset_warning
-        add_post_run_callback do
+        Minitest.after_run do
           Knapsack.logger.log(
             Presenter.time_offset_log_level,
             Presenter.time_offset_warning
@@ -64,16 +64,6 @@ module Knapsack
         # test_path will look like ./test/dir/unit_test.rb
         test_path
       end
-
-      private
-
-      def add_post_run_callback(&block)
-        if Minitest.respond_to?(:after_run)
-          Minitest.after_run { block.call }
-        else
-          Minitest::Unit.after_tests { block.call }
-        end
-      end
     end
   end
 end

data/lib/knapsack/distributors/report_distributor.rb

@@ -2,7 +2,7 @@ module Knapsack
   module Distributors
     class ReportDistributor < BaseDistributor
       def sorted_report
-        @sorted_report ||= report.sort_by { |test_path, time| time }.reverse
+        @sorted_report ||= report.sort_by { |_test_path, time| -time }
       end
 
       def sorted_report_with_existing_tests
@@ -10,7 +10,7 @@ module Knapsack
       end
 
       def total_time_execution
-        @total_time_execution ||= sorted_report_with_existing_tests.map(&:last).reduce(0, :+).to_f
+        @total_time_execution ||= sorted_report_with_existing_tests.map { |_test_path, time| time }.reduce(0, :+).to_f
       end
 
       def node_time_execution
@@ -20,73 +20,52 @@ module Knapsack
       private
 
       def post_assign_test_files_to_node
-        assign_slow_test_files
-        assign_remaining_test_files
+        assign_test_files
         sort_assigned_test_files
       end
 
       def sort_assigned_test_files
-        ci_node_total.times do |index|
-          # sort by first key (file name)
-          # reverse it and then sort by second key (time) in reverse order
-          node_tests[index][:test_files_with_time].sort!.reverse!.sort! do |x, y|
-            y[1] <=> x[1]
-          end
+        node_tests.map do |node|
+          node[:test_files_with_time]
+            .sort_by! { |file_name, _time| file_name }
+            .reverse!
+            .sort_by! { |_file_name, time| time }
+            .reverse!
         end
       end
 
       def post_tests_for_node(node_index)
         node_test = node_tests[node_index]
         return unless node_test
-        node_test[:test_files_with_time].map(&:first)
+        node_test[:test_files_with_time].map { |file_name, _time| file_name }
       end
 
       def default_node_tests
-        @node_tests = []
-        ci_node_total.times do |index|
-          @node_tests << {
+        @node_tests = Array.new(ci_node_total) do |index|
+          {
             node_index: index,
             time_left: node_time_execution,
-            test_files_with_time: []
+            test_files_with_time: [],
+            weight: 0
           }
         end
       end
 
-      def assign_slow_test_files
-        @not_assigned_test_files = []
-        node_index = 0
-        sorted_report_with_existing_tests.each do |test_file_with_time|
-          assign_slow_test_file(node_index, test_file_with_time)
-          node_index += 1
-          node_index %= ci_node_total
-        end
-      end
+      def assign_test_files
+        sorted_report_with_existing_tests.map do |test_file_with_time|
+          test_execution_time = test_file_with_time.last
 
-      def assign_slow_test_file(node_index, test_file_with_time)
-        time = test_file_with_time[1]
-        time_left = node_tests[node_index][:time_left] - time
+          current_lightest_node = node_tests.min_by { |node| node[:weight] }
 
-        if time_left >= 0 or node_tests[node_index][:test_files_with_time].empty?
-          node_tests[node_index][:time_left] -= time
-          node_tests[node_index][:test_files_with_time] << test_file_with_time
-        else
-          @not_assigned_test_files << test_file_with_time
-        end
-      end
+          updated_node_data = {
+            time_left:            current_lightest_node[:time_left] - test_execution_time,
+            weight:               current_lightest_node[:weight] + test_execution_time,
+            test_files_with_time: current_lightest_node[:test_files_with_time] << test_file_with_time
+          }
 
-      def assign_remaining_test_files
-        @not_assigned_test_files.each do |test_file_with_time|
-          index = node_with_max_time_left
-          time = test_file_with_time[1]
-          node_tests[index][:time_left] -= time
-          node_tests[index][:test_files_with_time] << test_file_with_time
+          current_lightest_node.merge!(updated_node_data)
         end
       end
-
-      def node_with_max_time_left
-        node_test = node_tests.max { |a,b| a[:time_left] <=> b[:time_left] }
-        node_test[:node_index]
-      end
     end
   end
 end

data/lib/knapsack/presenter.rb

@@ -51,10 +51,14 @@ module Knapsack
         }
         if Knapsack.tracker.time_exceeded?
           str << %{
-Tests on this CI node took more than max allowed node time execution.
+Test on this CI node ran for longer than the max allowed node time execution.
 Please regenerate your knapsack report.
-If that didn't help then split your heavy test file
-or bump time_offset_in_seconds setting.}
+
+If that doesn't help, you can split your slowest test files into smaller files, or bump up the time_offset_in_seconds setting.
+
+You can also allow the knapsack_pro gem to automatically divide your slow test files across parallel CI nodes.
+https://knapsackpro.com/faq/question/how-to-auto-split-test-files-by-test-cases-on-parallel-jobs-ci-nodes?utm_source=knapsack_gem&utm_medium=knapsack_gem_output&utm_campaign=knapsack_gem_time_offset_warning
+}
         else
           str << %{
 Global time execution for this CI node is fine.
@@ -63,9 +67,8 @@ Happy testing!}
         str << "\n\nNeed explanation? See FAQ:"
         str << "\nhttps://docs.knapsackpro.com/ruby/knapsack#faq"
         str << "\n=================================================\n"
-        str << %{See how to split tests in a dynamic way using Queue Mode to ensure all parallel nodes
-finish work at a similar time even when your CI or random test execution is a bottleneck:
-https://youtu.be/hUEB1XDKEFY
+        str << %{Read up on the benefits of a dynamic test split with Knapsack Pro Queue Mode:
+https://docs.knapsackpro.com/2020/how-to-speed-up-ruby-and-javascript-tests-with-ci-parallelisation
 
 Sign up for Knapsack Pro here:
 https://knapsackpro.com}

data/lib/knapsack/tracker.rb

@@ -23,15 +23,19 @@ module Knapsack
     end
 
     def stop_timer
-      @execution_time = now_without_mock_time.to_f - @start_time
-      update_global_time
-      update_test_file_time
-      @execution_time
+      execution_time = now_without_mock_time.to_f - @start_time
+
+      if test_path
+        update_global_time(execution_time)
+        update_test_file_time(execution_time)
+        @test_path = nil
+      end
+
+      execution_time
     end
 
     def test_path
-      raise("test_path needs to be set by Knapsack Adapter's bind method") unless @test_path
-      @test_path.sub(/^\.\//, '')
+      @test_path.sub(/^\.\//, '') if @test_path
     end
 
     def time_exceeded?
@@ -62,13 +66,13 @@ module Knapsack
       @test_path = nil
     end
 
-    def update_global_time
-      @global_time += @execution_time
+    def update_global_time(execution_time)
+      @global_time += execution_time
     end
 
-    def update_test_file_time
+    def update_test_file_time(execution_time)
       @test_files_with_time[test_path] ||= 0
-      @test_files_with_time[test_path] += @execution_time
+      @test_files_with_time[test_path] += execution_time
     end
 
     def report_distributor

data/lib/knapsack/version.rb

@@ -1,3 +1,3 @@
 module Knapsack
-  VERSION = '1.21.0'
+  VERSION = '3.1.0'
 end

data/spec/knapsack/distributors/report_distributor_spec.rb

@@ -118,7 +118,7 @@ describe Knapsack::Distributors::ReportDistributor do
         'c_spec.rb' => 2.0,
         'd_spec.rb' => 2.5,
         'a_spec.rb' => 1.0,
-        'b_spec.rb' => 1.5,
+        'b_spec.rb' => 1.5
       }
     end
     let(:custom_args) { { ci_node_total: 3 } }
@@ -134,6 +134,7 @@ describe Knapsack::Distributors::ReportDistributor do
         expect(distributor.node_tests[0]).to eql({
           :node_index => 0,
           :time_left => -0.5,
+          :weight => 9.0,
           :test_files_with_time => [
             ["g_spec.rb", 9.0]
           ]
@@ -143,12 +144,12 @@ describe Knapsack::Distributors::ReportDistributor do
       it do
         expect(distributor.node_tests[1]).to eql({
           :node_index => 1,
-          :time_left => 0.0,
+          :time_left => 0.5,
+          :weight => 8.0,
           :test_files_with_time => [
             ["f_spec.rb", 3.5],
             ["d_spec.rb", 2.5],
-            ["b_spec.rb", 1.5],
-            ["a_spec.rb", 1.0]
+            ["c_spec.rb", 2.0]
           ]
         })
       end
@@ -156,11 +157,13 @@ describe Knapsack::Distributors::ReportDistributor do
       it do
         expect(distributor.node_tests[2]).to eql({
           :node_index => 2,
-          :time_left => 0.5,
+          :time_left => 0.0,
+          :weight => 8.5,
           :test_files_with_time => [
-            ["i_spec.rb", 3.0],
             ["h_spec.rb", 3.0],
-            ["c_spec.rb", 2.0]
+            ["i_spec.rb", 3.0],
+            ["b_spec.rb", 1.5],
+            ["a_spec.rb", 1.0]
           ]
         })
       end
@@ -170,10 +173,9 @@ describe Knapsack::Distributors::ReportDistributor do
       context 'when node exists' do
         it do
           expect(distributor.tests_for_node(1)).to eql([
-            'f_spec.rb',
-            'd_spec.rb',
-            'b_spec.rb',
-            'a_spec.rb'
+            "f_spec.rb",
+            "d_spec.rb",
+            "c_spec.rb"
           ])
         end
       end
@@ -183,4 +185,78 @@ describe Knapsack::Distributors::ReportDistributor do
       end
     end
   end
+
+  describe 'algorithmic efficiency' do
+    subject(:node_weights) do
+      distro = distributor
+      distro.assign_test_files_to_node
+      distro.node_tests.map { |node| node[:weight] }
+    end
+
+    before do
+      allow(distributor).to receive(:all_tests).and_return(report.keys)
+    end
+
+    let(:custom_args) { { ci_node_total: 3 } }
+
+    context 'with the most simple example' do
+      let(:report) do
+        {
+          'a_spec.rb' => 1.0,
+          'b_spec.rb' => 1.0,
+          'c_spec.rb' => 1.0,
+          'd_spec.rb' => 1.0,
+          'e_spec.rb' => 1.0,
+          'f_spec.rb' => 1.0,
+          'g_spec.rb' => 1.0,
+          'h_spec.rb' => 1.0,
+          'i_spec.rb' => 1.0
+        }
+      end
+
+      it 'assigns all nodes equally' do
+        expect(node_weights.uniq).to contain_exactly 3.0
+      end
+    end
+
+    context 'with a medium difficulty example' do
+      let(:report) do
+        {
+          'a_spec.rb' => 1.0,
+          'b_spec.rb' => 2.0,
+          'c_spec.rb' => 3.0,
+          'd_spec.rb' => 1.0,
+          'e_spec.rb' => 2.0,
+          'f_spec.rb' => 3.0,
+          'g_spec.rb' => 1.0,
+          'h_spec.rb' => 2.0,
+          'i_spec.rb' => 3.0
+        }
+      end
+
+      it 'assigns all nodes equally' do
+        expect(node_weights.uniq).to contain_exactly 6.0
+      end
+    end
+
+    context 'with a difficult example' do
+      let(:report) do
+        {
+          'a_spec.rb' => 2.0,
+          'b_spec.rb' => 2.0,
+          'c_spec.rb' => 3.0,
+          'd_spec.rb' => 1.0,
+          'e_spec.rb' => 1.0,
+          'f_spec.rb' => 1.0,
+          'g_spec.rb' => 9.0,
+          'h_spec.rb' => 1.0,
+          'i_spec.rb' => 10.0
+        }
+      end
+
+      it 'assigns all nodes equally' do
+        expect(node_weights.uniq).to contain_exactly 10.0
+      end
+    end
+  end
 end

data/spec/knapsack/tracker_spec.rb

@@ -48,7 +48,7 @@ describe Knapsack::Tracker do
 
     context 'when test_path not set' do
       it do
-        expect { subject }.to raise_error("test_path needs to be set by Knapsack Adapter's bind method")
+        expect(subject).to be_nil
       end
     end
 
@@ -133,6 +133,9 @@ describe Knapsack::Tracker do
       it { expect(tracker.test_files_with_time.keys.size).to eql 2 }
       it { expect(tracker.test_files_with_time['a_spec.rb']).to be_within(delta).of(0.1) }
       it { expect(tracker.test_files_with_time['b_spec.rb']).to be_within(delta).of(0.2) }
+      it 'resets test_path after time is measured' do
+        expect(tracker.test_path).to be_nil
+      end
     end
 
     context "with Timecop - Timecop shouldn't have impact on measured test time" do
@@ -157,6 +160,9 @@ describe Knapsack::Tracker do
       it { expect(tracker.test_files_with_time.keys.size).to eql 2 }
       it { expect(tracker.test_files_with_time['a_spec.rb']).to be_within(delta).of(0) }
       it { expect(tracker.test_files_with_time['b_spec.rb']).to be_within(delta).of(0) }
+      it 'resets test_path after time is measured' do
+        expect(tracker.test_path).to be_nil
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -4,9 +4,6 @@ require 'spinach'
 require 'timecop'
 Timecop.safe_mode = true
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
 require 'knapsack'
 
 Dir["#{Knapsack.root}/spec/support/**/*.rb"].each { |f| require f }

data/test_examples/fast/shared_examples_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class Minitest::SharedExamples < Module
-  include Minitest::Spec::DSL if RUBY_VERSION != "1.9.3"
+  include Minitest::Spec::DSL
 end
 
 SharedExampleSpec = Minitest::SharedExamples.new do

data/test_examples/fast/spec_test.rb

@@ -16,10 +16,22 @@ describe FakeCalculator do
   end
 
   it '#add' do
-    @calc.add(2, 3).must_equal 5
+    result = @calc.add(2, 3)
+
+    if self.respond_to?(:_)
+      _(result).must_equal 5
+    else
+      result.must_equal 5
+    end
   end
 
   it '#mal' do
-    @calc.mal(2, 3).must_equal 6
+    result = @calc.mal(2, 3)
+
+    if self.respond_to?(:_)
+      _(result).must_equal 6
+    else
+      result.must_equal 6
+    end
   end
 end

data/test_examples/test_helper.rb

@@ -2,15 +2,6 @@ require 'minitest/autorun'
 
 require 'knapsack'
 
-if RUBY_VERSION == "1.9.3"
-  unless defined? Minitest
-    Minitest = MiniTest
-  end
-  unless defined? Minitest::Test
-    Minitest::Test = MiniTest::Unit::TestCase
-  end
-end
-
 Knapsack.tracker.config({
   enable_time_offset_warning: true,
   time_offset_in_seconds: 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 3.1.0
 platform: ruby
 authors:
 - ArturT
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,36 +42,36 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -114,20 +114,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +134,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.9.4
 description: Parallel tests across CI server nodes based on each test file's time
   execution. It generates a test time execution report and uses it for future test
   runs.
@@ -163,20 +149,18 @@ email:
 - arturtrzop@gmail.com
 executables:
 - knapsack
-- print_header.sh
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/knapsack
-- bin/print_header.sh
 - docs/images/logos/knapsack-@2.png
 - docs/images/logos/knapsack-big.png
 - docs/images/logos/knapsack-logo-@2.png
@@ -278,14 +262,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Knapsack splits tests across CI nodes and makes sure that tests will run

data/.travis.yml

@@ -1,116 +0,0 @@
----
-sudo: false
-language: ruby
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - truffleruby-head
-addons:
-  code_climate:
-    repo_token: 38686058eed480dd0fcf8bce9015733e0bae88e44e30f4a1ac63df8aec2f86d8
-before_install:
-  - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
-script:
-  # Test for knapsack gem
-  - bin/print_header.sh "Run specs for Knapsack gem"
-  - bundle exec rspec spec
-
-
-  - bin/print_header.sh "------------------------------------------------------"
-
-
-  # Tests for example rspec test suite
-  - bin/print_header.sh "Generate knapsack report"
-  - KNAPSACK_GENERATE_REPORT=true bundle exec rspec --default-path spec_examples --tag focus
-
-  - bin/print_header.sh "Run specs with enabled time offset warning"
-  - bundle exec rspec --default-path spec_examples
-
-  - bin/print_header.sh "Run rake task for the first CI node"
-  - CI_NODE_TOTAL=2 CI_NODE_INDEX=0 KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
-  - bin/print_header.sh "Run rake task for the second CI node"
-  - CI_NODE_TOTAL=2 CI_NODE_INDEX=1 KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
-
-  - bin/print_header.sh "Check passing arguments to rspec. Run only specs with custom_focus tag"
-  - KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake "knapsack:rspec[--tag custom_focus]"
-  - KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bin/knapsack rspec "--tag custom_focus --profile"
-
-  - bin/print_header.sh "Run specs with custom knapsack logger"
-  - CUSTOM_LOGGER=true KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
-
-  - bin/print_header.sh "Run specs for custom knapsack report path"
-  - cp knapsack_rspec_report.json knapsack_custom_rspec_report.json
-  - KNAPSACK_REPORT_PATH="knapsack_custom_rspec_report.json" KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
-
-  - bin/print_header.sh "Run specs when spec file was removed and still exists in knapsack report json"
-  - rm spec_examples/fast/1_spec.rb
-  - KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
-
-  - bin/print_header.sh "Run specs from multiple directories with manually specified test_dir"
-  - KNAPSACK_TEST_DIR=spec_examples KNAPSACK_TEST_FILE_PATTERN="{spec_examples,spec_engine_examples}/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
-
-
-  - bin/print_header.sh "------------------------------------------------------"
-
-
-  # Tests for example minitest test suite
-  - bin/print_header.sh "Generate knapsack report"
-  - KNAPSACK_GENERATE_REPORT=true bundle exec rake test
-
-  - bin/print_header.sh "Run tests with enabled time offset warning"
-  - bundle exec rake test
-
-  - bin/print_header.sh "Run rake task for the first CI node"
-  - CI_NODE_TOTAL=2 CI_NODE_INDEX=0 KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
-  - bin/print_header.sh "Run rake task for the second CI node"
-  - CI_NODE_TOTAL=2 CI_NODE_INDEX=1 KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
-
-  - bin/print_header.sh "Check passing arguments to minitest. Run verbose tests"
-  - KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake "knapsack:minitest[--verbose]"
-  - if [ "$TRAVIS_RUBY_VERSION" == "1.9.3" ]; then KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bin/knapsack minitest "--verbose"; fi
-  - if [ "$TRAVIS_RUBY_VERSION" != "1.9.3" ]; then KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bin/knapsack minitest "--verbose --pride"; fi
-
-  - bin/print_header.sh "Run tests with custom knapsack logger"
-  - CUSTOM_LOGGER=true KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
-
-  - bin/print_header.sh "Run tests for custom knapsack report path"
-  - cp knapsack_minitest_report.json knapsack_custom_minitest_report.json
-  - KNAPSACK_REPORT_PATH="knapsack_custom_minitest_report.json" KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
-
-  - bin/print_header.sh "Run tests when test file was removed and still exists in knapsack report json"
-  - rm test_examples/fast/unit_test.rb
-  - KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
-
-
-  - bin/print_header.sh "------------------------------------------------------"
-
-
-  # Tests for example spinach test suite
-  - bin/print_header.sh "Generate knapsack report"
-  - KNAPSACK_GENERATE_REPORT=true bundle exec spinach -f spinach_examples
-
-  - bin/print_header.sh "Run tests with enabled time offset warning"
-  - bundle exec spinach -f spinach_examples
-
-  - bin/print_header.sh "Run rake task for the first CI node"
-  - CI_NODE_TOTAL=2 CI_NODE_INDEX=0 KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
-  - bin/print_header.sh "Run rake task for the second CI node"
-  - CI_NODE_TOTAL=2 CI_NODE_INDEX=1 KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
-
-  - bin/print_header.sh "Run tests with custom knapsack logger"
-  - CUSTOM_LOGGER=true KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
-
-  - bin/print_header.sh "Run tests for custom knapsack report path"
-  - cp knapsack_spinach_report.json knapsack_custom_spinach_report.json
-  - KNAPSACK_REPORT_PATH="knapsack_custom_spinach_report.json" KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
-
-  - bin/print_header.sh "Run tests when test file was removed and still exists in knapsack report json"
-  - rm spinach_examples/scenario1.feature
-  - KNAPSACK_TEST_FILE_PATTERN="spinach_examples/**{,/*/**}/*.feature" bundle exec rake "knapsack:spinach[-f spinach_examples]"
-notifications:
-  email: false

data/bin/print_header.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo ==========================================================================================================================
-echo $1
-echo ==========================================================================================================================