semaphore_test_boosters 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 850317895762d06c3ef3617213efd1dac7974784
-  data.tar.gz: 1a03f9570cbe6fdc73c46131f380eb8a694ad172
+  metadata.gz: de95c3faf8fec6fe5d037d492da9433df3028fa2
+  data.tar.gz: adbee1c687caf014f5145248b6994001365aa61c
 SHA512:
-  metadata.gz: 88f2e599a93f15e0e56c2d0d29cdd0b845f8cea2751c334649580d76ea1e567767b4aa920230111345247163e45a9b9f827b55dae51e0689d3bab9c16698c97e
-  data.tar.gz: e533bb7990e3ad15e5b53fce537d0c8c855762703e4b0358a82b8693f4f6f18037b2146610a2a7ac92f363658683c1401e995cd18bf9aae21206c5deafeeac88
+  metadata.gz: e3f19dac14a29900d51795f3ed105d70df9f09e4b983b6b78e395bae78d3e18af953b9005a7aa649764be2ad247390dea88d57d6da46a08f8566fe1b4393cc3c
+  data.tar.gz: 7e70e1209987c81c4a92c5d102ad82966e8fc634985f48f81c04da28938f69ac6f0dcf5dedc8e642c14aa02eb7d7c3c4279ad721d3bbe2625a8a0e7c3d55be1d

data/lib/test_boosters/cli_parser.rb

@@ -0,0 +1,15 @@
+module Semaphore
+  require "optparse"
+
+  def self.parse
+    options = {}
+
+    parser = OptionParser.new do |opts|
+      opts.on("--thread INDEX") { |index| options[:index] = index.to_i }
+    end
+
+    parser.parse!
+
+    options
+  end
+end

data/lib/test_boosters/display_files.rb

@@ -0,0 +1,9 @@
+module Semaphore
+  def self.display_files(title, files)
+    puts "#{title} #{files.count}\n"
+
+    files.each { |file| puts "- #{file}" }
+
+    puts "\n"
+  end
+end

data/lib/test_boosters/executor.rb

@@ -0,0 +1,9 @@
+module Semaphore
+  def self.execute(command)
+    log("Running command: #{command}")
+    system(command)
+    log("Command finished, exit status : #{$?.exitstatus}")
+
+    exit($?.exitstatus)
+  end
+end

data/lib/test_boosters/leftover_specs.rb

@@ -0,0 +1,26 @@
+module LeftoverSpecs
+  def self.select(all_leftover_specs, thread_count, thread_index)
+    all_leftover_specs = sort_by_size(all_leftover_specs)
+
+    return [] if all_leftover_specs.empty?
+
+    specs = all_leftover_specs
+      .each_slice(thread_count)
+      .reduce{|acc, slice| acc.map{|a| a}.zip(slice.reverse)}
+      .map{|f| if f.kind_of?(Array) then f.flatten else [f] end} [thread_index]
+
+    if    specs.nil?            then []
+    elsif specs.kind_of?(Array) then specs.compact
+    end
+  end
+
+  def self.sort_by_size(specs) # descending
+    specs
+      .map{|f| if File.file?(f) then f else nil end}
+      .compact
+      .map{|f| [f, File.size(f)]}
+      .sort_by{|a| a[1]}.map{|a| a[0]}.reverse
+  end
+
+
+end

data/lib/test_boosters/logger.rb

@@ -0,0 +1,7 @@
+module Semaphore
+  def self.log(message)
+    error_log_path = ENV["ERROR_LOG_PATH"] || "#{ENV["HOME"]}/test_booster_error.log"
+
+    File.open(error_log_path, "a") { |f| f.write("#{message}\n") }
+  end
+end

data/lib/test_boosters/rspec_booster.rb

