transpec 1.10.4 → 1.11.0

data/spec/transpec/syntax/should_spec.rb

@@ -82,109 +82,78 @@ module Transpec
       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
+        let(:source) do
+          <<-END
+            describe 'example' do
+              it 'is 1' do
+                subject.should == 1
               end
-            END
-          end
-
-          it 'returns an instance of Operator' do
-            should be_an(Operator)
-          end
+            end
+          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
+        it 'returns an instance of Operator' do
+          should be_an(Operator)
         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
+        let(:source) do
+          <<-END
+            describe 'example' do
+              it 'has 2 items' do
+                subject.should have(2).items
               end
-            END
-          end
-
-          it 'returns an instance of Have' do
-            should be_an(Have)
-          end
+            end
+          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
+        it 'returns an instance of Have' do
+          should be_an(Have)
         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
+      describe '#raise_error_matcher' do
+        subject { should_object.raise_error_matcher }
+
+        let(:source) do
+          <<-END
+            describe 'example' do
+              it 'raises error' do
+                lambda { do_something }.should raise_error
               end
-            END
-          end
+            end
+          END
+        end
 
-          it 'returns nil' do
-            should be_nil
-          end
+        it 'returns an instance of RaiseError' do
+          should be_an(RaiseError)
         end
       end
 
-      describe '#expectize!' do
-        context 'when it has an operator matcher' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'is 1' do
-                  subject.should == 1
-                end
+      describe '#dependent_syntaxes' do
+        let(:source) do
+          <<-END
+            describe 'example' do
+              it 'has 2 items' do
+                subject.should have(2).items
               end
-            END
-          end
+            end
+          END
+        end
 
-          it 'invokes Operator#convert_operator!' do
-            should_object.operator_matcher.should_receive(:convert_operator!)
-            should_object.expectize!
-          end
+        it 'returns an array containing #have_matcher, #operator_matcher, #raise_error_matcher' do
+          should_object.dependent_syntaxes.should =~ [
+            should_object.have_matcher,
+            should_object.operator_matcher,
+            should_object.raise_error_matcher
+          ]
         end
+      end
 
+      describe '#expectize!' do
         context 'with expression `obj.should`' do
           let(:source) do
             <<-END
@@ -414,13 +383,13 @@ module Transpec
             <<-END
               describe 'example' do
                 it 'is 1' do
-                  expect(subject).to eq(1)
+                  expect(subject).to == 1
                 end
               end
             END
           end
 
-          it 'converts to `expect(obj).to eq(1)` form' do
+          it 'converts to `expect(obj).to == 1` form' do
             should_object.expectize!
             rewritten_source.should == expected_source
           end

data/tasks/fixtures/guard/COMMIT_EDITMSG

@@ -0,0 +1,80 @@
+Convert specs to RSpec 2.99.0.beta2 syntax with Transpec
+
+This conversion is done by Transpec 1.10.4 with the following command:
+    transpec --force
+
+* 396 conversions
+    from: obj.should_receive(:message)
+      to: expect(obj).to receive(:message)
+
+* 239 conversions
+    from: obj.should
+      to: expect(obj).to
+
+* 113 conversions
+    from: obj.stub(:message)
+      to: allow(obj).to receive(:message)
+
+* 94 conversions
+    from: obj.should_not_receive(:message)
+      to: expect(obj).not_to receive(:message)
+
+* 86 conversions
+    from: == expected
+      to: eq(expected)
+
+* 16 conversions
+    from: stub('something')
+      to: double('something')
+
+* 15 conversions
+    from: be_true
+      to: be_truthy
+
+* 15 conversions
+    from: obj.stub!(:message)
+      to: allow(obj).to receive(:message)
+
+* 13 conversions
+    from: mock('something')
+      to: double('something')
+
+* 10 conversions
+    from: lambda { }.should_not
+      to: expect { }.not_to
+
+* 10 conversions
+    from: obj.should_not
+      to: expect(obj).not_to
+
+* 7 conversions
+    from: be_false
+      to: be_falsey
+
+* 7 conversions
+    from: obj.unstub(:message)
+      to: allow(obj).to receive(:message).and_call_original
+
+* 5 conversions
+    from: pending
+      to: skip
+
+* 4 conversions
+    from: lambda { }.should
+      to: expect { }.to
+
+* 4 conversions
+    from: obj.should_receive(:message).any_number_of_times
+      to: allow(obj).to receive(:message)
+
+* 3 conversions
+    from: collection.should have(n).items
+      to: expect(collection.size).to eq(n)
+
+* 1 conversion
+    from: it { should ... }
+      to: it { is_expected.to ... }
+
+* 1 conversion
+    from: it { should_not ... }
+      to: it { is_expected.not_to ... }

