knapsack 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8319351a256487728d985749b72592013e4300db
-  data.tar.gz: 685600b211177aa493dc3d607067d8553eb248f2
+  metadata.gz: 6ac6199bd640d975d725e7fc00509f1785a4fa2e
+  data.tar.gz: 1af90f4bff6a1077051e248459f82a9a8a1a3f7c
 SHA512:
-  metadata.gz: 2e17a9f6638b01ff7c94df361a29be64a5ae9b7402bdf7bfe108b3f3531d3f6be80a081d3c2eb50c5ad24bdb89ba479b4e73f055e4a8ca2316ba66e39c646800
-  data.tar.gz: 51de58b779209637241afe7dbb131412073bd77be4a66cfaccccd0a68407dd29a938fab9ba2a3d8497d6ee25c1f675b15c9ee7d9703b02828407ebf76939741e
+  metadata.gz: fe02e1a38bc1d34404dc0ddaeb9808924614ba7293a5bf9c3fe5486cf2afba012301b9e4a2fd2be1d3de585ad88331196e6e4246d841e6615a92d7a45ea035f6
+  data.tar.gz: eb874f176692f3d4199bbf79ca2f2ac42444698840ea7ec8f2a78e840bf1f843816cc8106d1cd59a294db739d0fef2a35a6e803d460377508485456fa13f3423

data/.travis.yml

@@ -29,24 +29,24 @@ script:
   - 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
+  - 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
+  - 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"
+  - 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
+  - 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
+  - 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
+  - KNAPSACK_TEST_FILE_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
 
 
   - bin/print_header.sh "------------------------------------------------------"
@@ -60,23 +60,23 @@ script:
   - 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
+  - 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
+  - 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]"
-  - KNAPSACK_TEST_FILE_PATTERN="test_examples/**/*_test.rb" bin/knapsack minitest "--verbose --pride"
+  - 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"
 
   - 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
+  - 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
+  - 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
+  - KNAPSACK_TEST_FILE_PATTERN="test_examples/**{,/*/**}/*_test.rb" bundle exec rake knapsack:minitest
 notifications:
   email: false

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 * TODO
 
+### 1.4.1
+
+* Update test file pattern in tests also. Related PR https://github.com/ArturT/knapsack/pull/27
+* Ensure there are no duplicates in leftover tests because of new test file pattern
+
+https://github.com/ArturT/knapsack/compare/v1.4.0...v1.4.1
+
 ### 1.4.0
 
 * Rename RspecAdapter to RSpecAdapter so that it is consistent

data/README.md

@@ -146,7 +146,7 @@ Knapsack.tracker.config({
 })
 
 Knapsack.report.config({
-  test_file_pattern: 'spec/**/*_spec.rb', # default value based on adapter
+  test_file_pattern: 'spec/**{,/*/**}/*_spec.rb', # default value based on adapter
   report_path: 'knapsack_custom_report.json'
 })
 
@@ -205,13 +205,13 @@ On your CI server run this command for the first CI node. Update `CI_NODE_INDEX`
 You can add `KNAPSACK_TEST_FILE_PATTERN` if your tests are not in default directory. For instance:
 
     # Step for RSpec
-    $ KNAPSACK_TEST_FILE_PATTERN="directory_with_specs/**/*_spec.rb" CI_NODE_TOTAL=2 CI_NODE_INDEX=0 bundle exec rake knapsack:rspec
+    $ KNAPSACK_TEST_FILE_PATTERN="directory_with_specs/**{,/*/**}/*_spec.rb" CI_NODE_TOTAL=2 CI_NODE_INDEX=0 bundle exec rake knapsack:rspec
 
     # Step for Cucumber
     $ KNAPSACK_TEST_FILE_PATTERN="directory_with_features/**/*.feature" CI_NODE_TOTAL=2 CI_NODE_INDEX=0 bundle exec rake knapsack:cucumber
 
     # Step for Minitest
-    $ KNAPSACK_TEST_FILE_PATTERN="directory_with_tests/**/*_test.rb" CI_NODE_TOTAL=2 CI_NODE_INDEX=0 bundle exec rake knapsack:minitest
+    $ KNAPSACK_TEST_FILE_PATTERN="directory_with_tests/**{,/*/**}/*_spec.rb" CI_NODE_TOTAL=2 CI_NODE_INDEX=0 bundle exec rake knapsack:minitest
 
 You can set `KNAPSACK_REPORT_PATH` if your knapsack report was saved in non default location. Example:
 
@@ -476,7 +476,7 @@ To generate a new knapsack report for specs with `focus` tag (only specs in `spe
 
 To see specs distributed for the first CI node type:
 
-    $ CI_NODE_TOTAL=2 CI_NODE_INDEX=0 KNAPSACK_SPEC_PATTERN="spec_examples/**/*_spec.rb" bundle exec rake knapsack:rspec
+    $ CI_NODE_TOTAL=2 CI_NODE_INDEX=0 KNAPSACK_SPEC_PATTERN="spec_examples/**{,/*/**}/*_spec.rb" bundle exec rake knapsack:rspec
 
 Specs in `spec_examples/leftover` take more than 3 seconds. This should cause a Knapsack time offset warning because we set `time_offset_in_seconds` to 3 in `spec_examples/spec_helper.rb`. Type below to see warning:
 

data/Rakefile

@@ -6,5 +6,5 @@ Knapsack.load_tasks
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test_examples'
-  t.pattern = 'test_examples/**/*_test.rb'
+  t.pattern = 'test_examples/**{,/*/**}/*_test.rb'
 end

data/knapsack.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rspec', '~> 3.0', '>= 2.0.0'
+  spec.add_development_dependency 'rspec-its', '~> 1.2'
   spec.add_development_dependency 'cucumber', '>= 1.3'
   spec.add_development_dependency 'minitest', '>= 5.0.0'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0'

data/lib/knapsack/adapters/rspec_adapter.rb

@@ -55,7 +55,7 @@ module Knapsack
       end
     end
 
-    # This is added to provide backwards compatabiliy
+    # This is added to provide backwards compatibility
     class RspecAdapter < RSpecAdapter
     end
   end

data/lib/knapsack/distributors/base_distributor.rb

@@ -37,7 +37,7 @@ module Knapsack
       end
 
       def all_tests
-        @all_tests ||= Dir[test_file_pattern].sort
+        @all_tests ||= Dir.glob(test_file_pattern).uniq.sort
       end
 
       protected

data/lib/knapsack/version.rb

@@ -1,3 +1,3 @@
 module Knapsack
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/spec/knapsack/allocator_builder_spec.rb

@@ -60,7 +60,7 @@ describe Knapsack::AllocatorBuilder do
       end
 
       context 'when ENV test_file_pattern has value' do
-        let(:env_test_file_pattern) { 'custom_spec/**/*_spec.rb' }
+        let(:env_test_file_pattern) { 'custom_spec/**{,/*/**}/*_spec.rb' }
         let(:report_config) { { report_path: adapter_report_path } }
         let(:allocator_args) do
           {
@@ -102,7 +102,7 @@ describe Knapsack::AllocatorBuilder do
     end
 
     context 'when ENV test_file_pattern has value' do
-      let(:env_test_file_pattern) { 'custom_spec/**/*_spec.rb' }
+      let(:env_test_file_pattern) { 'custom_spec/**{,/*/**}/*_spec.rb' }
 
       it { should eq 'custom_spec' }
     end

data/spec/knapsack/allocator_spec.rb

@@ -43,7 +43,7 @@ describe Knapsack::Allocator do
   end
 
   describe '#test_dir' do
-    let(:test_file_pattern) { "test_dir/**/*_spec.rb" }
+    let(:test_file_pattern) { "test_dir/**{,/*/**}/*_spec.rb" }
 
     subject { allocator.test_dir }
 

data/spec/knapsack/config/env_spec.rb

@@ -77,7 +77,7 @@ describe Knapsack::Config::Env do
     subject { described_class.test_file_pattern }
 
     context 'when ENV exists' do
-      let(:test_file_pattern) { 'custom_spec/**/*_spec.rb' }
+      let(:test_file_pattern) { 'custom_spec/**{,/*/**}/*_spec.rb' }
       before { stub_const("ENV", { 'KNAPSACK_TEST_FILE_PATTERN' => test_file_pattern }) }
       it { should eql test_file_pattern }
     end

data/spec/knapsack/distributors/base_distributor_spec.rb

@@ -3,7 +3,7 @@ describe Knapsack::Distributors::BaseDistributor do
   let(:default_args) do
     {
       report: report,
-      test_file_pattern: 'spec/**/*_spec.rb',
+      test_file_pattern: 'spec/**{,/*/**}/*_spec.rb',
       ci_node_total: '1',
       ci_node_index: '0'
     }

data/spec/knapsack/distributors/leftover_distributor_spec.rb

@@ -7,7 +7,7 @@ describe Knapsack::Distributors::LeftoverDistributor do
       'd_spec.rb' => 2.5,
     }
   end
-  let(:test_file_pattern) { 'spec/**/*_spec.rb' }
+  let(:test_file_pattern) { 'spec/**{,/*/**}/*_spec.rb' }
   let(:default_args) do
     {
       report: report,
@@ -29,18 +29,26 @@ describe Knapsack::Distributors::LeftoverDistributor do
     subject { distributor.all_tests }
 
     context 'when given test_file_pattern' do
-      context 'spec/**/*_spec.rb' do
+      context 'spec/**{,/*/**}/*_spec.rb' do
         it { should_not be_empty }
         it { should include 'spec/knapsack/tracker_spec.rb' }
         it { should include 'spec/knapsack/adapters/rspec_adapter_spec.rb' }
+
+        it 'has no duplicated test file paths' do
+          expect(subject.size).to eq subject.uniq.size
+        end
       end
 
-      context 'spec_examples/**/*_spec.rb' do
-        let(:test_file_pattern) { 'spec_examples/**/*_spec.rb' }
+      context 'spec_examples/**{,/*/**}/*_spec.rb' do
+        let(:test_file_pattern) { 'spec_examples/**{,/*/**}/*_spec.rb' }
 
         it { should_not be_empty }
         it { should include 'spec_examples/fast/1_spec.rb' }
         it { should include 'spec_examples/leftover/a_spec.rb' }
+
+        it 'has no duplicated test file paths' do
+          expect(subject.size).to eq subject.uniq.size
+        end
       end
     end
 

data/spec/knapsack/distributors/report_distributor_spec.rb

@@ -3,7 +3,7 @@ describe Knapsack::Distributors::ReportDistributor do
   let(:default_args) do
     {
       report: report,
-      test_file_pattern: 'spec/**/*_spec.rb',
+      test_file_pattern: 'spec/**{,/*/**}/*_spec.rb',
       ci_node_total: '1',
       ci_node_index: '0'
     }

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'rspec/its'
+
 require 'timecop'
 Timecop.safe_mode = true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement