transpec 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c33db67b6816b403a76cc42ab37c1a2fa20f0a5
-  data.tar.gz: 5842ca3f82cdd32eda912aabc59fe59b0b9e857f
+  metadata.gz: c4de7050825b2892a104decbe5977f02054f4d57
+  data.tar.gz: 26acc442dbdfcbf63b93b94556dc6406a63165b3
 SHA512:
-  metadata.gz: 57d17382d629af2561f02042eb31f8d1f64ac6d95c63251e55699974c1340da56947d91c51dd198e19c67b26e53edc0843c8aa58eb1fc73fa405ca8f99850327
-  data.tar.gz: 586efdc379d22a195160a5d5e83b4f0284b23c67fdb2b74c9f5b9917167c6de5ab55037ee20720925dbf1cce082463e0f3f9ce4140c4d9b62a11fbc7ea167873
+  metadata.gz: 2efb1b828b2c2e713e4d904cd34369abe134bb8d0cc0cc4381d06785cf77ef31ca7eae2f0f42298421c3603c498d3b85b66a4e72fdc1bb55a4c29cd30b2c2f7d
+  data.tar.gz: 367775428c9155fd721a33621b2cf561ea3c684d16baead448019bcd3f7e9008f2f30a55771dc9ca2f2c45d3e12e665830967945fcce78f5578b1791446018e9

data/.travis.yml

@@ -3,4 +3,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-script: bundle exec rake
+script:
+  - bundle exec rake
+  - bundle exec rake test:all

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master
 
+## 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)
+
 ## v0.0.3
 
 * Suppress addition of superfluous parentheses when converting operator matcher that have argument in parentheses to non-operator matcher (e.g. from `== (2 - 1)` to `eq(2 - 1)`)

data/Rakefile

@@ -42,4 +42,64 @@ end
 
 Rake::Task[:release].enhance([:abort_unless_latest_readme_is_committed])
 
+namespace :test do
+  projects = [
+    [:twitter, 'https://github.com/sferik/twitter.git', 'v4.1.0'],
+    [:guard,   'https://github.com/guard/guard.git',    'v1.8.1', '--without development']
+  ]
+
+  desc 'Test Transpec on all other projects'
+  task :all => projects.map(&:first)
+
+  projects.each do |name, url, ref, bundler_args|
+    desc "Test Transpec on #{name.to_s.capitalize} project"
+    task name do
+      require 'tmpdir'
+
+      Dir.chdir(Dir.mktmpdir) do
+        test_on_project(name.to_s.capitalize, url, ref, bundler_args)
+      end
+    end
+  end
+
+  def test_on_project(name, url, ref, bundler_args = nil)
+    require 'transpec'
+
+    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')
+
+    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')
+        sh 'rspec'
+      end
+    end
+  end
+
+  def with_clean_bundler_env
+    if defined?(Bundler)
+      Bundler.with_clean_env do
+        # Bundler.with_clean_env cleans environment variables
+        # which are set after bundler is loaded.
+        prepare_env
+        yield
+      end
+    else
+      prepare_env
+      yield
+    end
+  end
+
+  def prepare_env
+    # Disable Coveralls in other projects.
+    ENV['CI'] = ENV['JENKINS_URL'] = ENV['COVERALLS_RUN_LOCALLY'] = nil
+  end
+end
+
 task default: [:spec, :style, :readme]

data/lib/transpec/syntax/expectizable.rb

@@ -9,7 +9,7 @@ module Transpec
       include SendNodeSyntax
 
       def wrap_subject_in_expect!
-        if Util.in_parentheses?(subject_range)
+        if Util.in_parentheses?(subject_node)
           insert_before(subject_range, 'expect')
         else
           insert_before(subject_range, 'expect(')

data/lib/transpec/util.rb

@@ -41,19 +41,10 @@ module Transpec
       node.loc.begin.source.start_with?('<<')
     end
 
-    def in_parentheses?(subject)
-      source = case subject
-               when String
-                 subject
-               when Parser::Source::Range
-                 subject.source
-               when Parser::AST::Node
-                 subject.loc.expression.source
-               else
-                 fail ArgumentError
-               end
-
-      source[0] == '('
+    def in_parentheses?(node)
+      return false unless node.type == :begin
+      source = node.loc.expression.source
+      source[0] == '(' && source[-1] == ')'
     end
 
     def indentation_of_line(node)

data/lib/transpec/version.rb

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

data/lib/transpec.rb

@@ -0,0 +1,7 @@
+# coding: utf-8
+
+module Transpec
+  def self.root
+    File.expand_path('..', File.dirname(__FILE__))
+  end
+end

data/spec/spec_spec.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 require 'spec_helper'
+require 'transpec'
 require 'tmpdir'
 require 'English'
 
@@ -8,8 +9,7 @@ describe 'Transpec project spec', :do_not_run_in_converted_spec do
   copied_project_root = Dir.mktmpdir
 
   before(:all) do
-    project_root = File.expand_path('..', File.dirname(__FILE__))
-    Dir.chdir(project_root) do
+    Dir.chdir(Transpec.root) do
       FileUtils.cp_r(Dir['*'], copied_project_root)
     end
   end

data/spec/transpec/syntax/matcher_spec.rb

@@ -155,6 +155,28 @@ module Transpec
           end
         end
 
+        context 'when it is `== (2 - 1) + (1 + 2)` form' do
+          let(:source) do
+            <<-END
+              it 'is 1' do
+                subject.should == (2 - 1) + (1 + 2)
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'is 1' do
+                subject.should eq((2 - 1) + (1 + 2))
+              end
+            END
+          end
+
+          it 'converts into `eq((2 - 1) + (1 + 2))` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
         context "when it is `== { 'key' => 'value' }` form" do
           let(:source) do
             <<-END

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yuji Nakayama
@@ -170,6 +170,7 @@ files:
 - README.md.erb
 - Rakefile
 - bin/transpec
+- lib/transpec.rb
 - lib/transpec/ast/scanner.rb
 - lib/transpec/ast/scope_stack.rb
 - lib/transpec/cli.rb