rename multiple env, fix float bug, ensure parsing works (#993)

Author: grosser

CHANGELOG.md

@@ -6,7 +6,7 @@
 
 ### Added
 
-- Allow processor multiplier (flag: `-m` or `--multiply-processes`) to be set via the environment variable `PARALLEL_TEST_MULTIPLE`
+- Allow processor multiplier (flag: `-m` or `--multiply-processes`) to be set via the environment variable `PARALLEL_TEST_MULTIPLY_PROCESSES`
 
 ### Fixed
 

lib/parallel_tests.rb

@@ -6,28 +6,32 @@
 module ParallelTests
   WINDOWS = (RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
   RUBY_BINARY = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
-  DEFAULT_MULTIPLE = 1.0
+  DEFAULT_MULTIPLY_PROCESSES = 1.0
 
   autoload :CLI, "parallel_tests/cli"
   autoload :VERSION, "parallel_tests/version"
   autoload :Grouper, "parallel_tests/grouper"
   autoload :Pids, "parallel_tests/pids"
 
   class << self
-    def determine_number_of_processes(count)
-      [
-        count,
-        ENV["PARALLEL_TEST_PROCESSORS"],
-        Parallel.processor_count
-      ].detect { |c| !c.to_s.strip.empty? }.to_i
+    def determine_processor_count(count)
+      Integer(
+        [
+          count,
+          ENV["PARALLEL_TEST_PROCESSORS"],
+          Parallel.processor_count
+        ].detect { |c| !c.to_s.strip.empty? }
+      )
     end
 
     def determine_multiple(multiple)
-      [
-        multiple,
-        ENV["PARALLEL_TEST_MULTIPLE"],
-        DEFAULT_MULTIPLE,
-      ].detect { |c| !c.to_s.strip.empty? }.to_f
+      Float(
+        [
+          multiple,
+          ENV["PARALLEL_TEST_MULTIPLY_PROCESSES"],
+          DEFAULT_MULTIPLY_PROCESSES
+        ].detect { |c| !c.to_s.strip.empty? }
+      )
     end
 
     def with_pid_file

lib/parallel_tests/cli.rb

@@ -14,8 +14,8 @@ def run(argv)
 
       ENV['DISABLE_SPRING'] ||= '1'
 
-      num_processes = ParallelTests.determine_number_of_processes(options[:count])
-      num_processes *= ParallelTests.determine_multiple(options[:multiply])
+      num_processes = ParallelTests.determine_processor_count(options[:count])
+      num_processes = (num_processes * ParallelTests.determine_multiple(options[:multiply])).round
 
       options[:first_is_1] ||= first_is_1?
 
@@ -220,8 +220,8 @@ def parse_options!(argv)
             default - runtime when runtime log is filled otherwise filesize
           TEXT
         ) { |type| options[:group_by] = type.to_sym }
-        opts.on("-m COUNT", "--multiply-processes COUNT", Float, "use given number as a multiplier of processes to run") do |multiply|
-          options[:multiply] = multiply
+        opts.on("-m COUNT", "--multiply-processes COUNT", Float, "use given number as a multiplier of processes to run") do |m|
+          options[:multiply_processes] = m
         end
 
         opts.on("-s PATTERN", "--single PATTERN", "Run all matching files in the same process") do |pattern|

spec/parallel_tests_spec.rb

@@ -8,7 +8,7 @@
     end
 
     def call(count)
-      ParallelTests.determine_number_of_processes(count)
+      ParallelTests.determine_processor_count(count)
     end
 
     it "uses the given count if set" do
@@ -55,7 +55,7 @@ def call(multiple)
 
     it "uses the processor multiple from ENV before Parallel" do
       ENV['PARALLEL_TEST_MULTIPLE'] = '0.75'
-      expect(call(nil)).to eq(0.75)
+      expect(call(nil)).to eq(1)
     end
 
     it "does not use blank multiple" do