transpec 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6746cd9c37b13d9dcf9c77b423146988dc76fc05
-  data.tar.gz: 9741bc313663316ea54b25eff57abce0aa3b8440
+  metadata.gz: 44ca6a93bd2bda16ddb06a1b392b577d4058e181
+  data.tar.gz: 157977020a4bff523c6e261722288b3f06d49bc1
 SHA512:
-  metadata.gz: 8794a9d4a01800a80b7a7ab09c29418d2b27a55978263d655ea7f81ac8c2e7babbdacb306caef3a1086dba283c67bb7ec81b8a48267de1b3f3758eff7be57eeb
-  data.tar.gz: 531aca6df23e26d22e048231c6393c044e13137d753924b568a25ee7e11a81d57271ac652c93e403001fd65cc23f79cb3de2f4710f7496fed39521b6277d10e1
+  metadata.gz: 7aa89e910659d73dbe0c62bf494041cb94997f5a1d0fad85e01773dc8ff31be766f6f4f138cc0ec228391dded032e0181a75d1ba6f6cb9cd619769218db867e0
+  data.tar.gz: 9c902ba46ea0940d3d418bf5f9e752d97b9d19797d3543da814e41f568115dc4e17d3f8e6b0d132dd3704d06f7fc02a7efcf5a6070cfdaaf4b0bddf438f91ba5

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
   - 2.1.1
   - jruby
 before_install: gem update --remote bundler