data/tasks/fixtures/mail/COMMIT_EDITMSG

@@ -0,0 +1,84 @@
+Convert specs to RSpec 2.99.0.beta2 syntax with Transpec
+
+This conversion is done by Transpec 1.10.4 with the following command:
+    transpec --force
+
+* 2161 conversions
+    from: obj.should
+      to: expect(obj).to
+
+* 173 conversions
+    from: obj.should_not
+      to: expect(obj).not_to
+
+* 56 conversions
+    from: obj.should_receive(:message)
+      to: expect(obj).to receive(:message)
+
+* 32 conversions
+    from: == expected
+      to: eq(expected)
+
+* 26 conversions
+    from: =~ /pattern/
+      to: match(/pattern/)
+
+* 21 conversions
+    from: pending
+      to: skip
+
+* 20 conversions
+    from: be_true
+      to: be_truthy
+
+* 15 conversions
+    from: it { should ... }
+      to: it { is_expected.to ... }
+
+* 15 conversions
+    from: lambda { }.should
+      to: expect { }.to
+
+* 12 conversions
+    from: it { should_not ... }
+      to: it { is_expected.not_to ... }
+
+* 9 conversions
+    from: obj.should_not_receive(:message)
+      to: expect(obj).not_to receive(:message)
+
+* 9 conversions
+    from: obj.stub!(:message)
+      to: allow(obj).to receive(:message)
+
+* 7 conversions
+    from: < expected
+      to: be < expected
+
+* 6 conversions
+    from: be_false
+      to: be_falsey
+
+* 5 conversions
+    from: expect { }.not_to raise_error(SpecificErrorClass)
+      to: expect { }.not_to raise_error
+
+* 2 conversions
+    from: collection.should have(n).items
+      to: expect(collection.size).to eq(n)
+
+* 2 conversions
+    from: mock('something')
+      to: double('something')
+
+* 1 conversion
+    from: === expected
+      to: be === expected
+
+* 1 conversion
+    from: lambda { }.should_not
+      to: expect { }.not_to
+
+* 1 conversion
+    from: obj.stub!(:message)
+      to: obj.stub(:message)

data/tasks/fixtures/twitter/COMMIT_EDITMSG

@@ -0,0 +1,36 @@
+Convert specs to RSpec 2.99.0.beta2 syntax with Transpec
+
+This conversion is done by Transpec 1.10.4 with the following command:
+    transpec --force
+
+* 899 conversions
+    from: obj.should
+      to: expect(obj).to
+
+* 61 conversions
+    from: be_false
+      to: be_falsey
+
+* 37 conversions
+    from: be_true
+      to: be_truthy
+
+* 11 conversions
+    from: lambda { }.should
+      to: expect { }.to
+
+* 4 conversions
+    from: =~ /pattern/
+      to: match(/pattern/)
+
+* 3 conversions
+    from: == expected
+      to: eq(expected)
+
+* 2 conversions
+    from: obj.should_not
+      to: expect(obj).not_to
+
+* 2 conversions
+    from: obj.stub!(:message)
+      to: allow(obj).to receive(:message)

data/tasks/lib/transpec_test.rb

@@ -1,8 +1,10 @@
 # coding: utf-8
 
-class TranspecTest
+class TranspecTest # rubocop:disable ClassLength
   include FileUtils # This is Rake's one.
 
+  BUNDLER_RETRY_COUNT = 3
+
   attr_reader :url, :ref, :bundler_args
 
   def self.base_dir
@@ -91,10 +93,29 @@ class TranspecTest
       with_clean_bundler_env do
         sh File.join(Transpec.root, 'bin', 'transpec'), *transpec_args
         sh 'bundle exec rspec'
+        compare_summary!
       end
     end
   end
 
+  def compare_summary!
+    unless File.exist?(commit_message_fixture_path)
+      warn "#{commit_message_fixture_path} does not exist. Skipping summary comparison."
+      return
+    end
+
+    require 'rspec/expectations'
+    extend RSpec::Matchers
+    summary = File.read(File.join('.git', 'COMMIT_EDITMSG')).lines.to_a[5..-1]
+    expected_summary = File.read(commit_message_fixture_path).lines.to_a[5..-1]
+    expect(summary).to eq(expected_summary)
+  end
+
+  def commit_message_fixture_path
+    path = File.join(File.dirname(__FILE__), '..', 'fixtures', name, 'COMMIT_EDITMSG')
+    File.expand_path(path)
+  end
+
   def in_project_dir(&block)
     Dir.chdir(project_dir, &block)
   end
@@ -132,7 +153,7 @@ class TranspecTest
   def bundle_install
     in_project_dir do
       with_clean_bundler_env do
-        sh 'bundle', 'install', *bundler_args
+        sh 'bundle', 'install', '--retry', BUNDLER_RETRY_COUNT.to_s, *bundler_args
       end
     end
   end

data/tasks/readme.rake

@@ -28,6 +28,12 @@ def generate_readme
   erb.result(binding)
 end
 
+def convert(source, configuration = nil, rspec_version = nil)
+  spec_suite = FakeSpecSuite.new
+  converter = Transpec::Converter.new(spec_suite, configuration, rspec_version)
+  converter.convert_source(source)
+end
+
 def select_sections(content, header_level, *section_names)
   header_pattern = pattern_for_header_level(header_level)
   sections = content.each_line.slice_before(header_pattern)
@@ -55,3 +61,32 @@ end
 def pattern_for_header_level(level)
   /^#{'#' * level}[^#]/
 end
+
+def validate_syntax_type_table(markdown_table, types_in_code)
+  types_in_doc = markdown_table.lines.map do |line|
+    first_column = line.split('|').first
+    first_column.gsub(/[^\w]/, '').to_sym
+  end.sort
+
+  types_in_code.sort!
+
+  unless types_in_doc == types_in_code
+    types_missing_description = types_in_code - types_in_doc
+    fail "No descriptions for syntax types #{types_missing_description}"
+  end
+end
+
+require 'transpec/spec_suite'
+
+class FakeSpecSuite < Transpec::SpecSuite
+  def analyze
+  end
+
+  def need_to_modify_yield_receiver_to_any_instance_implementation_blocks_config?
+    true
+  end
+
+  def main_rspec_configure_node?(node)
+    true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.11.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -256,17 +256,20 @@ files:
 - lib/transpec/conversion_error.rb
 - lib/transpec/converter.rb
 - lib/transpec/dynamic_analyzer.rb
+- lib/transpec/dynamic_analyzer/helper.rb.erb
+- lib/transpec/dynamic_analyzer/node_util.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/parser.rb
+- lib/transpec/processed_source.rb
 - lib/transpec/project.rb
 - lib/transpec/record.rb
 - lib/transpec/report.rb
 - lib/transpec/rspec_dsl.rb
 - lib/transpec/rspec_version.rb
+- lib/transpec/spec_suite.rb
 - lib/transpec/static_context_inspector.rb
 - lib/transpec/syntax.rb
 - lib/transpec/syntax/allow.rb
@@ -275,6 +278,7 @@ files:
 - lib/transpec/syntax/current_example.rb
 - lib/transpec/syntax/double.rb
 - lib/transpec/syntax/example.rb
+- lib/transpec/syntax/example_group.rb
 - lib/transpec/syntax/expect.rb
 - lib/transpec/syntax/have.rb
 - lib/transpec/syntax/have/dynamic_analysis.rb
@@ -284,6 +288,7 @@ files:
 - lib/transpec/syntax/matcher_definition.rb
 - lib/transpec/syntax/method_stub.rb
 - lib/transpec/syntax/mixin/any_instance_block.rb
+- lib/transpec/syntax/mixin/context_sensitive.rb
 - lib/transpec/syntax/mixin/expect_base.rb
 - lib/transpec/syntax/mixin/expectizable.rb
 - lib/transpec/syntax/mixin/matcher_owner.rb
@@ -301,6 +306,7 @@ files:
 - lib/transpec/syntax/raise_error.rb
 - lib/transpec/syntax/receive.rb
 - lib/transpec/syntax/rspec_configure.rb
