transpec 2.3.6 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef34fe1049f37464615658931a9e8749da6b3a71
-  data.tar.gz: 1aac984a22901c935e382ee51091fb018107e318
+  metadata.gz: 6ce681149f6777fb46a239bcee88f92b42523600
+  data.tar.gz: 1536c4975b64ec6168e53ec1dffd4b315abe329e
 SHA512:
-  metadata.gz: b9dca048b790a0a7c28dffb238450cc79c952104e887ce046ef3b7ecec621a4c79582a13a70f45f1200257795a5c1ab8c8f3ca09f2d8da77457bd71dfc14af57
-  data.tar.gz: a86b56beed1896c16b6b197510e9ccf53802daf4b5c295cac426a51ae49b407c238f438dae76e0d51fe2caa4ddc6f1d0347f28a62d9f919df5140f35f5c3ebf9
+  metadata.gz: b5d797314a4304bf65be434947f3408cdeccb68379ce7696539854788b4f92cede514bed025c5d8f1876302b5535a2987186d136ca3c357f923f064c2bdd24a6
+  data.tar.gz: cd41e8284cb963cfd971fb64b05d5ca6988b406da92836ab6719ee675c3b955a47843edcb7a45b83a0399896218b90cbdb3d21ddb5a20169795f3c2de30d4b7d

data/.rubocop.yml

@@ -15,6 +15,9 @@ MethodLength:
 CyclomaticComplexity:
   Max: 8
 
+PerceivedComplexity:
+  Max: 10
+
 WordArray:
   Enabled: false
 

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v2.3.7
+
+* Fix a bug where nested example groups in `RSpec.describe` are wrongly converted to non-monkey-patch form when dynamic analysis is skipped. ([#89](https://github.com/yujinakayama/transpec/issues/89))
+
 ## v2.3.6
 
 * Fix error `Unresolved dependency found during sorting - parser` on `gem install transpec`.

data/README.md

@@ -292,7 +292,12 @@ See [Supported Conversions - Method stubs with a hash argument](#method-stubs-wi
 
 ### `-s/--skip-dynamic-analysis`
 
-Skip dynamic analysis and convert with only static analysis. Note that specifying this option decreases the conversion accuracy especially in the conversion of [`have(n).items` matcher](#havenitems-matcher).
+Skip dynamic analysis and convert with only static analysis.
+The use of this option is basically **discouraged**
+since it significantly decreases the overall conversion accuracy.
+
+This would be useful only if your spec suite takes really long (like an hour) to run
+and you prefer a combination of the rough but fast conversion by Transpec and manual fixes after that.
 
 ### `-n/--negative-form`
 

data/README.md.erb

@@ -280,7 +280,12 @@ See [Supported Conversions - Method stubs with a hash argument](#method-stubs-wi
 
 ### `-s/--skip-dynamic-analysis`
 
-Skip dynamic analysis and convert with only static analysis. Note that specifying this option decreases the conversion accuracy especially in the conversion of [`have(n).items` matcher](#havenitems-matcher).
+Skip dynamic analysis and convert with only static analysis.
+The use of this option is basically **discouraged**
+since it significantly decreases the overall conversion accuracy.
+
+This would be useful only if your spec suite takes really long (like an hour) to run
+and you prefer a combination of the rough but fast conversion by Transpec and manual fixes after that.
 
 ### `-n/--negative-form`
 

data/lib/transpec/dynamic_analyzer.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'transpec/dynamic_analyzer/constants'
 require 'transpec/dynamic_analyzer/rewriter'
 require 'transpec/dynamic_analyzer/runtime_data'
 require 'transpec/directory_cloner'
@@ -12,12 +13,6 @@ require 'English'
 
 module Transpec
   class DynamicAnalyzer
-    ANALYSIS_MODULE = 'Transpec'
-    ANALYSIS_METHOD = 'analyze'
-    RUNTIME_DATA_ERROR_MESSAGE_KEY = :error_message
-    HELPER_TEMPLATE_FILE = 'transpec_analysis_helper.rb.erb'
-    RESULT_FILE = 'transpec_analysis_result.json'
-
     attr_reader :project, :rspec_command, :silent
     alias_method :silent?, :silent
 

data/lib/transpec/dynamic_analyzer/constants.rb

@@ -0,0 +1,11 @@
+# coding: utf-8
+
+module Transpec
+  class DynamicAnalyzer
+    ANALYSIS_MODULE = 'Transpec'
+    ANALYSIS_METHOD = 'analyze'
+    RUNTIME_DATA_ERROR_MESSAGE_KEY = :error_message
+    HELPER_TEMPLATE_FILE = 'transpec_analysis_helper.rb.erb'
+    RESULT_FILE = 'transpec_analysis_result.json'
+  end
+end

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 require 'transpec/base_rewriter'
-require 'transpec/dynamic_analyzer'
+require 'transpec/dynamic_analyzer/constants'
 require 'transpec/dynamic_analyzer/node_util'
 require 'transpec/util'
 require 'transpec/syntax'

data/lib/transpec/dynamic_analyzer/runtime_data.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'transpec/dynamic_analyzer/constants'
 require 'transpec/dynamic_analyzer/node_util'
 require 'json'
 require 'ostruct'

data/lib/transpec/option_parser.rb

@@ -129,8 +129,9 @@ module Transpec
           'Force processing even if the current Git repository is not clean.'
         ],
         '-s' => [
-          'Skip dynamic analysis and convert with only static analysis. Note',
-          'that specifying this option decreases the conversion accuracy.'
+          'Skip dynamic analysis and convert with only static analysis. The',
+          'use of this option is basically *discouraged* since it',
+          'significantly decreases the overall conversion accuracy.'
         ],
         '-c' => [
           'Specify a command to run your specs that is used for dynamic',

data/lib/transpec/{file_finder.rb → spec_file_finder.rb}

@@ -3,7 +3,7 @@
 require 'find'
 
 module Transpec
-  module FileFinder
+  module SpecFileFinder
     module_function
 
     def find(paths)

data/lib/transpec/spec_suite.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
-require 'transpec/file_finder'
 require 'transpec/processed_source'
+require 'transpec/spec_file_finder'
 require 'transpec/syntax'
 
 Transpec::Syntax.require_all
@@ -19,7 +19,7 @@ module Transpec
     end
 
     def specs
-      @specs ||= FileFinder.find(@base_paths).map do |path|
+      @specs ||= SpecFileFinder.find(@base_paths).map do |path|
         ProcessedSource.from_file(path)
       end
     end

data/lib/transpec/static_context_inspector.rb

@@ -68,7 +68,7 @@ module Transpec
     def valid_ancestor_nodes
       valid_nodes = []
 
-      self_and_ancestor_nodes = [node] + node.each_ancestor.to_a
+      self_and_ancestor_nodes = [node] + node.ancestors
 
       self_and_ancestor_nodes.each_cons(2) do |child, parent|
         valid_nodes << parent unless belong_to_direct_outer_scope?(child)
@@ -101,12 +101,19 @@ module Transpec
       end
     end
 
-    def special_block_type(block_node)
+    def special_block_type(block_node) # rubocop:disable MethodLength, CyclomaticComplexity
       send_node = block_node.children.first
       receiver_node, method_name, *_ = *send_node
 
-      if const_name(receiver_node) == 'RSpec' && method_name == :configure
-        :rspec_configure
+      if const_name(receiver_node) == 'RSpec'
+        case method_name
+        when :configure
+          :rspec_configure
+        when *EXAMPLE_GROUP_METHODS
+          :example_group
+        else
+          nil
+        end
       elsif HOOK_METHODS.include?(method_name)
         hook_type(send_node)
       elsif receiver_node

data/lib/transpec/version.rb

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

data/spec/transpec/{file_finder_spec.rb → spec_file_finder_spec.rb}

@@ -1,10 +1,10 @@
 # coding: utf-8
 
 require 'spec_helper'
-require 'transpec/file_finder'
+require 'transpec/spec_file_finder'
 
 module Transpec
-  describe FileFinder do
+  describe SpecFileFinder do
     include FileHelper
 
     describe '.find' do
@@ -16,7 +16,7 @@ module Transpec
         end
       end
 
-      subject { FileFinder.find(paths) }
+      subject { SpecFileFinder.find(paths) }
 
       context 'when no path is passed' do
         let(:paths) { [] }
@@ -33,7 +33,7 @@ module Transpec
 
         context 'and there is not "spec" directory' do
           it 'raises error' do
-            -> { FileFinder.find(paths) }.should raise_error(ArgumentError)
+            -> { SpecFileFinder.find(paths) }.should raise_error(ArgumentError)
           end
         end
       end
@@ -58,7 +58,7 @@ module Transpec
         let(:paths) { ['non-existent-file'] }
 
         it 'raises error' do
-          -> { FileFinder.find(paths) }.should raise_error(ArgumentError) { |error|
+          -> { SpecFileFinder.find(paths) }.should raise_error(ArgumentError) { |error|
             error.message.should == 'No such file or directory "non-existent-file"'
           }
         end
@@ -76,7 +76,7 @@ module Transpec
     describe '.base_paths' do
       include_context 'isolated environment'
 
-      subject { FileFinder.base_paths(paths) }
+      subject { SpecFileFinder.base_paths(paths) }
 
       context 'when target paths are specified' do
         let(:paths) { ['foo_spec.rb', 'spec/bar_spec.rb'] }
@@ -90,7 +90,7 @@ module Transpec
         let(:paths) { ['../foo_spec.rb', 'spec/bar_spec.rb'] }
 
         it 'raises error' do
-          -> { FileFinder.base_paths(paths) }.should raise_error(ArgumentError)
+          -> { SpecFileFinder.base_paths(paths) }.should raise_error(ArgumentError)
         end
       end
 
@@ -109,7 +109,7 @@ module Transpec
 
         context 'and there is not "spec" directory' do
           it 'raises error' do
-            -> { FileFinder.base_paths(paths) }.should raise_error(ArgumentError)
+            -> { SpecFileFinder.base_paths(paths) }.should raise_error(ArgumentError)
           end
         end
       end

data/spec/transpec/static_context_inspector_spec.rb

@@ -49,6 +49,10 @@ module Transpec
             end
           end
 
+          RSpec.describe 'something' do
+            in_rspec_describe
+          end
+
           feature 'Capybara DSL' do
             background do
               in_background
@@ -118,6 +122,10 @@ module Transpec
           'send nil :in_block',
           'in normal block in #describe in module',
           [:module]
+        ], [
+          'send nil :in_rspec_describe',
+          'in RSpec.describe',
+          [:example_group]
         ], [
           'send nil :in_background',
           'in #background block in #feature',

data/spec/transpec/syntax/example_group_spec.rb

@@ -126,6 +126,33 @@ module Transpec
           end
         end
 
+        context 'when the #describe is in another RSpec.describe' do
+          include_context 'multiple #describes'
+
+          let(:source) do
+            <<-END
+              RSpec.describe 'something' do
+                describe '#some_method' do
+                end
+              end
+            END
+          end
+
+          context 'without runtime information' do
+            it 'does nothing' do
+              rewritten_source.should == source
+            end
+          end
+
+          context 'with runtime information' do
+            include_context 'dynamic analysis objects'
+
+            it 'does nothing' do
+              rewritten_source.should == source
+            end
+          end
+        end
+
         context 'when logical-inner #describe is placed outside of the outer #describe in source' do
           include_context 'multiple #describes'
 

data/transpec.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_runtime_dependency 'parser',        '>= 2.2.0.pre.3', '< 3.0'
-  spec.add_runtime_dependency 'astrolabe',     '>= 0.6', '< 0.7'
+  spec.add_runtime_dependency 'astrolabe',     '~> 1.2'
   spec.add_runtime_dependency 'bundler',       '~> 1.3'
   spec.add_runtime_dependency 'rainbow',       '>= 1.99.1', '< 3.0'
   spec.add_runtime_dependency 'json',          '~> 1.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -34,22 +34,16 @@ dependencies:
   name: astrolabe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -283,11 +277,11 @@ files:
 - lib/transpec/converter.rb
 - lib/transpec/directory_cloner.rb
 - lib/transpec/dynamic_analyzer.rb
+- lib/transpec/dynamic_analyzer/constants.rb
 - lib/transpec/dynamic_analyzer/node_util.rb
 - lib/transpec/dynamic_analyzer/rewriter.rb
 - lib/transpec/dynamic_analyzer/runtime_data.rb
 - lib/transpec/dynamic_analyzer/transpec_analysis_helper.rb.erb
-- lib/transpec/file_finder.rb
 - lib/transpec/git.rb
 - lib/transpec/option_parser.rb
 - lib/transpec/processed_source.rb
@@ -296,6 +290,7 @@ files:
 - lib/transpec/report.rb
 - lib/transpec/rspec_dsl.rb
 - lib/transpec/rspec_version.rb
+- lib/transpec/spec_file_finder.rb
 - lib/transpec/spec_suite.rb
 - lib/transpec/static_context_inspector.rb
 - lib/transpec/syntax.rb
@@ -360,7 +355,6 @@ files:
 - spec/transpec/directory_cloner_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/processed_source_spec.rb
@@ -368,6 +362,7 @@ files:
 - spec/transpec/record_spec.rb
 - spec/transpec/report_spec.rb
 - spec/transpec/rspec_version_spec.rb
+- spec/transpec/spec_file_finder_spec.rb
 - spec/transpec/spec_suite_spec.rb
 - spec/transpec/static_context_inspector_spec.rb
 - spec/transpec/syntax/allow_spec.rb
@@ -444,7 +439,6 @@ test_files:
 - spec/transpec/directory_cloner_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/processed_source_spec.rb
@@ -452,6 +446,7 @@ test_files:
 - spec/transpec/record_spec.rb
 - spec/transpec/report_spec.rb
 - spec/transpec/rspec_version_spec.rb
+- spec/transpec/spec_file_finder_spec.rb
 - spec/transpec/spec_suite_spec.rb
 - spec/transpec/static_context_inspector_spec.rb
 - spec/transpec/syntax/allow_spec.rb