knapsack_pro 2.16.0 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 534699a91609a71a2621b9625a3ff555a58bf385728be90adce4cfe6d6b771dd
-  data.tar.gz: 913fc4a85433a50f3639bdc087995f9dc5e482b33d7768cfdb84c0f767326c2c
+  metadata.gz: e22a25e69f6cfda9a42568aed336631f601423b0b930525fc8becbc1b1ee7fe9
+  data.tar.gz: ac1df0750000066a933cc4814f185d09a6d38ce09028680c8f20678bb7b0473e
 SHA512:
-  metadata.gz: da5e5ef1c262d97b6214eddff32c8aa2031fe122ad1597a1cf4bd2a939fe82f9fd6b0c7287861f5373521f731318a0e856a331220ae0076eef9cdf8323ab0548
-  data.tar.gz: 2e058c2c3b82c9c97481ab84873c652fb3ab4844521c4746efeaca2dccca8b265b58ba427d44af56b130769bf56c6cbacd84b516b1e6b44d099a8a33b2ef340b
+  metadata.gz: 91687797a4f7c80bcd852f7c8e5ec18f523eb5a9375b3dc069b6abce67bc58ccda010f36b6c003fefa01971e628518bf0b9f9e855d7992c86d9ea7dcb375be4b
+  data.tar.gz: c32195b9e6fd4fdee7b5087f61f7d1b28fdb7a6a995930d23e109eda296156026a79fea579e06540e2a64c75ee3a03a6b216f2a8492eb48e422bc9193aad0146

data/.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
     parallelism: 1
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.7.0
+      - image: circleci/ruby:3.0.1
         environment:
           CODECLIMATE_REPO_TOKEN: b6626e682a8e97e0c5978febc92c3526792a2d018b41b8e1b52689da37fb7d92
 

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 2.17.0
+
+* Use Ruby 3 in development and add small improvements
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/147
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v2.16.0...v2.17.0
+
 ### 2.16.0
 
 * Improve test time execution tracking for RSpec

data/knapsack_pro.gemspec

@@ -29,14 +29,13 @@ Gem::Specification.new do |spec|
 
   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 'test-unit', '>= 3.0.0'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 0'
   spec.add_development_dependency 'pry', '~> 0'
-  spec.add_development_dependency 'vcr', '~> 2.9'
-  spec.add_development_dependency 'webmock', '~> 1.21'
-  spec.add_development_dependency 'timecop', '>= 0.1.0'
+  spec.add_development_dependency 'vcr', '>= 6.0'
+  spec.add_development_dependency 'webmock', '>= 3.13'
+  spec.add_development_dependency 'timecop', '>= 0.9.4'
 end

data/lib/knapsack_pro/config/ci/circle.rb

@@ -23,8 +23,7 @@ module KnapsackPro
         end
 
         def project_dir
-          project_repo_name = ENV['CIRCLE_PROJECT_REPONAME']
-          "/home/ubuntu/#{project_repo_name}" if project_repo_name
+          ENV['CIRCLE_WORKING_DIRECTORY']
         end
       end
     end

data/lib/knapsack_pro/repository_adapters/git_adapter.rb

@@ -17,7 +17,8 @@ module KnapsackPro
       private
 
       def working_dir
-        KnapsackPro::Config::Env.project_dir
+        dir = KnapsackPro::Config::Env.project_dir
+        File.expand_path(dir)
       end
     end
   end

data/lib/knapsack_pro/runners/base_runner.rb

@@ -35,6 +35,10 @@ module KnapsackPro
 
       attr_reader :allocator_builder,
         :allocator
+
+      def self.child_status
+        $?
+      end
     end
   end
 end

data/lib/knapsack_pro/runners/queue/base_runner.rb

@@ -29,6 +29,10 @@ module KnapsackPro
 
         attr_reader :allocator_builder,
           :allocator
+
+        def self.child_status
+          $?
+        end
       end
     end
   end

data/lib/knapsack_pro/runners/queue/cucumber_runner.rb

@@ -95,16 +95,14 @@ module KnapsackPro
           # which is defined in lib/knapsack_pro/adapters/cucumber_adapter.rb
           ENV['KNAPSACK_PRO_BEFORE_QUEUE_HOOK_CALLED'] = 'true'
 
-          process_status = $?
-
-          unless process_status.exited?
+          unless child_status.exited?
             raise "Cucumber process execution failed. It's likely that your CI server has exceeded"\
                     " its available memory. Please try changing CI config or retrying the CI build.\n"\
                     "Failed command: #{cmd}\n"\
-                    "Process status: #{process_status.inspect}"
+                    "Process status: #{child_status.inspect}"
           end
 
-          process_status.exitstatus
+          child_status.exitstatus
         end
       end
     end

data/lib/knapsack_pro/runners/spinach_runner.rb

@@ -13,7 +13,7 @@ module KnapsackPro
           cmd = %Q[KNAPSACK_PRO_RECORDING_ENABLED=true KNAPSACK_PRO_TEST_SUITE_TOKEN=#{ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN']} bundle exec spinach #{args} --features_path #{runner.test_dir} -- #{runner.stringify_test_file_paths}]
 
           Kernel.system(cmd)
-          Kernel.exit($?.exitstatus) unless $?.exitstatus.zero?
+          Kernel.exit(child_status.exitstatus) unless child_status.exitstatus.zero?
         end
       end
     end

data/lib/knapsack_pro/runners/test_unit_runner.rb

@@ -11,21 +11,32 @@ module KnapsackPro
         if runner.test_files_to_execute_exist?
           adapter_class.verify_bind_method_called
 
-          require 'test/unit'
-
           cli_args =
             (args || '').split +
             runner.test_file_paths.map do |f|
               File.expand_path(f)
             end
 
-          exit ::Test::Unit::AutoRunner.run(
+          exit test_unit_autorunner_run(
             true,
             runner.test_dir,
             cli_args
           )
         end
       end
+
+      private
+
+      # https://www.rubydoc.info/github/test-unit/test-unit/Test/Unit/AutoRunner#run-class_method
+      def self.test_unit_autorunner_run(force_standalone, default_dir, argv)
+        require 'test/unit'
+
+        ::Test::Unit::AutoRunner.run(
+          force_standalone,
+          default_dir,
+          argv
+        )
+      end
     end
   end
 end

data/lib/knapsack_pro/version.rb

@@ -1,3 +1,3 @@
 module KnapsackPro
-  VERSION = '2.16.0'
+  VERSION = '2.17.0'
 end

data/spec/knapsack_pro/adapters/test_unit_adapter_spec.rb

@@ -1,4 +1,11 @@
-require 'test/unit/testcase'
+# fake class to make tests pass and to avoid require 'test/unit/testcase' to not break RSpec
+# https://www.rubydoc.info/gems/test-unit/3.4.1/Test/Unit/TestSuite
+module Test
+  module Unit
+    class TestSuite
+    end
+  end
+end
 
 describe KnapsackPro::Adapters::TestUnitAdapter do
   it do

data/spec/knapsack_pro/config/ci/circle_spec.rb

@@ -75,9 +75,9 @@ describe KnapsackPro::Config::CI::Circle do
   describe '#project_dir' do
     subject { described_class.new.project_dir }
 
-    context 'when environment exists' do
-      let(:env) { { 'CIRCLE_PROJECT_REPONAME' => 'knapsack_pro-ruby' } }
-      it { should eql '/home/ubuntu/knapsack_pro-ruby' }
+    context 'when CIRCLE_WORKING_DIRECTORY environment variable exists' do
+      let(:env) { { 'CIRCLE_WORKING_DIRECTORY' => '~/knapsack_pro-ruby' } }
+      it { should eql '~/knapsack_pro-ruby' }
     end
 
     context "when environment doesn't exist" do

data/spec/knapsack_pro/repository_adapters/git_adapter_spec.rb

@@ -15,20 +15,20 @@ describe KnapsackPro::RepositoryAdapters::GitAdapter do
 
     it { should_not be_nil }
     its(:size) { should eq 40 }
-    it { should eq circle_sha1 } if ENV['CIRCLE_SHA1']
+    it { should eq circle_sha1 } if ENV['CIRCLECI']
   end
 
   describe '#branch' do
     subject { described_class.new.branch }
 
     it { should_not be_nil }
-    it { should eq circle_branch } if ENV['CIRCLE_BRANCH']
+    it { should eq circle_branch } if ENV['CIRCLECI']
   end
 
   describe '#branches' do
     subject { described_class.new.branches }
 
     it { expect(subject.include?('master')).to be true }
-    it { expect(subject.include?(circle_branch)).to be true } if ENV['CIRCLE_BRANCH']
+    it { expect(subject.include?(circle_branch)).to be true } if ENV['CIRCLECI']
   end
 end

data/spec/knapsack_pro/runners/queue/cucumber_runner_spec.rb

@@ -100,6 +100,7 @@ describe KnapsackPro::Runners::Queue::CucumberRunner do
 
     context 'when test files exist' do
       let(:test_file_paths) { ['features/a.feature', 'features/b.feature'] }
+      let(:child_status) { double }
 
       before do
         subset_queue_id = 'fake-subset-queue-id'
@@ -117,8 +118,9 @@ describe KnapsackPro::Runners::Queue::CucumberRunner do
 
         expect(ENV).to receive(:[]=).with('KNAPSACK_PRO_BEFORE_QUEUE_HOOK_CALLED', 'true')
 
-        expect($?).to receive(:exited?).and_return(process_exited)
-        allow($?).to receive(:exitstatus).and_return(exitstatus)
+        allow(described_class).to receive(:child_status).and_return(child_status)
+        expect(child_status).to receive(:exited?).and_return(process_exited)
+        allow(child_status).to receive(:exitstatus).and_return(exitstatus)
       end
 
       context 'when system process finished its work (exited)' do

data/spec/knapsack_pro/runners/spinach_runner_spec.rb

@@ -24,11 +24,14 @@ describe KnapsackPro::Runners::SpinachRunner do
                         stringify_test_file_paths: stringify_test_file_paths,
                         test_files_to_execute_exist?: true)
       end
+      let(:child_status) { double }
 
       before do
         expect(KnapsackPro::Adapters::SpinachAdapter).to receive(:verify_bind_method_called)
 
         expect(Kernel).to receive(:system).with('KNAPSACK_PRO_RECORDING_ENABLED=true KNAPSACK_PRO_TEST_SUITE_TOKEN=spinach-token bundle exec spinach --custom-arg --features_path fake-test-dir -- features/a.feature features/b.feature')
+
+        allow(described_class).to receive(:child_status).and_return(child_status)
       end
 
       after { subject }
@@ -37,7 +40,7 @@ describe KnapsackPro::Runners::SpinachRunner do
         let(:exitstatus) { 0 }
 
         before do
-          expect($?).to receive(:exitstatus).and_return(exitstatus)
+          expect(child_status).to receive(:exitstatus).and_return(exitstatus)
         end
 
         it do
@@ -49,7 +52,7 @@ describe KnapsackPro::Runners::SpinachRunner do
         let(:exitstatus) { 1 }
 
         before do
-          expect($?).to receive(:exitstatus).twice.and_return(exitstatus)
+          expect(child_status).to receive(:exitstatus).twice.and_return(exitstatus)
         end
 
         it do

data/spec/knapsack_pro/runners/test_unit_runner_spec.rb

@@ -1,5 +1,3 @@
-require 'test/unit'
-
 describe KnapsackPro::Runners::TestUnitRunner do
   subject { described_class.new(KnapsackPro::Adapters::TestUnitAdapter) }
 
@@ -27,7 +25,7 @@ describe KnapsackPro::Runners::TestUnitRunner do
         .with(KnapsackPro::Adapters::TestUnitAdapter).and_return(runner)
 
         auto_runner_exit_code = 0
-        expect(Test::Unit::AutoRunner).to receive(:run) do |flag, test_dir, cli_args|
+        expect(described_class).to receive(:test_unit_autorunner_run) do |flag, test_dir, cli_args|
           expect(flag).to be true
           expect(test_dir).to eq 'test-unit_fake'
           expect(cli_args.size).to eq 4

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 'vcr'
 require 'webmock/rspec'
 VCR.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.17.0
 platform: ruby
 authors:
 - ArturT
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-05-25 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
@@ -128,20 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.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
@@ -160,44 +146,44 @@ dependencies:
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     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: Run tests in parallel across CI server nodes based on tests execution
   time. Split tests in a dynamic way to ensure parallel jobs are done at a similar
   time. Thanks to that your CI build time is as fast as possible. It works with many
@@ -423,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Knapsack Pro splits tests across parallel CI nodes and ensures each parallel