@@ -1,87 +1,73 @@
-#!/usr/bin/env ruby
+module Semaphore
+  require "json"
+  require "test_boosters/cli_parser"
+  require "test_boosters/logger"
+  require "test_boosters/executor"
+  require "test_boosters/display_files"
+  require "test_boosters/leftover_specs"
+
+  class RspecBooster
+    Error = -1
+
+    def initialize(thread_index)
+      @thread_index = thread_index
+      @report_path = ENV["REPORT_PATH"] || "#{ENV["HOME"]}/rspec_report.json"
+      @spec_path = ENV["SPEC_PATH"] || "spec"
+    end
+
+    def run
+      specs_to_run = select
+
+      if specs_to_run == Error
+        if @thread_index == 0
+          Semaphore::execute("bundle exec rspec #{@spec_path}")
+        end
+      elsif specs_to_run.empty?
+          puts "No spec files in this thread!"
+      else
+        Semaphore::execute("bundle exec rspec #{specs_to_run.join(" ")}")
+      end
+    end
+
+    def select
+      with_fallback do
+        rspec_report = JSON.parse(File.read(@report_path))
+        thread_count = rspec_report.count
+        thread = rspec_report[@thread_index]
+
+        all_specs = Dir["#{@spec_path}/**/*_spec.rb"].sort
+        all_known_specs = rspec_report.map { |t| t["files"] }.flatten.sort
+
+        all_leftover_specs = all_specs - all_known_specs
+        thread_leftover_specs = LeftoverSpecs.select(all_leftover_specs, thread_count, @thread_index)
+        thread_specs = all_specs & thread["files"].sort
+        specs_to_run = thread_specs + thread_leftover_specs
+
+        Semaphore::display_files("This thread specs:", thread_specs)
+        Semaphore::display_files("This thread leftover specs:", thread_leftover_specs)
+        Semaphore::display_files("All leftover specs:", all_leftover_specs)
+
+        specs_to_run
+      end
+    end
+
+
+    def with_fallback
+      yield
+    rescue StandardError => e
+      error = %{
+        WARNING: An error detected while parsing the test boosters report file.
+        WARNING: All tests will be executed on the first thread.
+      }
+
+      puts error
+
+      error += %{Exception: #{e.message}}
+
+      Semaphore::log(error)
+
+      Error
+    end
 
-require "optparse"
-require "json"
-
-def log(message)
-  error_log_path = ENV["ERROR_LOG_PATH"] || "#{ENV["HOME"]}/test_booster_error.log"
-
-  File.open(error_log_path, "a") { |f| f.write("#{message}\n") }
-end
-
-def display_files(title, files)
-  puts "#{title} #{files.count}\n"
-
-  files.each { |file| puts "- #{file}" }
-
-  puts "\n"
-end
-
-def execute(command)
-  log("Running command: #{command}")
-  system(command)
-  log("Command finished, exit status : #{$?.exitstatus}")
-
-  exit($?.exitstatus)
-end
-
-def parse_cli_options
-  options = {}
-
-  parser = OptionParser.new do |opts|
-    opts.on("--thread INDEX") { |index| options[:index] = index.to_i }
-  end
-
-  parser.parse!
-
-  options
-end
-
-def with_fallback
-  yield
-rescue StandardError => e
-  error = %{
-WARNING: An error detected while parsing the test boosters report file.
-WARNING: All tests will be executed on the first thread.
-}
-
-  puts error
-
-  error += %{
-Exception:
-#{e.message}
-}
-
-  log(error)
-
-  execute("bundle exec rspec") if $cli_options[:index] == 1
-end
-
-$cli_options = parse_cli_options
-
-report_path = ENV["REPORT_PATH"] || "#{ENV["HOME"]}/rspec_report.json"
-spec_path = ENV["SPEC_PATH"] || "spec"
-
-with_fallback do
-  rspec_report = JSON.parse(File.read(report_path))
-
-  thread = rspec_report[$cli_options[:index] - 1]
-
-  all_specs = Dir["#{spec_path}/**/*_spec.rb"].sort
-  all_known_specs = rspec_report.map { |t| t["files"] }.flatten.sort
-
-  leftover_specs = all_specs - all_known_specs
-  thread_specs = all_specs & thread["files"].sort
-  specs_to_run = thread_specs + (thread["run_leftover_files"] ? leftover_specs : [])
-
-  display_files("Thread specs:", thread_specs)
-
-  display_files("Leftover specs:", leftover_specs) if thread["run_leftover_files"]
-
-  if specs_to_run.empty?
-    puts "No spec files in this thread!"
-    exit
   end
-
-  execute("bundle exec rspec #{specs_to_run.join(" ")}")
 end

data/lib/test_boosters/version.rb

@@ -1,3 +1,3 @@
 module TestBoosters
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/test_boosters.rb

@@ -1,4 +1,5 @@
 require "test_boosters/version"
+require "test_boosters/rspec_booster"
 
 module TestBoosters
   # Your code goes here...

data/script/rspec_booster

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require "test_boosters/rspec_booster"
+
+cli_options = Semaphore::parse
+thread_index = cli_options[:index] - 1
+rspec_booster = Semaphore::RspecBooster.new(thread_index)
+rspec_booster.run

data/test_boosters.gemspec

@@ -6,8 +6,8 @@ require 'test_boosters/version'
 Gem::Specification.new do |spec|
   spec.name          = "semaphore_test_boosters"
   spec.version       = TestBoosters::VERSION
-  spec.authors       = ["Predrag Rakic"]
-  spec.email         = ["prakic@renderedtext.com"]
+  spec.authors       = ["MAINTAINER Rendered Text"]
+  spec.email         = ["devops@renderedtext.com"]
 
   spec.summary       = %q{Semaphore job parallelization.}
   spec.description   = %q{Gem for auto-parallelizing builds across Semaphore jobs.}

data/test_data/a_spec.rb

@@ -0,0 +1 @@
+12345678901234567890

data/test_data/b_spec.rb

@@ -0,0 +1 @@
+123

data/test_data/c_spec.rb

@@ -0,0 +1 @@
+123456789

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semaphore_test_boosters
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
-- Predrag Rakic
+- MAINTAINER Rendered Text
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
 description: Gem for auto-parallelizing builds across Semaphore jobs.
 email:
-- prakic@renderedtext.com
+- devops@renderedtext.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -69,9 +69,18 @@ files:
 - bin/console
 - bin/setup
 - lib/test_boosters.rb
+- lib/test_boosters/cli_parser.rb
+- lib/test_boosters/display_files.rb
+- lib/test_boosters/executor.rb
+- lib/test_boosters/leftover_specs.rb
+- lib/test_boosters/logger.rb
 - lib/test_boosters/rspec_booster.rb
 - lib/test_boosters/version.rb
+- script/rspec_booster
 - test_boosters.gemspec
+- test_data/a_spec.rb
+- test_data/b_spec.rb
+- test_data/c_spec.rb
 homepage: https://github.com/renderedtext/test-boosters
 licenses:
 - MIT