opal-rspec 0.8.0.alpha3 → 1.0.0.alpha1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/build.yml +7 -7
- data/.gitmodules +6 -0
- data/CHANGELOG.md +16 -1
- data/Gemfile +13 -0
- data/README.md +63 -59
- data/diff-lcs/spec/files_to_exclude.txt +1 -0
- data/diff-lcs/spec/requires.rb +4 -0
- data/diff-lcs/upstream/.autotest +5 -0
- data/diff-lcs/upstream/.fasterer.yml +3 -0
- data/{stubs/diff/lcs.rb → diff-lcs/upstream/.gemtest} +0 -0
- data/diff-lcs/upstream/.github/workflows/ci.yml +64 -0
- data/diff-lcs/upstream/.github/workflows/codeql-analysis.yml +70 -0
- data/diff-lcs/upstream/.gitignore +20 -0
- data/diff-lcs/upstream/.hoerc +52 -0
- data/diff-lcs/upstream/.rspec +1 -0
- data/diff-lcs/upstream/.standard.yml +6 -0
- data/diff-lcs/upstream/Code-of-Conduct.md +74 -0
- data/diff-lcs/upstream/Contributing.md +119 -0
- data/diff-lcs/upstream/Gemfile +28 -0
- data/diff-lcs/upstream/History.md +407 -0
- data/diff-lcs/upstream/License.md +41 -0
- data/diff-lcs/upstream/Manifest.txt +59 -0
- data/diff-lcs/upstream/README.rdoc +84 -0
- data/diff-lcs/upstream/Rakefile +127 -0
- data/diff-lcs/upstream/bin/htmldiff +35 -0
- data/diff-lcs/upstream/bin/ldiff +9 -0
- data/diff-lcs/upstream/diff-lcs.gemspec +48 -0
- data/diff-lcs/upstream/docs/COPYING.txt +339 -0
- data/diff-lcs/upstream/docs/artistic.txt +127 -0
- data/diff-lcs/upstream/lib/diff/lcs/array.rb +7 -0
- data/diff-lcs/upstream/lib/diff/lcs/backports.rb +9 -0
- data/diff-lcs/upstream/lib/diff/lcs/block.rb +37 -0
- data/diff-lcs/upstream/lib/diff/lcs/callbacks.rb +327 -0
- data/diff-lcs/upstream/lib/diff/lcs/change.rb +174 -0
- data/diff-lcs/upstream/lib/diff/lcs/htmldiff.rb +158 -0
- data/diff-lcs/upstream/lib/diff/lcs/hunk.rb +363 -0
- data/diff-lcs/upstream/lib/diff/lcs/internals.rb +308 -0
- data/diff-lcs/upstream/lib/diff/lcs/ldiff.rb +173 -0
- data/diff-lcs/upstream/lib/diff/lcs/string.rb +5 -0
- data/diff-lcs/upstream/lib/diff/lcs.rb +741 -0
- data/diff-lcs/upstream/lib/diff-lcs.rb +3 -0
- data/diff-lcs/upstream/spec/change_spec.rb +89 -0
- data/diff-lcs/upstream/spec/diff_spec.rb +51 -0
- data/diff-lcs/upstream/spec/fixtures/aX +1 -0
- data/diff-lcs/upstream/spec/fixtures/bXaX +1 -0
- data/diff-lcs/upstream/spec/fixtures/ds1.csv +50 -0
- data/diff-lcs/upstream/spec/fixtures/ds2.csv +51 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff +4 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff-c +7 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff-e +3 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff-f +3 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff-u +5 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef +4 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef-c +15 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef-e +3 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef-f +3 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef-u +9 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef2 +7 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef2-c +20 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef2-d +7 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef2-e +7 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef2-f +7 -0
- data/diff-lcs/upstream/spec/fixtures/ldiff/output.diff.chef2-u +16 -0
- data/diff-lcs/upstream/spec/fixtures/new-chef +4 -0
- data/diff-lcs/upstream/spec/fixtures/new-chef2 +17 -0
- data/diff-lcs/upstream/spec/fixtures/old-chef +4 -0
- data/diff-lcs/upstream/spec/fixtures/old-chef2 +14 -0
- data/diff-lcs/upstream/spec/hunk_spec.rb +83 -0
- data/diff-lcs/upstream/spec/issues_spec.rb +160 -0
- data/diff-lcs/upstream/spec/lcs_spec.rb +56 -0
- data/diff-lcs/upstream/spec/ldiff_spec.rb +89 -0
- data/diff-lcs/upstream/spec/patch_spec.rb +416 -0
- data/diff-lcs/upstream/spec/sdiff_spec.rb +216 -0
- data/diff-lcs/upstream/spec/spec_helper.rb +376 -0
- data/diff-lcs/upstream/spec/traverse_balanced_spec.rb +312 -0
- data/diff-lcs/upstream/spec/traverse_sequences_spec.rb +137 -0
- data/lib/opal/rspec/runner.rb +11 -0
- data/lib/opal/rspec/sprockets.rb +6 -0
- data/lib/opal/rspec/version.rb +1 -1
- data/lib/opal/rspec.rb +1 -2
- data/lib-opal/opal/rspec/async/configuration.rb +39 -0
- data/lib-opal/opal/rspec/async/example.rb +80 -168
- data/lib-opal/opal/rspec/async/example_group.rb +71 -81
- data/lib-opal/opal/rspec/async/hooks.rb +98 -8
- data/lib-opal/opal/rspec/async/memoized_helpers.rb +32 -0
- data/lib-opal/opal/rspec/async/reporter.rb +6 -3
- data/lib-opal/opal/rspec/async/runner.rb +33 -24
- data/lib-opal/opal/rspec/async.rb +4 -1
- data/lib-opal/opal/rspec/browser.rb +0 -8
- data/lib-opal/opal/rspec/browser_early.rb +5 -0
- data/lib-opal/opal/rspec/fixes/diff-lcs/hunk.rb +164 -0
- data/lib-opal/opal/rspec/fixes/diff-lcs/lcs.rb +112 -0
- data/lib-opal/opal/rspec/fixes/diff-lcs.rb +2 -0
- data/lib-opal/opal/rspec/fixes/opal.rb +4 -17
- data/lib-opal/opal/rspec/fixes/rspec/core/example_status_persister.rb +11 -0
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/deprecation_formatter.rb +3 -12
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/exception_presenter.rb +28 -0
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/loader.rb +0 -32
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/snippet_extractor.rb +17 -0
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/syntax_highlighter.rb +17 -0
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters.rb +3 -4
- data/lib-opal/opal/rspec/fixes/rspec/core/metadata.rb +24 -8
- data/lib-opal/opal/rspec/fixes/rspec/core/notifications/examples_notification.rb +3 -20
- data/lib-opal/opal/rspec/fixes/rspec/core/notifications.rb +0 -2
- data/lib-opal/opal/rspec/fixes/rspec/core.rb +1 -2
- data/lib-opal/opal/rspec/fixes/rspec/expectations.rb +0 -1
- data/lib-opal/opal/rspec/fixes/rspec/matchers/built_in/base_matcher.rb +26 -0
- data/lib-opal/opal/rspec/fixes/rspec/matchers/built_in.rb +1 -3
- data/lib-opal/opal/rspec/fixes/rspec/matchers/expecteds_for_multiple_diffs.rb +13 -0
- data/lib-opal/opal/rspec/fixes/rspec/matchers.rb +1 -1
- data/lib-opal/opal/rspec/fixes/rspec/mocks/error_generator.rb +26 -10
- data/lib-opal/opal/rspec/fixes/rspec/mocks/proxy.rb +19 -0
- data/lib-opal/opal/rspec/fixes/rspec/mocks.rb +1 -3
- data/lib-opal/opal/rspec/fixes/rspec/support/differ.rb +29 -0
- data/lib-opal/opal/rspec/fixes/rspec/support/encoded_string.rb +9 -5
- data/lib-opal/opal/rspec/fixes/rspec/support/ruby_features.rb +22 -0
- data/lib-opal/opal/rspec/fixes/rspec/support/source.rb +15 -0
- data/lib-opal/opal/rspec/fixes/rspec/support.rb +3 -3
- data/lib-opal/opal/rspec/fixes/rspec.rb +0 -1
- data/lib-opal/opal/rspec/fixes.rb +1 -0
- data/lib-opal/opal/rspec/formatter/document_io.rb +1 -1
- data/lib-opal/opal/rspec/formatter/html_printer.rb +1 -1
- data/lib-opal/opal/rspec/pre_require_fixes.rb +1 -5
- data/lib-opal/opal/rspec/requires.rb +32 -19
- data/lib-opal/opal/rspec/sprockets_runner.rb.erb +1 -0
- data/lib-opal/opal/rspec.rb +3 -0
- data/opal-rspec.gemspec +1 -1
- data/rspec/upstream/.document +1 -1
- data/rspec/upstream/.github/FUNDING.yml +5 -0
- data/rspec/upstream/.gitignore +1 -0
- data/rspec/upstream/LICENSE.md +27 -0
- data/rspec/upstream/README.md +26 -26
- data/rspec/upstream/Rakefile +1 -1
- data/rspec/upstream/certs/rspec.pem +32 -20
- data/rspec/upstream/certs/samphippen.asc +18 -0
- data/rspec/upstream/code_of_conduct.md +59 -0
- data/rspec/upstream/lib/rspec/version.rb +1 -1
- data/rspec/upstream/rspec.gemspec +7 -2
- data/rspec-core/upstream/.document +1 -1
- data/rspec-core/upstream/.github/FUNDING.yml +5 -0
- data/rspec-core/upstream/.github/workflows/ci.yml +150 -0
- data/rspec-core/upstream/.gitignore +2 -0
- data/rspec-core/upstream/.rspec +1 -0
- data/rspec-core/upstream/.rubocop.yml +64 -12
- data/rspec-core/upstream/.rubocop_rspec_base.yml +224 -38
- data/rspec-core/upstream/.rubocop_todo.yml +1031 -0
- data/rspec-core/upstream/.yardopts +2 -1
- data/rspec-core/upstream/BUILD_DETAIL.md +149 -0
- data/rspec-core/upstream/CODE_OF_CONDUCT.md +59 -0
- data/rspec-core/upstream/CONTRIBUTING.md +86 -0
- data/rspec-core/upstream/Changelog.md +721 -2
- data/rspec-core/upstream/DEV-README.md +2 -2
- data/rspec-core/upstream/DEVELOPMENT.md +131 -0
- data/rspec-core/upstream/Filtering.md +173 -0
- data/rspec-core/upstream/Gemfile +78 -9
- data/rspec-core/upstream/ISSUE_TEMPLATE.md +24 -0
- data/rspec-core/upstream/{License.txt → LICENSE.md} +6 -5
- data/rspec-core/upstream/README.md +165 -24
- data/rspec-core/upstream/REPORT_TEMPLATE.md +43 -0
- data/rspec-core/upstream/Rakefile +1 -1
- data/rspec-core/upstream/benchmarks/allocations/1000_groups_1_example.rb +124 -0
- data/rspec-core/upstream/benchmarks/allocations/1_group_1000_examples.rb +63 -0
- data/rspec-core/upstream/benchmarks/allocations/helper.rb +30 -0
- data/rspec-core/upstream/benchmarks/allocations/running_1000_groups_1_example.rb +100 -0
- data/rspec-core/upstream/benchmarks/allocations/running_1_group_1000_examples.rb +60 -0
- data/rspec-core/upstream/benchmarks/capture_block_vs_yield.rb +208 -0
- data/rspec-core/upstream/benchmarks/flat_map_vs_inject.rb +55 -0
- data/rspec-core/upstream/benchmarks/hash_functions.rb +74 -0
- data/rspec-core/upstream/benchmarks/keys_each_vs_each_key.rb +43 -0
- data/rspec-core/upstream/benchmarks/module_inclusion_filtering.rb +89 -0
- data/rspec-core/upstream/benchmarks/precalculate_absolute_file_path_or_not.rb +29 -0
- data/rspec-core/upstream/benchmarks/shuffle_vs_sort_by_for_random_ordering.rb +131 -0
- data/rspec-core/upstream/benchmarks/singleton_example_groups/helper.rb +122 -0
- data/rspec-core/upstream/benchmarks/singleton_example_groups/with_config_hooks.rb +28 -0
- data/rspec-core/upstream/benchmarks/singleton_example_groups/with_config_hooks_module_inclusions_and_shared_context_inclusions.rb +35 -0
- data/rspec-core/upstream/benchmarks/singleton_example_groups/with_module_inclusions.rb +28 -0
- data/rspec-core/upstream/benchmarks/singleton_example_groups/with_no_config_hooks_or_inclusions.rb +22 -0
- data/rspec-core/upstream/benchmarks/singleton_example_groups/with_shared_context_inclusions.rb +28 -0
- data/rspec-core/upstream/benchmarks/threadsafe_let_block.rb +312 -0
- data/rspec-core/upstream/cucumber.yml +7 -2
- data/rspec-core/upstream/features/.nav +5 -1
- data/rspec-core/upstream/features/README.md +2 -2
- data/rspec-core/upstream/features/clear_examples.feature +106 -0
- data/rspec-core/upstream/features/command_line/bisect.feature +178 -0
- data/rspec-core/upstream/features/command_line/example_matches_name_option.feature +131 -0
- data/rspec-core/upstream/features/command_line/example_name_option.feature +2 -0
- data/rspec-core/upstream/features/command_line/fail_fast.feature +21 -4
- data/rspec-core/upstream/features/command_line/init.feature +2 -2
- data/rspec-core/upstream/features/command_line/line_number_appended_to_path.feature +2 -2
- data/rspec-core/upstream/features/command_line/only_failures.feature +113 -0
- data/rspec-core/upstream/features/command_line/order.md +8 -1
- data/rspec-core/upstream/features/command_line/pattern_option.feature +6 -3
- data/rspec-core/upstream/features/command_line/rake_task.feature +3 -3
- data/rspec-core/upstream/features/command_line/randomization.feature +5 -2
- data/rspec-core/upstream/features/command_line/ruby.feature +6 -2
- data/rspec-core/upstream/features/command_line/tag.feature +13 -11
- data/rspec-core/upstream/features/command_line/warnings_option.feature +20 -3
- data/rspec-core/upstream/features/configuration/backtrace_exclusion_patterns.feature +45 -29
- data/rspec-core/upstream/features/configuration/color.feature +22 -0
- data/rspec-core/upstream/features/configuration/custom_settings.feature +9 -13
- data/rspec-core/upstream/features/configuration/default_path.feature +1 -1
- data/rspec-core/upstream/features/configuration/enable_global_dsl.feature +15 -1
- data/rspec-core/upstream/features/configuration/error_exit_code.feature +52 -0
- data/rspec-core/upstream/features/configuration/fail_fast.feature +42 -12
- data/rspec-core/upstream/features/configuration/fail_if_no_examples.feature +31 -0
- data/rspec-core/upstream/features/configuration/failure_exit_code.feature +26 -0
- data/rspec-core/upstream/features/configuration/overriding_global_ordering.feature +1 -1
- data/rspec-core/upstream/features/configuration/pattern.feature +1 -1
- data/rspec-core/upstream/features/configuration/profile.feature +25 -0
- data/rspec-core/upstream/features/configuration/read_options_from_file.feature +25 -19
- data/rspec-core/upstream/features/configuration/run_all_when_everything_filtered.feature +4 -0
- data/rspec-core/upstream/features/core_standalone.feature +2 -0
- data/rspec-core/upstream/features/example_groups/basic_structure.feature +1 -0
- data/rspec-core/upstream/features/example_groups/shared_context.feature +55 -5
- data/rspec-core/upstream/features/example_groups/shared_examples.feature +59 -15
- data/rspec-core/upstream/features/expectation_framework_integration/aggregating_failures.feature +602 -0
- data/rspec-core/upstream/features/expectation_framework_integration/configure_expectation_framework.feature +13 -5
- data/rspec-core/upstream/features/filtering/filter_run_when_matching.feature +75 -0
- data/rspec-core/upstream/features/formatters/configurable_colors.feature +23 -4
- data/rspec-core/upstream/features/helper_methods/let.feature +3 -0
- data/rspec-core/upstream/features/helper_methods/modules.feature +6 -0
- data/rspec-core/upstream/features/hooks/around_hooks.feature +36 -6
- data/rspec-core/upstream/features/hooks/before_and_after_hooks.feature +47 -5
- data/rspec-core/upstream/features/hooks/filtering.feature +199 -4
- data/rspec-core/upstream/features/hooks/when_first_matching_example_defined.feature +70 -0
- data/rspec-core/upstream/features/metadata/current_scope.feature +87 -0
- data/rspec-core/upstream/features/metadata/described_class.feature +12 -5
- data/rspec-core/upstream/features/metadata/user_defined.feature +3 -3
- data/rspec-core/upstream/features/mock_framework_integration/use_any_framework.feature +1 -1
- data/rspec-core/upstream/features/mock_framework_integration/use_flexmock.feature +5 -5
- data/rspec-core/upstream/features/mock_framework_integration/use_mocha.feature +5 -5
- data/rspec-core/upstream/features/mock_framework_integration/use_rr.feature +5 -5
- data/rspec-core/upstream/features/mock_framework_integration/use_rspec.feature +6 -6
- data/rspec-core/upstream/features/pending_and_skipped_examples/pending_examples.feature +8 -7
- data/rspec-core/upstream/features/pending_and_skipped_examples/skipped_examples.feature +49 -22
- data/rspec-core/upstream/features/step_definitions/additional_cli_steps.rb +142 -12
- data/rspec-core/upstream/features/step_definitions/core_standalone_steps.rb +6 -2
- data/rspec-core/upstream/features/subject/implicit_subject.feature +3 -2
- data/rspec-core/upstream/features/subject/one_liner_syntax.feature +9 -5
- data/rspec-core/upstream/features/support/diff_lcs_versions.rb +17 -0
- data/rspec-core/upstream/features/support/env.rb +20 -7
- data/rspec-core/upstream/features/support/jruby.rb +8 -0
- data/rspec-core/upstream/features/support/require_expect_syntax_in_aruba_specs.rb +6 -3
- data/rspec-core/upstream/features/support/rubinius.rb +5 -1
- data/rspec-core/upstream/features/support/ruby_27_support.rb +7 -0
- data/rspec-core/upstream/features/support/send_sigint_during_bisect.rb +21 -0
- data/rspec-core/upstream/lib/rspec/autorun.rb +1 -0
- data/rspec-core/upstream/lib/rspec/core/backtrace_formatter.rb +3 -4
- data/rspec-core/upstream/lib/rspec/core/bisect/coordinator.rb +62 -0
- data/rspec-core/upstream/lib/rspec/core/bisect/example_minimizer.rb +173 -0
- data/rspec-core/upstream/lib/rspec/core/bisect/fork_runner.rb +138 -0
- data/rspec-core/upstream/lib/rspec/core/bisect/server.rb +61 -0
- data/rspec-core/upstream/lib/rspec/core/bisect/shell_command.rb +126 -0
- data/rspec-core/upstream/lib/rspec/core/bisect/shell_runner.rb +73 -0
- data/rspec-core/upstream/lib/rspec/core/bisect/utilities.rb +69 -0
- data/rspec-core/upstream/lib/rspec/core/configuration.rb +1157 -212
- data/rspec-core/upstream/lib/rspec/core/configuration_options.rb +82 -22
- data/rspec-core/upstream/lib/rspec/core/did_you_mean.rb +46 -0
- data/rspec-core/upstream/lib/rspec/core/drb.rb +10 -1
- data/rspec-core/upstream/lib/rspec/core/dsl.rb +10 -5
- data/rspec-core/upstream/lib/rspec/core/example.rb +271 -107
- data/rspec-core/upstream/lib/rspec/core/example_group.rb +426 -127
- data/rspec-core/upstream/lib/rspec/core/example_status_persister.rb +235 -0
- data/rspec-core/upstream/lib/rspec/core/filter_manager.rb +76 -104
- data/rspec-core/upstream/lib/rspec/core/flat_map.rb +6 -4
- data/rspec-core/upstream/lib/rspec/core/formatters/base_bisect_formatter.rb +45 -0
- data/rspec-core/upstream/lib/rspec/core/formatters/base_formatter.rb +7 -4
- data/rspec-core/upstream/lib/rspec/core/formatters/base_text_formatter.rb +15 -16
- data/rspec-core/upstream/lib/rspec/core/formatters/bisect_drb_formatter.rb +29 -0
- data/rspec-core/upstream/lib/rspec/core/formatters/bisect_progress_formatter.rb +157 -0
- data/rspec-core/upstream/lib/rspec/core/formatters/console_codes.rb +28 -16
- data/rspec-core/upstream/lib/rspec/core/formatters/deprecation_formatter.rb +14 -13
- data/rspec-core/upstream/lib/rspec/core/formatters/documentation_formatter.rb +47 -13
- data/rspec-core/upstream/lib/rspec/core/formatters/exception_presenter.rb +525 -0
- data/rspec-core/upstream/lib/rspec/core/formatters/failure_list_formatter.rb +23 -0
- data/rspec-core/upstream/lib/rspec/core/formatters/fallback_message_formatter.rb +28 -0
- data/rspec-core/upstream/lib/rspec/core/formatters/helpers.rb +40 -9
- data/rspec-core/upstream/lib/rspec/core/formatters/html_formatter.rb +20 -16
- data/rspec-core/upstream/lib/rspec/core/formatters/html_printer.rb +27 -18
- data/rspec-core/upstream/lib/rspec/core/formatters/html_snippet_extractor.rb +120 -0
- data/rspec-core/upstream/lib/rspec/core/formatters/json_formatter.rb +15 -7
- data/rspec-core/upstream/lib/rspec/core/formatters/profile_formatter.rb +10 -7
- data/rspec-core/upstream/lib/rspec/core/formatters/progress_formatter.rb +1 -0
- data/rspec-core/upstream/lib/rspec/core/formatters/protocol.rb +62 -43
- data/rspec-core/upstream/lib/rspec/core/formatters/snippet_extractor.rb +115 -85
- data/rspec-core/upstream/lib/rspec/core/formatters/syntax_highlighter.rb +91 -0
- data/rspec-core/upstream/lib/rspec/core/formatters.rb +71 -32
- data/rspec-core/upstream/lib/rspec/core/hooks.rb +303 -248
- data/rspec-core/upstream/lib/rspec/core/invocations.rb +87 -0
- data/rspec-core/upstream/lib/rspec/core/memoized_helpers.rb +155 -47
- data/rspec-core/upstream/lib/rspec/core/metadata.rb +102 -41
- data/rspec-core/upstream/lib/rspec/core/metadata_filter.rb +209 -49
- data/rspec-core/upstream/lib/rspec/core/minitest_assertions_adapter.rb +5 -2
- data/rspec-core/upstream/lib/rspec/core/mocking_adapters/flexmock.rb +1 -1
- data/rspec-core/upstream/lib/rspec/core/mocking_adapters/mocha.rb +8 -8
- data/rspec-core/upstream/lib/rspec/core/notifications.rb +180 -201
- data/rspec-core/upstream/lib/rspec/core/option_parser.rb +159 -58
- data/rspec-core/upstream/lib/rspec/core/ordering.rb +40 -26
- data/rspec-core/upstream/lib/rspec/core/output_wrapper.rb +29 -0
- data/rspec-core/upstream/lib/rspec/core/pending.rb +19 -25
- data/rspec-core/upstream/lib/rspec/core/profiler.rb +34 -0
- data/rspec-core/upstream/lib/rspec/core/project_initializer/.rspec +0 -1
- data/rspec-core/upstream/lib/rspec/core/project_initializer/spec/spec_helper.rb +31 -22
- data/rspec-core/upstream/lib/rspec/core/project_initializer.rb +1 -1
- data/rspec-core/upstream/lib/rspec/core/rake_task.rb +73 -72
- data/rspec-core/upstream/lib/rspec/core/reporter.rb +134 -18
- data/rspec-core/upstream/lib/rspec/core/ruby_project.rb +13 -5
- data/rspec-core/upstream/lib/rspec/core/runner.rb +99 -45
- data/rspec-core/upstream/lib/rspec/core/sandbox.rb +37 -0
- data/rspec-core/upstream/lib/rspec/core/set.rb +54 -0
- data/rspec-core/upstream/lib/rspec/core/shared_example_group.rb +126 -37
- data/rspec-core/upstream/lib/rspec/core/shell_escape.rb +49 -0
- data/rspec-core/upstream/lib/rspec/core/test_unit_assertions_adapter.rb +3 -3
- data/rspec-core/upstream/lib/rspec/core/version.rb +1 -1
- data/rspec-core/upstream/lib/rspec/core/warnings.rb +2 -2
- data/rspec-core/upstream/lib/rspec/core/world.rb +164 -60
- data/rspec-core/upstream/lib/rspec/core.rb +64 -21
- data/rspec-core/upstream/maintenance-branch +1 -1
- data/rspec-core/upstream/rspec-core.gemspec +16 -11
- data/rspec-core/upstream/script/ci_functions.sh +73 -0
- data/rspec-core/upstream/script/clone_all_rspec_repos +2 -2
- data/rspec-core/upstream/script/cucumber.sh +8 -0
- data/rspec-core/upstream/script/custom_build_functions.sh +22 -0
- data/rspec-core/upstream/script/functions.sh +125 -89
- data/rspec-core/upstream/script/legacy_setup.sh +20 -0
- data/rspec-core/upstream/script/predicate_functions.sh +162 -0
- data/rspec-core/upstream/script/rspec_with_simplecov +6 -6
- data/rspec-core/upstream/script/run_build +14 -9
- data/rspec-core/upstream/script/run_rubocop +14 -0
- data/rspec-core/upstream/script/update_rubygems_and_install_bundler +20 -0
- data/rspec-expectations/upstream/.document +1 -1
- data/rspec-expectations/upstream/.github/FUNDING.yml +5 -0
- data/rspec-expectations/upstream/.github/workflows/ci.yml +150 -0
- data/rspec-expectations/upstream/.gitignore +2 -0
- data/rspec-expectations/upstream/.rubocop.yml +126 -2
- data/rspec-expectations/upstream/.rubocop_rspec_base.yml +224 -38
- data/rspec-expectations/upstream/.rubocop_todo.yml +335 -0
- data/rspec-expectations/upstream/.yardopts +1 -1
- data/rspec-expectations/upstream/BUILD_DETAIL.md +149 -0
- data/rspec-expectations/upstream/CODE_OF_CONDUCT.md +59 -0
- data/rspec-expectations/upstream/CONTRIBUTING.md +86 -0
- data/rspec-expectations/upstream/Changelog.md +454 -4
- data/rspec-expectations/upstream/DEV-README.md +3 -3
- data/rspec-expectations/upstream/DEVELOPMENT.md +131 -0
- data/rspec-expectations/upstream/Gemfile +77 -9
- data/rspec-expectations/upstream/ISSUE_TEMPLATE.md +24 -0
- data/{rspec-mocks/upstream/License.txt → rspec-expectations/upstream/LICENSE.md} +5 -4
- data/rspec-expectations/upstream/README.md +73 -31
- data/rspec-expectations/upstream/REPORT_TEMPLATE.md +43 -0
- data/rspec-expectations/upstream/Rakefile +13 -10
- data/rspec-expectations/upstream/Should.md +13 -5
- data/rspec-expectations/upstream/benchmarks/2.x_vs_3.x_matcher_dsl_implementation.rb +1 -2
- data/rspec-expectations/upstream/benchmarks/caller_vs_raise_for_backtrace.rb +77 -0
- data/rspec-expectations/upstream/benchmarks/count_vs_select_size.rb +68 -0
- data/rspec-expectations/upstream/benchmarks/default_messages_as_methods_v_blocks.rb +1 -1
- data/rspec-expectations/upstream/benchmarks/gsub_vs_tr_single_character.rb +28 -0
- data/rspec-expectations/upstream/benchmarks/include_matcher.rb +249 -0
- data/rspec-expectations/upstream/benchmarks/include_v_superclass.rb +0 -1
- data/rspec-expectations/upstream/benchmarks/match_array/failing_with_duplicate_items.rb +1 -1
- data/rspec-expectations/upstream/benchmarks/output_stringio_vs_tempfile.rb +31 -0
- data/rspec-expectations/upstream/benchmarks/set_vs_array_include.rb +1 -3
- data/rspec-expectations/upstream/cucumber.yml +9 -4
- data/rspec-expectations/upstream/features/.nav +1 -0
- data/rspec-expectations/upstream/features/aggregating_failures.feature +56 -0
- data/rspec-expectations/upstream/features/built_in_matchers/README.md +3 -3
- data/rspec-expectations/upstream/features/built_in_matchers/all.feature +3 -2
- data/rspec-expectations/upstream/features/built_in_matchers/be_within.feature +1 -1
- data/rspec-expectations/upstream/features/built_in_matchers/change.feature +8 -6
- data/rspec-expectations/upstream/features/built_in_matchers/comparisons.feature +33 -1
- data/rspec-expectations/upstream/features/built_in_matchers/contain_exactly.feature +1 -0
- data/rspec-expectations/upstream/features/built_in_matchers/cover.feature +3 -3
- data/rspec-expectations/upstream/features/built_in_matchers/exist.feature +1 -1
- data/rspec-expectations/upstream/features/built_in_matchers/have_attributes.feature +1 -2
- data/rspec-expectations/upstream/features/built_in_matchers/include.feature +74 -17
- data/rspec-expectations/upstream/features/built_in_matchers/match.feature +2 -2
- data/rspec-expectations/upstream/features/built_in_matchers/output.feature +67 -4
- data/rspec-expectations/upstream/features/built_in_matchers/predicates.feature +56 -19
- data/rspec-expectations/upstream/features/built_in_matchers/raise_error.feature +16 -2
- data/rspec-expectations/upstream/features/built_in_matchers/respond_to.feature +191 -3
- data/rspec-expectations/upstream/features/built_in_matchers/satisfy.feature +17 -8
- data/rspec-expectations/upstream/features/built_in_matchers/throw_symbol.feature +1 -1
- data/rspec-expectations/upstream/features/built_in_matchers/types.feature +34 -34
- data/rspec-expectations/upstream/features/built_in_matchers/yield.feature +2 -2
- data/rspec-expectations/upstream/features/composing_matchers.feature +4 -4
- data/rspec-expectations/upstream/features/custom_matchers/define_block_matcher.feature +78 -0
- data/rspec-expectations/upstream/features/custom_matchers/define_diffable_matcher.feature +115 -3
- data/rspec-expectations/upstream/features/custom_matchers/define_matcher.feature +173 -21
- data/rspec-expectations/upstream/features/custom_matchers/define_matcher_with_fluent_interface.feature +21 -2
- data/rspec-expectations/upstream/features/define_negated_matcher.feature +2 -1
- data/rspec-expectations/upstream/features/diffing.feature +29 -1
- data/rspec-expectations/upstream/features/implicit_docstrings.feature +8 -8
- data/rspec-expectations/upstream/features/step_definitions/additional_cli_steps.rb +11 -7
- data/rspec-expectations/upstream/features/support/diff_lcs_versions.rb +25 -0
- data/rspec-expectations/upstream/features/support/disallow_certain_apis.rb +3 -3
- data/rspec-expectations/upstream/features/support/env.rb +11 -11
- data/rspec-expectations/upstream/features/support/rubinius.rb +1 -1
- data/rspec-expectations/upstream/features/support/ruby_features.rb +39 -0
- data/rspec-expectations/upstream/features/syntax_configuration.feature +9 -9
- data/rspec-expectations/upstream/features/test_frameworks/minitest.feature +69 -2
- data/rspec-expectations/upstream/lib/rspec/expectations/block_snippet_extractor.rb +253 -0
- data/rspec-expectations/upstream/lib/rspec/expectations/configuration.rb +84 -1
- data/rspec-expectations/upstream/lib/rspec/expectations/expectation_target.rb +82 -38
- data/rspec-expectations/upstream/lib/rspec/expectations/fail_with.rb +11 -6
- data/rspec-expectations/upstream/lib/rspec/expectations/failure_aggregator.rb +212 -0
- data/rspec-expectations/upstream/lib/rspec/expectations/handler.rb +27 -12
- data/rspec-expectations/upstream/lib/rspec/expectations/minitest_integration.rb +43 -2
- data/rspec-expectations/upstream/lib/rspec/expectations/syntax.rb +5 -5
- data/rspec-expectations/upstream/lib/rspec/expectations/version.rb +1 -1
- data/rspec-expectations/upstream/lib/rspec/expectations.rb +15 -1
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/all.rb +1 -0
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/base_matcher.rb +77 -11
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be.rb +28 -114
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be_between.rb +1 -1
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be_instance_of.rb +5 -1
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be_kind_of.rb +5 -1
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be_within.rb +4 -4
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/change.rb +168 -55
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/compound.rb +61 -29
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/contain_exactly.rb +73 -12
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/count_expectation.rb +169 -0
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/eq.rb +3 -38
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/eql.rb +2 -2
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/equal.rb +3 -3
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/exist.rb +7 -3
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/has.rb +90 -24
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/have_attributes.rb +37 -7
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/include.rb +124 -23
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/match.rb +79 -2
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/operators.rb +14 -5
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/output.rb +56 -1
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/raise_error.rb +126 -29
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/respond_to.rb +118 -9
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/satisfy.rb +28 -7
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/{start_and_end_with.rb → start_or_end_with.rb} +20 -8
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/throw_symbol.rb +11 -5
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in/yield.rb +110 -155
- data/rspec-expectations/upstream/lib/rspec/matchers/built_in.rb +4 -3
- data/rspec-expectations/upstream/lib/rspec/matchers/composable.rb +23 -35
- data/rspec-expectations/upstream/lib/rspec/matchers/dsl.rb +179 -26
- data/rspec-expectations/upstream/lib/rspec/matchers/english_phrasing.rb +58 -0
- data/rspec-expectations/upstream/lib/rspec/matchers/expecteds_for_multiple_diffs.rb +82 -0
- data/rspec-expectations/upstream/lib/rspec/matchers/fail_matchers.rb +42 -0
- data/rspec-expectations/upstream/lib/rspec/matchers/generated_descriptions.rb +1 -2
- data/rspec-expectations/upstream/lib/rspec/matchers/matcher_delegator.rb +2 -0
- data/rspec-expectations/upstream/lib/rspec/matchers/matcher_protocol.rb +72 -66
- data/rspec-expectations/upstream/lib/rspec/matchers.rb +227 -150
- data/rspec-expectations/upstream/maintenance-branch +1 -1
- data/rspec-expectations/upstream/rspec-expectations.gemspec +13 -8
- data/rspec-expectations/upstream/script/ci_functions.sh +73 -0
- data/rspec-expectations/upstream/script/clone_all_rspec_repos +2 -2
- data/rspec-expectations/upstream/script/cucumber.sh +8 -0
- data/rspec-expectations/upstream/script/functions.sh +125 -89
- data/rspec-expectations/upstream/script/legacy_setup.sh +20 -0
- data/rspec-expectations/upstream/script/predicate_functions.sh +162 -0
- data/rspec-expectations/upstream/script/run_build +14 -9
- data/rspec-expectations/upstream/script/run_rubocop +14 -0
- data/rspec-expectations/upstream/script/update_rubygems_and_install_bundler +20 -0
- data/rspec-mocks/upstream/.document +1 -1
- data/rspec-mocks/upstream/.github/FUNDING.yml +5 -0
- data/rspec-mocks/upstream/.github/workflows/ci.yml +150 -0
- data/rspec-mocks/upstream/.gitignore +2 -0
- data/rspec-mocks/upstream/.rubocop.yml +28 -9
- data/rspec-mocks/upstream/.rubocop_rspec_base.yml +224 -38
- data/rspec-mocks/upstream/.rubocop_todo.yml +573 -0
- data/rspec-mocks/upstream/.yardopts +1 -1
- data/rspec-mocks/upstream/BUILD_DETAIL.md +149 -0
- data/rspec-mocks/upstream/CODE_OF_CONDUCT.md +59 -0
- data/rspec-mocks/upstream/CONTRIBUTING.md +86 -0
- data/rspec-mocks/upstream/Changelog.md +398 -3
- data/rspec-mocks/upstream/DEV-README.md +3 -3
- data/rspec-mocks/upstream/DEVELOPMENT.md +131 -0
- data/rspec-mocks/upstream/Gemfile +77 -10
- data/rspec-mocks/upstream/ISSUE_TEMPLATE.md +24 -0
- data/{rspec-expectations/upstream/License.txt → rspec-mocks/upstream/LICENSE.md} +5 -4
- data/rspec-mocks/upstream/README.md +83 -17
- data/rspec-mocks/upstream/REPORT_TEMPLATE.md +43 -0
- data/rspec-mocks/upstream/Rakefile +3 -3
- data/rspec-mocks/upstream/benchmarks/accessing_configuration_via_method_vs_cache.rb +52 -0
- data/rspec-mocks/upstream/benchmarks/allocations/1_object_1000_mocks.rb +76 -0
- data/rspec-mocks/upstream/benchmarks/allocations/helper.rb +17 -0
- data/rspec-mocks/upstream/benchmarks/each_value_v_values_each.rb +4 -5
- data/rspec-mocks/upstream/benchmarks/find_original_method_early.rb +1 -1
- data/rspec-mocks/upstream/benchmarks/method_defined_at_any_visibility.rb +3 -3
- data/rspec-mocks/upstream/benchmarks/thread_safety.rb +1 -1
- data/rspec-mocks/upstream/benchmarks/transfer_nested_constants.rb +1 -1
- data/rspec-mocks/upstream/cucumber.yml +8 -1
- data/rspec-mocks/upstream/features/.nav +2 -0
- data/rspec-mocks/upstream/features/basics/allowing_messages.feature +1 -1
- data/rspec-mocks/upstream/features/basics/expecting_messages.feature +40 -1
- data/rspec-mocks/upstream/features/basics/null_object_doubles.feature +1 -1
- data/rspec-mocks/upstream/features/basics/partial_test_doubles.feature +1 -1
- data/rspec-mocks/upstream/features/basics/scope.feature +5 -5
- data/rspec-mocks/upstream/features/basics/spies.feature +17 -30
- data/rspec-mocks/upstream/features/basics/test_doubles.feature +4 -4
- data/rspec-mocks/upstream/features/configuring_responses/README.md +2 -0
- data/rspec-mocks/upstream/features/configuring_responses/calling_the_original_implementation.feature +2 -2
- data/rspec-mocks/upstream/features/configuring_responses/mixed_responses.feature +25 -0
- data/rspec-mocks/upstream/features/configuring_responses/raising_an_error.feature +1 -0
- data/rspec-mocks/upstream/features/configuring_responses/wrapping_the_original_implementation.feature +3 -3
- data/rspec-mocks/upstream/features/configuring_responses/yielding.feature +2 -2
- data/rspec-mocks/upstream/features/mutating_constants/README.md +1 -1
- data/rspec-mocks/upstream/features/old_syntax/any_instance.feature +3 -3
- data/rspec-mocks/upstream/features/old_syntax/should_receive.feature +3 -1
- data/rspec-mocks/upstream/features/outside_rspec/any_test_framework.feature +116 -0
- data/rspec-mocks/upstream/features/outside_rspec/minitest.feature +202 -46
- data/rspec-mocks/upstream/features/outside_rspec/standalone.feature +5 -5
- data/rspec-mocks/upstream/features/setting_constraints/matching_arguments.feature +54 -27
- data/rspec-mocks/upstream/features/setting_constraints/message_order.feature +2 -2
- data/rspec-mocks/upstream/features/setting_constraints/receive_counts.feature +18 -0
- data/rspec-mocks/upstream/features/step_definitions/additional_cli_steps.rb +4 -4
- data/rspec-mocks/upstream/features/support/disallow_certain_apis.rb +3 -2
- data/rspec-mocks/upstream/features/support/env.rb +12 -12
- data/rspec-mocks/upstream/features/support/rubinius.rb +1 -1
- data/rspec-mocks/upstream/features/verifying_doubles/README.md +2 -2
- data/rspec-mocks/upstream/features/verifying_doubles/class_doubles.feature +1 -1
- data/rspec-mocks/upstream/features/verifying_doubles/dynamic_classes.feature +41 -5
- data/rspec-mocks/upstream/features/verifying_doubles/instance_doubles.feature +5 -3
- data/rspec-mocks/upstream/features/working_with_legacy_code/any_instance.feature +8 -6
- data/rspec-mocks/upstream/features/working_with_legacy_code/message_chains.feature +16 -1
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance/chain.rb +3 -1
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance/error_generator.rb +31 -0
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance/expect_chain_chain.rb +1 -5
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance/expectation_chain.rb +7 -5
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance/message_chains.rb +1 -3
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance/recorder.rb +42 -14
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance/stub_chain.rb +13 -7
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance/stub_chain_chain.rb +1 -5
- data/rspec-mocks/upstream/lib/rspec/mocks/any_instance.rb +1 -0
- data/rspec-mocks/upstream/lib/rspec/mocks/argument_list_matcher.rb +53 -10
- data/rspec-mocks/upstream/lib/rspec/mocks/argument_matchers.rb +66 -26
- data/rspec-mocks/upstream/lib/rspec/mocks/configuration.rb +59 -4
- data/rspec-mocks/upstream/lib/rspec/mocks/error_generator.rb +235 -108
- data/rspec-mocks/upstream/lib/rspec/mocks/example_methods.rb +82 -27
- data/rspec-mocks/upstream/lib/rspec/mocks/instance_method_stasher.rb +12 -1
- data/rspec-mocks/upstream/lib/rspec/mocks/matchers/have_received.rb +30 -17
- data/rspec-mocks/upstream/lib/rspec/mocks/matchers/receive.rb +28 -1
- data/rspec-mocks/upstream/lib/rspec/mocks/matchers/receive_message_chain.rb +17 -1
- data/rspec-mocks/upstream/lib/rspec/mocks/matchers/receive_messages.rb +6 -0
- data/rspec-mocks/upstream/lib/rspec/mocks/message_chain.rb +0 -4
- data/rspec-mocks/upstream/lib/rspec/mocks/message_expectation.rb +430 -304
- data/rspec-mocks/upstream/lib/rspec/mocks/method_double.rb +46 -15
- data/rspec-mocks/upstream/lib/rspec/mocks/method_reference.rb +78 -19
- data/rspec-mocks/upstream/lib/rspec/mocks/minitest_integration.rb +68 -0
- data/rspec-mocks/upstream/lib/rspec/mocks/mutate_const.rb +23 -8
- data/rspec-mocks/upstream/lib/rspec/mocks/object_reference.rb +81 -23
- data/rspec-mocks/upstream/lib/rspec/mocks/proxy.rb +135 -41
- data/rspec-mocks/upstream/lib/rspec/mocks/space.rb +33 -16
- data/rspec-mocks/upstream/lib/rspec/mocks/standalone.rb +1 -1
- data/rspec-mocks/upstream/lib/rspec/mocks/syntax.rb +18 -22
- data/rspec-mocks/upstream/lib/rspec/mocks/targets.rb +51 -24
- data/rspec-mocks/upstream/lib/rspec/mocks/test_double.rb +42 -6
- data/rspec-mocks/upstream/lib/rspec/mocks/verifying_double.rb +15 -21
- data/rspec-mocks/upstream/lib/rspec/mocks/{verifying_message_expecation.rb → verifying_message_expectation.rb} +11 -18
- data/rspec-mocks/upstream/lib/rspec/mocks/verifying_proxy.rb +60 -11
- data/rspec-mocks/upstream/lib/rspec/mocks/version.rb +1 -1
- data/rspec-mocks/upstream/lib/rspec/mocks.rb +8 -1
- data/rspec-mocks/upstream/maintenance-branch +1 -1
- data/rspec-mocks/upstream/rspec-mocks.gemspec +14 -6
- data/rspec-mocks/upstream/script/ci_functions.sh +73 -0
- data/rspec-mocks/upstream/script/clone_all_rspec_repos +2 -2
- data/rspec-mocks/upstream/script/cucumber.sh +8 -0
- data/rspec-mocks/upstream/script/functions.sh +125 -89
- data/rspec-mocks/upstream/script/legacy_setup.sh +20 -0
- data/rspec-mocks/upstream/script/predicate_functions.sh +162 -0
- data/rspec-mocks/upstream/script/run_build +14 -9
- data/rspec-mocks/upstream/script/run_rubocop +14 -0
- data/rspec-mocks/upstream/script/update_rubygems_and_install_bundler +20 -0
- data/{stubs/diff/lcs/assertions.rb → rspec-mocks/upstream/tmp/.gitkeep} +0 -0
- data/rspec-support/upstream/.github/FUNDING.yml +5 -0
- data/rspec-support/upstream/.github/workflows/ci.yml +150 -0
- data/rspec-support/upstream/.gitignore +4 -0
- data/rspec-support/upstream/.rubocop.yml +33 -1
- data/rspec-support/upstream/.rubocop_rspec_base.yml +224 -38
- data/rspec-support/upstream/.rubocop_todo.yml +424 -0
- data/rspec-support/upstream/BUILD_DETAIL.md +149 -0
- data/rspec-support/upstream/CODE_OF_CONDUCT.md +59 -0
- data/rspec-support/upstream/CONTRIBUTING.md +86 -0
- data/rspec-support/upstream/Changelog.md +287 -0
- data/rspec-support/upstream/DEVELOPMENT.md +131 -0
- data/rspec-support/upstream/Gemfile +52 -4
- data/rspec-support/upstream/ISSUE_TEMPLATE.md +24 -0
- data/rspec-support/upstream/{LICENSE.txt → LICENSE.md} +3 -2
- data/rspec-support/upstream/README.md +29 -6
- data/rspec-support/upstream/REPORT_TEMPLATE.md +43 -0
- data/rspec-support/upstream/Rakefile +9 -5
- data/rspec-support/upstream/benchmarks/caller_vs_caller_locations.rb +19 -0
- data/rspec-support/upstream/benchmarks/caller_vs_caller_locations_vs_raise.rb +153 -0
- data/rspec-support/upstream/benchmarks/class_exec_vs_klass_exec.rb +43 -0
- data/rspec-support/upstream/benchmarks/map_hash.rb +70 -0
- data/rspec-support/upstream/benchmarks/ripper.rb +44 -0
- data/rspec-support/upstream/benchmarks/skip_frames_for_caller_filter.rb +27 -0
- data/rspec-support/upstream/lib/rspec/support/caller_filter.rb +35 -15
- data/rspec-support/upstream/lib/rspec/support/comparable_version.rb +46 -0
- data/rspec-support/upstream/lib/rspec/support/differ.rb +35 -34
- data/rspec-support/upstream/lib/rspec/support/directory_maker.rb +3 -1
- data/rspec-support/upstream/lib/rspec/support/encoded_string.rb +103 -11
- data/rspec-support/upstream/lib/rspec/support/fuzzy_matcher.rb +5 -5
- data/rspec-support/upstream/lib/rspec/support/matcher_definition.rb +11 -0
- data/rspec-support/upstream/lib/rspec/support/method_signature_verifier.rb +192 -26
- data/rspec-support/upstream/lib/rspec/support/mutex.rb +73 -0
- data/rspec-support/upstream/lib/rspec/support/object_formatter.rb +275 -0
- data/rspec-support/upstream/lib/rspec/support/recursive_const_methods.rb +1 -1
- data/rspec-support/upstream/lib/rspec/support/reentrant_mutex.rb +78 -0
- data/rspec-support/upstream/lib/rspec/support/ruby_features.rb +168 -15
- data/rspec-support/upstream/lib/rspec/support/source/location.rb +21 -0
- data/rspec-support/upstream/lib/rspec/support/source/node.rb +110 -0
- data/rspec-support/upstream/lib/rspec/support/source/token.rb +94 -0
- data/rspec-support/upstream/lib/rspec/support/source.rb +85 -0
- data/rspec-support/upstream/lib/rspec/support/spec/deprecation_helpers.rb +17 -29
- data/rspec-support/upstream/lib/rspec/support/spec/diff_helpers.rb +31 -0
- data/rspec-support/upstream/lib/rspec/support/spec/in_sub_process.rb +41 -17
- data/rspec-support/upstream/lib/rspec/support/spec/library_wide_checks.rb +150 -0
- data/rspec-support/upstream/lib/rspec/support/spec/shell_out.rb +39 -3
- data/rspec-support/upstream/lib/rspec/support/spec/stderr_splitter.rb +27 -4
- data/rspec-support/upstream/lib/rspec/support/spec/string_matcher.rb +45 -0
- data/rspec-support/upstream/lib/rspec/support/spec/with_isolated_directory.rb +5 -1
- data/rspec-support/upstream/lib/rspec/support/spec.rb +17 -7
- data/rspec-support/upstream/lib/rspec/support/version.rb +1 -1
- data/rspec-support/upstream/lib/rspec/support/warnings.rb +3 -3
- data/rspec-support/upstream/lib/rspec/support/with_keywords_when_needed.rb +33 -0
- data/rspec-support/upstream/lib/rspec/support.rb +81 -3
- data/rspec-support/upstream/maintenance-branch +1 -1
- data/rspec-support/upstream/rspec-support.gemspec +10 -4
- data/rspec-support/upstream/script/ci_functions.sh +73 -0
- data/rspec-support/upstream/script/clone_all_rspec_repos +2 -2
- data/rspec-support/upstream/script/cucumber.sh +8 -0
- data/rspec-support/upstream/script/functions.sh +125 -89
- data/rspec-support/upstream/script/legacy_setup.sh +20 -0
- data/rspec-support/upstream/script/predicate_functions.sh +162 -0
- data/rspec-support/upstream/script/run_build +14 -9
- data/rspec-support/upstream/script/run_rubocop +14 -0
- data/rspec-support/upstream/script/update_rubygems_and_install_bundler +20 -0
- data/stubs/{diff/lcs/block.rb → coderay.rb} +0 -0
- data/stubs/{diff/lcs/callbacks.rb → drb/acl.rb} +0 -0
- data/stubs/{diff/lcs/change.rb → erb/version.rb} +0 -0
- data/stubs/{diff/lcs/hunk.rb → open3.rb} +0 -0
- data/stubs/{diff/lcs/internals.rb → psych.rb} +0 -0
- data/stubs/{optparse.rb → ripper.rb} +0 -0
- data/stubs/{prettyprint.rb → thread_order.rb} +0 -0
- data/tasks/testing.rake +7 -3
- metadata +270 -61
- data/gemfiles/.bundle/config +0 -2
- data/gemfiles/opal_0.11.gemfile +0 -14
- data/gemfiles/opal_master.gemfile +0 -14
- data/lib-opal/opal/rspec/async/core_ext.rb +0 -23
- data/lib-opal/opal/rspec/async/legacy.rb +0 -49
- data/lib-opal/opal/rspec/fixes/rspec/caller_filter.rb +0 -6
- data/lib-opal/opal/rspec/fixes/rspec/core/example.rb +0 -20
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/backtrace_formatter.rb +0 -20
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/console_codes.rb +0 -11
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/generated_deprecation_message.rb +0 -15
- data/lib-opal/opal/rspec/fixes/rspec/core/formatters/json_formatter.rb +0 -15
- data/lib-opal/opal/rspec/fixes/rspec/core/notifications/failed_example_notification.rb +0 -20
- data/lib-opal/opal/rspec/fixes/rspec/core/notifications/summary_notification.rb +0 -21
- data/lib-opal/opal/rspec/fixes/rspec/core/warnings.rb +0 -27
- data/lib-opal/opal/rspec/fixes/rspec/expectations/fail_with.rb +0 -21
- data/lib-opal/opal/rspec/fixes/rspec/matchers/built_in/all.rb +0 -10
- data/lib-opal/opal/rspec/fixes/rspec/matchers/built_in/compound.rb +0 -15
- data/lib-opal/opal/rspec/fixes/rspec/matchers/built_in/yield.rb +0 -21
- data/lib-opal/opal/rspec/fixes/rspec/matchers/pretty.rb +0 -15
- data/lib-opal/opal/rspec/fixes/rspec/mocks/space.rb +0 -41
- data/lib-opal/opal/rspec/fixes/rspec/mocks/test_double.rb +0 -39
- data/lib-opal/opal/rspec/fixes/rspec/mocks/verifying_double.rb +0 -29
- data/lib-opal/opal/rspec/fixes/rspec/support/recursive_const_methods.rb +0 -7
- data/lib-opal/opal/rspec/fixes/rspec/support/spec/stderr_splitter.rb +0 -13
- data/lib-opal/opal/rspec/fixes/rspec/support/spec.rb +0 -1
- data/lib-opal/opal/rspec/fixes/rspec/support/warnings.rb +0 -16
- data/rspec/upstream/License.txt +0 -24
- data/rspec-core/upstream/.travis.yml +0 -35
- data/rspec-core/upstream/benchmarks/sort_by_v_shuffle.rb +0 -83
- data/rspec-core/upstream/features/Upgrade.md +0 -352
- data/rspec-core/upstream/lib/rspec/core/backport_random.rb +0 -336
- data/rspec-expectations/upstream/.travis.yml +0 -35
- data/rspec-expectations/upstream/lib/rspec/matchers/pretty.rb +0 -77
- data/rspec-mocks/upstream/.travis.yml +0 -35
- data/rspec-support/upstream/.travis.yml +0 -35
- data/rspec-support/upstream/lib/rspec/support/os.rb +0 -18
- data/rspec-support/upstream/lib/rspec/support/spec/prevent_load_time_warnings.rb +0 -44
- data/rspec-support/upstream/lib/rspec/support/version_checker.rb +0 -53
- data/stubs/shellwords.rb +0 -0
- data/stubs/uri.rb +0 -0
- data/vendor/spec_runner.js +0 -64
@@ -0,0 +1,327 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "diff/lcs/change"
|
4
|
+
|
5
|
+
module Diff::LCS
|
6
|
+
# This callback object implements the default set of callback events,
|
7
|
+
# which only returns the event itself. Note that #finished_a and
|
8
|
+
# #finished_b are not implemented -- I haven't yet figured out where they
|
9
|
+
# would be useful.
|
10
|
+
#
|
11
|
+
# Note that this is intended to be called as is, e.g.,
|
12
|
+
#
|
13
|
+
# Diff::LCS.LCS(seq1, seq2, Diff::LCS::DefaultCallbacks)
|
14
|
+
class DefaultCallbacks
|
15
|
+
class << self
|
16
|
+
# Called when two items match.
|
17
|
+
def match(event)
|
18
|
+
event
|
19
|
+
end
|
20
|
+
|
21
|
+
# Called when the old value is discarded in favour of the new value.
|
22
|
+
def discard_a(event)
|
23
|
+
event
|
24
|
+
end
|
25
|
+
|
26
|
+
# Called when the new value is discarded in favour of the old value.
|
27
|
+
def discard_b(event)
|
28
|
+
event
|
29
|
+
end
|
30
|
+
|
31
|
+
# Called when both the old and new values have changed.
|
32
|
+
def change(event)
|
33
|
+
event
|
34
|
+
end
|
35
|
+
|
36
|
+
private :new
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
# An alias for DefaultCallbacks that is used in
|
41
|
+
# Diff::LCS#traverse_sequences.
|
42
|
+
#
|
43
|
+
# Diff::LCS.LCS(seq1, seq2, Diff::LCS::SequenceCallbacks)
|
44
|
+
SequenceCallbacks = DefaultCallbacks
|
45
|
+
|
46
|
+
# An alias for DefaultCallbacks that is used in
|
47
|
+
# Diff::LCS#traverse_balanced.
|
48
|
+
#
|
49
|
+
# Diff::LCS.LCS(seq1, seq2, Diff::LCS::BalancedCallbacks)
|
50
|
+
BalancedCallbacks = DefaultCallbacks
|
51
|
+
|
52
|
+
def self.callbacks_for(callbacks)
|
53
|
+
callbacks.new
|
54
|
+
rescue
|
55
|
+
callbacks
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
# This will produce a compound array of simple diff change objects. Each
|
60
|
+
# element in the #diffs array is a +hunk+ or +hunk+ array, where each
|
61
|
+
# element in each +hunk+ array is a single Change object representing the
|
62
|
+
# addition or removal of a single element from one of the two tested
|
63
|
+
# sequences. The +hunk+ provides the full context for the changes.
|
64
|
+
#
|
65
|
+
# diffs = Diff::LCS.diff(seq1, seq2)
|
66
|
+
# # This example shows a simplified array format.
|
67
|
+
# # [ [ [ '-', 0, 'a' ] ], # 1
|
68
|
+
# # [ [ '+', 2, 'd' ] ], # 2
|
69
|
+
# # [ [ '-', 4, 'h' ], # 3
|
70
|
+
# # [ '+', 4, 'f' ] ],
|
71
|
+
# # [ [ '+', 6, 'k' ] ], # 4
|
72
|
+
# # [ [ '-', 8, 'n' ], # 5
|
73
|
+
# # [ '-', 9, 'p' ],
|
74
|
+
# # [ '+', 9, 'r' ],
|
75
|
+
# # [ '+', 10, 's' ],
|
76
|
+
# # [ '+', 11, 't' ] ] ]
|
77
|
+
#
|
78
|
+
# There are five hunks here. The first hunk says that the +a+ at position 0
|
79
|
+
# of the first sequence should be deleted (<tt>'-'</tt>). The second hunk
|
80
|
+
# says that the +d+ at position 2 of the second sequence should be inserted
|
81
|
+
# (<tt>'+'</tt>). The third hunk says that the +h+ at position 4 of the
|
82
|
+
# first sequence should be removed and replaced with the +f+ from position 4
|
83
|
+
# of the second sequence. The other two hunks are described similarly.
|
84
|
+
#
|
85
|
+
# === Use
|
86
|
+
#
|
87
|
+
# This callback object must be initialised and is used by the Diff::LCS#diff
|
88
|
+
# method.
|
89
|
+
#
|
90
|
+
# cbo = Diff::LCS::DiffCallbacks.new
|
91
|
+
# Diff::LCS.LCS(seq1, seq2, cbo)
|
92
|
+
# cbo.finish
|
93
|
+
#
|
94
|
+
# Note that the call to #finish is absolutely necessary, or the last set of
|
95
|
+
# changes will not be visible. Alternatively, can be used as:
|
96
|
+
#
|
97
|
+
# cbo = Diff::LCS::DiffCallbacks.new { |tcbo| Diff::LCS.LCS(seq1, seq2, tcbo) }
|
98
|
+
#
|
99
|
+
# The necessary #finish call will be made.
|
100
|
+
#
|
101
|
+
# === Simplified Array Format
|
102
|
+
#
|
103
|
+
# The simplified array format used in the example above can be obtained
|
104
|
+
# with:
|
105
|
+
#
|
106
|
+
# require 'pp'
|
107
|
+
# pp diffs.map { |e| e.map { |f| f.to_a } }
|
108
|
+
class Diff::LCS::DiffCallbacks
|
109
|
+
# Returns the difference set collected during the diff process.
|
110
|
+
attr_reader :diffs
|
111
|
+
|
112
|
+
def initialize # :yields: self
|
113
|
+
@hunk = []
|
114
|
+
@diffs = []
|
115
|
+
|
116
|
+
return unless block_given?
|
117
|
+
|
118
|
+
begin
|
119
|
+
yield self
|
120
|
+
ensure
|
121
|
+
finish
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
# Finalizes the diff process. If an unprocessed hunk still exists, then it
|
126
|
+
# is appended to the diff list.
|
127
|
+
def finish
|
128
|
+
finish_hunk
|
129
|
+
end
|
130
|
+
|
131
|
+
def match(_event)
|
132
|
+
finish_hunk
|
133
|
+
end
|
134
|
+
|
135
|
+
def discard_a(event)
|
136
|
+
@hunk << Diff::LCS::Change.new("-", event.old_position, event.old_element)
|
137
|
+
end
|
138
|
+
|
139
|
+
def discard_b(event)
|
140
|
+
@hunk << Diff::LCS::Change.new("+", event.new_position, event.new_element)
|
141
|
+
end
|
142
|
+
|
143
|
+
def finish_hunk
|
144
|
+
@diffs << @hunk unless @hunk.empty?
|
145
|
+
@hunk = []
|
146
|
+
end
|
147
|
+
private :finish_hunk
|
148
|
+
end
|
149
|
+
|
150
|
+
# This will produce a compound array of contextual diff change objects. Each
|
151
|
+
# element in the #diffs array is a "hunk" array, where each element in each
|
152
|
+
# "hunk" array is a single change. Each change is a Diff::LCS::ContextChange
|
153
|
+
# that contains both the old index and new index values for the change. The
|
154
|
+
# "hunk" provides the full context for the changes. Both old and new objects
|
155
|
+
# will be presented for changed objects. +nil+ will be substituted for a
|
156
|
+
# discarded object.
|
157
|
+
#
|
158
|
+
# seq1 = %w(a b c e h j l m n p)
|
159
|
+
# seq2 = %w(b c d e f j k l m r s t)
|
160
|
+
#
|
161
|
+
# diffs = Diff::LCS.diff(seq1, seq2, Diff::LCS::ContextDiffCallbacks)
|
162
|
+
# # This example shows a simplified array format.
|
163
|
+
# # [ [ [ '-', [ 0, 'a' ], [ 0, nil ] ] ], # 1
|
164
|
+
# # [ [ '+', [ 3, nil ], [ 2, 'd' ] ] ], # 2
|
165
|
+
# # [ [ '-', [ 4, 'h' ], [ 4, nil ] ], # 3
|
166
|
+
# # [ '+', [ 5, nil ], [ 4, 'f' ] ] ],
|
167
|
+
# # [ [ '+', [ 6, nil ], [ 6, 'k' ] ] ], # 4
|
168
|
+
# # [ [ '-', [ 8, 'n' ], [ 9, nil ] ], # 5
|
169
|
+
# # [ '+', [ 9, nil ], [ 9, 'r' ] ],
|
170
|
+
# # [ '-', [ 9, 'p' ], [ 10, nil ] ],
|
171
|
+
# # [ '+', [ 10, nil ], [ 10, 's' ] ],
|
172
|
+
# # [ '+', [ 10, nil ], [ 11, 't' ] ] ] ]
|
173
|
+
#
|
174
|
+
# The five hunks shown are comprised of individual changes; if there is a
|
175
|
+
# related set of changes, they are still shown individually.
|
176
|
+
#
|
177
|
+
# This callback can also be used with Diff::LCS#sdiff, which will produce
|
178
|
+
# results like:
|
179
|
+
#
|
180
|
+
# diffs = Diff::LCS.sdiff(seq1, seq2, Diff::LCS::ContextCallbacks)
|
181
|
+
# # This example shows a simplified array format.
|
182
|
+
# # [ [ [ "-", [ 0, "a" ], [ 0, nil ] ] ], # 1
|
183
|
+
# # [ [ "+", [ 3, nil ], [ 2, "d" ] ] ], # 2
|
184
|
+
# # [ [ "!", [ 4, "h" ], [ 4, "f" ] ] ], # 3
|
185
|
+
# # [ [ "+", [ 6, nil ], [ 6, "k" ] ] ], # 4
|
186
|
+
# # [ [ "!", [ 8, "n" ], [ 9, "r" ] ], # 5
|
187
|
+
# # [ "!", [ 9, "p" ], [ 10, "s" ] ],
|
188
|
+
# # [ "+", [ 10, nil ], [ 11, "t" ] ] ] ]
|
189
|
+
#
|
190
|
+
# The five hunks are still present, but are significantly shorter in total
|
191
|
+
# presentation, because changed items are shown as changes ("!") instead of
|
192
|
+
# potentially "mismatched" pairs of additions and deletions.
|
193
|
+
#
|
194
|
+
# The result of this operation is similar to that of
|
195
|
+
# Diff::LCS::SDiffCallbacks. They may be compared as:
|
196
|
+
#
|
197
|
+
# s = Diff::LCS.sdiff(seq1, seq2).reject { |e| e.action == "=" }
|
198
|
+
# c = Diff::LCS.sdiff(seq1, seq2, Diff::LCS::ContextDiffCallbacks).flatten(1)
|
199
|
+
#
|
200
|
+
# s == c # -> true
|
201
|
+
#
|
202
|
+
# === Use
|
203
|
+
#
|
204
|
+
# This callback object must be initialised and can be used by the
|
205
|
+
# Diff::LCS#diff or Diff::LCS#sdiff methods.
|
206
|
+
#
|
207
|
+
# cbo = Diff::LCS::ContextDiffCallbacks.new
|
208
|
+
# Diff::LCS.LCS(seq1, seq2, cbo)
|
209
|
+
# cbo.finish
|
210
|
+
#
|
211
|
+
# Note that the call to #finish is absolutely necessary, or the last set of
|
212
|
+
# changes will not be visible. Alternatively, can be used as:
|
213
|
+
#
|
214
|
+
# cbo = Diff::LCS::ContextDiffCallbacks.new { |tcbo| Diff::LCS.LCS(seq1, seq2, tcbo) }
|
215
|
+
#
|
216
|
+
# The necessary #finish call will be made.
|
217
|
+
#
|
218
|
+
# === Simplified Array Format
|
219
|
+
#
|
220
|
+
# The simplified array format used in the example above can be obtained
|
221
|
+
# with:
|
222
|
+
#
|
223
|
+
# require 'pp'
|
224
|
+
# pp diffs.map { |e| e.map { |f| f.to_a } }
|
225
|
+
class Diff::LCS::ContextDiffCallbacks < Diff::LCS::DiffCallbacks
|
226
|
+
def discard_a(event)
|
227
|
+
@hunk << Diff::LCS::ContextChange.simplify(event)
|
228
|
+
end
|
229
|
+
|
230
|
+
def discard_b(event)
|
231
|
+
@hunk << Diff::LCS::ContextChange.simplify(event)
|
232
|
+
end
|
233
|
+
|
234
|
+
def change(event)
|
235
|
+
@hunk << Diff::LCS::ContextChange.simplify(event)
|
236
|
+
end
|
237
|
+
end
|
238
|
+
|
239
|
+
# This will produce a simple array of diff change objects. Each element in
|
240
|
+
# the #diffs array is a single ContextChange. In the set of #diffs provided
|
241
|
+
# by SDiffCallbacks, both old and new objects will be presented for both
|
242
|
+
# changed <strong>and unchanged</strong> objects. +nil+ will be substituted
|
243
|
+
# for a discarded object.
|
244
|
+
#
|
245
|
+
# The diffset produced by this callback, when provided to Diff::LCS#sdiff,
|
246
|
+
# will compute and display the necessary components to show two sequences
|
247
|
+
# and their minimized differences side by side, just like the Unix utility
|
248
|
+
# +sdiff+.
|
249
|
+
#
|
250
|
+
# same same
|
251
|
+
# before | after
|
252
|
+
# old < -
|
253
|
+
# - > new
|
254
|
+
#
|
255
|
+
# seq1 = %w(a b c e h j l m n p)
|
256
|
+
# seq2 = %w(b c d e f j k l m r s t)
|
257
|
+
#
|
258
|
+
# diffs = Diff::LCS.sdiff(seq1, seq2)
|
259
|
+
# # This example shows a simplified array format.
|
260
|
+
# # [ [ "-", [ 0, "a"], [ 0, nil ] ],
|
261
|
+
# # [ "=", [ 1, "b"], [ 0, "b" ] ],
|
262
|
+
# # [ "=", [ 2, "c"], [ 1, "c" ] ],
|
263
|
+
# # [ "+", [ 3, nil], [ 2, "d" ] ],
|
264
|
+
# # [ "=", [ 3, "e"], [ 3, "e" ] ],
|
265
|
+
# # [ "!", [ 4, "h"], [ 4, "f" ] ],
|
266
|
+
# # [ "=", [ 5, "j"], [ 5, "j" ] ],
|
267
|
+
# # [ "+", [ 6, nil], [ 6, "k" ] ],
|
268
|
+
# # [ "=", [ 6, "l"], [ 7, "l" ] ],
|
269
|
+
# # [ "=", [ 7, "m"], [ 8, "m" ] ],
|
270
|
+
# # [ "!", [ 8, "n"], [ 9, "r" ] ],
|
271
|
+
# # [ "!", [ 9, "p"], [ 10, "s" ] ],
|
272
|
+
# # [ "+", [ 10, nil], [ 11, "t" ] ] ]
|
273
|
+
#
|
274
|
+
# The result of this operation is similar to that of
|
275
|
+
# Diff::LCS::ContextDiffCallbacks. They may be compared as:
|
276
|
+
#
|
277
|
+
# s = Diff::LCS.sdiff(seq1, seq2).reject { |e| e.action == "=" }
|
278
|
+
# c = Diff::LCS.sdiff(seq1, seq2, Diff::LCS::ContextDiffCallbacks).flatten(1)
|
279
|
+
#
|
280
|
+
# s == c # -> true
|
281
|
+
#
|
282
|
+
# === Use
|
283
|
+
#
|
284
|
+
# This callback object must be initialised and is used by the Diff::LCS#sdiff
|
285
|
+
# method.
|
286
|
+
#
|
287
|
+
# cbo = Diff::LCS::SDiffCallbacks.new
|
288
|
+
# Diff::LCS.LCS(seq1, seq2, cbo)
|
289
|
+
#
|
290
|
+
# As with the other initialisable callback objects,
|
291
|
+
# Diff::LCS::SDiffCallbacks can be initialised with a block. As there is no
|
292
|
+
# "fininishing" to be done, this has no effect on the state of the object.
|
293
|
+
#
|
294
|
+
# cbo = Diff::LCS::SDiffCallbacks.new { |tcbo| Diff::LCS.LCS(seq1, seq2, tcbo) }
|
295
|
+
#
|
296
|
+
# === Simplified Array Format
|
297
|
+
#
|
298
|
+
# The simplified array format used in the example above can be obtained
|
299
|
+
# with:
|
300
|
+
#
|
301
|
+
# require 'pp'
|
302
|
+
# pp diffs.map { |e| e.to_a }
|
303
|
+
class Diff::LCS::SDiffCallbacks
|
304
|
+
# Returns the difference set collected during the diff process.
|
305
|
+
attr_reader :diffs
|
306
|
+
|
307
|
+
def initialize # :yields: self
|
308
|
+
@diffs = []
|
309
|
+
yield self if block_given?
|
310
|
+
end
|
311
|
+
|
312
|
+
def match(event)
|
313
|
+
@diffs << Diff::LCS::ContextChange.simplify(event)
|
314
|
+
end
|
315
|
+
|
316
|
+
def discard_a(event)
|
317
|
+
@diffs << Diff::LCS::ContextChange.simplify(event)
|
318
|
+
end
|
319
|
+
|
320
|
+
def discard_b(event)
|
321
|
+
@diffs << Diff::LCS::ContextChange.simplify(event)
|
322
|
+
end
|
323
|
+
|
324
|
+
def change(event)
|
325
|
+
@diffs << Diff::LCS::ContextChange.simplify(event)
|
326
|
+
end
|
327
|
+
end
|
@@ -0,0 +1,174 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# Represents a simplistic (non-contextual) change. Represents the removal or
|
4
|
+
# addition of an element from either the old or the new sequenced
|
5
|
+
# enumerable.
|
6
|
+
class Diff::LCS::Change
|
7
|
+
IntClass = 1.class # Fixnum is deprecated in Ruby 2.4 # rubocop:disable Naming/ConstantName
|
8
|
+
|
9
|
+
# The only actions valid for changes are '+' (add), '-' (delete), '='
|
10
|
+
# (no change), '!' (changed), '<' (tail changes from first sequence), or
|
11
|
+
# '>' (tail changes from second sequence). The last two ('<>') are only
|
12
|
+
# found with Diff::LCS::diff and Diff::LCS::sdiff.
|
13
|
+
VALID_ACTIONS = %w[+ - = ! > <].freeze
|
14
|
+
|
15
|
+
def self.valid_action?(action)
|
16
|
+
VALID_ACTIONS.include? action
|
17
|
+
end
|
18
|
+
|
19
|
+
# Returns the action this Change represents.
|
20
|
+
attr_reader :action
|
21
|
+
|
22
|
+
# Returns the position of the Change.
|
23
|
+
attr_reader :position
|
24
|
+
# Returns the sequence element of the Change.
|
25
|
+
attr_reader :element
|
26
|
+
|
27
|
+
def initialize(*args)
|
28
|
+
@action, @position, @element = *args
|
29
|
+
|
30
|
+
fail "Invalid Change Action '#{@action}'" unless Diff::LCS::Change.valid_action?(@action)
|
31
|
+
fail "Invalid Position Type" unless @position.is_a? IntClass
|
32
|
+
end
|
33
|
+
|
34
|
+
def inspect(*_args)
|
35
|
+
"#<#{self.class}: #{to_a.inspect}>"
|
36
|
+
end
|
37
|
+
|
38
|
+
def to_a
|
39
|
+
[@action, @position, @element]
|
40
|
+
end
|
41
|
+
|
42
|
+
alias_method :to_ary, :to_a
|
43
|
+
|
44
|
+
def self.from_a(arr)
|
45
|
+
arr = arr.flatten(1)
|
46
|
+
case arr.size
|
47
|
+
when 5
|
48
|
+
Diff::LCS::ContextChange.new(*(arr[0...5]))
|
49
|
+
when 3
|
50
|
+
Diff::LCS::Change.new(*(arr[0...3]))
|
51
|
+
else
|
52
|
+
fail "Invalid change array format provided."
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
include Comparable
|
57
|
+
|
58
|
+
def ==(other)
|
59
|
+
(self.class == other.class) and
|
60
|
+
(action == other.action) and
|
61
|
+
(position == other.position) and
|
62
|
+
(element == other.element)
|
63
|
+
end
|
64
|
+
|
65
|
+
def <=>(other)
|
66
|
+
r = action <=> other.action
|
67
|
+
r = position <=> other.position if r.zero?
|
68
|
+
r = element <=> other.element if r.zero?
|
69
|
+
r
|
70
|
+
end
|
71
|
+
|
72
|
+
def adding?
|
73
|
+
@action == "+"
|
74
|
+
end
|
75
|
+
|
76
|
+
def deleting?
|
77
|
+
@action == "-"
|
78
|
+
end
|
79
|
+
|
80
|
+
def unchanged?
|
81
|
+
@action == "="
|
82
|
+
end
|
83
|
+
|
84
|
+
def changed?
|
85
|
+
@action == "!"
|
86
|
+
end
|
87
|
+
|
88
|
+
def finished_a?
|
89
|
+
@action == ">"
|
90
|
+
end
|
91
|
+
|
92
|
+
def finished_b?
|
93
|
+
@action == "<"
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
# Represents a contextual change. Contains the position and values of the
|
98
|
+
# elements in the old and the new sequenced enumerables as well as the action
|
99
|
+
# taken.
|
100
|
+
class Diff::LCS::ContextChange < Diff::LCS::Change
|
101
|
+
# We don't need these two values.
|
102
|
+
undef :position
|
103
|
+
undef :element
|
104
|
+
|
105
|
+
# Returns the old position being changed.
|
106
|
+
attr_reader :old_position
|
107
|
+
# Returns the new position being changed.
|
108
|
+
attr_reader :new_position
|
109
|
+
# Returns the old element being changed.
|
110
|
+
attr_reader :old_element
|
111
|
+
# Returns the new element being changed.
|
112
|
+
attr_reader :new_element
|
113
|
+
|
114
|
+
def initialize(*args)
|
115
|
+
@action, @old_position, @old_element, @new_position, @new_element = *args
|
116
|
+
|
117
|
+
fail "Invalid Change Action '#{@action}'" unless Diff::LCS::Change.valid_action?(@action)
|
118
|
+
fail "Invalid (Old) Position Type" unless @old_position.nil? || @old_position.is_a?(IntClass)
|
119
|
+
fail "Invalid (New) Position Type" unless @new_position.nil? || @new_position.is_a?(IntClass)
|
120
|
+
end
|
121
|
+
|
122
|
+
def to_a
|
123
|
+
[
|
124
|
+
@action,
|
125
|
+
[@old_position, @old_element],
|
126
|
+
[@new_position, @new_element]
|
127
|
+
]
|
128
|
+
end
|
129
|
+
|
130
|
+
alias_method :to_ary, :to_a
|
131
|
+
|
132
|
+
def self.from_a(arr)
|
133
|
+
Diff::LCS::Change.from_a(arr)
|
134
|
+
end
|
135
|
+
|
136
|
+
# Simplifies a context change for use in some diff callbacks. '<' actions
|
137
|
+
# are converted to '-' and '>' actions are converted to '+'.
|
138
|
+
def self.simplify(event)
|
139
|
+
ea = event.to_a
|
140
|
+
|
141
|
+
case ea[0]
|
142
|
+
when "-"
|
143
|
+
ea[2][1] = nil
|
144
|
+
when "<"
|
145
|
+
ea[0] = "-"
|
146
|
+
ea[2][1] = nil
|
147
|
+
when "+"
|
148
|
+
ea[1][1] = nil
|
149
|
+
when ">"
|
150
|
+
ea[0] = "+"
|
151
|
+
ea[1][1] = nil
|
152
|
+
end
|
153
|
+
|
154
|
+
Diff::LCS::ContextChange.from_a(ea)
|
155
|
+
end
|
156
|
+
|
157
|
+
def ==(other)
|
158
|
+
(self.class == other.class) and
|
159
|
+
(@action == other.action) and
|
160
|
+
(@old_position == other.old_position) and
|
161
|
+
(@new_position == other.new_position) and
|
162
|
+
(@old_element == other.old_element) and
|
163
|
+
(@new_element == other.new_element)
|
164
|
+
end
|
165
|
+
|
166
|
+
def <=>(other)
|
167
|
+
r = @action <=> other.action
|
168
|
+
r = @old_position <=> other.old_position if r.zero?
|
169
|
+
r = @new_position <=> other.new_position if r.zero?
|
170
|
+
r = @old_element <=> other.old_element if r.zero?
|
171
|
+
r = @new_element <=> other.new_element if r.zero?
|
172
|
+
r
|
173
|
+
end
|
174
|
+
end
|
@@ -0,0 +1,158 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "cgi"
|
4
|
+
|
5
|
+
# Produce a simple HTML diff view.
|
6
|
+
class Diff::LCS::HTMLDiff
|
7
|
+
class << self
|
8
|
+
attr_accessor :can_expand_tabs # :nodoc:
|
9
|
+
end
|
10
|
+
self.can_expand_tabs = true
|
11
|
+
|
12
|
+
class Callbacks # :nodoc:
|
13
|
+
attr_accessor :output
|
14
|
+
attr_accessor :match_class
|
15
|
+
attr_accessor :only_a_class
|
16
|
+
attr_accessor :only_b_class
|
17
|
+
|
18
|
+
def initialize(output, options = {})
|
19
|
+
@output = output
|
20
|
+
options ||= {}
|
21
|
+
|
22
|
+
@match_class = options[:match_class] || "match"
|
23
|
+
@only_a_class = options[:only_a_class] || "only_a"
|
24
|
+
@only_b_class = options[:only_b_class] || "only_b"
|
25
|
+
end
|
26
|
+
|
27
|
+
def htmlize(element, css_class)
|
28
|
+
element = " " if element.empty?
|
29
|
+
%(<pre class="#{__send__(css_class)}">#{element}</pre>\n)
|
30
|
+
end
|
31
|
+
private :htmlize
|
32
|
+
|
33
|
+
# This will be called with both lines are the same
|
34
|
+
def match(event)
|
35
|
+
@output << htmlize(event.old_element, :match_class)
|
36
|
+
end
|
37
|
+
|
38
|
+
# This will be called when there is a line in A that isn't in B
|
39
|
+
def discard_a(event)
|
40
|
+
@output << htmlize(event.old_element, :only_a_class)
|
41
|
+
end
|
42
|
+
|
43
|
+
# This will be called when there is a line in B that isn't in A
|
44
|
+
def discard_b(event)
|
45
|
+
@output << htmlize(event.new_element, :only_b_class)
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
# standard:disable Style/HashSyntax
|
50
|
+
DEFAULT_OPTIONS = {
|
51
|
+
:expand_tabs => nil,
|
52
|
+
:output => nil,
|
53
|
+
:css => nil,
|
54
|
+
:title => nil
|
55
|
+
}.freeze
|
56
|
+
# standard:enable Style/HashSyntax
|
57
|
+
|
58
|
+
# standard:disable Layout/HeredocIndentation
|
59
|
+
DEFAULT_CSS = <<-CSS
|
60
|
+
body { margin: 0; }
|
61
|
+
.diff
|
62
|
+
{
|
63
|
+
border: 1px solid black;
|
64
|
+
margin: 1em 2em;
|
65
|
+
}
|
66
|
+
p
|
67
|
+
{
|
68
|
+
margin-left: 2em;
|
69
|
+
}
|
70
|
+
pre
|
71
|
+
{
|
72
|
+
padding-left: 1em;
|
73
|
+
margin: 0;
|
74
|
+
font-family: Inconsolata, Consolas, Lucida, Courier, monospaced;
|
75
|
+
white-space: pre;
|
76
|
+
}
|
77
|
+
.match { }
|
78
|
+
.only_a
|
79
|
+
{
|
80
|
+
background-color: #fdd;
|
81
|
+
color: red;
|
82
|
+
text-decoration: line-through;
|
83
|
+
}
|
84
|
+
.only_b
|
85
|
+
{
|
86
|
+
background-color: #ddf;
|
87
|
+
color: blue;
|
88
|
+
border-left: 3px solid blue
|
89
|
+
}
|
90
|
+
h1 { margin-left: 2em; }
|
91
|
+
CSS
|
92
|
+
# standard:enable Layout/HeredocIndentation
|
93
|
+
|
94
|
+
def initialize(left, right, options = nil)
|
95
|
+
@left = left
|
96
|
+
@right = right
|
97
|
+
@options = options
|
98
|
+
|
99
|
+
@options = DEFAULT_OPTIONS.dup if @options.nil?
|
100
|
+
end
|
101
|
+
|
102
|
+
def verify_options
|
103
|
+
@options[:expand_tabs] ||= 4
|
104
|
+
@options[:expand_tabs] = 4 if @options[:expand_tabs].negative?
|
105
|
+
|
106
|
+
@options[:output] ||= $stdout
|
107
|
+
|
108
|
+
@options[:css] ||= DEFAULT_CSS.dup
|
109
|
+
|
110
|
+
@options[:title] ||= "diff"
|
111
|
+
end
|
112
|
+
private :verify_options
|
113
|
+
|
114
|
+
attr_reader :options
|
115
|
+
|
116
|
+
def run
|
117
|
+
verify_options
|
118
|
+
|
119
|
+
if @options[:expand_tabs].positive? && self.class.can_expand_tabs
|
120
|
+
formatter = Text::Format.new
|
121
|
+
formatter.tabstop = @options[:expand_tabs]
|
122
|
+
|
123
|
+
@left.map! { |line| formatter.expand(line.chomp) }
|
124
|
+
@right.map! { |line| formatter.expand(line.chomp) }
|
125
|
+
end
|
126
|
+
|
127
|
+
@left.map! { |line| CGI.escapeHTML(line.chomp) }
|
128
|
+
@right.map! { |line| CGI.escapeHTML(line.chomp) }
|
129
|
+
|
130
|
+
# standard:disable Layout/HeredocIndentation
|
131
|
+
@options[:output] << <<-OUTPUT
|
132
|
+
<html>
|
133
|
+
<head>
|
134
|
+
<title>#{@options[:title]}</title>
|
135
|
+
<style type="text/css">
|
136
|
+
#{@options[:css]}
|
137
|
+
</style>
|
138
|
+
</head>
|
139
|
+
<body>
|
140
|
+
<h1>#{@options[:title]}</h1>
|
141
|
+
<p>Legend: <span class="only_a">Only in Old</span>
|
142
|
+
<span class="only_b">Only in New</span></p>
|
143
|
+
<div class="diff">
|
144
|
+
OUTPUT
|
145
|
+
# standard:enable Layout/HeredocIndentation
|
146
|
+
|
147
|
+
callbacks = Callbacks.new(@options[:output])
|
148
|
+
Diff::LCS.traverse_sequences(@left, @right, callbacks)
|
149
|
+
|
150
|
+
# standard:disable Layout/HeredocIndentation
|
151
|
+
@options[:output] << <<-OUTPUT
|
152
|
+
</div>
|
153
|
+
</body>
|
154
|
+
</html>
|
155
|
+
OUTPUT
|
156
|
+
# standard:enable Layout/HeredocIndentation
|
157
|
+
end
|
158
|
+
end
|