semaphore_test_boosters 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ee85bdadc0f19aaf4b16c3e5f98a710540a999
-  data.tar.gz: 9c912cc4b2fa96df2ad02eddd132fec18651eb6e
+  metadata.gz: 4520935b29d20711b3eb5820b25f06f4636b9508
+  data.tar.gz: 128cc7b8d1003a16958eb8422170067627e24435
 SHA512:
-  metadata.gz: 0ae6310f2469127c089493e9adfb979628c0b00a6ce52f99ab17f559325b57324343f2eb0b08d26aab665fc47404eff5326ddc6f6e53865d6b8cbbae481d181b
-  data.tar.gz: b2ef54cccb3df907ddd682ae57242225aa9bbe32922b64a97873903325e45d35b16e3d59306081f53b6f878e5bb6c63d0845d873fc9c01ab32d3a84e3ec126bf
+  metadata.gz: 3e9462ca2bd7c54e737c5af5b7f1385e07430993e79c0a0ce4e4fa3453561bfcee0b720cd99e8cc74367c12a3784217f581259348bb5071104e3dc6cc8772262
+  data.tar.gz: de26c3793cb0aad2fe81428c18b7851d7b28d0c11b7f46644f76f5124bf21ee9f1f7592c1a4969d601f1080dd5128a3fc60b5a6f81af8510a5f6934a992e03fc

data/config/cucumber.yml

@@ -1,2 +1,3 @@
-default: --format pretty  --profile semaphoreci
+default: --format pretty  --profile semaphoreci --profile semaphoreci
+semaphoreci: --format json --out=../cucumber_report.json
 semaphoreci: --format json --out=../cucumber_report.json

data/lib/test_boosters/cucumber_booster.rb

@@ -4,8 +4,7 @@ module TestBoosters
 
     def initialize(thread_index)
       @thread_index = thread_index
-      @cucumber_split_configuration_path = ENV["CUCUMBER_SPLIT_CONFIGURATION_PATH"] || "#{ENV["HOME"]}/cucumber_split_configuration.json"
-      @report_path = "#{ENV["HOME"]}/rspec_report.json"
+      @report_path = ENV["REPORT_PATH"] || "#{ENV["HOME"]}/cucumber_report.json"
       @spec_path = ENV["SPEC_PATH"] || "features"
     end
 
@@ -37,16 +36,15 @@ module TestBoosters
 
     def select
       with_fallback do
-        file_distribution = JSON.parse(File.read(@cucumber_split_configuration_path))
-        thread_count = file_distribution.count
-        thread = file_distribution[@thread_index]
+        split_configuration = TestBoosters::SplitConfiguration.for_cucumber
+        thread_count = split_configuration.threads.count
 
         all_features = Dir["#{@spec_path}/**/*.feature"].sort
-        all_known_features = file_distribution.map { |t| t["files"] }.flatten.sort
+        all_known_features = split_configuration.all_files
 
         all_leftover_features = all_features - all_known_features
         thread_leftover_features = TestBoosters::LeftoverFiles.select(all_leftover_features, thread_count, @thread_index)
-        thread_features = all_features & thread["files"].sort
+        thread_features = all_features & split_configuration.files_for_thread(@thread_index)
         features_to_run = thread_features + thread_leftover_features
 
         TestBoosters::Shell.display_files("This thread features:", thread_features)

data/lib/test_boosters/rspec_booster.rb

@@ -4,7 +4,6 @@ module TestBoosters
 
     def initialize(thread_index)
       @thread_index = thread_index
-      @rspec_split_configuration_path = ENV["RSPEC_SPLIT_CONFIGURATION_PATH"] || "#{ENV["HOME"]}/rspec_split_configuration.json"
       @report_path = ENV["REPORT_PATH"] || "#{ENV["HOME"]}/rspec_report.json"
       @spec_path = ENV["SPEC_PATH"] || "spec"
     end
@@ -39,18 +38,18 @@ module TestBoosters
 
     def select
       with_fallback do
-        file_distribution = JSON.parse(File.read(@rspec_split_configuration_path))
-        thread_count = file_distribution.count
-        thread = file_distribution[@thread_index]
+        split_configuration = TestBoosters::SplitConfiguration.for_rspec
+        thread_count = split_configuration.threads.count
 
         puts "Running RSpec thread #{@thread_index + 1} out of #{thread_count} threads\n"
 
         all_specs = Dir["#{@spec_path}/**/*_spec.rb"].sort
-        all_known_specs = file_distribution.map { |t| t["files"] }.flatten.sort
+        all_known_specs = split_configuration.all_files
 
         all_leftover_specs = all_specs - all_known_specs
         thread_leftover_specs = TestBoosters::LeftoverFiles.select(all_leftover_specs, thread_count, @thread_index)
-        thread_specs = all_specs & thread["files"].sort
+
+        thread_specs = all_specs & split_configuration.files_for_thread(@thread_index)
         specs_to_run = thread_specs + thread_leftover_specs
 
         TestBoosters::Shell.display_files("This thread specs:", thread_specs)

data/lib/test_boosters/split_configuration.rb

@@ -0,0 +1,54 @@
+module TestBoosters
+  class SplitConfiguration
+
+    def self.for_rspec
+      path_from_env = ENV["RSPEC_SPLIT_CONFIGURATION_PATH"]
+      default_path = "#{ENV["HOME"]}/rspec_split_configuration.json"
+
+      new(path_from_env || default_path)
+    end
+
+    def self.for_cucumber
+      path_from_env = ENV["CUCUMBER_SPLIT_CONFIGURATION_PATH"]
+      default_path = "#{ENV["HOME"]}/cucumber_split_configuration.json"
+
+      new(path_from_env || default_path)
+    end
+
+    class Thread < Struct.new(:files, :thread_index)
+    end
+
+    def initialize(path)
+      @path = path
+    end
+
+    def present?
+      File.exist?(@path)
+    end
+
+    def all_files
+      @all_files ||= threads.map(&:files).flatten.sort
+    end
+
+    def files_for_thread(thread_index)
+      threads[thread_index].files
+    end
+
+    def threads
+      @threads ||= load_data.map.with_index do |raw_thread, index|
+        TestBoosters::SplitConfiguration::Thread.new(raw_thread["files"].sort, index)
+      end
+    end
+
+    private
+
+    def load_data
+      if present?
+        JSON.parse(File.read(@path))
+      else
+        []
+      end
+    end
+
+  end
+end

data/lib/test_boosters/version.rb

@@ -1,3 +1,3 @@
 module TestBoosters
-  VERSION = "1.2.4"
+  VERSION = "1.3.0"
 end

data/lib/test_boosters.rb

@@ -5,6 +5,7 @@ require "cucumber_booster_config"
 module TestBoosters
   require "test_boosters/version"
 
+  require "test_boosters/split_configuration"
   require "test_boosters/cli_parser"
   require "test_boosters/logger"
   require "test_boosters/shell"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semaphore_test_boosters
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - MAINTAINER Rendered Text
@@ -107,8 +107,8 @@ files:
 - lib/test_boosters/leftover_files.rb
 - lib/test_boosters/logger.rb
 - lib/test_boosters/rspec_booster.rb
-- lib/test_boosters/run_cucumber_config.rb
 - lib/test_boosters/shell.rb
+- lib/test_boosters/split_configuration.rb
 - lib/test_boosters/version.rb
 - test_boosters.gemspec
 - test_data/a.feature