transpec 1.12.0 → 1.13.0

data/Rakefile

@@ -11,4 +11,6 @@ end
 
 task default: %w(spec style readme)
 
-task ci: %w(spec style readme:check test:all)
+ci_tasks = %w(spec)
+ci_tasks.concat(%w(style readme:check test:all)) unless RUBY_ENGINE == 'jruby'
+task ci: ci_tasks

data/lib/transpec/base_rewriter.rb

@@ -43,7 +43,7 @@ module Transpec
 
     private
 
-    def process(ast, source_rewriter)
+    def process(ast, source_rewriter) # rubocop:disable UnusedMethodArgument
       fail NotImplementedError
     end
 

data/lib/transpec/cli.rb

@@ -85,7 +85,8 @@ module Transpec
     def fail_if_should_not_continue!
       unless configuration.forced?
         if Git.command_available? && Git.inside_of_repository? && !Git.clean?
-          fail 'The current Git repository is not clean. Aborting.'
+          fail 'The current Git repository is not clean. Aborting. ' \
+               'If you want to proceed forcibly, use -f/--force option.'
         end
       end
 

data/lib/transpec/converter.rb

@@ -11,6 +11,8 @@ Transpec::Syntax.require_all
 
 module Transpec
   class Converter < BaseRewriter # rubocop:disable ClassLength
+    include Syntax::Dispatcher
+
     attr_reader :spec_suite, :configuration, :rspec_version, :report
 
     alias_method :convert_file!, :rewrite_file!
@@ -30,30 +32,14 @@ module Transpec
 
     def process(ast, source_rewriter)
       return unless ast
-      ast.each_node do |node|
-        dispatch_node(node, source_rewriter)
-      end
-    end
-
-    def dispatch_node(node, source_rewriter)
-      Syntax.standalone_syntaxes.each do |syntax_class|
-        syntax = syntax_class.new(node, source_rewriter, runtime_data, report)
-        next unless syntax.conversion_target?
-        dispatch_syntax(syntax)
-        break
-      end
-    rescue OverlappedRewriteError # rubocop:disable HandleExceptions
-    rescue ConversionError => error
-      report.conversion_errors << error
-    end
 
-    def dispatch_syntax(syntax)
-      handler_name = "process_#{syntax.class.snake_case_name}"
-      send(handler_name, syntax)
-
-      syntax.dependent_syntaxes.each do |dependent_syntax|
-        next unless dependent_syntax.conversion_target?
-        dispatch_syntax(dependent_syntax)
+      ast.each_node do |node|
+        begin
+          dispatch_node(node, source_rewriter, runtime_data, report)
+        rescue OverlappedRewriteError # rubocop:disable HandleExceptions
+        rescue ConversionError => error
+          report.conversion_errors << error
+        end
       end
     end
 
@@ -78,12 +64,6 @@ module Transpec
       end
     end
 
-    def process_expect(expect)
-    end
-
-    def process_allow(allow)
-    end
-
     def process_should_receive(should_receive)
       if should_receive.useless_expectation?
         if configuration.convert_deprecated_method?
@@ -98,8 +78,6 @@ module Transpec
       elsif configuration.convert_should_receive?
         should_receive.expectize!(configuration.negative_form_of_to)
       end
-
-      process_messaging_host(should_receive)
     end
 
     def process_double(double)
@@ -120,8 +98,6 @@ module Transpec
       end
 
       method_stub.remove_no_message_allowance! if configuration.convert_deprecated_method?
-
-      process_messaging_host(method_stub)
     end
 
     def process_operator(operator)
@@ -131,10 +107,6 @@ module Transpec
       operator.convert_operator!(configuration.parenthesize_matcher_arg?)
     end
 
-    def process_receive(receive)
-      process_messaging_host(receive)
-    end
-
     def process_be_boolean(be_boolean)
       return unless rspec_version.be_truthy_available?
       return unless configuration.convert_deprecated_method?
@@ -190,14 +162,6 @@ module Transpec
     def process_rspec_configure(rspec_configure)
       return unless spec_suite.main_rspec_configure_node?(rspec_configure.node)
 
-      if need_to_modify_expectation_syntax_configuration?(rspec_configure)
-        rspec_configure.expectations.syntaxes = :expect
-      end
-
-      if need_to_modify_mock_syntax_configuration?(rspec_configure)
-        rspec_configure.mocks.syntaxes = :expect
-      end
-
       if rspec_version.non_monkey_patch_example_group_available? &&
          configuration.convert_example_group?
         rspec_configure.expose_dsl_globally = false
@@ -219,11 +183,6 @@ module Transpec
       hook.convert_scope_name!
     end
 
