transpec 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92704929f93992b64fdcb82e658214425bd23cb
-  data.tar.gz: c224583a7f8d0e0c44bf7f3a715d1c3aeff090ca
+  metadata.gz: abbc3182fd195b7473eea1f3bb4fcf8c7386a7c7
+  data.tar.gz: c3ea7cfb834e1bb4a65c018416dc809da620ec84
 SHA512:
-  metadata.gz: 1da1c8cd1bd30a65f25836b87e7ee6454158eeb7f69462b54e13614cbbc4af90002f1625af5077b5868c249498d356efe6dfc06a4b79c05c5ebe497afae015db
-  data.tar.gz: 758cb3a86ee46ea070c0a03c814d9c9aa81a82b853e950b5e2ba508ba101df78d63aa24092044609cb52fdc23a5fff90c0646908017d7b1a5c9cbfbb4b1e3748
+  metadata.gz: 36bc1599b648b15dc9ab19f66e45e105a521886832179e2ef29643ddb28519d233d2e6a7ee2de34c6bbc2dfbe316ba84d4f9a95175d900fe6b671113d49b7e82
+  data.tar.gz: cdf7b01444576de368f5359b79d0e98561e96d624e090ed6df1cfb9f17457d3c7c752cfac8d6e9ee882bbd4ea67c6f34804ca47657f78ddef9bec3382cbdf34e

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Master
 
+## v0.1.0
+
+* Highlight source in console when warning conversion error
+* Add `--no-color` option
+
 ## v0.0.10
 
 * Support conversion of `at_least(0)`

data/lib/transpec/cli.rb

@@ -6,6 +6,7 @@ require 'transpec/rewriter'
 require 'transpec/version'
 require 'optparse'
 require 'find'
+require 'rainbow'
 
 module Transpec
   class CLI
@@ -44,9 +45,7 @@ module Transpec
       end
 
       target_files(paths).each do |file_path|
-        puts "Processing #{file_path}"
-        rewriter = Rewriter.new(@configuration)
-        rewriter.rewrite_file!(file_path)
+        process_file(file_path)
       end
 
       # TODO: Print summary
@@ -57,6 +56,17 @@ module Transpec
       false
     end
 
+    def process_file(file_path)
+      puts "Processing #{file_path}"
+
+      rewriter = Rewriter.new(@configuration)
+      rewriter.rewrite_file!(file_path)
+
+      rewriter.errors.each do |error|
+        warn_not_in_example_group_context_error(error)
+      end
+    end
+
     # rubocop:disable MethodLength
     def parse_options(args)
       parser = OptionParser.new
@@ -114,6 +124,10 @@ module Transpec
         @configuration.parenthesize_matcher_arg = false
       end
 
+      parser.on('--no-color', 'Disable color in the output.') do
+        Sickill::Rainbow.enabled = false
+      end
+
       parser.on('--version', 'Show Transpec version.') do
         puts Version.to_s
         exit
@@ -162,5 +176,23 @@ module Transpec
 
       fail 'The current Git repository is not clean. Aborting.'
     end
+
+    def warn_not_in_example_group_context_error(error)
+      message = error.message.color(:yellow) + $RS
+      message << highlighted_source(error)
+      warn message
+    end
+
+    def highlighted_source(error)
+      filename = error.source_buffer.name.color(:cyan)
+
+      line_number = error.source_range.line
+
+      source = error.source_range.source_line
+      highlight_range = error.source_range.column_range
+      source[highlight_range] = source[highlight_range].underline
+
+      [filename, line_number, source].join(':')
+    end
   end
 end

data/lib/transpec/rewriter.rb

@@ -16,8 +16,11 @@ require 'parser/current'
 
 module Transpec
   class Rewriter
+    attr_reader :errors
+
     def initialize(configuration = Configuration.new)
       @configuration = configuration
+      @errors = []
     end
 
     def rewrite_file!(file_path)
@@ -78,17 +81,7 @@ module Transpec
         break
       end
     rescue Syntax::NotInExampleGroupContextError => error
-      warn_not_in_example_group_context_error(error)
-    end
-
-    def warn_not_in_example_group_context_error(error)
-      warn error.message
-      warn format(
-        '%s:%d:%s',
-        error.source_buffer.name,
-        error.source_range.line,
-        error.source_range.source_line
-      )
+      @errors << error
     end
 
     def process_should(should)

data/lib/transpec/syntax/method_stub.rb

