rspec-parallel 2.14.8.2 → 2.14.8.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTFhNDU3NjI5NTg3YzU3ZTAwYTcyMzk2MjUzNmFhMTdhNzY0YTEwNA==
+  data.tar.gz: !binary |-
+    M2IwMGViOGQ1MjZiMzExMTFjNGQwNGZkOGViYTcxMzM2OTdjZmYwOA==
+SHA512:
+  metadata.gz: !binary |-
+    MzU5NWZkYjE3ZWIyMThlZDA2NTJkZGNlMmQ1NGNiNDUxNmU1MTNlNTA2NWNh
+    OThlZmY3ZWJlZDU1MDIwZDQ0Y2IyMjE3NDBkNjA0YmQ0ZjcwMjUyNTUwNjIw
+    MGQ5NTE3MTAyZDc1ZWFjYmQwN2QzNTk5NTA2ZjNkODI5NjEyNTA=
+  data.tar.gz: !binary |-
+    ZWM0MWFiZWJmNzc0OGE4M2RhYTNhNDUzNTk1NTJiMDU3YTcyMGI3YjcwNzM2
+    ZDg3Y2VjYzQxNjRhODc5NGU0OGNiYWQ5Nzk2OTg5ZmM4MmYyMzljMWY0OTAw
+    MjZiMWEwMDQyZWRiNmUzMmQyMzQwY2ViOWFhMzdjNTU4NTY0MTY=

data/bin/rspec

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
 begin
-  require 'rspec/autorun'
+  require 'rspec/parallel_autorun'
 rescue LoadError
   $stderr.puts <<-EOS
 #{'*'*50}
-Could not find 'rspec/autorun'
+Could not find 'rspec/parallel_autorun'
 
 This may happen if you're using rubygems as your package manager, but it is not
 being required through some mechanism before executing the rspec command.

data/lib/rspec/parallel.rb

@@ -13,26 +13,36 @@ require_rspec['parallel/version']
 require_rspec['parallel/configuration']
 require_rspec['parallel/option_parser']
 require_rspec['parallel/configuration_options']
+require_rspec['parallel/command_line']
 require_rspec['parallel/example_thread_runner']
 require_rspec['parallel/example_group_thread_runner']
 require_rspec['parallel/runner']
 
 module RSpec
-  # Returns the global [Configuration](RSpec/Parallel/Configuration) object. While you
+  # Returns the global [Configuration](RSpec/Core/Configuration) object. While you
   # _can_ use this method to access the configuration, the more common
   # convention is to use [RSpec.configure](RSpec#configure-class_method).
   #
   # @example
   #     RSpec.configuration.drb_port = 1234
   # @see RSpec.configure
-  # @see Parallel::Configuration
+  # @see Core::Configuration
   def self.configuration
-    @configuration ||= begin
-                         config = RSpec::Parallel::Configuration.new
-                         config.expose_dsl_globally = true
-                         config
-                       end
+    if block_given?
+      RSpec.warn_deprecation <<-WARNING
 
+*****************************************************************
+DEPRECATION WARNING
+
+* RSpec.configuration with a block is deprecated and has no effect.
+* please use RSpec.configure with a block instead.
+
+Called from #{caller(0)[1]}
+*****************************************************************
+
+WARNING
+    end
+    @configuration ||= RSpec::Parallel::Configuration.new
   end
 
   module Parallel

data/lib/rspec/parallel/command_line.rb

@@ -3,35 +3,35 @@ module RSpec
     class CommandLine < RSpec::Core::CommandLine
       def initialize(options, configuration=RSpec::configuration, world=RSpec::world)
         if Array === options
-          options = ConfigurationOptions.new(options)
+          options = RSpec::Parallel::ConfigurationOptions.new(options)
           options.parse_options
         end
-        @options = options
+        @options       = options
         @configuration = configuration
-        @world = world
+        @world         = world
       end
 
       # Configures and runs a suite
       #
       # @param [IO] err
       # @param [IO] out
-      def run_parallel(err, out)
+      def run(err, out)
         @configuration.error_stream = err
         @configuration.output_stream ||= out
         @options.configure(@configuration)
         @configuration.load_spec_files
         @world.announce_filters
-
+        
         @configuration.reporter.report(@world.example_count, @configuration.randomize? ? @configuration.seed : nil) do |reporter|
           begin
             @configuration.run_hook(:before, :suite)
-            group_threads = RSpec::Parallel::ExampleGroupThreadRunner.new(@configuration.thread_maximum)
+            group_threads = RSpec::Parallel::ExampleGroupThreadRunner.new(@options.options[:thread_maximum])
             @world.example_groups.ordered.map {|g| group_threads.run(g, reporter)}
             group_threads.wait_for_completion
 
             @world.example_groups.all? do |g| 
-              result_for_this_group = g.filtered_examples.all? { |example| example.metadata[:execution_result].exception.nil? }
-              results_for_descendants = g.children.all? { |child| child.filtered_examples.all? { |example| example.metadata[:execution_result].exception.nil? } }
+              result_for_this_group = g.filtered_examples.all? { |example| example.exception.nil? }
+              results_for_descendants = g.children.all? { |child| child.filtered_examples.all? { |example| example.exception.nil? } }
               result_for_this_group && results_for_descendants
             end ? 0 : @configuration.failure_exit_code
           ensure

data/lib/rspec/parallel/configuration_options.rb

@@ -1,10 +1,18 @@
 module RSpec
   module Parallel
     class ConfigurationOptions < RSpec::Core::ConfigurationOptions
-      UNFORCED_OPTIONS = [
-        :requires, :profile, :drb, :libs, :files_or_directories_to_run,
-        :full_description, :full_backtrace, :tty, :thread_maximum
+      NON_FORCED_OPTIONS = [
+        :debug, :requires, :profile, :drb, :libs, :files_or_directories_to_run,
+        :line_numbers, :full_description, :full_backtrace, :tty, :thread_maximum
       ].to_set
+
+      def env_options
+        ENV["SPEC_OPTS"] ? RSpec::Parallel::Parser.parse!(Shellwords.split(ENV["SPEC_OPTS"])) : {}
+      end
+
+      def command_line_options
+        @command_line_options ||= RSpec::Parallel::Parser.parse!(@args).merge :files_or_directories_to_run => @args
+      end
     end
   end
 end

data/lib/rspec/parallel/option_parser.rb

@@ -1,213 +1,205 @@
 module RSpec
   module Parallel
     class Parser < RSpec::Core::Parser
-      def parser(options)
-      OptionParser.new do |parser|
-        parser.banner = "Usage: rspec [options] [files or directories]\n\n"
+      def parse!(args)
+        return {} if args.empty?
 
-        parser.on('-I PATH', 'Specify PATH to add to $LOAD_PATH (may be used more than once).') do |dir|
-          options[:libs] ||= []
-          options[:libs] << dir
-        end
+        convert_deprecated_args(args)
 
-        parser.on('-r', '--require PATH', 'Require a file.') do |path|
-          options[:requires] ||= []
-          options[:requires] << path
+        options = args.delete('--tty') ? {:tty => true} : {}
+        begin
+          parser(options).parse!(args)
+        rescue OptionParser::InvalidOption => e
+          abort "#{e.message}\n\nPlease use --help for a listing of valid options"
         end
 
-        parser.on('-O', '--options PATH', 'Specify the path to a custom options file.') do |path|
-          options[:custom_options_file] = path
-        end
+        options
+      end
 
-        parser.on('--order TYPE[:SEED]', 'Run examples by the specified order type.',
-                  '  [defined] examples and groups are run in the order they are defined',
-                  '  [rand]    randomize the order of groups and examples',
-                  '  [random]  alias for rand',
-                  '  [random:SEED] e.g. --order random:123') do |o|
-          options[:order] = o
-        end
+      def parser(options)
+        OptionParser.new do |parser|
+          parser.banner = "Usage: rspec [options] [files or directories]\n\n"
 
-        parser.on('--seed SEED', Integer, 'Equivalent of --order rand:SEED.') do |seed|
-          options[:order] = "rand:#{seed}"
-        end
+          parser.on('-I PATH', 'Specify PATH to add to $LOAD_PATH (may be used more than once).') do |dir|
+            options[:libs] ||= []
+            options[:libs] << dir
+          end
 
-        parser.on('--fail-fast', 'Abort the run on first failure.') do |o|
-          options[:fail_fast] = true
-        end
+          parser.on('-r', '--require PATH', 'Require a file.') do |path|
+            options[:requires] ||= []
+            options[:requires] << path
+          end
 
-        parser.on('--no-fail-fast', 'Do not abort the run on first failure.') do |o|
-          options[:fail_fast] = false
-        end
+          parser.on('-O', '--options PATH', 'Specify the path to a custom options file.') do |path|
+            options[:custom_options_file] = path
+          end
 
-        parser.on('--failure-exit-code CODE', Integer, 'Override the exit code used when there are failing specs.') do |code|
-          options[:failure_exit_code] = code
-        end
+          parser.on('--order TYPE[:SEED]', 'Run examples by the specified order type.',
+                    '  [default] files are ordered based on the underlying file',
+                    '            system\'s order',
+                    '  [rand]    randomize the order of files, groups and examples',
+                    '  [random]  alias for rand',
+                    '  [random:SEED] e.g. --order random:123') do |o|
+            options[:order] = o
+          end
 
-        parser.on('--dry-run', 'Print the formatter output of your suite without',
-                  '  running any examples or hooks') do |o|
-          options[:dry_run] = true
-        end
+          parser.on('--seed SEED', Integer, 'Equivalent of --order rand:SEED.') do |seed|
+            options[:order] = "rand:#{seed}"
+          end
 
-        parser.on('-X', '--[no-]drb', 'Run examples via DRb.') do |o|
-          options[:drb] = o
-        end
+          parser.on('-d', '--debugger', 'Enable debugging.') do |o|
+            options[:debug] = true
+          end
 
-        parser.on('--drb-port PORT', 'Port to connect to the DRb server.') do |o|
-          options[:drb_port] = o.to_i
-        end
+          parser.on('--fail-fast', 'Abort the run on first failure.') do |o|
+            options[:fail_fast] = true
+          end
 
-        parser.on('--init', 'Initialize your project with RSpec.') do |cmd|
-          RSpec::Support.require_rspec_core "project_initializer"
-          ProjectInitializer.new.run
-          exit
-        end
+          parser.on('--failure-exit-code CODE', Integer, 'Override the exit code used when there are failing specs.') do |code|
+            options[:failure_exit_code] = code
+          end
 
-        parser.separator("\n  **** Output ****\n\n")
+          parser.on('-X', '--[no-]drb', 'Run examples via DRb.') do |o|
+            options[:drb] = o
+          end
 
-        parser.on('-f', '--format FORMATTER', 'Choose a formatter.',
-                '  [p]rogress (default - dots)',
-                '  [d]ocumentation (group and example names)',
-                '  [h]tml',
-                '  [j]son',
-                '  custom formatter class name') do |o|
-          options[:formatters] ||= []
-          options[:formatters] << [o]
-        end
+          parser.on('--drb-port PORT', 'Port to connect to the DRb server.') do |o|
+            options[:drb_port] = o.to_i
+          end
 
-        parser.on('-o', '--out FILE',
-                  'Write output to a file instead of $stdout. This option applies',
-                  '  to the previously specified --format, or the default format',
-                  '  if no format is specified.'
-                 ) do |o|
-          options[:formatters] ||= [['progress']]
-          options[:formatters].last << o
-        end
+          parser.on('--init', 'Initialize your project with RSpec.') do |cmd|
+            ProjectInitializer.new(cmd).run
+            exit
+          end
 
-        parser.on('--deprecation-out FILE', 'Write deprecation warnings to a file instead of $stderr.') do |file|
-          options[:deprecation_stream] = file
-        end
+          parser.on('--configure', 'Deprecated. Use --init instead.') do |cmd|
+            warn "--configure is deprecated with no effect. Use --init instead."
+            exit
+          end
 
-        parser.on('-b', '--backtrace', 'Enable full backtrace.') do |o|
-          options[:full_backtrace] = true
-        end
+          parser.separator("\n  **** Output ****\n\n")
+
+          parser.on('-f', '--format FORMATTER', 'Choose a formatter.',
+                  '  [p]rogress (default - dots)',
+                  '  [d]ocumentation (group and example names)',
+                  '  [h]tml',
+                  '  [t]extmate',
+                  '  [j]son',
+                  '  custom formatter class name') do |o|
+            options[:formatters] ||= []
+            options[:formatters] << [o]
+          end
 
-        parser.on('-c', '--[no-]color', '--[no-]colour', 'Enable color in the output.') do |o|
-          options[:color] = o
-        end
+          parser.on('-o', '--out FILE',
+                    'Write output to a file instead of $stdout. This option applies',
+                    '  to the previously specified --format, or the default format',
+                    '  if no format is specified.'
+                   ) do |o|
+            options[:formatters] ||= [['progress']]
+            options[:formatters].last << o
+          end
+
+          parser.on('-b', '--backtrace', 'Enable full backtrace.') do |o|
+            options[:full_backtrace] = true
+          end
+
+          parser.on('-c', '--[no-]color', '--[no-]colour', 'Enable color in the output.') do |o|
+            options[:color] = o
+          end
 
-        parser.on('-p', '--[no-]profile [COUNT]', 'Enable profiling of examples and list the slowest examples (default: 10).') do |argument|
-          options[:profile_examples] = if argument.nil?
-                                         true
-                                       elsif argument == false
-                                         false
-                                       else
-                                         begin
-                                           Integer(argument)
-                                         rescue ArgumentError
-                                           RSpec.warning "Non integer specified as profile count, seperate " +
-                                                       "your path from options with -- e.g. " +
-                                                       "`rspec --profile -- #{argument}`",
-                                                       :call_site => nil
+          parser.on('-p', '--[no-]profile [COUNT]', 'Enable profiling of examples and list the slowest examples (default: 10).') do |argument|
+            options[:profile_examples] = if argument.nil?
                                            true
+                                         elsif argument == false
+                                           false
+                                         else
+                                           begin
+                                             Integer(argument)
+                                           rescue ArgumentError
+                                             Kernel.warn "Non integer specified as profile count, seperate " +
+                                                         "your path from options with -- e.g. " +
+                                                         "`rspec --profile -- #{argument}`"
+                                             true
+                                           end
                                          end
-                                       end
-        end
+          end
 
-        parser.on('-w', '--warnings', 'Enable ruby warnings') do
-          $VERBOSE = true
-        end
+          parser.on('-w', '--warnings', 'Enable ruby warnings') do
+            options[:warnings] = true
+          end
 
-        parser.on('--parallel-test NUMBER', 'Run the tests with the specified number of parallel threads (default: 1).') do |n|
-          options[:thread_maximum] = if !n.nil?
-                                      begin
-                                        Integer(n)
-                                      rescue ArgumentError
-                                        RSpec.warning "Non integer specified as number of parallel threads, seperate " +
-                                                       "your path from options with a space e.g. " +
-                                                       "`rspec --parallel-test #{n}`",
-                                                       :call_site => nil
-                                        1
-                                      end
-                                    end
-        end
+          parser.separator <<-FILTERING
 
-        parser.separator <<-FILTERING
+    **** Filtering/tags ****
 
-  **** Filtering/tags ****
+      In addition to the following options for selecting specific files, groups,
+      or examples, you can select a single example by appending the line number to
+      the filename:
 
-    In addition to the following options for selecting specific files, groups,
-    or examples, you can select a single example by appending the line number to
-    the filename:
+        rspec path/to/a_spec.rb:37
 
-      rspec path/to/a_spec.rb:37
+  FILTERING
 
-FILTERING
+          parser.on('-P', '--pattern PATTERN', 'Load files matching pattern (default: "spec/**/*_spec.rb").') do |o|
+            options[:pattern] = o
+          end
 
-        parser.on('-P', '--pattern PATTERN', 'Load files matching pattern (default: "spec/**/*_spec.rb").') do |o|
-          options[:pattern] = o
-        end
+          parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING (may be",
+                                              "  used more than once)") do |o|
+            (options[:full_description] ||= []) << Regexp.compile(Regexp.escape(o))
+          end
 
-        parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING (may be",
-                                            "  used more than once)") do |o|
-          (options[:full_description] ||= []) << Regexp.compile(Regexp.escape(o))
-        end
+          parser.on('-l', '--line-number LINE', 'Specify line number of an example or group (may be',
+                                                '  used more than once).') do |o|
+            (options[:line_numbers] ||= []) << o
+          end
 
-        parser.on('-t', '--tag TAG[:VALUE]',
-                  'Run examples with the specified tag, or exclude examples',
-                  'by adding ~ before the tag.',
-                  '  - e.g. ~slow',
-                  '  - TAG is always converted to a symbol') do |tag|
-          filter_type = tag =~ /^~/ ? :exclusion_filter : :inclusion_filter
-
-          name,value = tag.gsub(/^(~@|~|@)/, '').split(':',2)
-          name = name.to_sym
-
-          options[filter_type] ||= {}
-          options[filter_type][name] = case value
-                                         when  nil        then true # The default value for tags is true
-                                         when 'true'      then true
-                                         when 'false'     then false
-                                         when 'nil'       then nil
-                                         when /^:/        then value[1..-1].to_sym
-                                         when /^\d+$/     then Integer(value)
-                                         when /^\d+.\d+$/ then Float(value)
-                                       else
-                                         value
-                                       end
-        end
+          parser.on('-t', '--tag TAG[:VALUE]',
+                    'Run examples with the specified tag, or exclude examples',
+                    'by adding ~ before the tag.',
+                    '  - e.g. ~slow',
+                    '  - TAG is always converted to a symbol') do |tag|
+            filter_type = tag =~ /^~/ ? :exclusion_filter : :inclusion_filter
 
-        parser.on('--default-path PATH', 'Set the default path where RSpec looks for examples (can',
-                                         '  be a path to a file or a directory).') do |path|
-          options[:default_path] = path
-        end
+            name,value = tag.gsub(/^(~@|~|@)/, '').split(':')
+            name = name.to_sym
 
-        parser.separator("\n  **** Utility ****\n\n")
+            options[filter_type] ||= {}
+            options[filter_type][name] = value.nil? ? true : eval(value) rescue value
+          end
 
-        parser.on('-v', '--version', 'Display the version.') do
-          puts RSpec::Core::Version::STRING
-          exit
-        end
+          parser.on('--default-path PATH', 'Set the default path where RSpec looks for examples (can',
+                                           '  be a path to a file or a directory).') do |path|
+            options[:default_path] = path
+          end
 
-        # these options would otherwise be confusing to users, so we forcibly prevent them from executing
-        # --I is too similar to -I
-        # -d was a shorthand for --debugger, which is removed, but now would trigger --default-path
-        invalid_options = %w[-d --I]
+          parser.separator("\n  **** Utility ****\n\n")
+
+          parser.on('--parallel-test NUMBER', 'Run the tests with the specified number of parallel threads (default: 1).') do |n|
+            options[:thread_maximum] = if !n.nil?
+                                        begin
+                                          Integer(n)
+                                        rescue ArgumentError
+                                          RSpec.warning "Non integer specified as number of parallel threads, seperate " +
+                                                         "your path from options with a space e.g. " +
+                                                         "`rspec --parallel-test #{n}`",
+                                                         :call_site => nil
+                                          1
+                                        end
+                                      end
+          end
 
-        parser.on_tail('-h', '--help', "You're looking at it.") do
-          # removing the blank invalid options from the output
-          puts parser.to_s.gsub(/^\s+(#{invalid_options.join('|')})\s*$\n/,'')
-          exit
-        end
+          parser.on('-v', '--version', 'Display the version.') do
+            puts RSpec::Parallel::Version::STRING
+            exit
+          end
 
-        # this prevents usage of the invalid_options
-        invalid_options.each do |option|
-          parser.on(option) do
-            raise OptionParser::InvalidOption.new
+          parser.on_tail('-h', '--help', "You're looking at it.") do
+            puts parser
+            exit
           end
         end
-
       end
     end
-    end
   end
 end

data/lib/rspec/parallel/runner.rb

@@ -19,10 +19,10 @@ module RSpec
       # * +Fixnum+ - exit status code (0/1)
       def self.run(args, err=$stderr, out=$stdout)
         trap_interrupt
-        options = ConfigurationOptions.new(args)
+        options = RSpec::Parallel::ConfigurationOptions.new(args)
         options.parse_options
-
         parallel = (options.options[:thread_maximum].nil?) ? false : true
+        
         drb = options.options[:drb]
 
         if drb
@@ -38,9 +38,9 @@ module RSpec
         unless drb
           if parallel
             require 'thread'
-            CommandLine.new(options).run_parallel(err, out)
+            RSpec::Parallel::CommandLine.new(options).run(err, out)
           else
-            CommandLine.new(options).run(err, out)
+            RSpec::Core::CommandLine.new(options).run(err, out)
           end
         end
       ensure

data/lib/rspec/parallel/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Parallel.
     module Version
       # Current version of RSpec Parallel, in semantic versioning format.
-      STRING = '2.14.8.2'
+      STRING = '2.14.8.3'
     end
   end
 end

data/lib/rspec/parallel_autorun.rb

@@ -0,0 +1,3 @@
+require 'rspec/core'
+require 'rspec/parallel'
+RSpec::Parallel::Runner.autorun

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-parallel
 version: !ruby/object:Gem::Version
-  version: 2.14.8.2
-  prerelease: 
+  version: 2.14.8.3
 platform: ruby
 authors:
 - Jason Holt Smith
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,8 +32,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/rspec
 - lib/rspec/parallel.rb
-- lib/rspec/parallel/autorun.rb
 - lib/rspec/parallel/command_line.rb
 - lib/rspec/parallel/configuration.rb
 - lib/rspec/parallel/configuration_options.rb
@@ -45,31 +42,30 @@ files:
 - lib/rspec/parallel/option_parser.rb
 - lib/rspec/parallel/runner.rb
 - lib/rspec/parallel/version.rb
-- bin/rspec
+- lib/rspec/parallel_autorun.rb
 homepage: https://github.com/bicarbon8/rspec-parallel.git
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parallel rspec execution gem
 test_files: []
 has_rdoc: 

data/lib/rspec/parallel/autorun.rb

@@ -1,2 +0,0 @@
-require 'rspec/core'
-RSpec::Parallel::Runner.autorun