transpec 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84654b586ffec308305611b94645b31b0273c5fa
-  data.tar.gz: 550b871976225f5b49b79ce3e098ac69bade0071
+  metadata.gz: 9a3e260298c65e466e7a7460347e7f30c0a21756
+  data.tar.gz: 2c1638289bf22ca3478ffe62c22419451ffe4dcd
 SHA512:
-  metadata.gz: 2a363066e3a0ad769016ba1ce600530827fe5207c8df6113bb7ab34d2fc726d014951acb6f40038617d3f14f3e6ce0b03441cb6b2aef8d40a7c227df881ad66e
-  data.tar.gz: efe834fdda78a29a07e461780b860107db23121be76beb2ece5529892d21b7945570e6d86888c541daaaf47300b57219cb1a383d0ad36145471c321eb779459b
+  metadata.gz: cf8a5e86460c68c9a5de1148dadab3af4edc88d775992e49069de3f17f689ececc22494c2e9c0ae52f5d4c73813c3d5beb3b7324faed94cd9163f0406d513e63
+  data.tar.gz: a0b827f6aa1aa0101a459440f2325f362509e6a8c5de0e88c741c93482ecb005d539ac2e61ee0312023ac6a6836589792d29de5f95b4bae616be917fca7b555a

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Master
 
+## v0.1.2
+
+* Continue processing files even if a file has invalid syntax
+* Fix a crash on source `variable::Const`
+* Fix generating invalid code with here document followed by method
+* Fix generating invalid code when converting `obj.should() == 1`
+
 ## v0.1.1
 
 * Fix a bug where `be > 1` was converted into `be be > 1`

data/lib/transpec/cli.rb

@@ -65,6 +65,8 @@ module Transpec
       rewriter.errors.each do |error|
         warn_not_in_example_group_context_error(error)
       end
+    rescue Parser::SyntaxError => error
+      warn_syntax_error(error)
     end
 
     # rubocop:disable MethodLength
@@ -177,6 +179,10 @@ module Transpec
       fail 'The current Git repository is not clean. Aborting.'
     end
 
+    def warn_syntax_error(error)
+      warn "Syntax error at #{error.diagnostic.location}. Skipping the file.".color(:red)
+    end
+
     def warn_not_in_example_group_context_error(error)
       message = error.message.color(:yellow) + $RS
       message << highlighted_source(error)

data/lib/transpec/syntax/matcher.rb

@@ -38,7 +38,7 @@ module Transpec
       end
 
       def parenthesize!(always = true)
-        return if here_document?(arg_node)
+        return if argument_is_here_document?
 
         case left_parenthesis_range.source
         when ' '
@@ -59,6 +59,11 @@ module Transpec
 
       private
 
+      def argument_is_here_document?
+        here_document?(arg_node) ||
+          arg_node.each_descendent_node.any? { |n| here_document?(n) }
+      end
+
       def prefixed_with_be?
         receiver_node == s(:send, nil, :be)
       end

data/lib/transpec/syntax/should.rb

@@ -25,7 +25,7 @@ module Transpec
           wrap_subject_in_expect!
         end
 
-        replace(selector_range, positive? ? 'to' : negative_form)
+        replace(should_range, positive? ? 'to' : negative_form)
 
         matcher.correct_operator!(parenthesize_matcher_arg)
       end
@@ -53,6 +53,14 @@ module Transpec
         range_of_subject_method_taking_block = send_node.loc.expression
         replace(range_of_subject_method_taking_block, 'expect')
       end
+
+      def should_range
+        if arg_node
+          selector_range
+        else
+          selector_range.join(expression_range.end)
+        end
+      end
     end
   end
 end

data/lib/transpec/util.rb

@@ -29,6 +29,7 @@ module Transpec
         namespace_node, name = *const_node
         const_names << name
         break unless namespace_node
+        break unless namespace_node.is_a?(Parser::AST::Node)
         break if namespace_node.type == :cbase
         const_node = namespace_node
       end
@@ -38,6 +39,7 @@ module Transpec
 
     def here_document?(node)
       return false unless [:str, :dstr].include?(node.type)
+      return false unless node.loc.begin
       node.loc.begin.source.start_with?('<<')
     end
 

data/lib/transpec/version.rb

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

data/spec/transpec/cli_spec.rb

@@ -5,6 +5,8 @@ require 'transpec/cli'
 
 module Transpec
   describe CLI do
+    include FileHelper
+
     subject(:cli) { CLI.new }
 
     describe '.run' do
@@ -28,7 +30,6 @@ module Transpec
         cli.stub(:puts)
         cli.stub(:warn)
         cli.stub(:target_files).and_return(args)
-        Rewriter.stub(:new).and_return(rewriter)
       end
 
       subject { cli.run(args) }
@@ -46,7 +47,15 @@ module Transpec
         end
       end
 
+      shared_context 'stubbed rewriter' do
+        before do
+          Rewriter.stub(:new).and_return(rewriter)
+        end
+      end
+
       context 'when git is available' do
