transpec 0.2.6 → 1.0.0

data/spec/transpec/syntax/should_spec.rb

@@ -11,16 +11,14 @@ module Transpec
 
       let(:record) { should_object.report.records.first }
 
-      before do
-        should_object.context.stub(:expect_to_matcher_available?).and_return(true)
-      end
-
       describe '#matcher_node' do
         context 'when it is taking operator matcher' do
           let(:source) do
             <<-END
-              it 'is 1' do
-                subject.should == 1
+              describe 'example' do
+                it 'is 1' do
+                  subject.should == 1
+                end
               end
             END
           end
@@ -43,8 +41,10 @@ module Transpec
         context 'when it is taking non-operator matcher without argument' do
           let(:source) do
             <<-END
-              it 'is empty' do
-                subject.should be_empty
+              describe 'example' do
+                it 'is empty' do
+                  subject.should be_empty
+                end
               end
             END
           end
@@ -66,8 +66,10 @@ module Transpec
         context 'when it is taking non-operator matcher with argument' do
           let(:source) do
             <<-END
-              it 'is 1' do
-                subject.should eq(1)
+              describe 'example' do
+                it 'is 1' do
+                  subject.should eq(1)
+                end
               end
             END
           end
@@ -88,33 +90,127 @@ module Transpec
         end
       end
 
+      describe '#operator_matcher' do
+        subject { should_object.operator_matcher }
+
+        context 'when it is taking operator matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is 1' do
+                  subject.should == 1
+                end
+              end
+            END
+          end
+
+          it 'returns an instance of OperatorMatcher' do
+            should be_an(OperatorMatcher)
+          end
+        end
+
+        context 'when it is taking non-operator matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  subject.should be_empty
+                end
+              end
+            END
+          end
+
+          it 'returns nil' do
+            should be_nil
+          end
+        end
+      end
+
+      describe '#have_matcher' do
+        subject { should_object.have_matcher }
+
+        context 'when it is taking #have matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  subject.should have(2).items
+                end
+              end
+            END
+          end
+
+          it 'returns an instance of Have' do
+            should be_an(Have)
+          end
+        end
+
+        context 'when it is taking operator matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is 1' do
+                  subject.should == 1
+                end
+              end
+            END
+          end
+
+          it 'returns nil' do
+            should be_nil
+          end
+        end
+
+        context 'when it is taking any other non-operator matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  subject.should be_empty
+                end
+              end
+            END
+          end
+
+          it 'returns nil' do
+            should be_nil
+          end
+        end
+      end
+
       describe '#expectize!' do
         let(:source) do
           <<-END
-            it 'is 1' do
-              subject.should == 1
+            describe 'example' do
+              it 'is 1' do
+                subject.should == 1
+              end
             end
           END
         end
 
-        it 'invokes Matcher#correct_operator!' do
-          should_object.matcher.should_receive(:correct_operator!)
+        it 'invokes OperatorMatcher#correct_operator!' do
+          should_object.operator_matcher.should_receive(:correct_operator!)
           should_object.expectize!
         end
 
         context 'when it is `subject.should` form' do
           let(:source) do
             <<-END
-              it 'is 1' do
-                subject.should eq(1)
+              describe 'example' do
+                it 'is 1' do
+                  subject.should eq(1)
+                end
               end
             END
           end
 
           let(:expected_source) do
             <<-END
-              it 'is 1' do
-                expect(subject).to eq(1)
+              describe 'example' do
+                it 'is 1' do
+                  expect(subject).to eq(1)
+                end
               end
             END
           end
@@ -129,21 +225,89 @@ module Transpec
             record.original_syntax.should  == 'obj.should'
             record.converted_syntax.should == 'expect(obj).to'
           end
+
+          context 'and #expect is not available in the context' do
+            context 'and the context is determinable statically' do
+              let(:source) do
+                <<-END
+                  describe 'example' do
+                    class TestRunner
+                      def run
+                        1.should == 1
+                      end
+                    end
+
+                    it 'is 1' do
+                      TestRunner.new.run
+                    end
+                  end
+                END
+              end
+
+              context 'with runtime information' do
+                include_context 'dynamic analysis objects'
+
+                it 'raises InvalidContextError' do
+                  -> { should_object.expectize! }.should raise_error(InvalidContextError)
+                end
+              end
+
+              context 'without runtime information' do
+                it 'raises InvalidContextError' do
+                  -> { should_object.expectize! }.should raise_error(InvalidContextError)
+                end
+              end
+            end
+
+            context 'and the context is not determinable statically' do
+              let(:source) do
+                <<-END
+                  def my_eval(&block)
+                    Object.new.instance_eval(&block)
+                  end
+
+                  describe 'example' do
+                    it 'responds to #foo' do
+                      my_eval { 1.should == 1 }
+                    end
+                  end
+                END
+              end
+
+              context 'with runtime information' do
+                include_context 'dynamic analysis objects'
+
+                it 'raises InvalidContextError' do
+                  -> { should_object.expectize! }.should raise_error(InvalidContextError)
+                end
+              end
+
+              context 'without runtime information' do
+                it 'does not raise InvalidContextError' do
+                  -> { should_object.expectize! }.should_not raise_error
+                end
+              end
+            end
+          end
         end
 
         context 'when it is `subject.should_not` form' do
           let(:source) do
             <<-END
-              it 'is not 1' do
-                subject.should_not eq(1)
+              describe 'example' do
+                it 'is not 1' do
+                  subject.should_not eq(1)
+                end
               end
             END
           end
 
           let(:expected_source) do
             <<-END
-              it 'is not 1' do
-                expect(subject).not_to eq(1)
+              describe 'example' do
+                it 'is not 1' do
+                  expect(subject).not_to eq(1)
+                end
               end
             END
           end
@@ -162,8 +326,10 @@ module Transpec
           context 'and "to_not" is passed as negative form' do
             let(:expected_source) do
             <<-END
-              it 'is not 1' do
-                expect(subject).to_not eq(1)
+              describe 'example' do
+                it 'is not 1' do
+                  expect(subject).to_not eq(1)
+                end
               end
             END
             end
@@ -184,16 +350,20 @@ module Transpec
         context 'when it is `(subject).should` form' do
           let(:source) do
             <<-END
-              it 'is true' do
-                (1 == 1).should be_true
+              describe 'example' do
+                it 'is true' do
+                  (1 == 1).should be_true
+                end
               end
             END
           end
 
           let(:expected_source) do
             <<-END
-              it 'is true' do
-                expect(1 == 1).to be_true
+              describe 'example' do
+                it 'is true' do
+                  expect(1 == 1).to be_true
+                end
               end
             END
           end
@@ -207,16 +377,20 @@ module Transpec
         context 'when it is `subject.should() == 1` form' do
           let(:source) do
             <<-END
-              it 'is 1' do
-                subject.should() == 1
+              describe 'example' do
+                it 'is 1' do
+                  subject.should() == 1
+                end
               end
             END
           end
 
           let(:expected_source) do
             <<-END
-              it 'is 1' do
-                expect(subject).to eq(1)
+              describe 'example' do
+                it 'is 1' do
+                  expect(subject).to eq(1)
+                end
               end
             END
           end
@@ -236,16 +410,20 @@ module Transpec
           context "when it is `#{method} { ... }.should` form" do
             let(:source) do
               <<-END
-                it 'raises error' do
-                  #{method} { fail }.should raise_error
+                describe 'example' do
+                  it 'raises error' do
+                    #{method} { fail }.should raise_error
+                  end
                 end
               END
             end
 
             let(:expected_source) do
               <<-END
-                it 'raises error' do
-                  expect { fail }.to raise_error
+                describe 'example' do
+                  it 'raises error' do
+                    expect { fail }.to raise_error
+                  end
                 end
               END
             end
@@ -267,16 +445,20 @@ module Transpec
           context "when it is `#{method} { ... }.should` form" do
             let(:source) do
               <<-END
-                it 'is 1' do
-                  #{method} { fail }.should eq(1)
+                describe 'example' do
+                  it 'is 1' do
+                    #{method} { fail }.should eq(1)
+                  end
                 end
               END
             end
 
             let(:expected_source) do
               <<-END
-                it 'is 1' do
-                  expect(#{method} { fail }).to eq(1)
+                describe 'example' do
+                  it 'is 1' do
+                    expect(#{method} { fail }).to eq(1)
+                  end
                 end
               END
             end
@@ -291,16 +473,20 @@ module Transpec
         context 'when it is `method { ... }.should` form but the subject value is not proc' do
           let(:source) do
             <<-END
-              it 'increments all elements' do
-                [1, 2].map { |i| i + 1 }.should eq([2, 3])
+              describe 'example' do
+                it 'increments all elements' do
+                  [1, 2].map { |i| i + 1 }.should eq([2, 3])
+                end
               end
             END
           end
 
           let(:expected_source) do
             <<-END
-              it 'increments all elements' do
-                expect([1, 2].map { |i| i + 1 }).to eq([2, 3])
+              describe 'example' do
+                it 'increments all elements' do
+                  expect([1, 2].map { |i| i + 1 }).to eq([2, 3])
+                end
               end
             END
           end

data/spec/transpec/util_spec.rb

@@ -9,17 +9,10 @@ module Transpec
     include ::AST::Sexp
 
     describe '#const_name' do
-      subject { Util.const_name(const_node) }
-
-      let(:const_node) do
-        AST::Scanner.scan(ast) do |node|
-          return node if node.type == :const
-        end
-        fail 'No const node is found!'
-      end
+      subject { Util.const_name(ast) }
 
       context 'when the passed node is not :const type' do
-        let(:const_node) do
+        let(:ast) do
           s(:lvasgn, :foo,
             s(:int, 1))
         end

data/tasks/lib/transpec_demo.rb

@@ -28,7 +28,7 @@ class TranspecDemo < TranspecTest
   def run_demo(transpec_args = [])
     in_project_dir do
       with_clean_bundler_env do
-        sh File.join(Transpec.root, 'bin', 'transpec'), '--force', '--commit-message'
+        sh File.join(Transpec.root, 'bin', 'transpec'), '--force', '--generate-commit-message'
         sh 'bundle exec rspec'
         sh "git checkout --quiet -b #{DEMO_BRANCH}"
         sh 'git commit --all --file .git/COMMIT_EDITMSG'

data/tasks/lib/transpec_test.rb

@@ -36,13 +36,9 @@ class TranspecTest
 
   def run
     require 'transpec'
-
     puts " Testing on #{name} Project ".center(80, '=')
-
-    [%w(--force), %w(--force --no-parentheses-matcher-arg)].each do |args|
-      prepare_project
-      run_test(args)
-    end
+    prepare_project
+    run_test(%w(--force))
   end
 
   private
@@ -65,7 +61,7 @@ class TranspecTest
 
     Dir.chdir(url) do
       Dir.new('.').each do |entry|
-        next if ['.', '..', '.git', 'tmp'].include?(entry)
+        next if ['.', '..', 'tmp'].include?(entry)
         FileUtils.cp_r(entry, project_dir)
       end
     end
@@ -144,5 +140,7 @@ class TranspecTest
   def prepare_env
     # Disable Coveralls.
     ENV['CI'] = ENV['JENKINS_URL'] = ENV['COVERALLS_RUN_LOCALLY'] = nil
+
+    ENV['TRANSPEC_TEST'] = 'true'
   end
 end

data/tasks/test.rake

@@ -14,9 +14,13 @@ namespace :test do
   tests = [
     TranspecTest.new(File.expand_path('.'), nil, ['--quiet']),
     TranspecTest.new('https://github.com/sferik/twitter.git', 'v4.1.0', bundler_args),
-    TranspecTest.new('https://github.com/yujinakayama/guard.git', 'transpec-test', bundler_args + %w(--without development)),
     TranspecTest.new('https://github.com/yujinakayama/mail.git', 'transpec-test', bundler_args)
   ]
+
+  # Sometimes Guard fails with JRuby randomly.
+  unless RUBY_ENGINE == 'jruby'
+    tests << TranspecTest.new('https://github.com/yujinakayama/guard.git', 'transpec-test', bundler_args + %w(--without development))
+  end
   # rubocop:enable LineLength
 
   desc 'Test Transpec on all projects'

data/transpec.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'parser',  '~> 2.0'
   spec.add_runtime_dependency 'rspec',   '~> 2.14'
+  spec.add_runtime_dependency 'bundler', '~> 1.3'
   spec.add_runtime_dependency 'rainbow', '~> 1.1'
 
-  spec.add_development_dependency 'bundler',       '~> 1.3'
   spec.add_development_dependency 'rake',          '~> 10.1'
   spec.add_development_dependency 'simplecov',     '~> 0.7'
   spec.add_development_dependency 'rubocop',       '~> 0.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '1.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -188,31 +188,42 @@ files:
 - lib/transpec/ast/builder.rb
 - lib/transpec/ast/node.rb
 - lib/transpec/ast/scanner.rb
+- lib/transpec/base_rewriter.rb
 - lib/transpec/cli.rb
 - lib/transpec/commit_message.rb
 - lib/transpec/configuration.rb
-- lib/transpec/context.rb
+- lib/transpec/converter.rb
+- lib/transpec/dynamic_analyzer.rb
+- lib/transpec/dynamic_analyzer/rewriter.rb
+- lib/transpec/dynamic_analyzer/runtime_data.rb
+- lib/transpec/file_finder.rb
 - lib/transpec/git.rb
+- lib/transpec/option_parser.rb
 - lib/transpec/record.rb
 - lib/transpec/report.rb
-- lib/transpec/rewriter.rb
+- lib/transpec/static_context_inspector.rb
 - lib/transpec/syntax.rb
-- lib/transpec/syntax/able_to_allow_no_message.rb
-- lib/transpec/syntax/able_to_target_any_instance.rb
 - lib/transpec/syntax/be_close.rb
 - lib/transpec/syntax/double.rb
-- lib/transpec/syntax/expectizable.rb
-- lib/transpec/syntax/matcher.rb
+- lib/transpec/syntax/expect.rb
+- lib/transpec/syntax/have.rb
 - lib/transpec/syntax/method_stub.rb
+- lib/transpec/syntax/mixin/allow_no_message.rb
+- lib/transpec/syntax/mixin/any_instance.rb
+- lib/transpec/syntax/mixin/expectizable.rb
+- lib/transpec/syntax/mixin/have_matcher.rb
+- lib/transpec/syntax/mixin/monkey_patch.rb
+- lib/transpec/syntax/mixin/send.rb
+- lib/transpec/syntax/operator_matcher.rb
 - lib/transpec/syntax/raise_error.rb
 - lib/transpec/syntax/rspec_configure.rb
-- lib/transpec/syntax/send_node_syntax.rb
 - lib/transpec/syntax/should.rb
 - lib/transpec/syntax/should_receive.rb
 - lib/transpec/util.rb
 - lib/transpec/version.rb
 - spec/.rubocop.yml
 - spec/spec_helper.rb
+- spec/support/cache_helper.rb
 - spec/support/file_helper.rb
 - spec/support/shared_context.rb
 - spec/transpec/ast/node_spec.rb
@@ -220,15 +231,21 @@ files:
 - spec/transpec/cli_spec.rb
 - spec/transpec/commit_message_spec.rb
 - spec/transpec/configuration_spec.rb
-- spec/transpec/context_spec.rb
+- spec/transpec/converter_spec.rb
+- spec/transpec/dynamic_analyzer/rewriter_spec.rb
+- spec/transpec/dynamic_analyzer_spec.rb
+- spec/transpec/file_finder_spec.rb
 - spec/transpec/git_spec.rb
+- spec/transpec/option_parser_spec.rb
 - spec/transpec/record_spec.rb
 - spec/transpec/report_spec.rb
-- spec/transpec/rewriter_spec.rb
+- spec/transpec/static_context_inspector_spec.rb
 - spec/transpec/syntax/be_close_spec.rb
 - spec/transpec/syntax/double_spec.rb
-- spec/transpec/syntax/matcher_spec.rb
+- spec/transpec/syntax/expect_spec.rb
+- spec/transpec/syntax/have_spec.rb
 - spec/transpec/syntax/method_stub_spec.rb
+- spec/transpec/syntax/operator_matcher_spec.rb
 - spec/transpec/syntax/raise_error_spec.rb
 - spec/transpec/syntax/rspec_configure_spec.rb
 - spec/transpec/syntax/should_receive_spec.rb
@@ -268,6 +285,7 @@ summary: RSpec syntax converter
 test_files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb
+- spec/support/cache_helper.rb
 - spec/support/file_helper.rb
 - spec/support/shared_context.rb
 - spec/transpec/ast/node_spec.rb
@@ -275,15 +293,21 @@ test_files:
 - spec/transpec/cli_spec.rb
 - spec/transpec/commit_message_spec.rb
 - spec/transpec/configuration_spec.rb
-- spec/transpec/context_spec.rb
+- spec/transpec/converter_spec.rb
+- spec/transpec/dynamic_analyzer/rewriter_spec.rb
+- spec/transpec/dynamic_analyzer_spec.rb
+- spec/transpec/file_finder_spec.rb
 - spec/transpec/git_spec.rb
+- spec/transpec/option_parser_spec.rb
 - spec/transpec/record_spec.rb
 - spec/transpec/report_spec.rb
-- spec/transpec/rewriter_spec.rb
+- spec/transpec/static_context_inspector_spec.rb
 - spec/transpec/syntax/be_close_spec.rb
 - spec/transpec/syntax/double_spec.rb
-- spec/transpec/syntax/matcher_spec.rb
+- spec/transpec/syntax/expect_spec.rb
+- spec/transpec/syntax/have_spec.rb
 - spec/transpec/syntax/method_stub_spec.rb
+- spec/transpec/syntax/operator_matcher_spec.rb
 - spec/transpec/syntax/raise_error_spec.rb
 - spec/transpec/syntax/rspec_configure_spec.rb
 - spec/transpec/syntax/should_receive_spec.rb