opal-rspec 0.4.3 → 0.5.0.beta1

data/{vendor_lib → rspec-core/lib}/rspec/core/option_parser.rb

@@ -2,21 +2,16 @@
 require 'optparse'
 
 module RSpec::Core
+  # @private
   class Parser
-    def self.parse!(args)
-      new.parse!(args)
+    def self.parse(args)
+      new.parse(args)
     end
 
-    class << self
-      alias_method :parse, :parse!
-    end
-
-    def parse!(args)
+    def parse(args)
       return {} if args.empty?
 
-      convert_deprecated_args(args)
-
-      options = args.delete('--tty') ? {:tty => true} : {}
+      options = args.delete('--tty') ? { :tty => true } : {}
       begin
         parser(options).parse!(args)
       rescue OptionParser::InvalidOption => e
@@ -26,24 +21,6 @@ module RSpec::Core
       options
     end
 
-    def convert_deprecated_args(args)
-      args.map! { |arg|
-        case arg
-        when "--formatter"
-          RSpec.deprecate("the --formatter option", :replacement => "-f or --format")
-          "--format"
-        when "--default_path"
-          "--default-path"
-        when "--line_number"
-          "--line-number"
-        else
-          arg
-        end
-      }
-    end
-
-    alias_method :parse, :parse!
-
     def parser(options)
       OptionParser.new do |parser|
         parser.banner = "Usage: rspec [options] [files or directories]\n\n"
@@ -74,11 +51,11 @@ module RSpec::Core
           options[:order] = "rand:#{seed}"
         end
 
-        parser.on('--fail-fast', 'Abort the run on first failure.') do |o|
+        parser.on('--fail-fast', 'Abort the run on first failure.') do |_o|
           options[:fail_fast] = true
         end
 
-        parser.on('--no-fail-fast', 'Do not abort the run on first failure.') do |o|
+        parser.on('--no-fail-fast', 'Do not abort the run on first failure.') do |_o|
           options[:fail_fast] = false
         end
 
@@ -87,7 +64,7 @@ module RSpec::Core
         end
 
         parser.on('--dry-run', 'Print the formatter output of your suite without',
-                  '  running any examples or hooks') do |o|
+                  '  running any examples or hooks') do |_o|
           options[:dry_run] = true
         end
 
@@ -99,25 +76,20 @@ module RSpec::Core
           options[:drb_port] = o.to_i
         end
 
-        parser.on('--init', 'Initialize your project with RSpec.') do |cmd|
-          require 'rspec/core/project_initializer'
-          ProjectInitializer.new(cmd).run
-          exit
-        end
-
-        parser.on('--configure', 'Deprecated. Use --init instead.') do |cmd|
-          RSpec.warning "--configure is deprecated with no effect. Use --init instead.", :call_site => nil
+        parser.on('--init', 'Initialize your project with RSpec.') do |_cmd|
+          RSpec::Support.require_rspec_core "project_initializer"
+          ProjectInitializer.new.run
           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',
-                '  [j]son',
-                '  custom formatter class name') do |o|
+                  '  [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
@@ -131,7 +103,11 @@ module RSpec::Core
           options[:formatters].last << o
         end
 
-        parser.on('-b', '--backtrace', 'Enable full backtrace.') do |o|
+        parser.on('--deprecation-out FILE', 'Write deprecation warnings to a file instead of $stderr.') do |file|
+          options[:deprecation_stream] = file
+        end
+
+        parser.on('-b', '--backtrace', 'Enable full backtrace.') do |_o|
           options[:full_backtrace] = true
         end
 
@@ -148,17 +124,17 @@ module RSpec::Core
                                          begin
                                            Integer(argument)
                                          rescue ArgumentError
-                                           RSpec.warning "Non integer specified as profile count, seperate " +
-                                                       "your path from options with -- e.g. " +
+                                           RSpec.warning "Non integer specified as profile count, seperate " \
+                                                       "your path from options with -- e.g. " \
                                                        "`rspec --profile -- #{argument}`",
-                                                       :call_site => nil
+                                                         :call_site => nil
                                            true
                                          end
                                        end
         end
 
         parser.on('-w', '--warnings', 'Enable ruby warnings') do
-          options[:warnings] = true
+          $VERBOSE = true
         end
 
         parser.separator <<-FILTERING
@@ -177,14 +153,13 @@ FILTERING
           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))
+        parser.on('--exclude-pattern PATTERN', 'Load files except those matching pattern. Opposite effect of --pattern.') do |o|
+          options[:exclude_pattern] = 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
+        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('-t', '--tag TAG[:VALUE]',
@@ -194,25 +169,25 @@ FILTERING
                   '  - TAG is always converted to a symbol') do |tag|
           filter_type = tag =~ /^~/ ? :exclusion_filter : :inclusion_filter
 
