transpec 2.3.8 → 3.0.0

data/lib/transpec/spec_suite.rb

@@ -10,17 +10,20 @@ module Transpec
   class SpecSuite
     include Syntax::Dispatcher
 
-    attr_reader :runtime_data
+    attr_reader :project, :target_paths, :runtime_data
 
-    def initialize(base_paths = [], runtime_data = nil)
-      @base_paths = base_paths
+    def initialize(project = Project.new, target_paths = [], runtime_data = nil)
+      @project = project
+      @target_paths = target_paths
       @runtime_data = runtime_data
       @analyzed = false
     end
 
     def specs
-      @specs ||= SpecFileFinder.find(@base_paths).map do |path|
-        ProcessedSource.from_file(path)
+      @specs ||= Dir.chdir(project.path) do
+        SpecFileFinder.find(target_paths).map do |path|
+          ProcessedSource.from_file(path)
+        end
       end
     end
 
@@ -30,7 +33,7 @@ module Transpec
       specs.each do |spec|
         next unless spec.ast
         spec.ast.each_node do |node|
-          dispatch_node(node, nil, runtime_data)
+          dispatch_node(node, runtime_data, project)
         end
       end
 

data/lib/transpec/syntax.rb

@@ -2,6 +2,7 @@
 
 require 'transpec/conversion_error'
 require 'transpec/dynamic_analyzer/runtime_data'
+require 'transpec/project'
 require 'transpec/record'
 require 'transpec/report'
 require 'transpec/static_context_inspector'
@@ -53,12 +54,14 @@ end
 module Transpec
   class Syntax
     module Dispatcher
-      def dispatch_node(node, source_rewriter = nil, runtime_data = nil, report = nil)
+      # rubocop:disable LineLength
+      def dispatch_node(node, runtime_data = nil, project = nil, source_rewriter = nil, report = nil)
         Syntax.standalone_syntaxes.find do |syntax_class|
-          syntax = syntax_class.new(node, source_rewriter, runtime_data, report)
+          syntax = syntax_class.new(node, runtime_data, project, source_rewriter, report)
           dispatch_syntax(syntax)
         end
       end
+      # rubocop:enable LineLength
 
       def dispatch_syntax(syntax)
         return false unless syntax.conversion_target?
@@ -145,7 +148,7 @@ module Transpec
     extend Collection
     include Rewritable, DynamicAnalysis
 
-    attr_reader :node, :source_rewriter, :runtime_data, :report
+    attr_reader :node, :runtime_data, :project, :source_rewriter, :report
 
     def self.standalone?
       true
@@ -155,10 +158,11 @@ module Transpec
       @snake_cake_name ||= ModuleUtil.snake_case_name(name)
     end
 
-    def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)
+    def initialize(node, runtime_data = nil, project = nil, source_rewriter = nil, report = nil)
       @node = node
-      @source_rewriter = source_rewriter
       @runtime_data = runtime_data || DynamicAnalyzer::RuntimeData.new
+      @project = project || Project.new
+      @source_rewriter = source_rewriter
       @report = report || Report.new
     end
 
@@ -186,6 +190,10 @@ module Transpec
       node.loc.expression
     end
 
+    def rspec_version
+      project.rspec_version
+    end
+
     def inspect
       "#<#{self.class}: #{node.type}>"
     end

data/lib/transpec/syntax/method_stub.rb

@@ -57,7 +57,7 @@ module Transpec
         [:unstub, :unstub!].include?(method_name)
       end
 
-      def allowize!(rspec_version)
+      def allowize!
         return if method_name == :stub_chain && !rspec_version.receive_message_chain_available?
 
         unless allow_to_receive_available?

data/lib/transpec/syntax/mixin/matcher_owner.rb

@@ -15,7 +15,9 @@ module Transpec
 
             define_method(accessor) do
               return instance_variable_get(ivar) if instance_variable_defined?(ivar)