-    def process_messaging_host(messaging_host)
-      process_useless_and_return(messaging_host)
-      process_any_instance_block(messaging_host)
-    end
-
     def process_useless_and_return(messaging_host)
       return unless messaging_host
       return unless configuration.convert_deprecated_method?
@@ -242,20 +201,5 @@ module Transpec
       rspec_version.rspec_2_99? && configuration.convert_deprecated_method? &&
         spec_suite.need_to_modify_yield_receiver_to_any_instance_implementation_blocks_config?
     end
-
-    def need_to_modify_expectation_syntax_configuration?(rspec_configure)
-      return false unless configuration.convert_should?
-      rspec_configure.expectations.syntaxes == [:should]
-    rescue Syntax::RSpecConfigure::Framework::UnknownSyntaxError
-      false
-    end
-
-    def need_to_modify_mock_syntax_configuration?(rspec_configure)
-      return false if !configuration.convert_should_receive? &&
-                      !configuration.convert_stub?
-      rspec_configure.mocks.syntaxes == [:should]
-    rescue Syntax::RSpecConfigure::Framework::UnknownSyntaxError
-      false
-    end
   end
 end

data/lib/transpec/spec_suite.rb

@@ -8,6 +8,8 @@ Transpec::Syntax.require_all
 
 module Transpec
   class SpecSuite
+    include Syntax::Dispatcher
+
     ANALYSIS_TARGET_CLASSES = [Syntax::Mixin::AnyInstanceBlock]
 
     attr_reader :runtime_data
@@ -32,7 +34,7 @@ module Transpec
       specs.each do |spec|
         next unless spec.ast
         spec.ast.each_node do |node|
-          dispatch_node(node)
+          dispatch_node(node, nil, runtime_data)
         end
       end
 
@@ -56,41 +58,6 @@ module Transpec
 
     private
 
-    def dispatch_node(node)
-      Syntax.standalone_syntaxes.each do |syntax_class|
-        syntax = syntax_class.new(node, nil, runtime_data)
-        next unless syntax.conversion_target?
-        dispatch_syntax(syntax)
-        break
-      end
-    end
-
-    def dispatch_syntax(syntax)
-      invoke_handler(syntax.class, syntax)
-
-      syntax_mixins.each do |mixin|
-        next unless syntax.class.ancestors.include?(mixin)
-        invoke_handler(mixin, syntax)
-      end
-
-      syntax.dependent_syntaxes.each do |dependent_syntax|
-        next unless dependent_syntax.conversion_target?
-        dispatch_syntax(dependent_syntax)
-      end
-    end
-
-    def syntax_mixins
-      Syntax::Mixin.constants.map do |const_name|
-        Syntax::Mixin.const_get(const_name, false)
-      end
-    end
-
-    def invoke_handler(klass, syntax)
-      class_name = klass.name.split('::').last.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
-      handler_name = "process_#{class_name}"
-      send(handler_name, syntax) if respond_to?(handler_name, true)
-    end
-
     def process_any_instance_block(syntax)
       @need_to_modify_yield_receiver_to_any_instance_implementation_blocks_config ||=
         syntax.need_to_add_receiver_arg_to_any_instance_implementation_block?

data/lib/transpec/syntax.rb

@@ -28,6 +28,66 @@ module Transpec
       def standalone_syntaxes
         @standalone_syntaxes ||= all_syntaxes.select(&:standalone?)
       end
+
+      def mixins
+        @mixins ||= Mixin.constants.map do |const_name|
+          Mixin.const_get(const_name, false)
+        end
+      end
+    end
+  end
+end
+
+module Transpec
+  class Syntax
+    module ModuleUtil
+      module_function
+
+      def snake_case_name(module_name)
+        module_name.split('::').last.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
+      end
+    end
+  end
+end
+
+module Transpec
+  class Syntax
+    module Dispatcher
+      def dispatch_node(node, source_rewriter = nil, runtime_data = nil, report = nil)
+        Syntax.standalone_syntaxes.find do |syntax_class|
+          syntax = syntax_class.new(node, source_rewriter, runtime_data, report)
+          dispatch_syntax(syntax)
+        end
+      end
+
+      def dispatch_syntax(syntax)
+        return false unless syntax.conversion_target?
+
+        invoke_handler(syntax.class, syntax)
+
+        included_mixins = syntax.class.included_modules & Syntax.mixins
+        included_mixins.each do |mixin|
+          invoke_handler(mixin, syntax)
+        end
+
+        syntax.dependent_syntaxes.each do |dependent_syntax|
+          dispatch_syntax(dependent_syntax)
+        end
+
+        true
+      end
+
+      def invoke_handler(klass, syntax)
+        handler_name = handler_names[klass]
+        send(handler_name, syntax) if respond_to?(handler_name, true)
+      end
+
+      def handler_names
+        @handler_names_cache ||= Hash.new do |hash, klass|
+          class_name = ModuleUtil.snake_case_name(klass.name)
+          hash[klass] = "process_#{class_name}"
+        end
+      end
     end
   end
 end
@@ -92,10 +152,7 @@ module Transpec
     end
 
     def self.snake_case_name
-      @snake_cake_name ||= begin
-        class_name = name.split('::').last
-        class_name.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
-      end
+      @snake_cake_name ||= ModuleUtil.snake_case_name(name)
     end
 
     def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)

data/lib/transpec/util.rb

@@ -138,12 +138,6 @@ module Transpec
       Parser::Source::Range.new(range.source_buffer, begin_pos, begin_pos)
     end
 
-    def end_of_line_range(arg)
-      range = range_from_arg(arg)
-      begin_pos = beginning_of_line_range(range).begin_pos + range.source_line.size
-      Parser::Source::Range.new(range.source_buffer, begin_pos, begin_pos)
-    end
-
     def line_range(arg)
       range = range_from_arg(arg)
       beginning_of_line_range(range).resize(range.source_line.size + 1)

data/lib/transpec/version.rb

@@ -4,7 +4,7 @@ module Transpec
   # http://semver.org/
   module Version
     MAJOR = 1
-    MINOR = 12
+    MINOR = 13
     PATCH = 0
 
     def self.to_s

data/spec/transpec/cli_spec.rb

@@ -90,9 +90,10 @@ module Transpec
               include_examples 'aborts processing'
               include_examples 'does not generate commit message'
 
-              it 'warns to the user' do
-                cli.should_receive(:warn) do |arg|
-                  arg.should include('clean')
+              it 'warns and suggests the use of -f/--force option' do
+                cli.should_receive(:warn) do |message|
+                  message.should include('clean')
+                  message.should include('-f/--force')
                 end
 
                 cli.run(args)
@@ -140,10 +141,7 @@ module Transpec
         include_examples 'aborts processing'
 
         it 'warns to the user' do
-          cli.should_receive(:warn) do |arg|
-            arg.should match(/rspec.+dependency/i)
-          end
-
+          cli.should_receive(:warn).with(/rspec.+dependency/i)
           cli.run(args)
         end
       end
@@ -275,10 +273,7 @@ module Transpec
         end
 
         it 'warns to user' do
-          cli.should_receive(:warn) do |message|
-            message.should =~ /converted.+but.+incorrect/i
-          end
-
+          cli.should_receive(:warn).with(/converted.+but.+incorrect/i)
           cli.convert_spec(processed_source, spec_suite)
         end
       end

data/spec/transpec/converter_spec.rb

@@ -475,16 +475,6 @@ module Transpec
           end
         end
       end
-
-      it 'invokes #process_useless_and_return with the should_receive' do
-        converter.should_receive(:process_useless_and_return).with(should_receive_object)
-        converter.process_should_receive(should_receive_object)
-      end
-
-      it 'invokes #process_any_instance_block with the should_receive' do
-        converter.should_receive(:process_any_instance_block).with(should_receive_object)
-        converter.process_should_receive(should_receive_object)
-      end
     end
 
     describe '#process_method_stub' do
@@ -617,16 +607,6 @@ module Transpec
           include_examples 'does not invoke MethodStub#remove_no_message_allowance!'
         end
       end
-
-      it 'invokes #process_useless_and_return with the method stub' do
-        converter.should_receive(:process_useless_and_return).with(method_stub_object)
-        converter.process_method_stub(method_stub_object)
-      end
-
-      it 'invokes #process_any_instance_block with the method stub' do
-        converter.should_receive(:process_any_instance_block).with(method_stub_object)
-        converter.process_method_stub(method_stub_object)
-      end
     end
 
     describe '#process_double' do
@@ -1125,50 +1105,6 @@ module Transpec
         ).as_null_object
       end
 
-      context 'when #need_to_modify_expectation_syntax_configuration? returns true' do
-        before do
-          converter.stub(:need_to_modify_expectation_syntax_configuration?).and_return(true)
-        end
-
-        it 'invokes RSpecConfigure.expectations.syntaxes= with :expect' do
-          rspec_configure.expectations.should_receive(:syntaxes=).with(:expect)
-          converter.process_rspec_configure(rspec_configure)
-        end
-      end
-
-      context 'when #need_to_modify_expectation_syntax_configuration? returns false' do
-        before do
-          converter.stub(:need_to_modify_expectation_syntax_configuration?).and_return(false)
-        end
-
-        it 'does not invoke RSpecConfigure.expectations.syntaxes=' do
-          rspec_configure.expectations.should_not_receive(:syntaxes=)
-          converter.process_rspec_configure(rspec_configure)
-        end
-      end
-
-      context 'when #need_to_modify_mock_syntax_configuration? returns true' do
-        before do
-          converter.stub(:need_to_modify_mock_syntax_configuration?).and_return(true)
-        end
-
-        it 'invokes RSpecConfigure.mocks.syntaxes= with :expect' do
-          rspec_configure.mocks.should_receive(:syntaxes=).with(:expect)
-          converter.process_rspec_configure(rspec_configure)
-        end
-      end
-
-      context 'when #need_to_modify_mock_syntax_configuration? returns false' do
-        before do
-          converter.stub(:need_to_modify_mock_syntax_configuration?).and_return(false)
-        end
-
-        it 'does not invoke RSpecConfigure.mocks.syntaxes=' do
-          rspec_configure.mocks.should_not_receive(:syntaxes=)
-          converter.process_rspec_configure(rspec_configure)
-        end
-      end
-
       context 'when RSpecVersion#rspec_2_99? returns true' do
         before do
           rspec_version.stub(:rspec_2_99?).and_return(true)
@@ -1376,114 +1312,5 @@ module Transpec
         end
       end
     end
-
-    shared_examples 'syntaxes' do |framework_type, expectations|
-      expectations.each do |current_syntaxes, return_value|
-        context "and RSpecConfigure.#{framework_type}.syntaxes returns #{current_syntaxes.inspect}" do
-          before do
-            rspec_configure.stub_chain(framework_type, :syntaxes).and_return(current_syntaxes)
-          end
-
-          it "returns #{return_value}" do
-            should == return_value
-          end
-        end
-      end
-
-      context "and RSpecConfigure.#{framework_type}.syntaxes raises UnknownSyntaxError" do
-        before do
-          rspec_configure.stub_chain(framework_type, :syntaxes)
-            .and_raise(Syntax::RSpecConfigure::Framework::UnknownSyntaxError)
-        end
-
-        it 'returns false' do
-          should be_false
-        end
-      end
-    end
-
-    describe '#need_to_modify_expectation_syntax_configuration?' do
-      subject { converter.need_to_modify_expectation_syntax_configuration?(rspec_configure) }
-      let(:rspec_configure) { double('rspec_configure') }
-
-      context 'when Configuration#convert_should? is true' do
-        before { configuration.convert_should = true }
-
-        include_examples 'syntaxes', :expectations, {
-          []                 => false,
-          [:should]          => true,
-          [:expect]          => false,
-          [:should, :expect] => false
-        }
-      end
-
-      context 'when Configuration#convert_should? is false' do
-        before { configuration.convert_should = false }
-
-        include_examples 'syntaxes', :expectations, {
-          []                 => false,
-          [:should]          => false,
-          [:expect]          => false,
-          [:should, :expect] => false
-        }
-      end
-    end
-
-    describe '#need_to_modify_mock_syntax_configuration?' do
-      subject { converter.need_to_modify_mock_syntax_configuration?(rspec_configure) }
-      let(:rspec_configure) { double('rspec_configure') }
-
-      context 'when Configuration#convert_should_receive? is true' do
-        before { configuration.convert_should_receive = true }
-
-        context 'and Configuration#convert_stub? is true' do
-          before { configuration.convert_stub = true }
-
-          include_examples 'syntaxes', :mocks, {
-            []                 => false,
-            [:should]          => true,
-            [:expect]          => false,
-            [:should, :expect] => false
-          }
-        end
-
-        context 'and Configuration#convert_stub? is false' do
-          before { configuration.convert_stub = false }
-
-          include_examples 'syntaxes', :mocks, {
-            []                 => false,
-            [:should]          => true,
-            [:expect]          => false,
-            [:should, :expect] => false
-          }
-        end
-      end
-
-      context 'when Configuration#convert_should_receive? is false' do
-        before { configuration.convert_should_receive = false }
-
-        context 'and Configuration#convert_stub? is true' do
-          before { configuration.convert_stub = true }
-
-          include_examples 'syntaxes', :mocks, {
-            []                 => false,
-            [:should]          => true,
-            [:expect]          => false,
-            [:should, :expect] => false
-          }
-        end
-
-        context 'and Configuration#convert_stub? is false' do
-          before { configuration.convert_stub = false }
-
-          include_examples 'syntaxes', :mocks, {
-            []                 => false,
-            [:should]          => false,
-            [:expect]          => false,
-            [:should, :expect] => false
-          }
-        end
-      end
-    end
   end
 end