knapsack 1.17.2 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61f6516fa6a095392a8ba944e43261cd7c566ea26242465d2f42b3d7ed253fc
-  data.tar.gz: 30b50a3b66085ce2c0b1672b7fd815dec2a2b449f54625b65ca49da705411754
+  metadata.gz: b673e54c4a69c274d1c0bea7d3ab53d603ad95d178550a6d787904803dcc728f
+  data.tar.gz: b88dd14ffeb3dc33648ae953fc789d63cbc25a4be72d643dea6acddc09bc3f3e
 SHA512:
-  metadata.gz: c2d01955882b05683b6c06482a186afe479fc1437a7c2a40bee66fb4353eda4cc0e10aaacafb8a860be1c7b693d4ee157de10fc8ceec553cee853e1e8f5318fd
-  data.tar.gz: f4d4772ef21c7c05a3cf3f5a11d6e633cd2c163bb82eda5f79031c17c672ca4f61b8b4d8ca8c27906f0d467141dffe9590180d46697b344f298104cf445af673
+  metadata.gz: 2837e7b8732843c8b778c82c26c57c2f5757c6402c464a6e57f71c046c8c07f1674d9ae124ec6759808d81d557684cc62f7a5c1dda331a9265b1ebfc53cc8228
+  data.tar.gz: 9270341918460fb18dad56753b6cba0308783940c601b6cbd88331629c3f4453fd3e15faa355a8830822cdd98b449e8b96c1f7a58015cff385ca78f0108a8fd4

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 * TODO
 
+### 1.18.0
+
+* Add support for Semaphore 2.0
+
+    https://github.com/ArturT/knapsack/pull/92
+
+https://github.com/ArturT/knapsack/compare/v1.17.2...v1.18.0
+
 ### 1.17.2
 
 * Allow for new `bundler` in development

data/lib/knapsack/config/env.rb

@@ -7,11 +7,11 @@ module Knapsack
         end
 
         def ci_node_total
-          ENV['CI_NODE_TOTAL'] || ENV['CIRCLE_NODE_TOTAL'] || ENV['SEMAPHORE_THREAD_COUNT'] || ENV['BUILDKITE_PARALLEL_JOB_COUNT'] || ENV['SNAP_WORKER_TOTAL'] || 1
+          ENV['CI_NODE_TOTAL'] || ENV['CIRCLE_NODE_TOTAL'] || ENV['SEMAPHORE_JOB_COUNT'] || ENV['SEMAPHORE_THREAD_COUNT'] || ENV['BUILDKITE_PARALLEL_JOB_COUNT'] || ENV['SNAP_WORKER_TOTAL'] || 1
         end
 
         def ci_node_index
-          gitlab_ci_node_index || ENV['CI_NODE_INDEX'] || ENV['CIRCLE_NODE_INDEX'] || semaphore_current_thread || ENV['BUILDKITE_PARALLEL_JOB'] || snap_ci_worker_index || 0
+          gitlab_ci_node_index || ENV['CI_NODE_INDEX'] || ENV['CIRCLE_NODE_INDEX'] || semaphore_job_index || semaphore_current_thread || ENV['BUILDKITE_PARALLEL_JOB'] || snap_ci_worker_index || 0
         end
 
         def test_file_pattern
@@ -36,6 +36,10 @@ module Knapsack
           index.to_i - 1 if index
         end
 
+        def semaphore_job_index
+          index_starting_from_one(ENV['SEMAPHORE_JOB_INDEX'])
+        end
+
         def semaphore_current_thread
           index_starting_from_one(ENV['SEMAPHORE_CURRENT_THREAD'])
         end

data/lib/knapsack/version.rb

@@ -1,3 +1,3 @@
 module Knapsack
-  VERSION = '1.17.2'
+  VERSION = '1.18.0'
 end

data/spec/knapsack/config/env_spec.rb

@@ -27,6 +27,11 @@ describe Knapsack::Config::Env do
         it { should eql 4 }
       end
 
+      context 'when SEMAPHORE_JOB_COUNT has value' do
+        before { stub_const("ENV", { 'SEMAPHORE_JOB_COUNT' => 3 }) }
+        it { should eql 3 }
+      end
+
       context 'when SEMAPHORE_THREAD_COUNT has value' do
         before { stub_const("ENV", { 'SEMAPHORE_THREAD_COUNT' => 3 }) }
         it { should eql 3 }
@@ -67,6 +72,11 @@ describe Knapsack::Config::Env do
         it { should eql 2 }
       end
 
+      context 'when SEMAPHORE_JOB_INDEX has value' do
+        before { stub_const("ENV", { 'SEMAPHORE_JOB_INDEX' => 3 }) }
+        it { should eql 2 }
+      end
+
       context 'when SEMAPHORE_CURRENT_THREAD has value' do
         before { stub_const("ENV", { 'SEMAPHORE_CURRENT_THREAD' => 1 }) }
         it { should eql 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack
 version: !ruby/object:Gem::Version
-  version: 1.17.2
+  version: 1.18.0
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake