transpec 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4de7050825b2892a104decbe5977f02054f4d57
-  data.tar.gz: 26acc442dbdfcbf63b93b94556dc6406a63165b3
+  metadata.gz: 9855e40cab5a33c95ac0c45e62ba2c8a166d1176
+  data.tar.gz: 1984df95dd4b3c84eedf68b93096f5b28b63ae83
 SHA512:
-  metadata.gz: 2efb1b828b2c2e713e4d904cd34369abe134bb8d0cc0cc4381d06785cf77ef31ca7eae2f0f42298421c3603c498d3b85b66a4e72fdc1bb55a4c29cd30b2c2f7d
-  data.tar.gz: 367775428c9155fd721a33621b2cf561ea3c684d16baead448019bcd3f7e9008f2f30a55771dc9ca2f2c45d3e12e665830967945fcce78f5578b1791446018e9
+  metadata.gz: 888b7c747f4f36905ebd892b72f391de1d25afa26b22b00c61d74634afdf88ab4ef70c90204d47412c896839d07f34ed3e0f9f9187e6e0e24d073f0529cf2969
+  data.tar.gz: 7d6df84751dcae9b33ec2f9a755207b22e7e0eaa99993d01e46fac69643dd278954b3dbc6f0aa02055a673a7011342f94b158ba26bf91b430beecaa48393ad27

data/.rubocop.yml

@@ -1,4 +1,8 @@
 
+AllCops:
+  Excludes:
+    - tmp/*
+
 LineLength:
   Max: 100
 

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master
 
+## v0.0.5
+
+* Support conversion of `any_number_of_times`
+
 ## v0.0.4
 
 * Fix a bug where necessary parentheses were not added when converting operator matcher to non-operator matcher in some cases (e.g. `== (2 - 1) + (1 + 2)` was converted into `eq(2 - 1) + (1 + 2)` unintentionally)

data/README.md

@@ -123,6 +123,21 @@ After the conversion, run `rspec` again and check if all pass.
 
 ## Options
 
+### `--force`
+
+Force processing even if the current Git repository is not clean.
+
+```bash
+$ git status --short
+ M spec/spec_helper.rb
+$ transpec
+The current Git repository is not clean. Aborting.
+$ transpec --force
+Processing spec/spec_helper.rb
+Processing spec/spec_spec.rb
+Processing spec/support/file_helper.rb
+```
+
 ### `-d/--disable`
 
 Disable specific conversions.

data/README.md.erb

@@ -96,6 +96,21 @@ After the conversion, run `rspec` again and check if all pass.
 
 ## Options
 
+### `--force`
+
+Force processing even if the current Git repository is not clean.
+
+```bash
+$ git status --short
+ M spec/spec_helper.rb
+$ transpec
+The current Git repository is not clean. Aborting.
+$ transpec --force
+Processing spec/spec_helper.rb
+Processing spec/spec_spec.rb
+Processing spec/support/file_helper.rb
+```
+
 ### `-d/--disable`
 
 Disable specific conversions.

data/Rakefile

@@ -54,9 +54,11 @@ namespace :test do
   projects.each do |name, url, ref, bundler_args|
     desc "Test Transpec on #{name.to_s.capitalize} project"
     task name do
-      require 'tmpdir'
+      tmpdir = 'tmp'
 
-      Dir.chdir(Dir.mktmpdir) do
+      Dir.mkdir(tmpdir) unless Dir.exist?(tmpdir)
+
+      Dir.chdir(tmpdir) do
         test_on_project(name.to_s.capitalize, url, ref, bundler_args)
       end
     end
@@ -67,13 +69,9 @@ namespace :test do
 
     puts " Testing on #{name} Project ".center(80, '=')
 
-    # Disabling checkout here to suppress "detached HEAD" warning.
-    sh "git clone --no-checkout --depth 1 --branch #{ref} #{url}"
-    
-    repo_dir = File.basename(url, '.git')
+    repo_dir = prepare_git_repo(url, ref)
 
     Dir.chdir(repo_dir) do
-      sh "git checkout --quiet #{ref}"
       with_clean_bundler_env do
         sh "bundle install #{bundler_args}"
         sh File.join(Transpec.root, 'bin', 'transpec')
@@ -82,6 +80,43 @@ namespace :test do
     end
   end
 
+  def prepare_git_repo(url, ref)
+    repo_dir = File.basename(url, '.git')
+
+    needs_clone = false
+
+    if Dir.exist?(repo_dir)
+      current_ref = nil
+
+      Dir.chdir(repo_dir) do
+        current_ref = `git describe --all`.chomp.sub(/\Aheads\//, '')
+      end
+
+      if current_ref == ref
+        Dir.chdir(repo_dir) do
+          sh 'git reset --hard'
+        end
+      else
+        require 'fileutils'
+        FileUtils.rm_rf(repo_dir)
+        needs_clone = true
+      end
+    else
+      needs_clone = true
+    end
+
+    if needs_clone
+      # Disabling checkout here to suppress "detached HEAD" warning.
+      sh "git clone --no-checkout --depth 1 --branch #{ref} #{url}"
+
+      Dir.chdir(repo_dir) do
+        sh "git checkout --quiet #{ref}"
+      end
+    end
+
+    repo_dir
+  end
+
   def with_clean_bundler_env
     if defined?(Bundler)
       Bundler.with_clean_env do

data/lib/transpec/rewriter.rb

@@ -99,7 +99,13 @@ module Transpec
 
     def process_should_receive(should_receive)
       if @configuration.convert_to_expect_to_receive?
-        should_receive.expectize!(@configuration.negative_form_of_to)
+        if should_receive.any_number_of_times? && @configuration.replace_deprecated_method?
+          should_receive.allowize_any_number_of_times!(@configuration.negative_form_of_to)
+        else
+          should_receive.expectize!(@configuration.negative_form_of_to)
+        end
+      elsif should_receive.any_number_of_times? && @configuration.replace_deprecated_method?
+        should_receive.stubize_any_number_of_times!
       end
     end
 
@@ -113,6 +119,8 @@ module Transpec
       elsif @configuration.replace_deprecated_method?
         method_stub.replace_deprecated_method!
       end
+
+      method_stub.remove_any_number_of_times! if @configuration.replace_deprecated_method?
     end
 
     def process_be_close(be_close)

data/lib/transpec/syntax/any_number_of_timesable.rb

@@ -0,0 +1,42 @@
+# coding: utf-8
+
+require 'transpec/syntax'
+
+module Transpec
+  class Syntax
+    module AnyNumberOfTimesable
+      def any_number_of_times?
+        !any_number_of_times_node.nil?
+      end
+
+      def remove_any_number_of_times!
+        return unless any_number_of_times?
+
+        map = any_number_of_times_node.loc
+        dot_any_number_of_times_range = map.dot.join(map.selector)
+        remove(dot_any_number_of_times_range)
+      end
+
+      private
+
+      def any_number_of_times_node
+        each_following_chained_method_node do |chained_node|
+          method_name = chained_node.children[1]
+          return chained_node if method_name == :any_number_of_times
+        end
+      end
+
+      def each_following_chained_method_node
+        return to_enum(__method__) unless block_given?
+
+        @ancestor_nodes.reverse.reduce(@node) do |child_node, parent_node|
+          return unless [:send, :block].include?(parent_node.type)
+          return unless parent_node.children.first == child_node
+          yield parent_node, child_node
+          parent_node
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/transpec/syntax/expectizable.rb

@@ -9,10 +9,16 @@ module Transpec
       include SendNodeSyntax
 
       def wrap_subject_in_expect!
+        wrap_subject_with_method!('expect')
+      end
+
+      private
+
+      def wrap_subject_with_method!(method)
         if Util.in_parentheses?(subject_node)
-          insert_before(subject_range, 'expect')
+          insert_before(subject_range, method)
         else
-          insert_before(subject_range, 'expect(')
+          insert_before(subject_range, "#{method}(")
           insert_after(subject_range, ')')
         end
       end

data/lib/transpec/syntax/method_stub.rb

@@ -2,13 +2,14 @@
 
 require 'transpec/syntax'
 require 'transpec/syntax/any_instanceable'
+require 'transpec/syntax/any_number_of_timesable'
 require 'transpec/util'
 require 'English'
 
 module Transpec
   class Syntax
     class MethodStub < Syntax
-      include AnyInstanceable, Util
+      include AnyInstanceable, AnyNumberOfTimesable, Util
 
       def allowize!
         # There's no way of unstubbing in #allow syntax.

data/lib/transpec/syntax/should_receive.rb

@@ -3,25 +3,46 @@
 require 'transpec/syntax'
 require 'transpec/syntax/expectizable'
 require 'transpec/syntax/any_instanceable'
+require 'transpec/syntax/any_number_of_timesable'
 
 module Transpec
   class Syntax
     class ShouldReceive < Syntax
-      include Expectizable, AnyInstanceable
+      include Expectizable, AnyInstanceable, AnyNumberOfTimesable
 
       def positive?
         method_name == :should_receive
       end
 
       def expectize!(negative_form = 'not_to')
+        convert_to_syntax!('expect', negative_form)
+      end
+
+      def allowize_any_number_of_times!(negative_form = 'not_to')
+        return unless any_number_of_times?
+
+        convert_to_syntax!('allow', negative_form)
+        remove_any_number_of_times!
+      end
+
+      def stubize_any_number_of_times!(negative_form = 'not_to')
+        return unless any_number_of_times?
+
+        replace(selector_range, 'stub')
+        remove_any_number_of_times!
+      end
+
+      private
+
+      def convert_to_syntax!(syntax, negative_form)
         unless in_example_group_context?
-          fail NotInExampleGroupContextError.new(expression_range, "##{method_name}", '#expect')
+          fail NotInExampleGroupContextError.new(expression_range, "##{method_name}", "##{syntax}")
         end
 
         if any_instance?
           wrap_class_in_expect_any_instance_of!
         else
-          wrap_subject_in_expect!
+          wrap_subject_with_method!(syntax)
         end
 
         replace(selector_range, "#{positive? ? 'to' : negative_form} receive")
@@ -40,8 +61,6 @@ module Transpec
         end
       end
 
-      private
-
       def self.target_receiver_node?(node)
         !node.nil?
       end
@@ -60,7 +79,7 @@ module Transpec
       def broken_block_nodes
         @broken_block_nodes ||= [
           block_node_taken_by_with_method_with_no_normal_args,
-          block_node_followed_by_message_expectation_method
+          block_node_following_message_expectation_method
         ].compact.uniq
       end
 
@@ -76,20 +95,12 @@ module Transpec
       #   (args
       #     (arg :block_arg)) nil)
       def block_node_taken_by_with_method_with_no_normal_args
-        @ancestor_nodes.reverse.reduce(@node) do |child_node, parent_node|
-          return nil unless [:send, :block].include?(parent_node.type)
-          return nil unless parent_node.children.first == child_node
-
-          if parent_node.type == :block
-            return nil unless child_node.children[1] == :with
-            return nil if child_node.children[2]
-            return parent_node
-          end
-
-          parent_node
+        each_following_chained_method_node do |chained_node, child_node|
+          next unless chained_node.type == :block
+          return nil unless child_node.children[1] == :with
+          return nil if child_node.children[2]
+          return chained_node
         end
-
-        nil
       end
 
       # subject.should_receive(:method_name) do |block_arg|
@@ -102,15 +113,11 @@ module Transpec
       #       (sym :method_name))
       #     (args
       #       (arg :block_arg)) nil) :once)
-      def block_node_followed_by_message_expectation_method
-        @ancestor_nodes.reverse.reduce(@node) do |child_node, parent_node|
-          return nil unless [:send, :block].include?(parent_node.type)
-          return nil unless parent_node.children.first == child_node
-          return child_node if child_node.type == :block && parent_node.type == :send
-          parent_node
+      def block_node_following_message_expectation_method
+        each_following_chained_method_node do |chained_node, child_node|
+          next unless chained_node.type == :send
+          return child_node if child_node.type == :block
         end
-
-        nil
       end
     end
   end

data/lib/transpec/version.rb

@@ -5,7 +5,7 @@ module Transpec
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 4
+    PATCH = 5
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ RSpec.configure do |config|
     c.syntax = :should
   end
 
+  config.color_enabled = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run_excluding do_not_run_in_converted_spec: ENV['TRANSPEC_CONVERTED_SPEC']
 

data/spec/transpec/cli_spec.rb

@@ -164,7 +164,7 @@ module Transpec
           context "when #{cli_type.inspect} is specified" do
             let(:args) { ['--disable', cli_type] }
 
-            it "sets configuration ##{config_attr} false" do
+            it "sets Configuration##{config_attr} false" do
               cli.parse_options(args)
               cli.configuration.send(config_attr).should be_false
             end
@@ -197,7 +197,7 @@ module Transpec
           context "when #{form.inspect} is specified" do
             let(:args) { ['--negative-form', form] }
 
-            it "sets configuration #negative_form_of_to? #{form.inspect}" do
+            it "sets Configuration#negative_form_of_to? #{form.inspect}" do
               cli.parse_options(args)
               cli.configuration.negative_form_of_to.should == form
             end
@@ -208,7 +208,7 @@ module Transpec
       describe '-p/--no-parentheses-matcher-arg option' do
         let(:args) { ['--no-parentheses-matcher-arg'] }
 
-        it 'sets configuration #parenthesize_matcher_arg? false' do
+        it 'sets Configuration#parenthesize_matcher_arg? false' do
           cli.parse_options(args)
           cli.configuration.parenthesize_matcher_arg.should be_false
         end
@@ -282,7 +282,7 @@ module Transpec
       context 'when a directory path is passed' do
         let(:paths) { ['dir'] }
 
-        it 'returns file paths with .rb extension in the directory' do
+        it 'returns file paths with .rb extension in the directory recursively' do
           should == ['dir/file.rb']
         end
       end