@@ -20,7 +20,7 @@ module Transpec
         fail 'Already replaced deprecated method, cannot allowize.' if @replaced_deprecated_method
 
         unless in_example_group_context?
-          fail NotInExampleGroupContextError.new(expression_range, "##{method_name}", '#allow')
+          fail NotInExampleGroupContextError.new(selector_range, "##{method_name}", '#allow')
         end
 
         if arg_node.type == :hash

data/lib/transpec/syntax/should.rb

@@ -16,7 +16,7 @@ module Transpec
 
       def expectize!(negative_form = 'not_to', parenthesize_matcher_arg = true)
         unless in_example_group_context?
-          fail NotInExampleGroupContextError.new(expression_range, "##{method_name}", '#expect')
+          fail NotInExampleGroupContextError.new(selector_range, "##{method_name}", '#expect')
         end
 
         if proc_literal?(subject_node)

data/lib/transpec/syntax/should_receive.rb

@@ -38,7 +38,7 @@ module Transpec
 
       def convert_to_syntax!(syntax, negative_form)
         unless in_example_group_context?
-          fail NotInExampleGroupContextError.new(expression_range, "##{method_name}", "##{syntax}")
+          fail NotInExampleGroupContextError.new(selector_range, "##{method_name}", "##{syntax}")
         end
 
         if any_instance?

data/lib/transpec/version.rb

@@ -4,8 +4,8 @@ module Transpec
   # http://semver.org/
   module Version
     MAJOR = 0
-    MINOR = 0
-    PATCH = 10
+    MINOR = 1
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/spec_helper.rb

@@ -14,8 +14,10 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run_excluding do_not_run_in_converted_spec: ENV['TRANSPEC_CONVERTED_SPEC']
 
-  if ENV['TRAVIS']
-    config.before(:all) do
+  config.before(:all) do
+    Sickill::Rainbow.enabled = false
+
+    if ENV['TRAVIS']
       system('git config --global user.email "you@example.com"')
       system('git config --global user.name "Your Name"')
     end

data/spec/transpec/cli_spec.rb

@@ -132,6 +132,44 @@ module Transpec
       end
     end
 
+    describe '#process_file' do
+      include_context 'isolated environment'
+
+      let(:file_path) { 'example.rb' }
+
+      before do
+        FileHelper.create_file(file_path, source)
+        cli.stub(:puts)
+      end
+
+      context 'when the source has a monkey-patched expectation outside of example group context' do
+        let(:source) do
+          <<-END
+            describe 'example group' do
+              class SomeClass
+                def some_method
+                  1.should == 1
+                end
+              end
+
+              it 'is an example' do
+                SomeClass.new.some_method
+              end
+            end
+          END
+        end
+
+        it 'warns to user' do
+          cli.should_receive(:warn) do |message|
+            message.should =~ /cannot/i
+            message.should =~ /context/i
+          end
+
+          cli.process_file(file_path)
+        end
+      end
+    end
+
     describe '#parse_options' do
       subject { cli.parse_options(args) }
       let(:args) { ['some_file', '--negative-form', 'to_not', 'some_dir'] }
@@ -214,6 +252,19 @@ module Transpec
         end
       end
 
+      describe '--no-color option' do
+        before do
+          Sickill::Rainbow.enabled = true
+        end
+
+        let(:args) { ['--no-color'] }
+
+        it 'disables color in the output' do
+          cli.parse_options(args)
+          Sickill::Rainbow.enabled.should be_false
+        end
+      end
+
       describe '--version option' do
         before do
           cli.stub(:puts)

data/spec/transpec/rewriter_spec.rb

@@ -95,15 +95,6 @@ module Transpec
         it 'does not rewrite the expectation to non-monkey-patch syntax' do
           should == source
         end
-
-        it 'warns to user' do
-          rewriter.should_receive(:warn) do |message|
-            message.should =~ /cannot/i
-            message.should =~ /context/i
-          end
-
-          rewriter.rewrite(source)
-        end
       end
     end
 

data/transpec.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'parser', '~> 2.0.0.pre1'
-  spec.add_runtime_dependency 'rspec',  '~> 2.14'
+  spec.add_runtime_dependency 'parser',  '~> 2.0.0.pre1'
+  spec.add_runtime_dependency 'rspec',   '~> 2.14'
+  spec.add_runtime_dependency 'rainbow', '~> 1.1'
 
   spec.add_development_dependency 'bundler',       '~> 1.3'
   spec.add_development_dependency 'rake',          '~> 10.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Yuji Nakayama
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement