knapsack 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5171bf868196514551699fe2604e1ee1844920e2
-  data.tar.gz: 6c1fd98385306d4fdc80a806c325c54ffd470d0b
+  metadata.gz: e65fdc9823d7ad10bb38a4d96663526897528565
+  data.tar.gz: ac938b8d273c278c79b87b961a48edd716c0f8a5
 SHA512:
-  metadata.gz: 6c62afcf1e03a56bdf8abe71b2682b969d30ca1895a4854a8533b3ed314ee188b5e37b9f066c5b9ad626f676fbb7e08a06be6697bb3b621d217f7cda4fb96dbe
-  data.tar.gz: 3946fb08bceb702502ded292da873c4016677aa82ac85ed958186727186ea2476db01fe7b74e6230709f67cadd579ff1a6ff59384c043dfb12cefa95dbcd93e3
+  metadata.gz: 67cfb99f75768e27301dc1d0446c5950b8d97640eec3f98062832004d0c2be2931cc2f0421c641817ed50c713fb464a3ee059208fb4bb18d0e58065015f16a18
+  data.tar.gz: 70bf4d8fe18658b1dbeece948208c7b1d2d147384fe59564546976d2b8a1775638ae0cd113d3fc873143b5e3259f5d4e69355ae69d087ba13a6939a15f140c40

data/.travis.yml

@@ -3,10 +3,8 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
-  - 2.1.3
+  - 2.1.5
+  - 2.2.0
 addons:
   code_climate:
     repo_token: 38686058eed480dd0fcf8bce9015733e0bae88e44e30f4a1ac63df8aec2f86d8

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 * TODO
 
+### 1.0.2
+
+* Fix bug #8 - Sort all tests just in case to avoid wrong order of files when running tests on machines where `Dir.glob` has different implementation.
+
 ### 1.0.1
 
 * Fix bug - Add support for Cucumber Scenario Outline.

data/README.md

@@ -116,6 +116,12 @@ Commit generated report `knapsack_rspec_report.json` or `knapsack_cucumber_repor
 
 This report should be updated only after you add a lot of new slow tests or you change existing ones which causes a big time execution difference between CI nodes. Either way, you will get time offset warning at the end of the rspec/cucumber results which reminds you when it’s a good time to regenerate the knapsack report.
 
+#### Adding or removing tests
+
+There is no need to regenerate the report every time when you add/remove test file. If you remove a test file then Knapsack will ignore its entry in report. In case when you add a new file and it doesn't already exist in report, the test file will be assigned to one of the CI node.
+
+You'll want to regenerate your execution report whenever you remove or add a test file with a long time execution  time that would affect one of the CI nodes. You will get Knapsack notification whenever is good time to regenerate report.
+
 ## Setup your CI server
 
 On your CI server run this command for the first CI node. Update `CI_NODE_INDEX` for the next one.
@@ -213,11 +219,12 @@ Now everything should works. You will get warning at the end of rspec/cucumber r
 For the first time run all tests at once with enabled report generator. Edit `.travis.yml`
 
 ```yaml
-# Step for RSpec
-script: "KNAPSACK_GENERATE_REPORT=true bundle exec rspec spec"
+script:
+  # Step for RSpec
+  - "KNAPSACK_GENERATE_REPORT=true bundle exec rspec spec"
 
-# Step for Cucumber
-script: "KNAPSACK_GENERATE_REPORT=true bundle exec cucumber features"
+  # Step for Cucumber
+  - "KNAPSACK_GENERATE_REPORT=true bundle exec cucumber features"
 ```
 
 After tests pass your should copy knapsack json report which is rendered at the end of rspec/cucumber results. Save it into your repository as `knapsack_rspec_report.json` or `knapsack_cucumber_report.json` file and commit.
@@ -227,11 +234,12 @@ After tests pass your should copy knapsack json report which is rendered at the
 You can parallel your builds across virtual machines with [travis matrix feature](http://docs.travis-ci.com/user/speeding-up-the-build/#Parallelizing-your-builds-across-virtual-machines). Edit `.travis.yml`
 
 ```yaml
-# Step for RSpec
-script: "bundle exec rake knapsack:rspec"
+script:
+  # Step for RSpec
+  - "bundle exec rake knapsack:rspec"
 
-# Step for Cucumber
-script: "bundle exec rake knapsack:cucumber"
+  # Step for Cucumber
+  - "bundle exec rake knapsack:cucumber"
 
 env:
   - CI_NODE_TOTAL=2 CI_NODE_INDEX=0
