knapsack_pro 8.0.1 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4bed2e7600e26f350d8f1847550aaea7be38b032a029a589e6082dbb31b31c
-  data.tar.gz: 2a66e48a7ccb7be83a553a2746611ce5addeac2114aa469c75f6a6faa3ee70a3
+  metadata.gz: 6135451be036cbd75b78cb5efd31498b91b08698771c78c69dfa7b2b1d218faa
+  data.tar.gz: bd73f2525bc9b89c5faca60bf95249d06e525fb533422b8e98399b03dcf732bf
 SHA512:
-  metadata.gz: cca2870484c23ce7aed1ab44b43a8ba4c862d37c2c9a29ec54b627433fef05cb43f0126a611e888ffb0a5cbc8fe13e01f7b97dd7c61b64404771a0a2c190db70
-  data.tar.gz: 6db4e20ea3aaa81b1467971435688667004576402bb9f686a0287f3c54d82dab84c1271ef78605e46d5d4050e634cc3d8e229dffd81a3d8646e3eb81b68eebad
+  metadata.gz: 3cca977135a8795f725cd2ee73ae5c8af2df313db76892a9e29e283fc788f0c7479dff1e8aed532fb43a1ac56cb4582200dda0af1e953426c571fb177eb2ad2f
+  data.tar.gz: 00bb2a047303b2e11eb06f1f0f358dd209a1d98cb01657b4c8144a7f137efc5cb7aa44e736e6f4925642975afb83b576c2e9a0039233b389a196180ca0a194d3

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # 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

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -7,7 +7,7 @@ module KnapsackPro
     class RSpecAdapter < BaseAdapter
       TEST_DIR_PATTERN = 'spec/**{,/*/**}/*_spec.rb'
       # https://github.com/rspec/rspec/blob/86b5e4218eece4c1913fe9aad24c0a96d8bc9f40/rspec-core/lib/rspec/core/example.rb#L122
-      REGEX = /^(.*?)(?:\[([\d\s:,]+)\])?$/.freeze
+      REGEX = /\A(.*?)(?:\[([\d\s:,]+)\])?\z/.freeze
 
       def self.split_by_test_cases_enabled?
         return false unless KnapsackPro::Config::Env.rspec_split_by_test_examples?
@@ -76,9 +76,9 @@ 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)

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.1'
+  VERSION = '8.0.2'
 end

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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.2
 platform: ruby
 authors:
 - ArturT
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake