rspec-sharder 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: defc38fdaa55ddfeb271282a3ca2a992b0391fed1eb4be8d552fcd41caafc551
-  data.tar.gz: 22fa847d430e3bc20069803710a0e3429eede4a58b4cd56d28eb3f9492c95f2c
+  metadata.gz: 7abffffb75542211fc36495edeca3b96f32f59b6975686568b3532d2df6ff9c6
+  data.tar.gz: 64bccf923c9897fa23205ade6af164ca10eb60dfc3c89b760b9a73be35d382bb
 SHA512:
-  metadata.gz: 507e697bece492b62a5310f761c923e3956e328c014e6aa610fd2106c57c55662a84c23c1e91fca3ee8b3a2028d96832d1a7e790716f21c786d93bdf408c6342
-  data.tar.gz: 443c1586f14b36142790ea916f3864e797481d8729e16b418e1fb123361d9f7263115cbe9ba7f710c2052d13547b9e1150799c9e80a2198613cb178d0fe1893c
+  metadata.gz: 3cbba17bc9116dbe0a8e3f6aef9d7865f57e40c6393d2e3d3243afacfc5dee658d33fe2c729734fb43ad291280a67f124913807f0b5d69eb28f13671d194309f
+  data.tar.gz: 809210eec8b32c39a87c6f64dbe6e9f699c1f1242b8edb1c0a9ea8120c7945801461744ad17065913f981a81bdfe1b5e1a031a2ce68a746871db995504e39ff1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-sharder (0.0.1)
+    rspec-sharder (0.0.2)
       rspec-core
 
 GEM

data/bin/rspec-sharder

@@ -1,75 +1,3 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
-require 'rspec-sharder'
-
-def fail(message)
-  warn message
-  puts
-  puts @parser.help
-  exit 1
-end
-
-@total_shards = 1
-@shard_num = 1
-@persist = false
-
-@parser = OptionParser.new do |opts|
-  opts.banner = <<~EOF
-    Groups specs into shards, ensuring that each shard has a similar size, and runs
-    the specified shard.
-
-    Shard size is determined by summing the saved durations for each spec file in
-    the shard. Durations are saved in .spec_durations. If a spec file is not found
-    in .spec_durations, the duration is estimated based on the number of examples in
-    the spec file.
-
-    .spec_durations is generate/updated after a successful run when --persist is
-    specified, but only for the shard which was actually executed. To generate
-    durations for all shards simultaneously, run with the default options of 1 total
-    shards and --persist:
-
-    bundle exec rspec-sharder --persist -- [<rspec-args...>]
-
-    Usage: bundle exec rspec-sharder [--total-shards <num> [--shard <num>]] [--persist] -- [<rspec-args...>]
-
-    Options:
-  EOF
-
-  opts.on('-h', '--help', "Print this message.") do
-    puts opts
-    exit
-  end
-
-  opts.on('-t', '--total-shards <num>', 'The total number of shards. Defaults to 1.') do |total_shards|
-    begin
-      @total_shards = Integer(total_shards)
-    rescue ArgumentError
-      fail('fatal: invalid value for --total-shards')
-    end
-  end
-
-  opts.on('-s', '--shard <num>', 'The shard to run. Defaults to 1.') do |shard|
-    begin
-      @shard = Integer(shard)
-    rescue ArgumentError
-      fail('fatal: invalid value for --shard')
-    end
-  end
-
-  opts.on('-p', '--persist', 'Save durations to .spec_durations.') do
-    @persist = true
-  end
-end
-
-begin
-  @parser.parse!
-rescue StandardError => e
-  fail("fatal: #{e.message}")
-end
-
-fail('fatal: invalid value for --total-shards') unless @total_shards > 0
-fail('fatal: invalid value for --shard') unless @shard > 0
-fail('fatal: --shard may not be greater than --total-shards') unless @shard <= @total_shards
-
-RSpec::Sharder.run(total_shards: @total_shards, shard_num: @shard, persist: @persist, rspec_args: ARGV)
+require 'rspec-sharder/command'

data/lib/rspec-sharder/command.rb

@@ -0,0 +1,73 @@
+require 'optparse'
+require 'rspec-sharder'
+
+def fail(message)
+  warn message
+  puts
+  puts @parser.help
+  exit 1
+end
+
+@total_shards = 1
+@shard = 1
+@persist = false
+
+@parser = OptionParser.new do |opts|
+  opts.banner = <<~EOF
+    Groups specs into shards, ensuring that each shard has a similar size, and runs
+    the specified shard.
+
+    Shard size is determined by summing the saved durations for each spec file in
+    the shard. Durations are saved in .spec_durations. If a spec file is not found
+    in .spec_durations, the duration is estimated based on the number of examples in
+    the spec file.
+
+    .spec_durations is generate/updated after a successful run when --persist is
+    specified, but only for the shard which was actually executed. To generate
+    durations for all shards simultaneously, run with the default options of 1 total
+    shards and --persist:
+
+    bundle exec rspec-sharder --persist -- [<rspec-args...>]
+
+    Usage: bundle exec rspec-sharder [--total-shards <num> [--shard <num>]] [--persist] -- [<rspec-args...>]
+
+    Options:
+  EOF
+
+  opts.on('-h', '--help', "Print this message.") do
+    puts opts
+    exit
+  end
+
+  opts.on('-t', '--total-shards <num>', 'The total number of shards. Defaults to 1.') do |total_shards|
+    begin
+      @total_shards = Integer(total_shards)
+    rescue ArgumentError
+      fail('fatal: invalid value for --total-shards')
+    end
+  end
+
+  opts.on('-s', '--shard <num>', 'The shard to run. Defaults to 1.') do |shard|
+    begin
+      @shard = Integer(shard)
+    rescue ArgumentError
+      fail('fatal: invalid value for --shard')
+    end
+  end
+
+  opts.on('-p', '--persist', 'Save durations to .spec_durations.') do
+    @persist = true
+  end
+end
+
+begin
+  @parser.parse!
+rescue StandardError => e
+  fail("fatal: #{e.message}")
+end
+
+fail('fatal: invalid value for --total-shards') unless @total_shards > 0
+fail('fatal: invalid value for --shard') unless @shard > 0
+fail('fatal: --shard may not be greater than --total-shards') unless @shard <= @total_shards
+
+RSpec::Sharder.run(total_shards: @total_shards, shard_num: @shard, persist: @persist, rspec_args: ARGV)

data/lib/rspec-sharder/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Sharder
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/rspec-sharder.rb

@@ -50,12 +50,9 @@ module RSpec
           end
 
           group_results = example_groups.map do |example_group|
-            start_time = current_time_millis
-            result = example_group.run(reporter)
-            end_time = current_time_millis
+            result, duration = run_example_group(example_group, reporter)
 
             file_path = example_group.metadata[:file_path]
-            duration = (end_time - start_time).to_i
             actual_total_duration += duration
             new_durations[file_path] ||= 0
             new_durations[file_path] += duration
@@ -88,10 +85,7 @@ module RSpec
       else
         if exit_code == 0
           # Print recorded durations and summary.
-          ::RSpec.configuration.output_stream.puts <<~EOF
-            
-            Durations:
-          EOF
+          ::RSpec.configuration.output_stream.puts 'Durations'
 
           new_durations.sort_by { |file_path, duration| file_path }.each do |file_path, duration|
             ::RSpec.configuration.output_stream.puts "#{file_path},#{duration}"
@@ -177,7 +171,7 @@ module RSpec
         if durations[file_path]
           files[file_path] = durations[file_path]
         else
-          ::RSpec.configuration.error_stream.puts "warning: recorded duration not found for #{file_path}"
+          ::RSpec.configuration.output_stream.puts "warning: recorded duration not found for #{file_path}"
 
           # Assume 1000 milliseconds per example.
           files[file_path] += ::RSpec.world.example_count([example_group]) * 1000
@@ -209,7 +203,7 @@ module RSpec
       end
       ::RSpec::Core::ExampleStatusPersister.persist(examples, path)
     rescue SystemCallError => e
-      ::RSpec.configuration.error_stream.puts "warning: failed to write results to #{path}"
+      ::RSpec.configuration.output_stream.puts "warning: failed to write results to #{path}"
     end
 
     def self.pretty_duration(duration_millis)
@@ -236,7 +230,7 @@ module RSpec
         shard[:file_paths].each do |file_path|
           ::RSpec.configuration.output_stream.puts file_path
         end
-        ::RSpec.configuration.output_stream.puts
+        ::RSpec.configuration.output_stream.puts unless i == shards.size - 1
       end
     end
 
@@ -255,5 +249,11 @@ module RSpec
     def self.current_time_millis
       (Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1000).to_i
     end
+
+    def self.run_example_group(example_group, reporter)
+      start_time = current_time_millis
+      result = example_group.run(reporter)
+      [result, (current_time_millis - start_time).to_i]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sharder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nick Dower
@@ -39,6 +39,7 @@ files:
 - README.md
 - bin/rspec-sharder
 - lib/rspec-sharder.rb
+- lib/rspec-sharder/command.rb
 - lib/rspec-sharder/version.rb
 - rspec-sharder.gemspec
 - scripts/release.sh