-              matcher = matcher_class.new(matcher_node, self, source_rewriter, runtime_data, report)
+              matcher = matcher_class.new(
+                matcher_node, self, runtime_data, project, source_rewriter, report
+              )
               instance_variable_set(ivar, matcher)
             end
 

data/lib/transpec/syntax/mixin/owned_matcher.rb

@@ -18,10 +18,12 @@ module Transpec
           end
         end
 
-        def initialize(node, expectation, source_rewriter = nil, runtime_data = nil, report = nil)
-          super(node, source_rewriter, runtime_data, report)
+        # rubocop:disable LineLength
+        def initialize(node, expectation, runtime_data = nil, project = nil, source_rewriter = nil, report = nil)
+          super(node, runtime_data, project, source_rewriter, report)
           @expectation = expectation
         end
+        # rubocop:enable LineLength
       end
     end
   end

data/lib/transpec/syntax/mixin/rspec_rails.rb

@@ -18,7 +18,7 @@ module Transpec
           if runtime_data.present?(node, :rspec_rails?)
             runtime_data[node, :rspec_rails?]
           else
-            true
+            project.depend_on_rspec_rails?
           end
         end
       end

data/lib/transpec/syntax/oneliner_should.rb

@@ -74,7 +74,7 @@ module Transpec
 
           found = Syntax.all_syntaxes.find do |syntax_class|
             next unless syntax_class.ancestors.include?(Mixin::Examplish)
-            syntax = syntax_class.new(send_node, source_rewriter, runtime_data)
+            syntax = syntax_class.new(send_node, runtime_data, project, source_rewriter)
             next unless syntax.conversion_target?
             @example = syntax
           end

data/lib/transpec/syntax/operator.rb

@@ -21,14 +21,16 @@ module Transpec
         end
       end
 
-      def initialize(node, expectation, source_rewriter = nil, runtime_data = nil, report = nil)
+      def initialize(*args)
+        node = args.shift
+
         operator_node = if node == BE_NODE
                           node.parent
                         else
                           node
                         end
 
-        super(operator_node, expectation, source_rewriter, runtime_data, report)
+        super(operator_node, *args)
       end
 
       def dynamic_analysis_target?

data/lib/transpec/syntax/rspec_configure.rb

@@ -67,7 +67,7 @@ module Transpec
         !find_config_node(:infer_spec_type_from_file_location!).nil?
       end
 
-      def convert_deprecated_options!(rspec_version) # rubocop:disable MethodLength
+      def convert_deprecated_options! # rubocop:disable MethodLength
         replace_config!(:backtrace_clean_patterns,  :backtrace_exclusion_patterns)
         replace_config!(:backtrace_clean_patterns=, :backtrace_exclusion_patterns=)
         replace_config!(:color_enabled=, :color=)

data/lib/transpec/version.rb

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

data/spec/spec_helper.rb

@@ -33,15 +33,12 @@ RSpec.configure do |config|
   end
 end
 
-if ENV['TRAVIS'] || ENV['CI'] || ENV['COVERAGE']
+if ENV['TRAVIS'] || ENV['COVERAGE']
   require 'simplecov'
 
   if ENV['TRAVIS']
     require 'coveralls'
     SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  elsif ENV['CI']
-    require 'simplecov-rcov'
-    SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
   end
 
   SimpleCov.start do

data/spec/support/shared_context.rb

@@ -22,6 +22,11 @@ shared_context 'parsed objects' do
 
   # Include 'dynamic analysis objects' after this context so that this nil will be overridden.
   let(:runtime_data) { nil }
+
+  let(:project) do
+    require 'transpec/project'
+    Transpec::Project.new
+  end
 end
 
 # This context requires `source` to be defined with #let.
@@ -49,7 +54,7 @@ end
 shared_context 'syntax object' do |syntax_class, name|
   let(name) do
     ast.each_node do |node|
-      syntax = syntax_class.new(node, source_rewriter, runtime_data)
+      syntax = syntax_class.new(node, runtime_data, project, source_rewriter)
       return syntax if syntax.conversion_target?
     end
 

data/spec/transpec/config_spec.rb