@@ -241,11 +249,12 @@ env:
 If you want to have some global ENVs and matrix of ENVs then do it like this:
 
 ```yaml
-# Step for RSpec
-script: "bundle exec rake knapsack:rspec"
+script:
+  # Step for RSpec
+  - "bundle exec rake knapsack:rspec"
 
-# Step for Cucumber
-script: "bundle exec rake knapsack:cucumber"
+  # Step for Cucumber
+  - "bundle exec rake knapsack:cucumber"
 
 env:
   global:
@@ -341,5 +350,6 @@ Many thanks to [Małgorzata Nowak](https://github.com/informatykgosia) for beaut
 ## Mentions
 
 * Lunar Logic Blog | [Parallel your specs and don’t waste time](http://blog.lunarlogic.io/2014/parallel-your-specs-and-dont-waste-time/)
-* Travis CI | [Parallelizing RSpec tests on multiple VMs](http://docs.travis-ci.com/user/speeding-up-the-build/#Parallelizing-RSpec-tests-on-multiple-VMs)
+* Travis CI | [Parallelizing RSpec and Cucumber on multiple VMs](http://docs.travis-ci.com/user/speeding-up-the-build/#Parallelizing-RSpec-and-Cucumber-on-multiple-VMs)
 * Semaphore | [Running RSpec specs in parallel](https://semaphoreapp.com/docs/running-rspec-specs-in-threads.html)
+* Semaphore | [Running Cucumber scenarios in parallel](https://semaphoreapp.com/docs/running-cucumber-scenarios-in-threads.html)

data/lib/knapsack/distributors/base_distributor.rb

@@ -33,7 +33,7 @@ module Knapsack
       end
 
       def all_tests
-        @all_tests ||= Dir[test_file_pattern]
+        @all_tests ||= Dir[test_file_pattern].sort
       end
 
       protected

data/lib/knapsack/distributors/report_distributor.rb

@@ -22,6 +22,17 @@ module Knapsack
       def post_assign_test_files_to_node
         assign_slow_test_files
         assign_remaining_test_files
+        sort_assigned_test_files
+      end
+
+      def sort_assigned_test_files
+        ci_node_total.times do |index|
+          # sort by first key (file name)
+          # reverse it and then sort by second key (time) in reverse order
+          node_tests[index][:test_files_with_time].sort!.reverse!.sort! do |x, y|
+            y[1] <=> x[1]
+          end
+        end
       end
 
       def post_tests_for_node(node_index)

data/lib/knapsack/presenter.rb

@@ -52,6 +52,9 @@ or bump time_offset_in_seconds setting.}
 Global time execution for this CI node is fine.
 Happy testing!}
         end
+        str << "\n=================================================\n"
+        str << %{Sign up for beta Knapsack Pro here:
+http://knapsack.launchrock.com}
         str << "\n=================================================\n"
         str
       end

data/lib/knapsack/version.rb

@@ -1,3 +1,3 @@
 module Knapsack
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/knapsack/distributors/report_distributor_spec.rb

@@ -147,8 +147,8 @@ describe Knapsack::Distributors::ReportDistributor do
           :test_files_with_time => [
             ["f_spec.rb", 3.5],
             ["d_spec.rb", 2.5],
-            ["a_spec.rb", 1.0],
-            ["b_spec.rb", 1.5]
+            ["b_spec.rb", 1.5],
+            ["a_spec.rb", 1.0]
           ]
         })
       end
@@ -158,9 +158,9 @@ describe Knapsack::Distributors::ReportDistributor do
           :node_index => 2,
           :time_left => 0.5,
           :test_files_with_time => [
+            ["i_spec.rb", 3.0],
             ["h_spec.rb", 3.0],
-            ["c_spec.rb", 2.0],
-            ["i_spec.rb", 3.0]
+            ["c_spec.rb", 2.0]
           ]
         })
       end
@@ -172,8 +172,8 @@ describe Knapsack::Distributors::ReportDistributor do
           expect(distributor.tests_for_node(1)).to eql([
             'f_spec.rb',
             'd_spec.rb',
-            'a_spec.rb',
-            'b_spec.rb'
+            'b_spec.rb',
+            'a_spec.rb'
           ])
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Knapsack splits tests across CI nodes and makes sure that tests will run