-script: bundle exec rake travis
+script: bundle exec rake ci

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v1.10.1
+
+* Fix a bug where `expect(hash['some_key']).to have(2).items` was converted to `expect(hash[().size).to eq(2)` ([#51](https://github.com/yujinakayama/transpec/issues/51))
+
 ## v1.10.0
 
 * Support conversion of pending examples
@@ -130,7 +134,7 @@
 
 ## v0.2.5
 
-* Do not touch file if the source does need to be rewritten
+* Do not touch file if the source does not need to be rewritten
 
 ## v0.2.4
 

data/Guardfile

@@ -4,7 +4,7 @@
 # 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_on_start: true, failed_mode: :keep, cmd: 'bundle exec rspec' do
+  guard :rspec, 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" }

data/Rakefile

@@ -11,4 +11,4 @@ end
 
 task default: %w(spec style readme)
 
-task travis: %w(spec style readme:check test:all)
+task ci: %w(spec style readme:check test:all)

data/lib/transpec/ast/node.rb

@@ -5,46 +5,6 @@ require 'parser'
 module Transpec
   module AST
     class Node < Parser::AST::Node
-      TYPES = %w(
-        true false nil
-        int float
-        str dstr
-        sym dsym
-        xstr
-        regexp regopt
-        array splat
-        hash pair kwsplat
-        irange erange
-        self
-        lvar ivar cvar gvar
-        nth_ref back_ref
-        const cbase
-        defined?
-        lvasgn ivasgn cvasgn gvasgn
-        casgn
-        masgn mlhs
-        op_asgn or_asgn and_asgn
-        module class sclass
-        def defs undef
-        alias
-        args
-        arg optarg restarg blockarg shadowarg kwarg kwoptarg kwrestarg
-        send
-        super zsuper
-        yield
-        block block_pass
-        and or not
-        if
-        case when
-        while until while_post until_post for
-        break next redo return
-        begin
-        rescue resbody ensure retry
-        preexe postexe
-        iflipflop eflipflop
-        match_current_line match_with_lvasgn
-      ).map(&:to_sym).freeze
-
       attr_reader :metadata
 
       def initialize(type, children = [], properties = {})
@@ -59,7 +19,7 @@ module Transpec
         end
       end
 
-      TYPES.each do |node_type|
+      Parser::Meta::NODE_TYPES.each do |node_type|
         method_name = "#{node_type.to_s.gsub(/\W/, '')}_type?"
         define_method(method_name) do
           type == node_type

data/lib/transpec/report.rb

@@ -55,7 +55,7 @@ module Transpec
                      :green
                    end
 
-      convertion_incomplete_caution_stats(base_color) + error_stats(base_color)
+      conversion_incomplete_caution_stats(base_color) + error_stats(base_color)
     end
 
     def stats
@@ -93,7 +93,7 @@ module Transpec
       text << indentation + '    ' + colorize('to: ', :cyan) + record.converted_syntax + "\n"
     end
 
-    def convertion_incomplete_caution_stats(color)
+    def conversion_incomplete_caution_stats(color)
       text = pluralize(records.count, 'conversion') + ', '
       text << pluralize(conversion_errors.count, 'incomplete') + ', '
       text << pluralize(annotation_count, 'caution') + ', '

data/lib/transpec/syntax/have/source_builder.rb

@@ -52,7 +52,7 @@ module Transpec
 
           if node.send_type? && (arg_node = node.children[2])
             left_of_arg_range = map.selector.end.join(arg_node.loc.expression.begin)
-            unless left_of_arg_range.source.include?('(')
+            if !map.selector.source.start_with?('[') && !left_of_arg_range.source.include?('(')
               relative_index = left_of_arg_range.begin_pos - map.expression.begin_pos
               source[relative_index, left_of_arg_range.length] = '('
               source << ')'

data/lib/transpec/syntax/operator.rb

@@ -21,15 +21,16 @@ module Transpec
 
       def self.check_target_node_statically(node)
         node = node.parent_node if node == BE_NODE
-        return false unless node && node.send_type?
-        receiver_node, method_name, *_ = *node
-        return false if receiver_node.nil?
-        OPERATORS.include?(method_name)
+        super(node)
+      end
+
+      def self.target_method?(receiver_node, method_name)
+        !receiver_node.nil? && OPERATORS.include?(method_name)
       end
 
       define_dynamic_analysis_request do |rewriter|
         if method_name == :=~
-          rewriter.register_request(arg_node, :arg_is_enumerable?, 'is_a?(Enumerable)')
+          rewriter.register_request(arg_node, :enumerable_arg?, 'is_a?(Enumerable)')
         end
       end
 
@@ -47,10 +48,10 @@ module Transpec
         case method_name
         when :==
           convert_to_eq!(parenthesize_arg)
-        when :===, :<, :<=, :>, :>=
-          convert_to_be_operator!
         when :=~
           convert_to_match!(parenthesize_arg)
+        else
+          convert_to_be_operator!
         end
       end
 
@@ -84,7 +85,7 @@ module Transpec
       def convert_to_match!(parenthesize_arg)
         handle_anterior_of_operator!
 
-        if arg_is_enumerable?
+        if enumerable_arg?
           replace(selector_range, 'match_array')
         else
           replace(selector_range, 'match')
@@ -92,11 +93,11 @@ module Transpec
 
         parenthesize!(parenthesize_arg)
 
+        accurate = !enumerable_arg?.nil?
+
         # Need to register record after all source rewrites are done
         # to avoid false record when failed with overlapped rewrite.
-        accurate = !arg_is_enumerable?.nil?
-
-        if arg_is_enumerable?
+        if enumerable_arg?
           register_record('=~ [1, 2]', 'match_array([1, 2])', accurate)
         else
           register_record('=~ /pattern/', 'match(/pattern/)', accurate)
@@ -111,14 +112,14 @@ module Transpec
         end
       end
 
-      def arg_is_enumerable?
+      def enumerable_arg?
         case arg_node.type
         when :array
           true
         when :regexp
           false
         else
-          runtime_data[arg_node, :arg_is_enumerable?]
+          runtime_data[arg_node, :enumerable_arg?]
         end
       end
 

data/lib/transpec/version.rb

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

data/spec/transpec/dynamic_analyzer/rewriter_spec.rb

@@ -43,7 +43,7 @@ module Transpec
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-END
-              transpec_analyze((transpec_analyze((subject), self, "(string)_14_21", { :should_source_location => [:object, "method(:should).source_location"] }).should), self, "(string)_14_28", { :"=~_source_location" => [:object, "method(:=~).source_location"], :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }) =~ transpec_analyze((<<-HEREDOC.gsub('foo', 'bar')), self, "(string)_32_61", { :arg_is_enumerable? => [:object, "is_a?(Enumerable)"] })
+              transpec_analyze((transpec_analyze((subject), self, "(string)_14_21", { :should_source_location => [:object, "method(:should).source_location"] }).should), self, "(string)_14_28", { :"=~_source_location" => [:object, "method(:=~).source_location"], :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }) =~ transpec_analyze((<<-HEREDOC.gsub('foo', 'bar')), self, "(string)_32_61", { :enumerable_arg? => [:object, "is_a?(Enumerable)"] })
               foo
               HEREDOC
             END

data/spec/transpec/syntax/have_spec.rb

@@ -1118,6 +1118,35 @@ module Transpec
           end
         end
 
+        context "when it is `expect(hash['some_key']).to have(2).items` form" do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  expect(hash['some_key']).to have(2).items
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  expect(hash['some_key'].size).to eq(2)
+                end
+              end
+            END
+          end
+
+          let(:have_object) { expect_object.have_matcher }
+
+          fit "converts into `expect(hash['some_key'].size).to eq(2)` form" do
+            have_object.convert_to_standard_expectation!
+            rewritten_source.should == expected_source
+          end
+        end
+
         context 'when it is `it { should have(2).items }` form' do
           let(:source) do
             <<-END

data/spec/transpec/syntax/pending_spec.rb

@@ -157,6 +157,11 @@ module Transpec
           it 'converts into `pending; do_something_fail` form' do
             rewritten_source.should == expected_source
           end
+
+          it 'adds record `pending { do_something_fail }` -> `pending; do_something_fail`' do
+            record.original_syntax.should  == 'pending { do_something_fail }'
+            record.converted_syntax.should == 'pending; do_something_fail'
+          end
         end
 
         context "when it is singleline `pending('some reason') { do_something_fail }` form" do

data/tasks/lib/transpec_demo.rb

@@ -25,6 +25,10 @@ class TranspecDemo < TranspecTest
     git_branch_delete(DEMO_BRANCH) if git_local_branch_exist?(DEMO_BRANCH)
   end
 
+  def shallow_clone?
+    false
+  end
+
   def run_demo(transpec_args = [])
     in_project_dir do
       with_clean_bundler_env do

data/tasks/lib/transpec_test.rb

@@ -114,7 +114,10 @@ class TranspecTest
   def git_clone
     Dir.chdir(self.class.base_dir) do
       # Disabling checkout here to suppress "detached HEAD" warning.
-      sh "git clone --no-checkout --depth 1 --branch #{ref} #{url}"
+      command = %w(git clone --no-checkout)
+      command.concat(%w(--depth 1)) if shallow_clone?
+      command.concat(['--branch', ref, url])
+      sh command.join(' ')
     end
 
     in_project_dir do
@@ -122,6 +125,10 @@ class TranspecTest
     end
   end
 
+  def shallow_clone?
+    true
+  end
+
   def bundle_install
     in_project_dir do
       with_clean_bundler_env do

data/transpec.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_runtime_dependency 'parser',        '>= 2.1.3', '< 3.0'
+  spec.add_runtime_dependency 'parser',        '>= 2.1.6', '< 3.0'
   spec.add_runtime_dependency 'bundler',       '~> 1.3'
   spec.add_runtime_dependency 'rainbow',       '>= 1.99.1', '< 3.0'
   spec.add_runtime_dependency 'json',          '~> 1.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'