rspec-parallel 2.14.8.3 → 2.14.8.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFhNDU3NjI5NTg3YzU3ZTAwYTcyMzk2MjUzNmFhMTdhNzY0YTEwNA==
+    N2E4MWM2ZmE0OGFhOTg1MDkzMzk5MjJjZWM3ZjIxYzZlMDM5M2FkMw==
   data.tar.gz: !binary |-
-    M2IwMGViOGQ1MjZiMzExMTFjNGQwNGZkOGViYTcxMzM2OTdjZmYwOA==
+    YmQxNGYwYmE4ZTJlNDk3YjZhNmY1OWM0YzYwOTYwNzJiZDhiMTAwZg==
 SHA512:
   metadata.gz: !binary |-
-    MzU5NWZkYjE3ZWIyMThlZDA2NTJkZGNlMmQ1NGNiNDUxNmU1MTNlNTA2NWNh
-    OThlZmY3ZWJlZDU1MDIwZDQ0Y2IyMjE3NDBkNjA0YmQ0ZjcwMjUyNTUwNjIw
-    MGQ5NTE3MTAyZDc1ZWFjYmQwN2QzNTk5NTA2ZjNkODI5NjEyNTA=
+    MjM1N2I0NjgxNWYyN2JmOTcwY2MxNmJlZTBhNjg5M2I3OGMwZDAzYmI2YTJm
+    ZTMzMzMzOTU1YWFhMDQ0OGI5MDk0ZTBmOTE2MTdiYWJhYjE3MWIwNjA2ZGZl
+    MzJmNTM5M2VjY2UwMWQwY2ZmNjUzODc4MjNmNDcxYzE1NjAyOWQ=
   data.tar.gz: !binary |-
-    ZWM0MWFiZWJmNzc0OGE4M2RhYTNhNDUzNTk1NTJiMDU3YTcyMGI3YjcwNzM2
-    ZDg3Y2VjYzQxNjRhODc5NGU0OGNiYWQ5Nzk2OTg5ZmM4MmYyMzljMWY0OTAw
-    MjZiMWEwMDQyZWRiNmUzMmQyMzQwY2ViOWFhMzdjNTU4NTY0MTY=
+    MmZhMGQ1NzNjN2VkM2Q0NjBhNGUzNWE5Y2JhMjQ3ZjIwM2EzYWNhNGFkNGMy
+    YmUyN2YwOTQ3OTJlNDdhOTU2MjZlM2Q3Y2YyMmFjNzhlOWZjODAwMjYwNjQ4
+    ODZhZjJlZDMxOTE1NWZmMzY4NWRjN2FmYjU0MjUwNWI2ZDhmNDM=

data/lib/rspec/parallel/configuration_options.rb

@@ -13,6 +13,10 @@ module RSpec
       def command_line_options
         @command_line_options ||= RSpec::Parallel::Parser.parse!(@args).merge :files_or_directories_to_run => @args
       end
+
+      def options_from(path)
+        RSpec::Parallel::Parser.parse(args_from_options_file(path))
+      end
     end
   end
 end

data/lib/rspec/parallel/option_parser.rb

@@ -8,7 +8,17 @@ module RSpec
 
         options = args.delete('--tty') ? {:tty => true} : {}
         begin
-          parser(options).parse!(args)
+          parser(options).parse(args)
+          delete_next = false
+          args.delete_if do |arg|
+            if delete_next
+              true
+            elsif arg == '--parallel-test'
+              delete_next = true
+              true
+            end
+          end
+          parser(options, true).parse!(args)
         rescue OptionParser::InvalidOption => e
           abort "#{e.message}\n\nPlease use --help for a listing of valid options"
         end
@@ -16,187 +26,25 @@ module RSpec
         options
       end
 
-      def parser(options)
-        OptionParser.new do |parser|
-          parser.banner = "Usage: rspec [options] [files or directories]\n\n"
-
-          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('-r', '--require PATH', 'Require a file.') do |path|
-            options[:requires] ||= []
-            options[:requires] << path
-          end
-
-          parser.on('-O', '--options PATH', 'Specify the path to a custom options file.') do |path|
-            options[:custom_options_file] = path
-          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('--seed SEED', Integer, 'Equivalent of --order rand:SEED.') do |seed|
-            options[:order] = "rand:#{seed}"
-          end
-
-          parser.on('-d', '--debugger', 'Enable debugging.') do |o|
-            options[:debug] = true
-          end
-
-          parser.on('--fail-fast', 'Abort the run on first failure.') do |o|
-            options[:fail_fast] = true
-          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('-X', '--[no-]drb', 'Run examples via DRb.') do |o|
-            options[:drb] = 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('--init', 'Initialize your project with RSpec.') do |cmd|
-            ProjectInitializer.new(cmd).run
-            exit
-          end
-
-          parser.on('--configure', 'Deprecated. Use --init instead.') do |cmd|
-            warn "--configure is deprecated with no effect. Use --init instead."
-            exit
-          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('-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
-                                             Kernel.warn "Non integer specified as profile count, seperate " +
-                                                         "your path from options with -- e.g. " +
-                                                         "`rspec --profile -- #{argument}`"
-                                             true
-                                           end
-                                         end
-          end
-
-          parser.on('-w', '--warnings', 'Enable ruby warnings') do
-            options[:warnings] = true
-          end
-
-          parser.separator <<-FILTERING
-
-    **** 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:
-
-        rspec path/to/a_spec.rb:37
-
-  FILTERING
-
-          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('-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(':')
-            name = name.to_sym
-
-            options[filter_type] ||= {}
-            options[filter_type][name] = value.nil? ? true : eval(value) rescue value
-          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
-
-          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('-v', '--version', 'Display the version.') do
-            puts RSpec::Parallel::Version::STRING
-            exit
-          end
-
-          parser.on_tail('-h', '--help', "You're looking at it.") do
-            puts parser
-            exit
+      def parser(options, bypass = false)
+        if bypass
+          super(options)
+        else
+          OptionParser.new do |parser|
+            parser.banner = "\n  **** Parallel Testing ****\n\n"
+
+            parser.on('--parallel-test NUMBER', Integer, 'Run the tests with the specified number of parallel threads (default: 1).') do |n|
+              puts "found --parallel-test with value of: #{n}"
+              options[:thread_maximum] = n || 1
+            end
+
+            parser.on('-v', '--version', 'Display the version.') do
+              puts "rspec-parallel: #{RSpec::Parallel::Version::STRING}"
+            end
+
+            parser.on_tail('-h', '--help', "You're looking at it.") do
+              puts parser
+            end
           end
         end
       end

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.3'
+      STRING = '2.14.8.4'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-parallel
 version: !ruby/object:Gem::Version
-  version: 2.14.8.3
+  version: 2.14.8.4
 platform: ruby
 authors:
 - Jason Holt Smith