@@ -25,8 +25,8 @@ module Transpec
         [:negative_form_of_to,                                    'not_to'],
         [:boolean_matcher_type,                                   :conditional],
         [:form_of_be_falsey,                                      'be_falsey'],
+        [:add_explicit_type_metadata_to_example_group?,           false],
         [:add_receiver_arg_to_any_instance_implementation_block?, true],
-        [:add_explicit_type_metadata_to_example_group?,           true],
         [:parenthesize_matcher_arg?,                              true]
       ].each do |attribute, value|
         describe "##{attribute}" do

data/spec/transpec/converter_spec.rb

@@ -5,11 +5,16 @@ require 'transpec/converter'
 
 module Transpec
   describe Converter do
-    subject(:converter) { Converter.new(spec_suite, config, rspec_version) }
+    subject(:converter) { Converter.new(spec_suite, project, config) }
     let(:spec_suite) { double('spec_suite', runtime_data: nil).as_null_object }
+    let(:project) { Project.new }
     let(:config) { Config.new }
     let(:rspec_version) { Transpec.required_rspec_version }
 
+    before do
+      converter.stub(:rspec_version).and_return(rspec_version)
+    end
+
     describe '#convert_file!' do
       include_context 'isolated environment'
 
@@ -481,8 +486,8 @@ module Transpec
       let(:method_stub_object) { double('method_stub_object').as_null_object }
 
       shared_examples 'invokes MethodStub#allowize!' do
-        it 'invokes MethodStub#allowize! with RSpecVersion' do
-          method_stub_object.should_receive(:allowize!).with(rspec_version)
+        it 'invokes MethodStub#allowize!' do
+          method_stub_object.should_receive(:allowize!)
           converter.process_method_stub(method_stub_object)
         end
       end
@@ -1143,8 +1148,8 @@ module Transpec
       context 'when Config#convert_deprecated_method? returns true' do
         before { config.convert_deprecated_method = true }
 
-        it 'invokes RSpecConfigure#convert_deprecated_options! with RSpecVersion' do
-          rspec_configure.should_receive(:convert_deprecated_options!).with(rspec_version)
+        it 'invokes RSpecConfigure#convert_deprecated_options!' do
+          rspec_configure.should_receive(:convert_deprecated_options!)
           converter.process_rspec_configure(rspec_configure)
         end
       end

data/spec/transpec/dynamic_analyzer_spec.rb

@@ -51,9 +51,9 @@ module Transpec
       end
 
       context 'when command is not specified' do
-        context 'and there is a Gemfile' do
+        context 'and there is a Gemfile.lock' do
           before do
-            create_file('Gemfile', '')
+            create_file('Gemfile.lock', '')
           end
 
           it 'returns "bundle exec rspec"' do
@@ -61,7 +61,7 @@ module Transpec
           end
         end
 
-        context 'and there is no Gemfile' do
+        context 'and there is no Gemfile.lock' do
           it 'returns "rspec"' do
             should == 'rspec'
           end
@@ -87,9 +87,9 @@ module Transpec
       end
 
       context 'when already in copied project directory' do
-        it 'does not change working directory' do
+        it 'does not copy the project again' do
           DynamicAnalyzer.new(silent: true) do |analyzer|
-            Dir.should_not_receive(:chdir)
+            DirectoryCloner.should_not_receive(:copy_recursively)
             analyzer.analyze
           end
         end
@@ -260,7 +260,7 @@ module Transpec
                 gem 'rspec', '~> 2.99'
               END
 
-              Project.new.with_bundler_clean_env do
+              Bundler.with_clean_env do
                 `bundle install --path vendor/bundle`
               end
 

data/spec/transpec/git_spec.rb

@@ -91,13 +91,16 @@ module Transpec
       end
     end
 
-    describe '.repository_root' do
-      context 'when inside of git repository' do
+    describe '.write_commit_message' do
+      let(:message) { 'This is the commit message.' }
+
+      context 'when inside of standard git-dir (.git) repository' do
         include_context 'inside of git repository'
 
         context 'and the current working directory is the repository root' do
-          it 'returns the repository root path' do
-            Git.repository_root.should == File.expand_path('.')
+          it 'writes the message to .git/COMMIT_EDITMSG' do
+            Git.write_commit_message(message)
+            File.read('.git/COMMIT_EDITMSG').should == message
           end
         end
 
@@ -109,44 +112,30 @@ module Transpec
             end
           end
 
-          it 'returns the repository root path' do
-            Git.repository_root.should == File.expand_path('..')
+          it 'writes the message to .git/COMMIT_EDITMSG in the repository root' do
+            Git.write_commit_message(message)
+            File.read('../.git/COMMIT_EDITMSG').should == message
           end
         end
-      end
 
-      context 'when not inside of git repository' do
-        it 'raises error' do
-          -> { Git.repository_root }.should raise_error(/is not a Git repository/)
+        it 'returns the commit message file path' do
+          path = Git.write_commit_message(message)
+          File.read(path).should == message
         end
       end
-    end
-
-    describe '.write_commit_message' do
-      let(:message) { 'This is the commit message.' }
 
-      context 'when inside of git repository' do
-        include_context 'inside of git repository'
-
-        context 'and there is .git directory in the current working directory' do
-          it 'writes the message to .git/COMMIT_EDITMSG' do
-            Git.write_commit_message(message)
-            File.read('.git/COMMIT_EDITMSG').should == message
+      context 'when inside of separated git-dir repository' do
+        around do |example|
+          Dir.mkdir('repo')
+          Dir.chdir('repo') do
+            `git init --separate-git-dir this-is-git-dir`
+            example.run
           end
         end
 
-        context 'and there is not .git directory in the current working directory' do
-          around do |example|
-            Dir.mkdir('dir')
-            Dir.chdir('dir') do
-              example.run
-            end
-          end
-
-          it 'writes the message to .git/COMMIT_EDITMSG in repository root directory' do
-            Git.write_commit_message(message)
-            File.read('../.git/COMMIT_EDITMSG').should == message
-          end
+        it 'writes the message to COMMIT_EDITMSG in the separated git-dir' do
+          Git.write_commit_message(message)
+          File.read('this-is-git-dir/COMMIT_EDITMSG').should == message
         end
       end
 

data/spec/transpec/option_parser_spec.rb

@@ -163,12 +163,12 @@ module Transpec
         end
       end
 
-      describe '-t/--no-explicit-spec-type option' do
-        let(:args) { ['--no-explicit-spec-type'] }
+      describe '-e/--explicit-spec-type option' do
+        let(:args) { ['--explicit-spec-type'] }
 
-        it 'sets Config#add_explicit_type_metadata_to_example_group? false' do
+        it 'sets Config#add_explicit_type_metadata_to_example_group? true' do
           parser.parse(args)
-          config.add_explicit_type_metadata_to_example_group?.should be_false
+          config.add_explicit_type_metadata_to_example_group?.should be_true
         end
       end
 

data/spec/transpec/project_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require 'transpec/project'
+require 'active_support/core_ext/string/strip.rb'
 
 module Transpec
   describe Project do
@@ -10,20 +11,130 @@ module Transpec
 
     subject(:project) { Project.new }
 
-    describe '#require_bundler?' do
+    describe '#using_bundler?' do
       include_context 'isolated environment'
 
-      subject { project.require_bundler? }
+      subject { project.using_bundler? }
 
-      context 'when the project has a Gemfile' do
+      context 'when the project has a Gemfile.lock' do
         before do
-          create_file('Gemfile', '')
+          create_file('Gemfile.lock', '')
         end
 
         it { should be_true }
       end
 
-      context 'when the project have no Gemfile' do
+      context 'when the project have no Gemfile.lock' do
+        it { should be_false }
+      end
+    end
+
+    describe '#depend_on_rspec_rails?' do
+      include_context 'isolated environment'
+
+      subject { project.depend_on_rspec_rails? }
+
+      context 'when the project has a Gemfile.lock' do
+        before do
+          create_file('Gemfile.lock', gemfile_content)
+        end
+
+        context 'and rspec-rails is bundled' do
+          let(:gemfile_content) do
+            <<-END.strip_heredoc
+              GEM
+                remote: https://rubygems.org/
+                specs:
+                  actionpack (4.1.7)
+                    actionview (= 4.1.7)
+                    activesupport (= 4.1.7)
+                    rack (~> 1.5.2)
+                    rack-test (~> 0.6.2)
+                  actionview (4.1.7)
+                    activesupport (= 4.1.7)
+                    builder (~> 3.1)
+                    erubis (~> 2.7.0)
+                  activemodel (4.1.7)
+                    activesupport (= 4.1.7)
+                    builder (~> 3.1)
+                  activesupport (4.1.7)
+                    i18n (~> 0.6, >= 0.6.9)
+                    json (~> 1.7, >= 1.7.7)
+                    minitest (~> 5.1)
+                    thread_safe (~> 0.1)
+                    tzinfo (~> 1.1)
+                  builder (3.2.2)
+                  diff-lcs (1.2.5)
+                  erubis (2.7.0)
+                  i18n (0.6.11)
+                  json (1.8.1)
+                  minitest (5.4.3)
+                  rack (1.5.2)
+                  rack-test (0.6.2)
+                    rack (>= 1.0)
+                  railties (4.1.7)
+                    actionpack (= 4.1.7)
+                    activesupport (= 4.1.7)
+                    rake (>= 0.8.7)
+                    thor (>= 0.18.1, < 2.0)
+                  rake (10.4.0)
+                  rspec-core (2.14.8)
+                  rspec-expectations (2.14.5)
+                    diff-lcs (>= 1.1.3, < 2.0)
+                  rspec-mocks (2.14.6)
+                  rspec-rails (2.14.2)
+                    actionpack (>= 3.0)
+                    activemodel (>= 3.0)
+                    activesupport (>= 3.0)
+                    railties (>= 3.0)
+                    rspec-core (~> 2.14.0)
+                    rspec-expectations (~> 2.14.0)
+                    rspec-mocks (~> 2.14.0)
+                  thor (0.19.1)
+                  thread_safe (0.3.4)
+                  tzinfo (1.2.2)
+                    thread_safe (~> 0.1)
+
+              PLATFORMS
+                ruby
+
+              DEPENDENCIES
+                rspec-rails (~> 2.14.0)
+            END
+          end
+
+          it { should be_true }
+        end
+
+        context 'and rspec-rails is not bundled' do
+          let(:gemfile_content) do
+            <<-END.strip_heredoc
+              GEM
+                remote: https://rubygems.org/
+                specs:
+                  diff-lcs (1.2.5)
+                  rspec (2.14.1)
+                    rspec-core (~> 2.14.0)
+                    rspec-expectations (~> 2.14.0)
+                    rspec-mocks (~> 2.14.0)
+                  rspec-core (2.14.8)
+                  rspec-expectations (2.14.5)
+                    diff-lcs (>= 1.1.3, < 2.0)
+                  rspec-mocks (2.14.6)
+
+              PLATFORMS
+                ruby
+
+              DEPENDENCIES
+                rspec (~> 2.14.0)
+            END
+          end
+
+          it { should be_false }
+        end
+      end
+
+      context 'when the project have no Gemfile.lock' do
         it { should be_false }
       end
     end
@@ -45,7 +156,7 @@ module Transpec
                   "gem 'rspec-core', '2.13.0'"
                 ])
 
-                project.with_bundler_clean_env do
+                Bundler.with_clean_env do
                   `bundle install --path vendor/bundle`
                 end
               end
@@ -63,7 +174,7 @@ module Transpec
       context 'when the project has no Gemfile' do
         include_context 'isolated environment'
 
-        it 'returns version of the RSpec that is installed in the system' do
+        it 'returns version of the RSpec installed in the system' do
           require 'rspec/core/version'
           rspec_version.to_s.should == RSpec::Core::Version::STRING
         end