knapsack_pro 8.0.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c531fc28ddde021a2417447b60d2feaec8924994bb5575cf1f3cd63484d2fa2b
-  data.tar.gz: 28eb5e92aff6522f1dfb31b2c2c076bb54f6e50daec25985a09286fb337fec90
+  metadata.gz: 6135451be036cbd75b78cb5efd31498b91b08698771c78c69dfa7b2b1d218faa
+  data.tar.gz: bd73f2525bc9b89c5faca60bf95249d06e525fb533422b8e98399b03dcf732bf
 SHA512:
-  metadata.gz: 5b66568ea07f6ab6ef881e61d3f3affa5d9ba0c0201c64c2292573fc11afc8e212e4d848e63c22b2596b9e4ea36780ad4f5b72a25f729370e463f865aed324c4
-  data.tar.gz: '0021619b437b7815807667549ee8a49ffcfca23358b3456e3cbbc5331f2a03a535f271c9cdbf5c83db632709c47ec82e50f3806aab30a0660763011efe9e7800'
+  metadata.gz: 3cca977135a8795f725cd2ee73ae5c8af2df313db76892a9e29e283fc788f0c7479dff1e8aed532fb43a1ac56cb4582200dda0af1e953426c571fb177eb2ad2f
+  data.tar.gz: 00bb2a047303b2e11eb06f1f0f358dd209a1d98cb01657b4c8144a7f137efc5cb7aa44e736e6f4925642975afb83b576c2e9a0039233b389a196180ca0a194d3

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+### Unreleased
+
+### 8.0.2
+
+* (patch) Semaphore: Detect the correct branch name in the context of a PR
+* (patch) Semaphore: Detect user seat (committer)
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/294
+
+* (patch) RSpec: Use the same regex when parsing file path and id path
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/291
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v8.0.1...v8.0.2
+
+### 8.0.1
+
+* Fix detection of id paths for Turnip, which resulted in sending to the API both file and id paths timings
+    * Example:
+      * turnip/acceptance/foo.feature[1:1:1] 0 seconds
+      * turnip/acceptance/foo.feature[1:1:2] 0 seconds
+      * turnip/acceptance/foo.feature 30 milliseconds (time recorded for [1:1:1] or [1:1:2])
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/290
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v8.0.0...v8.0.1
+
 ### 8.0.0
 
 * Enable [`KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES`](https://docs.knapsackpro.com/ruby/split-by-test-examples/) by default

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -6,7 +6,8 @@ module KnapsackPro
   module Adapters
     class RSpecAdapter < BaseAdapter
       TEST_DIR_PATTERN = 'spec/**{,/*/**}/*_spec.rb'
-      ID_PATH_REGEX = /.+_spec\.rb\[.+\]$/
+      # https://github.com/rspec/rspec/blob/86b5e4218eece4c1913fe9aad24c0a96d8bc9f40/rspec-core/lib/rspec/core/example.rb#L122
+      REGEX = /\A(.*?)(?:\[([\d\s:,]+)\])?\z/.freeze
 
       def self.split_by_test_cases_enabled?
         return false unless KnapsackPro::Config::Env.rspec_split_by_test_examples?
@@ -75,13 +76,14 @@ module KnapsackPro
         return ''
       end
 
-      def self.parse_file_path(id)
-        # https://github.com/rspec/rspec-core/blob/1eeadce5aa7137ead054783c31ff35cbfe9d07cc/lib/rspec/core/example.rb#L122
-        id.match(/\A(.*?)(?:\[([\d\s:,]+)\])?\z/).captures.first
+      def self.parse_file_path(path)
+        file, _id = path.match(REGEX).captures
+        file
       end
 
       def self.id_path?(path)
-        ID_PATH_REGEX.match?(path)
+        _file, id = path.match(REGEX).captures
+        !id.nil?
       end
 
       def self.rails_helper_exists?(test_dir)

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

@@ -23,7 +23,8 @@ module KnapsackPro
         end
 
         def branch
-          ENV['SEMAPHORE_GIT_BRANCH']
+          ENV['SEMAPHORE_GIT_WORKING_BRANCH'] || # nil when workflow is triggered by pushing a Git tag
+            ENV['SEMAPHORE_GIT_BRANCH']
         end
 
         def project_dir
@@ -33,7 +34,7 @@ module KnapsackPro
         end
 
         def user_seat
-          # not provided
+          ENV['SEMAPHORE_GIT_COMMITTER']
         end
 
         def detected

data/lib/knapsack_pro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KnapsackPro
-  VERSION = '8.0.0'
+  VERSION = '8.0.2'
 end

data/spec/knapsack_pro/adapters/rspec_adapter_spec.rb

@@ -148,23 +148,41 @@ describe KnapsackPro::Adapters::RSpecAdapter do
   describe '.id_path?' do
     subject { described_class.id_path?(path) }
 
-    context 'when the path resembles the RSpec path with id' do
+    context 'when the path is an RSpec path with id' do
       let(:path) { 'spec/features/a_spec.rb[1:1:7:1]' }
 
       it { is_expected.to be true }
     end
 
-    context 'when the path resembles the RSpec path with multiple ids' do
+    context 'when the path is an RSpec path with multiple ids' do
       let(:path) { 'spec/features/a_spec.rb[1:1:7:1, 1:2]' }
 
       it { is_expected.to be true }
     end
 
-    context "when the path doesn't resemble the RSpec path with id" do
+    context 'when the path is an RSpec path with no id' do
       let(:path) { 'spec/features/a_spec.rb' }
 
       it { is_expected.to be false }
     end
+
+    context 'when the path is a Turnip path with id' do
+      let(:path) { 'spec/acceptance/a.feature[1:1:7:1]' }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when the path is a Turnip path with multiple ids' do
+      let(:path) { 'spec/acceptance/a.feature[1:1:7:1,1:2]' }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when the path is a Turnip path with no id' do
+      let(:path) { 'spec/acceptance/a.feature' }
+
+      it { is_expected.to be false }
+    end
   end
 
   describe '.rails_helper_exists?' do

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

@@ -62,12 +62,22 @@ describe KnapsackPro::Config::CI::Semaphore2 do
   describe '#branch' do
     subject { described_class.new.branch }
 
-    context 'when the environment exists' do
+    context 'when SEMAPHORE_GIT_WORKING_BRANCH is set' do
+      let(:env) { { 'SEMAPHORE_GIT_WORKING_BRANCH' => 'feature' } }
+      it { should eql 'feature' }
+    end
+
+    context 'when both SEMAPHORE_GIT_WORKING_BRANCH and SEMAPHORE_GIT_BRANCH are set' do
+      let(:env) { { 'SEMAPHORE_GIT_WORKING_BRANCH' => 'feature', 'SEMAPHORE_GIT_BRANCH' => 'master' } }
+      it { should eql 'feature' }
+    end
+
+    context 'when SEMAPHORE_GIT_BRANCH is set' do
       let(:env) { { 'SEMAPHORE_GIT_BRANCH' => 'master' } }
       it { should eql 'master' }
     end
 
-    context "when the environment doesn't exist" do
+    context "when no ENVs are set" do
       it { should be nil }
     end
   end
@@ -107,4 +117,17 @@ describe KnapsackPro::Config::CI::Semaphore2 do
       it { should be nil }
     end
   end
+
+  describe '#user_seat' do
+    subject { described_class.new.user_seat }
+
+    context 'when SEMAPHORE_GIT_COMMITTER is set' do
+      let(:env) { { 'SEMAPHORE_GIT_COMMITTER' => 'jane_doe' } }
+      it { should eql 'jane_doe' }
+    end
+
+    context "when no ENVs are set" do
+      it { should be nil }
+    end
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.2
 platform: ruby
 authors:
 - ArturT
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -418,7 +417,6 @@ metadata:
   documentation_uri: https://docs.knapsackpro.com/knapsack_pro-ruby/guide/
   homepage_uri: https://knapsackpro.com
   source_code_uri: https://github.com/KnapsackPro/knapsack_pro-ruby
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -433,8 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Knapsack Pro splits tests across parallel CI nodes and ensures each parallel
   job finish work at a similar time.