semaphore_test_boosters 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed293810759ad0c77be71fe83a4074ac16111377
-  data.tar.gz: d5b355fc1d0ff450971cb79e3c0a18a707ff6321
+  metadata.gz: 16ee85bdadc0f19aaf4b16c3e5f98a710540a999
+  data.tar.gz: 9c912cc4b2fa96df2ad02eddd132fec18651eb6e
 SHA512:
-  metadata.gz: 81776f5163c2664b11a07bf337203709e69f98093e1eac53f4514a04e8480929abd53d2b5ba95ada52ed7e2cf1fde06848d8c030746e057aaa730c9b9f1e9fb2
-  data.tar.gz: 2edf0360a6fd2841985414e31120687f2e05fbc55698e06cf0b11daadb9d38560dfa9ef6b92f9fa624c0ee69298ea196c2cf8ebcddf44a456c092880d722bbb8
+  metadata.gz: 0ae6310f2469127c089493e9adfb979628c0b00a6ce52f99ab17f559325b57324343f2eb0b08d26aab665fc47404eff5326ddc6f6e53865d6b8cbbae481d181b
+  data.tar.gz: b2ef54cccb3df907ddd682ae57242225aa9bbe32922b64a97873903325e45d35b16e3d59306081f53b6f878e5bb6c63d0845d873fc9c01ab32d3a84e3ec126bf

data/config/cucumber.yml

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

data/exe/cucumber_booster

@@ -2,14 +2,14 @@
 
 require "test_boosters"
 
-Semaphore::run_cucumber_config
+TestBoosters.run_cucumber_config
 
-cli_options = Semaphore::parse
+cli_options = TestBoosters::CliParser.parse
 thread_index = cli_options[:index] - 1
-cucumber_booster = Semaphore::CucumberBooster.new(thread_index)
+cucumber_booster = TestBoosters::CucumberBooster.new(thread_index)
 exit_status = cucumber_booster.run
 
 report_path = cucumber_booster.report_path
-Semaphore::InsightsUploader.new.upload("cucumber", report_path)
+TestBoosters::InsightsUploader.new.upload("cucumber", report_path)
 
 exit(exit_status)

data/exe/rspec_booster

@@ -2,12 +2,12 @@
 
 require "test_boosters"
 
-cli_options = Semaphore::parse
+cli_options = TestBoosters::CliParser.parse
 thread_index = cli_options[:index] - 1
-rspec_booster = Semaphore::RspecBooster.new(thread_index)
+rspec_booster = TestBoosters::RspecBooster.new(thread_index)
 exit_status = rspec_booster.run
 
 report_path = rspec_booster.report_path
-Semaphore::InsightsUploader.new.upload("rspec", report_path)
+TestBoosters::InsightsUploader.new.upload("rspec", report_path)
 
 exit(exit_status)

data/lib/test_boosters.rb

@@ -1,9 +1,27 @@
-require "test_boosters/version"
-require "test_boosters/rspec_booster"
-require "test_boosters/cucumber_booster"
-require "test_boosters/insights_uploader"
-require "test_boosters/run_cucumber_config"
+require "optparse"
+require "json"
+require "cucumber_booster_config"
 
 module TestBoosters
-  # Your code goes here...
+  require "test_boosters/version"
+
+  require "test_boosters/cli_parser"
+  require "test_boosters/logger"
+  require "test_boosters/shell"
+  require "test_boosters/leftover_files"
+
+  require "test_boosters/rspec_booster"
+  require "test_boosters/cucumber_booster"
+  require "test_boosters/insights_uploader"
+
+  module_function
+
+  def run_cucumber_config
+    puts
+    puts "================== Running Cucumber Booster Config ==================="
+    puts
+
+    CucumberBoosterConfig::CLI.start ["inject", "."]
+  end
+
 end

data/lib/test_boosters/cli_parser.rb

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

data/lib/test_boosters/cucumber_booster.rb

@@ -1,11 +1,4 @@
-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_files"
-
+module TestBoosters
   class CucumberBooster
     attr_reader :report_path
 
@@ -39,7 +32,7 @@ module Semaphore
       puts "========================= Running Cucumber =========================="
       puts
 
-      Semaphore::execute("bundle exec cucumber #{specs}")
+      TestBoosters::Shell.execute("bundle exec cucumber #{specs}")
     end
 
     def select
@@ -52,13 +45,13 @@ module Semaphore
         all_known_features = file_distribution.map { |t| t["files"] }.flatten.sort
 
         all_leftover_features = all_features - all_known_features
-        thread_leftover_features = LeftoverFiles.select(all_leftover_features, thread_count, @thread_index)
+        thread_leftover_features = TestBoosters::LeftoverFiles.select(all_leftover_features, thread_count, @thread_index)
         thread_features = all_features & thread["files"].sort
         features_to_run = thread_features + thread_leftover_features
 
-        Semaphore.display_files("This thread features:", thread_features)
-        Semaphore.display_title_and_count("All leftover features:", all_leftover_features)
-        Semaphore.display_files("This thread leftover features:", thread_leftover_features)
+        TestBoosters::Shell.display_files("This thread features:", thread_features)
+        TestBoosters::Shell.display_title_and_count("All leftover features:", all_leftover_features)
+        TestBoosters::Shell.display_files("This thread leftover features:", thread_leftover_features)
 
         features_to_run
       end
@@ -76,7 +69,7 @@ module Semaphore
 
       error += %{Exception: #{e.message}}
 
-      Semaphore.log(error)
+      TestBoosters::Logger.error(error)
 
       raise
     end

data/lib/test_boosters/insights_uploader.rb

@@ -1,6 +1,4 @@
-module Semaphore
-  module_function
-
+module TestBoosters
   class InsightsUploader
     def initialize
       @project_hash_id = ENV["SEMAPHORE_PROJECT_UUID"]
@@ -15,7 +13,7 @@ module Semaphore
             "&project_hash_id=#{@project_hash_id}"
       cmd = "http POST '#{url}' #{booster_type}:=@#{file}"
 
-      Semaphore.execute("#{cmd} > ~/insights_uploader.log")
+      TestBoosters::Shell.execute("#{cmd} > ~/insights_uploader.log")
     end
   end
 end

data/lib/test_boosters/leftover_files.rb

@@ -1,29 +1,30 @@
-module LeftoverFiles
-  module_function
+module TestBoosters
+  module LeftoverFiles
+    module_function
 
-  def self.select(all_leftover_files, thread_count, thread_index)
-    all_leftover_files = sort_by_size(all_leftover_files)
+    def select(all_leftover_files, thread_count, thread_index)
+      all_leftover_files = sort_descending_by_size(all_leftover_files)
 
-    return [] if all_leftover_files.empty?
+      return [] if all_leftover_files.empty?
 
-    files = all_leftover_files
-      .each_slice(thread_count)
-      .reduce{ |acc, slice| acc.map{|a| a}.zip(slice.reverse) }
-      .map{ |f| f.kind_of?(Array) ? f.flatten : [f] } [thread_index]
+      files = all_leftover_files
+        .each_slice(thread_count)
+        .reduce{ |acc, slice| acc.map{|a| a}.zip(slice.reverse) }
+        .map{ |f| f.kind_of?(Array) ? f.flatten : [f] } [thread_index]
 
-    if    files.nil?            then []
-    elsif files.kind_of?(Array) then files.compact
+      if    files.nil?            then []
+      elsif files.kind_of?(Array) then files.compact
+      end
     end
-  end
-
-  def self.sort_by_size(files) # descending
-    files
-      .select { |f| File.file?(f) }
-      .map{ |f| [f, File.size(f)] }
-      .sort_by{ |a| a[1] }
-      .map{ |a| a[0] }
-      .reverse
-  end
 
+    def sort_descending_by_size(files)
+      files
+        .select { |f| File.file?(f) }
+        .map { |f| [f, File.size(f)] }
+        .sort_by { |a| a[1] }
+        .map { |a| a[0] }
+        .reverse
+    end
 
+  end
 end

data/lib/test_boosters/logger.rb

@@ -1,9 +1,19 @@
-module Semaphore
-  module_function
+module TestBoosters
+  module Logger
+    module_function
 
-  def log(message)
-    error_log_path = ENV["ERROR_LOG_PATH"] || "#{ENV["HOME"]}/test_booster_error.log"
+    # TODO: why are we logging info messages into the error log?
+    def info(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 error(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
 
-    File.open(error_log_path, "a") { |f| f.write("#{message}\n") }
   end
 end

data/lib/test_boosters/rspec_booster.rb

@@ -1,11 +1,4 @@
-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_files"
-
+module TestBoosters
   class RspecBooster
     attr_reader :report_path
 
@@ -41,7 +34,7 @@ module Semaphore
       puts "========================= Running Rspec =========================="
       puts
 
-      Semaphore.execute("bundle exec rspec #{options} #{specs}")
+      TestBoosters::Shell.execute("bundle exec rspec #{options} #{specs}")
     end
 
     def select
@@ -50,23 +43,24 @@ module Semaphore
         thread_count = file_distribution.count
         thread = file_distribution[@thread_index]
 
+        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_leftover_specs = all_specs - all_known_specs
-        thread_leftover_specs = LeftoverFiles.select(all_leftover_specs, thread_count, @thread_index)
+        thread_leftover_specs = TestBoosters::LeftoverFiles.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_title_and_count("All leftover specs:", all_leftover_specs)
-        Semaphore.display_files("This thread leftover specs:", thread_leftover_specs)
+        TestBoosters::Shell.display_files("This thread specs:", thread_specs)
+        TestBoosters::Shell.display_title_and_count("All leftover specs:", all_leftover_specs)
+        TestBoosters::Shell.display_files("This thread leftover specs:", thread_leftover_specs)
 
         specs_to_run
       end
     end
 
-
     def with_fallback
       yield
     rescue StandardError => e
@@ -78,7 +72,7 @@ module Semaphore
       error += %{Exception: #{e.message}\n#{e.backtrace.join("\n")}}
 
       puts error
-      Semaphore.log(error)
+      TestBoosters::Logger.error(error)
 
       raise
     end

data/lib/test_boosters/run_cucumber_config.rb

@@ -1,13 +0,0 @@
-require 'cucumber_booster_config'
-
-module Semaphore
-  module_function
-
-  def run_cucumber_config()
-    puts
-    puts "================== Running Cucumber Booster Config ==================="
-    puts
-
-    CucumberBoosterConfig::CLI.start ["inject", "."]
-  end
-end

data/lib/test_boosters/shell.rb

@@ -0,0 +1,26 @@
+module TestBoosters
+  module Shell
+    module_function
+
+    def execute(command)
+      TestBoosters::Logger.info("Running command: #{command}")
+      system(command)
+      TestBoosters::Logger.info("Command finished, exit status : #{$?.exitstatus}")
+
+      $?.exitstatus
+    end
+
+    def display_files(title, files)
+      display_title_and_count(title, files)
+
+      files.each { |file| puts "- #{file}" }
+
+      puts "\n"
+    end
+
+    def display_title_and_count(title, files)
+      puts "#{title} #{files.count}\n"
+    end
+
+  end
+end

data/lib/test_boosters/version.rb

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

data/test_boosters.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'test_boosters/version'
+require "test_boosters/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "semaphore_test_boosters"
@@ -22,15 +22,15 @@ Gem::Specification.new do |spec|
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "semaphore_cucumber_booster_config", "~> 1.1"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "cucumber-rails"
+  spec.add_development_dependency "activesupport", "~> 4.0"
+  spec.add_development_dependency "cucumber-rails", "~> 1.4.3"
 end

data/test_data_fail/fail_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-# Booster = Semaphore::RspecBooster
-
-describe Semaphore::RspecBooster do
+describe TestBoosters::RspecBooster do
   it 'fails' do
     expect(TestBoosters::VERSION).to be "wrong"
   end

data/test_data_pass/pass_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Semaphore::RspecBooster do
+describe TestBoosters::RspecBooster do
   it 'passes' do
     expect(0).to eq(0)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semaphore_test_boosters
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - MAINTAINER Rendered Text
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semaphore_cucumber_booster_config
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
 description: Gem for auto-parallelizing builds across Semaphore jobs.
 email:
 - devops@renderedtext.com
@@ -103,13 +103,12 @@ files:
 - lib/test_boosters.rb
 - lib/test_boosters/cli_parser.rb
 - lib/test_boosters/cucumber_booster.rb
-- lib/test_boosters/display_files.rb
-- lib/test_boosters/executor.rb
 - lib/test_boosters/insights_uploader.rb
 - 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/version.rb
 - test_boosters.gemspec
 - test_data/a.feature

data/lib/test_boosters/display_files.rb

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

data/lib/test_boosters/executor.rb

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