+- lib/transpec/syntax/rspec_configure/configuration_modification.rb
 - lib/transpec/syntax/rspec_configure/expectations.rb
 - lib/transpec/syntax/rspec_configure/framework.rb
 - lib/transpec/syntax/rspec_configure/mocks.rb
@@ -309,6 +315,8 @@ files:
 - lib/transpec/util.rb
 - lib/transpec/version.rb
 - spec/.rubocop.yml
+- spec/acceptance/configuration_modification_spec.rb
+- spec/acceptance/conversion_spec.rb
 - spec/spec_helper.rb
 - spec/support/cache_helper.rb
 - spec/support/file_helper.rb
@@ -323,16 +331,19 @@ files:
 - spec/transpec/file_finder_spec.rb
 - spec/transpec/git_spec.rb
 - spec/transpec/option_parser_spec.rb
+- spec/transpec/processed_source_spec.rb
 - spec/transpec/project_spec.rb
 - spec/transpec/record_spec.rb
 - spec/transpec/report_spec.rb
 - spec/transpec/rspec_version_spec.rb
+- spec/transpec/spec_suite_spec.rb
 - spec/transpec/static_context_inspector_spec.rb
 - spec/transpec/syntax/allow_spec.rb
 - spec/transpec/syntax/be_boolean_spec.rb
 - spec/transpec/syntax/be_close_spec.rb
 - spec/transpec/syntax/current_example_spec.rb
 - spec/transpec/syntax/double_spec.rb
+- spec/transpec/syntax/example_group_spec.rb
 - spec/transpec/syntax/example_spec.rb
 - spec/transpec/syntax/expect_spec.rb
 - spec/transpec/syntax/have_spec.rb
@@ -351,6 +362,9 @@ files:
 - spec/transpec_spec.rb
 - tasks/ci/spec.rake
 - tasks/demo.rake
+- tasks/fixtures/guard/COMMIT_EDITMSG
+- tasks/fixtures/mail/COMMIT_EDITMSG
+- tasks/fixtures/twitter/COMMIT_EDITMSG
 - tasks/lib/transpec_demo.rb
 - tasks/lib/transpec_test.rb
 - tasks/readme.rake
@@ -382,6 +396,8 @@ specification_version: 4
 summary: The RSpec syntax converter
 test_files:
 - spec/.rubocop.yml
+- spec/acceptance/configuration_modification_spec.rb
+- spec/acceptance/conversion_spec.rb
 - spec/spec_helper.rb
 - spec/support/cache_helper.rb
 - spec/support/file_helper.rb
@@ -396,16 +412,19 @@ test_files:
 - spec/transpec/file_finder_spec.rb
 - spec/transpec/git_spec.rb
 - spec/transpec/option_parser_spec.rb
+- spec/transpec/processed_source_spec.rb
 - spec/transpec/project_spec.rb
 - spec/transpec/record_spec.rb
 - spec/transpec/report_spec.rb
 - spec/transpec/rspec_version_spec.rb
+- spec/transpec/spec_suite_spec.rb
 - spec/transpec/static_context_inspector_spec.rb
 - spec/transpec/syntax/allow_spec.rb
 - spec/transpec/syntax/be_boolean_spec.rb
 - spec/transpec/syntax/be_close_spec.rb
 - spec/transpec/syntax/current_example_spec.rb
 - spec/transpec/syntax/double_spec.rb
+- spec/transpec/syntax/example_group_spec.rb
 - spec/transpec/syntax/example_spec.rb
 - spec/transpec/syntax/expect_spec.rb
 - spec/transpec/syntax/have_spec.rb
@@ -422,4 +441,3 @@ test_files:
 - spec/transpec/syntax/should_spec.rb
 - spec/transpec/util_spec.rb
 - spec/transpec_spec.rb
-has_rdoc: 

data/lib/transpec/parser.rb

@@ -1,9 +0,0 @@
-# coding: utf-8
-
-begin
-  require 'parser/current'
-rescue NotImplementedError
-  warn 'Falling back to Ruby 2.1 parser.'
-  require 'parser/ruby21'
-  Parser::CurrentRuby = Parser::Ruby21 # rubocop:disable ConstantName
-end