-          name,value = tag.gsub(/^(~@|~|@)/, '').split(':',2)
+          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)
+                                       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('--default-path PATH', 'Set the default path where RSpec looks for examples (can',
-                                         '  be a path to a file or a directory).') do |path|
+                  '  be a path to a file or a directory).') do |path|
           options[:default_path] = path
         end
 
@@ -223,11 +198,24 @@ FILTERING
           exit
         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.on_tail('-h', '--help', "You're looking at it.") do
-          puts parser
+          # removing the blank invalid options from the output
+          puts parser.to_s.gsub(/^\s+(#{invalid_options.join('|')})\s*$\n/, '')
           exit
         end
 
+        # this prevents usage of the invalid_options
+        invalid_options.each do |option|
+          parser.on(option) do
+            raise OptionParser::InvalidOption.new
+          end
+        end
+
       end
     end
   end

data/{vendor_lib → rspec-core/lib}/rspec/core/ordering.rb

@@ -1,9 +1,11 @@
 module RSpec
   module Core
     if defined?(::Random)
+      # @private
       RandomNumberGenerator = ::Random
     else
-      require 'rspec/core/backport_random'
+      RSpec::Support.require_rspec_core "backport_random"
+      # @private
       RandomNumberGenerator = RSpec::Core::Backports::Random
     end
 
@@ -121,29 +123,29 @@ module RSpec
 
         def order=(type)
           order, seed = type.to_s.split(':')
-          @seed = seed = seed.to_i if seed
+          @seed = seed.to_i if seed
 
           ordering_name = if order.include?('rand')
-            :random
-          elsif order == 'defined'
-            :defined
-          end
+                            :random
+                          elsif order == 'defined'
+                            :defined
+                          end
 
           register_ordering(:global, ordering_registry.fetch(ordering_name)) if ordering_name
         end
 
         def force(hash)
-          if hash.has_key?(:seed)
+          if hash.key?(:seed)
             self.seed = hash[:seed]
             @seed_forced  = true
             @order_forced = true
-          elsif hash.has_key?(:order)
+          elsif hash.key?(:order)
             self.order = hash[:order]
             @order_forced = true
           end
         end
 
-        def register_ordering(name, strategy = Custom.new(Proc.new { |l| yield l }))
+        def register_ordering(name, strategy=Custom.new(Proc.new { |l| yield l }))
           return if @order_forced && name == :global
           ordering_registry.register(name, strategy)
         end
@@ -151,4 +153,3 @@ module RSpec
     end
   end
 end
-

data/rspec-core/lib/rspec/core/pending.rb

@@ -0,0 +1,163 @@
+module RSpec
+  module Core
+    # Provides methods to mark examples as pending. These methods are available to be
+    # called from within any example or hook.
+    module Pending
+      # Raised in the middle of an example to indicate that it should be marked as skipped.
+      class SkipDeclaredInExample < StandardError
+        attr_reader :argument
+
+        def initialize(argument)
+          @argument = argument
+        end
+      end
+
+      # If Test::Unit is loaded, we'll use its error as baseclass, so that Test::Unit
+      # will report unmet RSpec expectations as failures rather than errors.
+      begin
+        class PendingExampleFixedError < Test::Unit::AssertionFailedError; end
+      rescue
+        class PendingExampleFixedError < StandardError; end
+      end
+
+      # @private
+      NO_REASON_GIVEN = 'No reason given'
+
+      # @private
+      NOT_YET_IMPLEMENTED = 'Not yet implemented'
+
+      # @overload pending()
+      # @overload pending(message)
+      #
+      # Marks an example as pending. The rest of the example will still be
+      # executed, and if it passes the example will fail to indicate that the
+      # pending can be removed.
+      #
+      # @param message [String] optional message to add to the summary report.
+      #
+      # @example
+      #     describe "an example" do
+      #       # reported as "Pending: no reason given"
+      #       it "is pending with no message" do
+      #         pending
+      #         raise "broken"
+      #       end
+      #
+      #       # reported as "Pending: something else getting finished"
+      #       it "is pending with a custom message" do
+      #         pending("something else getting finished")
+      #         raise "broken"
+      #       end
+      #     end
+      #
+      # @note `before(:example)` hooks are eval'd when you use the `pending`
+      #   method within an example. If you want to declare an example `pending`
+      #   and bypass the `before` hooks as well, you can pass `:pending => true`
+      #   to the `it` method:
+      #
+      #       it "does something", :pending => true do
+      #         # ...
+      #       end
+      #
+      #   or pass `:pending => "something else getting finished"` to add a
+      #   message to the summary report:
+      #
+      #       it "does something", :pending => "something else getting finished" do
+      #         # ...
+      #       end
+      def pending(message=nil)
+        current_example = RSpec.current_example
+
+        if block_given?
+          raise ArgumentError, <<-EOS.gsub(/^\s+\|/, '')
+            |The semantics of `RSpec::Core::Pending#pending` have changed in
+            |RSpec 3.  In RSpec 2.x, it caused the example to be skipped. In
+            |RSpec 3, the rest of the example is still run but is expected to
+            |fail, and will be marked as a failure (rather than as pending) if
+            |the example passes.
+            |
+            |Passing a block within an example is now deprecated. Marking the
+            |example as pending provides the same behavior in RSpec 3 which was
+            |provided only by the block in RSpec 2.x.
+            |
+            |Move the code in the block provided to `pending` into the rest of
+            |the example body.
+            |
+            |Called from #{CallerFilter.first_non_rspec_line}.
+            |
+          EOS
+        elsif current_example
+          Pending.mark_pending! current_example, message
+        else
+          raise "`pending` may not be used outside of examples, such as in " \
+                "before(:context). Maybe you want `skip`?"
+        end
+      end
+
+      # @overload skip()
+      # @overload skip(message)
+      #
+      # Marks an example as pending and skips execution.
+      #
+      # @param message [String] optional message to add to the summary report.
+      #
+      # @example
+      #     describe "an example" do
+      #       # reported as "Pending: no reason given"
+      #       it "is skipped with no message" do
+      #         skip
+      #       end
+      #
+      #       # reported as "Pending: something else getting finished"
+      #       it "is skipped with a custom message" do
+      #         skip "something else getting finished"
+      #       end
+      #     end
+      def skip(message=nil)
+        current_example = RSpec.current_example
+
+        Pending.mark_skipped!(current_example, message) if current_example
+
+        raise SkipDeclaredInExample.new(message)
+      end
+
+      # @private
+      #
+      # Mark example as skipped
+      #
+      # @param example [RSpec::Core::Example] the example to mark as skipped
+      # @param message_or_bool [Boolean, String] the message to use, or true
+      def self.mark_skipped!(example, message_or_bool)
+        Pending.mark_pending! example, message_or_bool
+        example.metadata[:skip] = true
+      end
+
+      # @private
+      #
+      # Mark example as pending
+      #
+      # @param example [RSpec::Core::Example] the example to mark as pending
+      # @param message_or_bool [Boolean, String] the message to use, or true
+      def self.mark_pending!(example, message_or_bool)
+        message = if !message_or_bool || !(String === message_or_bool)
+                    NO_REASON_GIVEN
+                  else
+                    message_or_bool
+                  end
+
+        example.metadata[:pending] = true
+        example.execution_result.pending_message = message
+        example.execution_result.pending_fixed = false
+      end
+
+      # @private
+      #
+      # Mark example as fixed
+      #
+      # @param example [RSpec::Core::Example] the example to mark as fixed
+      def self.mark_fixed!(example)
+        example.execution_result.pending_fixed = true
+      end
+    end
+  end
+end

data/rspec-core/lib/rspec/core/project_initializer/spec/spec_helper.rb

@@ -0,0 +1,89 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

data/rspec-core/lib/rspec/core/project_initializer.rb

@@ -0,0 +1,48 @@
+RSpec::Support.require_rspec_support "directory_maker"
+
+module RSpec
+  module Core
+    # @private
+    # Generates conventional files for an rspec project
+    class ProjectInitializer
+      attr_reader :destination, :stream, :template_path
+
+      DOT_RSPEC_FILE = '.rspec'
+      SPEC_HELPER_FILE =  'spec/spec_helper.rb'
+
+      def initialize(opts={})
+        @destination = opts.fetch(:destination, Dir.getwd)
+        @stream = opts.fetch(:report_stream, $stdout)
+        @template_path = opts.fetch(:template_path) do
+          File.expand_path("../project_initializer", __FILE__)
+        end
+      end
+
+      def run
+        copy_template DOT_RSPEC_FILE
+        copy_template SPEC_HELPER_FILE
+      end
+
+    private
+
+      def copy_template(file)
+        destination_file = File.join(destination, file)
+        return report_exists(file) if File.exist?(destination_file)
+
+        report_creating(file)
+        RSpec::Support::DirectoryMaker.mkdir_p(File.dirname(destination_file))
+        File.open(destination_file, 'w') do |f|
+          f.write File.read(File.join(template_path, file))
+        end
+      end
+
+      def report_exists(file)
+        stream.puts "   exist   #{file}"
+      end
+
+      def report_creating(file)
+        stream.puts "  create   #{file}"
+      end
+    end
+  end
+end