+        include_context 'stubbed rewriter'
+
         before { Git.stub(:command_available?).and_return(true) }
 
         context 'and inside of a repository' do
@@ -91,11 +100,41 @@ module Transpec
       end
 
       context 'when git is not available' do
+        include_context 'stubbed rewriter'
         before { Git.stub(:command_available?).and_return(false) }
         include_examples 'rewrites files'
       end
 
-      context 'when an exception is raised while running' do
+      context 'when a syntax error is raised while processing files' do
+        include_context 'isolated environment'
+
+        let(:args) { [invalid_syntax_file_path, valid_syntax_file_path] }
+        let(:invalid_syntax_file_path) { 'invalid_example.rb' }
+        let(:valid_syntax_file_path) { 'valid_example.rb' }
+
+        before do
+          create_file(invalid_syntax_file_path, 'This is invalid syntax <')
+          create_file(valid_syntax_file_path, 'this_is_valid_syntax')
+        end
+
+        it 'warns to the user' do
+          cli.should_receive(:warn) do |message|
+            message.should include('Syntax error')
+          end
+
+          cli.run(args)
+        end
+
+        it 'continues processing files' do
+          cli.should_receive(:puts).with("Processing #{invalid_syntax_file_path}")
+          cli.should_receive(:puts).with("Processing #{valid_syntax_file_path}")
+          cli.run(args)
+        end
+      end
+
+      context 'when any other error is raised while running' do
+        include_context 'stubbed rewriter'
+
         before do
           cli.stub(:parse_options).and_raise(ArgumentError, 'No such file or directory - non-existent-file')
         end
@@ -112,6 +151,7 @@ module Transpec
 
       context 'when no target paths are specified' do
         include_context 'isolated environment'
+        include_context 'stubbed rewriter'
 
         let(:args) { [] }
 
@@ -138,7 +178,7 @@ module Transpec
       let(:file_path) { 'example.rb' }
 
       before do
-        FileHelper.create_file(file_path, source)
+        create_file(file_path, source)
         cli.stub(:puts)
       end
 
@@ -290,7 +330,7 @@ module Transpec
 
       before do
         ['file', 'file.rb', 'dir/file', 'dir/file.rb'].each do |path|
-          FileHelper.create_file(path, '')
+          create_file(path, '')
         end
       end
 

data/spec/transpec/syntax/matcher_spec.rb

@@ -428,6 +428,34 @@ module Transpec
           end
         end
 
+        context 'when its argument is a here document with chained method' do
+          let(:source) do
+            <<-END
+              it 'returns the document' do
+                subject.should eq <<-HEREDOC.gsub('foo', 'bar')
+                foo
+                HEREDOC
+              end
+            END
+          end
+
+          # (block
+          #   (send nil :it
+          #     (str "returns the document"))
+          #   (args)
+          #   (send
+          #     (send nil :subject) :should
+          #     (send nil :eq
+          #       (send
+          #         (str "                foo\n") :gsub
+          #         (str "foo")
+          #         (str "bar")))))
+
+          it 'does nothing' do
+            rewritten_source.should == source
+          end
+        end
+
         context 'when its argument is a here document with interpolation' do
           let(:source) do
             <<-'END'

data/spec/transpec/syntax/should_spec.rb

@@ -180,6 +180,29 @@ module Transpec
           end
         end
 
+        context 'when it is `subject.should() == 1` form' do
+          let(:source) do
+            <<-END
+              it 'is 1' do
+                subject.should() == 1
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'is 1' do
+                expect(subject).to eq(1)
+              end
+            END
+          end
+
+          it 'converts into `expect(subject).to eq(1)` form' do
+            should_object.expectize!
+            rewritten_source.should == expected_source
+          end
+        end
+
         [
           'lambda', 'Kernel.lambda', '::Kernel.lambda',
           'proc', 'Kernel.proc', '::Kernel.proc',

data/spec/transpec/util_spec.rb

@@ -34,7 +34,8 @@ module Transpec
         ['Foo::Bar',      'Foo::Bar'],
         ['Foo::Bar::Baz', 'Foo::Bar::Baz'],
         ['::Foo',         'Foo'],
-        ['::Foo::Bar',    'Foo::Bar']
+        ['::Foo::Bar',    'Foo::Bar'],
+        ['variable::Foo', 'variable::Foo']
       ].each do |source, expected_return_value|
         context "when the source is #{source.inspect}" do
           let(:source) { source }

data/transpec.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.version       = Transpec::Version.to_s
   spec.authors       = ['Yuji Nakayama']
   spec.email         = ['nkymyj@gmail.com']
-  spec.summary       = 'Transpec converts your specs into latest RSpec syntax'
+  spec.summary       = 'RSpec syntax converter'
   spec.description   = 'Transpec automatically converts your specs into latest RSpec syntax with static analysis.'
   spec.homepage      = 'https://github.com/yujinakayama/transpec'
   spec.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -253,7 +253,7 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Transpec converts your specs into latest RSpec syntax
+summary: RSpec syntax converter
 test_files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb