transpec 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb53fd56a9663b6ac60c9fcb539aa9f08ce4ef48
-  data.tar.gz: 483a8e18c082daa89c45a80a67397c5fab6dc7df
+  metadata.gz: c05b59c4946002626da61b3c8dc7fc4737ea3eda
+  data.tar.gz: e2b2eb1465049948c5e47ccb634b670fca2335b3
 SHA512:
-  metadata.gz: 29bdf20766286e22243e0d615b2cb934d86272ad6fec7b2a67d3e53fdb6c19d19f732c95ad3ff7fd6f7bf6732b9665c99d7f9e79a490af3ee4c2ba6a2812afe2
-  data.tar.gz: eeee1c1f55c9dfa1893be85c04a576f62286a35a60ce0359acbc91c1bf530a334cf6b47345525aa70ce2ec2730f05b20eb29f0159e3ecf700a22b0296a2dd014
+  metadata.gz: bb867b7c564d1e49c04677cc2fca28c7627b70fe8357122943be7584f340d0e58390f5859fc0d2250db878bae455ba0461826fd29d46367c0504ac40a5d6949a
+  data.tar.gz: d0930196ec951ab8bb0fce1ec44da5758ed0e6fa9c8711d315ef58a3c05680b394988032fb9d785b4ae9dac22b9c8b26bad7544f70bb7410594f770ec9d9605d

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Development
 
+## v1.5.1
+
+* Check whether a `stub` is RSpec's one or not with a static whitelist when there's no runtime data ([#33](https://github.com/yujinakayama/transpec/issues/33))
+* Fix a bug where one-liner `should` was converted to `is_expected.to` on RSpec 3.0.0.beta1 (available since 2.99.0.beta2 and 3.0.0.beta2)
+
 ## v1.5.0
 
 * Mention the project's RSpec version in the auto-generated commit message

data/Guardfile

@@ -1,21 +1,25 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec, all_after_pass: true, all_on_start: true, cmd: 'bundle exec rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})        { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')     { "spec" }
-  watch(%r{^spec/support/.+\.rb$}) { "spec" }
-end
+# This group allows to skip running RuboCop if RSpec failed,
+# like Red > Green (RSpec) > Refactor (RuboCop).
+group :red_green_refactor, halt_on_fail: true do
+  guard :rspec, all_after_pass: true, all_on_start: true, cmd: 'bundle exec rspec' do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})        { |m| "spec/#{m[1]}_spec.rb" }
+    watch('spec/spec_helper.rb')     { "spec" }
+    watch(%r{^spec/support/.+\.rb$}) { "spec" }
+  end
 
-guard :rubocop do
-  watch(%r{.+\.rb$})
-  watch(%r{.+\.rake$})
-  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
-end
+  guard :rubocop do
+    watch(%r{.+\.rb$})
+    watch(%r{.+\.rake$})
+    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  end
 
-guard :shell do
-  watch('README.md.erb') do
-    system('rake', 'readme') || n('Failed to build README.md', 'README Build Result', :failed)
+  guard :shell do
+    watch('README.md.erb') do
+      system('rake', 'readme') || n('Failed to build README.md', 'README Build Result', :failed)
+    end
   end
 end

data/README.md

@@ -2,7 +2,7 @@
 
 # Transpec
 
-**Transpec** automatically converts your specs to the latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
+**Transpec** is a tool for converting your specs to the latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
 
 This aims to facilitate smooth transition to RSpec 3, and it's now ready for RSpec 2.99 and 3.0 beta!
 

data/README.md.erb

@@ -2,7 +2,7 @@
 
 # Transpec
 
-**Transpec** automatically converts your specs to the latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
+**Transpec** is a tool for converting your specs to the latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
 
 This aims to facilitate smooth transition to RSpec 3, and it's now ready for RSpec 2.99 and 3.0 beta!
 

data/lib/transpec/cli.rb

@@ -65,9 +65,9 @@ module Transpec
       converter = Converter.new(@configuration, @project.rspec_version, runtime_data, @report)
       converter.convert_file!(file_path)
 
-      @report.invalid_context_errors.concat(converter.invalid_context_errors)
+      @report.context_errors.concat(converter.context_errors)
 
-      converter.invalid_context_errors.each do |error|
+      converter.context_errors.each do |error|
         warn_invalid_context_error(error)
       end
     rescue Parser::SyntaxError => error

data/lib/transpec/context_error.rb

@@ -0,0 +1,23 @@
+# coding: utf-8
+
+module Transpec
+  class ContextError < StandardError
+    attr_reader :message, :source_range
+
+    def initialize(source_range, original_syntax, target_syntax)
+      @source_range = source_range
+      @message = build_message(original_syntax, target_syntax)
+    end
+
+    def source_buffer
+      @source_range.source_buffer
+    end
+
+    private
+
+    def build_message(original_syntax, target_syntax)
+      "Cannot convert #{original_syntax} into #{target_syntax} " +
+      "since #{target_syntax} is not available in the context."
+    end
+  end
+end

data/lib/transpec/converter.rb

@@ -20,7 +20,7 @@ require 'transpec/syntax/should_receive'
 
 module Transpec
   class Converter < BaseRewriter
-    attr_reader :configuration, :rspec_version, :runtime_data, :report, :invalid_context_errors
+    attr_reader :configuration, :rspec_version, :runtime_data, :report, :context_errors
 
     alias_method :convert_file!, :rewrite_file!
     alias_method :convert, :rewrite
@@ -30,7 +30,7 @@ module Transpec
       @rspec_version = rspec_version || Transpec.current_rspec_version
       @runtime_data = runtime_data
       @report = report || Report.new
-      @invalid_context_errors = []
+      @context_errors = []
     end
 
     def process(ast, source_rewriter)
@@ -42,7 +42,7 @@ module Transpec
 
     def dispatch_node(node, source_rewriter)
       Syntax.standalone_syntaxes.each do |syntax_class|
-        next unless syntax_class.target_node?(node, @runtime_data)
+        next unless syntax_class.conversion_target_node?(node, @runtime_data)
 
         syntax = syntax_class.new(node, source_rewriter, @runtime_data, @report)
 
@@ -52,8 +52,8 @@ module Transpec
         break
       end
     rescue OverlappedRewriteError # rubocop:disable HandleExceptions
-    rescue Syntax::InvalidContextError => error
-      @invalid_context_errors << error
+    rescue ContextError => error
+      @context_errors << error
     end
 
     def process_should(should)

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -39,8 +39,7 @@ module Transpec
 
         ast.each_node do |node|
           Syntax.standalone_syntaxes.each do |syntax_class|
-            syntax_class.register_request_for_dynamic_analysis(node, self)
-            next unless syntax_class.target_node?(node)
+            next unless syntax_class.dynamic_analysis_target_node?(node)
             syntax = syntax_class.new(node)
             syntax.register_request_for_dynamic_analysis(self)
           end

data/lib/transpec/report.rb

@@ -4,11 +4,11 @@ require 'rainbow'
 
 module Transpec
   class Report
-    attr_reader :records, :invalid_context_errors, :syntax_errors
+    attr_reader :records, :context_errors, :syntax_errors
 
     def initialize
       @records = []
-      @invalid_context_errors = []
+      @context_errors = []
       @syntax_errors = []
     end
 
@@ -72,17 +72,17 @@ module Transpec
     end
 
     def convertion_and_incomplete_stats
-      color = invalid_context_errors.empty? ? :green : :yellow
+      color = context_errors.empty? ? :green : :yellow
 
       text = pluralize(records.count, 'conversion') + ', '
-      text << pluralize(invalid_context_errors.count, 'incomplete') + ', '
+      text << pluralize(context_errors.count, 'incomplete') + ', '
       text.color(color)
     end
 
     def error_stats
       color = if !syntax_errors.empty?
                 :red
-              elsif invalid_context_errors.empty?
+              elsif context_errors.empty?
                 :green
               else
                 :yellow

data/lib/transpec/rspec_version.rb

@@ -10,15 +10,18 @@ module Transpec
 
     attr_reader :gem_version
 
-    def self.define_feature_availability(feature, version_string)
+    def self.define_feature(feature, version_string, options = {})
       available_version = new(version_string)
 
+      exception_version_strings = Array(options[:except])
+      exception_versions = exception_version_strings.map { |s| new(s) }
+
       define_singleton_method("#{feature}_available_version") do
         available_version
       end
 
       define_method("#{feature}_available?") do
-        self >= available_version
+        self >= available_version && !exception_versions.include?(self)
       end
     end
 
@@ -38,10 +41,10 @@ module Transpec
       @gem_version.to_s
     end
 
-    define_feature_availability :be_truthy,             '2.99.0.beta1'
-    define_feature_availability :yielded_example,       '2.99.0.beta1'
-    define_feature_availability :one_liner_is_expected, '2.99.0.beta2'
-    define_feature_availability :receive_messages,      '3.0.0.beta1'
-    define_feature_availability :receive_message_chain, '3.0.0.beta2'
+    define_feature :be_truthy,             '2.99.0.beta1'
+    define_feature :yielded_example,       '2.99.0.beta1'
+    define_feature :one_liner_is_expected, '2.99.0.beta2', except: '3.0.0.beta1'
+    define_feature :receive_messages,      '3.0.0.beta1'
+    define_feature :receive_message_chain, '3.0.0.beta2'
   end
 end

data/lib/transpec/syntax.rb

@@ -1,24 +1,87 @@
 # coding: utf-8
 
+require 'transpec/context_error'
 require 'transpec/static_context_inspector'
 require 'transpec/record'
 require 'transpec/report'
+require 'active_support/concern'
 
 module Transpec
   class Syntax
-    attr_reader :node, :source_rewriter, :runtime_data, :report
+    module Collection
+      def inherited(subclass)
+        all_syntaxes << subclass
+      end
+
+      def all_syntaxes
+        @subclasses ||= []
+      end
 
-    def self.inherited(subclass)
-      all_syntaxes << subclass
+      def standalone_syntaxes
+        @standalone_syntaxes ||= all_syntaxes.select(&:standalone?)
+      end
     end
+  end
+end
+
+module Transpec
+  class Syntax
+    module Rewritable
+      private
+
+      def remove(range)
+        @source_rewriter.remove(range)
+      end
+
+      def insert_before(range, content)
+        @source_rewriter.insert_before(range, content)
+      end
 
-    def self.all_syntaxes
-      @subclasses ||= []
+      def insert_after(range, content)
+        @source_rewriter.insert_after(range, content)
+      end
+
+      def replace(range, content)
+        @source_rewriter.replace(range, content)
+      end
     end
+  end
+end
+
+module Transpec
+  class Syntax
+    module DynamicAnalysis
+      extend ActiveSupport::Concern
 
-    def self.standalone_syntaxes
-      @standalone_syntaxes ||= all_syntaxes.select(&:standalone?)
+      module ClassMethods
+        def add_dynamic_analysis_request(&block)
+          dynamic_analysis_requests << block
+        end
+
+        def dynamic_analysis_requests
+          @dynamic_analysis_requests ||= []
+        end
+
+        def dynamic_analysis_target_node?(node)
+          target_node?(node)
+        end
+      end
+
+      def register_request_for_dynamic_analysis(rewriter)
+        self.class.dynamic_analysis_requests.each do |request|
+          instance_exec(rewriter, &request)
+        end
+      end
     end
+  end
+end
+
+module Transpec
+  class Syntax
+    extend Collection
+    include Rewritable, DynamicAnalysis
+
+    attr_reader :node, :source_rewriter, :runtime_data, :report
 
     def self.standalone?
       true
@@ -31,13 +94,16 @@ module Transpec
       end
     end
 
-    def self.register_request_for_dynamic_analysis(node, rewriter)
-    end
-
+    # The default common method for .conversion_target_node? and .dynamic_analysis_target_node?.
+    # If they should behave differently, override either or both.
     def self.target_node?(node, runtime_data = nil)
       false
     end
 
+    def self.conversion_target_node?(node, runtime_data = nil)
+      target_node?(node, runtime_data)
+    end
+
     def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)
       @node = node
       @source_rewriter = source_rewriter
@@ -45,9 +111,6 @@ module Transpec
       @report = report || Report.new
     end
 
-    def register_request_for_dynamic_analysis(rewriter)
-    end
-
     def static_context_inspector
       @static_context_inspector ||= StaticContextInspector.new(@node)
     end
@@ -65,41 +128,5 @@ module Transpec
     def runtime_node_data(node)
       @runtime_data && @runtime_data[node]
     end
-
-    def remove(range)
-      @source_rewriter.remove(range)
-    end
-
-    def insert_before(range, content)
-      @source_rewriter.insert_before(range, content)
-    end
-
-    def insert_after(range, content)
-      @source_rewriter.insert_after(range, content)
-    end
-
-    def replace(range, content)
-      @source_rewriter.replace(range, content)
-    end
-
-    class InvalidContextError < StandardError
-      attr_reader :message, :source_range
-
-      def initialize(source_range, original_syntax, target_syntax)
-        @source_range = source_range
-        @message = build_message(original_syntax, target_syntax)
-      end
-
-      def source_buffer
-        @source_range.source_buffer
-      end
-
-      private
-
-      def build_message(original_syntax, target_syntax)
-        "Cannot convert #{original_syntax} into #{target_syntax} " +
-        "since #{target_syntax} is not available in the context."
-      end
-    end
   end
 end

data/lib/transpec/syntax/expect.rb

@@ -2,21 +2,17 @@
 
 require 'transpec/syntax'
 require 'transpec/syntax/mixin/send'
-require 'transpec/syntax/mixin/have_matcher'
+require 'transpec/syntax/mixin/have_matcher_owner'
 
 module Transpec
   class Syntax
     class Expect < Syntax
-      include Mixin::Send, Mixin::HaveMatcher
+      include Mixin::Send, Mixin::HaveMatcherOwner
 
       def self.target_method?(receiver_node, method_name)
         receiver_node.nil? && method_name == :expect
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
-        have_matcher.register_request_for_dynamic_analysis(rewriter) if have_matcher
-      end
-
       def current_syntax_type
         :expect
       end

data/lib/transpec/syntax/have.rb

@@ -38,7 +38,7 @@ module Transpec
         @report = report || Report.new
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
+      add_dynamic_analysis_request do |rewriter|
         DynamicInspector.register_request(self, rewriter)
       end
 
@@ -128,7 +128,6 @@ module Transpec
       end
 
       def replacement_matcher_source(parenthesize_arg)
-        size_source = size_node.loc.expression.source
         build_replacement_matcher_source(size_source, parenthesize_arg)
       end