transpec 2.3.1 → 2.3.2

data/spec/transpec/syntax/method_stub_spec.rb

@@ -14,13 +14,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:target_node) do
-          ast.each_descendent_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            next unless method_name == :stub
-            return node
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :stub
           end
-          fail 'No #stub node is found!'
         end
 
         let(:method_stub_object) do

data/spec/transpec/syntax/oneliner_should_spec.rb

@@ -13,13 +13,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:target_node) do
-          ast.each_descendent_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            next unless method_name == :should
-            return node
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :should
           end
-          fail 'No #should node is found!'
         end
 
         let(:should_object) do

data/spec/transpec/syntax/pending_spec.rb

@@ -13,12 +13,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:target_node) do
-          ast.each_descendent_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            return node if method_name == :pending
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :pending
           end
-          fail 'No #pending node is found!'
         end
 
         let(:pending_object) do

data/transpec.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_runtime_dependency 'parser',        '>= 2.1.6', '< 3.0'
+  spec.add_runtime_dependency 'astrolabe',     '>= 0.5.1', '< 0.6'
   spec.add_runtime_dependency 'bundler',       '~> 1.3'
   spec.add_runtime_dependency 'rainbow',       '>= 1.99.1', '< 3.0'
   spec.add_runtime_dependency 'json',          '~> 1.8'
@@ -32,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec',         '~> 2.14.0'
   spec.add_development_dependency 'fuubar',        '~> 1.3'
   spec.add_development_dependency 'simplecov',     '~> 0.7'
-  spec.add_development_dependency 'rubocop',       '~> 0.19'
+  spec.add_development_dependency 'rubocop',       '~> 0.24'
   spec.add_development_dependency 'guard-rspec',   '>= 4.2.3', '< 5.0'
   spec.add_development_dependency 'guard-rubocop', '~> 1.0'
   spec.add_development_dependency 'guard-shell',   '~> 0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: astrolabe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -160,14 +180,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +281,7 @@ files:
 - lib/transpec/config.rb
 - lib/transpec/conversion_error.rb
 - lib/transpec/converter.rb
+- lib/transpec/directory_cloner.rb
 - lib/transpec/dynamic_analyzer.rb
 - lib/transpec/dynamic_analyzer/node_util.rb
 - lib/transpec/dynamic_analyzer/rewriter.rb
@@ -332,11 +353,11 @@ files:
 - spec/support/cache_helper.rb
 - spec/support/file_helper.rb
 - spec/support/shared_context.rb
-- spec/transpec/ast/node_spec.rb
 - spec/transpec/cli_spec.rb
 - spec/transpec/commit_message_spec.rb
 - spec/transpec/config_spec.rb
 - spec/transpec/converter_spec.rb
+- 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
@@ -416,11 +437,11 @@ test_files:
 - spec/support/cache_helper.rb
 - spec/support/file_helper.rb
 - spec/support/shared_context.rb
-- spec/transpec/ast/node_spec.rb
 - spec/transpec/cli_spec.rb
 - spec/transpec/commit_message_spec.rb
 - spec/transpec/config_spec.rb
 - spec/transpec/converter_spec.rb
+- 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

data/spec/transpec/ast/node_spec.rb

@@ -1,323 +0,0 @@
-# coding: utf-8
-
-require 'spec_helper'
-require 'transpec/ast/node'
-
-module Transpec
-  module AST
-    describe Node do
-      include ::AST::Sexp
-      include_context 'parsed objects'
-
-      let(:source) do
-        <<-END
-          def some_method(arg_a, arg_b)
-            1.times do
-              do_something(arg_a)
-            end
-          end
-        END
-      end
-
-      # (def :some_method
-      #   (args
-      #     (arg :arg_a)
-      #     (arg :arg_b))
-      #   (block
-      #     (send
-      #       (int 1) :times)
-      #     (args)
-      #     (send nil :do_something
-      #       (lvar :arg_a))))
-
-      describe '#parent_node' do
-        context 'when the node has parent' do
-          let(:target_node) do
-            ast.each_descendent_node do |node|
-              return node if node == s(:args)
-            end
-          end
-
-          it 'returns the parent node' do
-            target_node.parent_node.type.should == :block
-          end
-        end
-
-        context 'when the node does not have parent' do
-          it 'returns nil' do
-            ast.parent_node.should be_nil
-          end
-        end
-      end
-
-      shared_context 'ancestor nodes' do
-        let(:target_node) do
-          ast.each_descendent_node do |node|
-            return node if node == s(:args)
-          end
-        end
-
-        let(:expected_types) { [:block, :def] }
-      end
-
-      describe '#each_ancestor_node' do
-        include_context 'ancestor nodes'
-
-        context 'when a block is given' do
-          it 'yields each ancestor node' do
-            index = 0
-
-            target_node.each_ancestor_node do |node|
-              expected_type = expected_types[index]
-              node.type.should == expected_type
-              index += 1
-            end
-
-            index.should_not == 0
-          end
-
-          it 'returns itself' do
-            returned_value = target_node.each_ancestor_node {}
-            returned_value.should be(target_node)
-          end
-        end
-
-        context 'when no block is given' do
-          it 'returns enumerator' do
-            target_node.each_ancestor_node.should be_a(Enumerator)
-          end
-
-          describe 'the returned enumerator' do
-            it 'enumerates the ancestor nodes' do
-              enumerator = target_node.each_ancestor_node
-
-              expected_types.each do |expected_type|
-                enumerator.next.type.should == expected_type
-              end
-            end
-          end
-        end
-      end
-
-      describe '#ancestor_nodes' do
-        include_context 'ancestor nodes'
-
-        it 'returns an array' do
-          target_node.ancestor_nodes.should be_an(Array)
-        end
-
-        it 'returns same nodes as #each_ancestor_node' do
-          types = target_node.ancestor_nodes.map(&:type)
-          types.should == expected_types
-        end
-      end
-
-      shared_context 'child nodes' do
-        let(:expected_types) { [:args, :block] }
-      end
-
-      describe '#each_child_node' do
-        include_context 'child nodes'
-
-        context 'when a block is given' do
-          it 'yields each child node' do
-            index = 0
-
-            ast.each_child_node do |node|
-              expected_type = expected_types[index]
-              node.type.should == expected_type
-              index += 1
-            end
-
-            index.should_not == 0
-          end
-
-          it 'returns itself' do
-            returned_value = ast.each_child_node {}
-            returned_value.should be(ast)
-          end
-        end
-
-        context 'when no block is given' do
-          it 'returns enumerator' do
-            ast.each_child_node.should be_a(Enumerator)
-          end
-
-          describe 'the returned enumerator' do
-            it 'enumerates the child nodes' do
-              enumerator = ast.each_child_node
-
-              expected_types.each do |expected_type|
-                enumerator.next.type.should == expected_type
-              end
-            end
-          end
-        end
-      end
-
-      describe '#child_nodes' do
-        include_context 'child nodes'
-
-        it 'returns an array' do
-          ast.child_nodes.should be_an(Array)
-        end
-
-        it 'returns same nodes as #each_child_node' do
-          types = ast.child_nodes.map(&:type)
-          types.should == expected_types
-        end
-      end
-
-      shared_context 'descendent nodes' do
-        let(:expected_types) do
-          [:args, :arg, :arg, :block, :send, :int, :args, :send, :lvar]
-        end
-      end
-
-      describe '#each_descendent_node' do
-        include_context 'descendent nodes'
-
-        context 'when a block is given' do
-          it 'yields each descendent node with depth first order' do
-            index = 0
-
-            ast.each_descendent_node do |node|
-              expected_type = expected_types[index]
-              node.type.should == expected_type
-              index += 1
-            end
-
-            index.should_not == 0
-          end
-
-          it 'returns itself' do
-            returned_value = ast.each_descendent_node {}
-            returned_value.should be(ast)
-          end
-        end
-
-        context 'when no block is given' do
-          it 'returns enumerator' do
-            ast.each_descendent_node.should be_a(Enumerator)
-          end
-
-          describe 'the returned enumerator' do
-            it 'enumerates the child nodes' do
-              enumerator = ast.each_descendent_node
-
-              expected_types.each do |expected_type|
-                enumerator.next.type.should == expected_type
-              end
-            end
-          end
-        end
-      end
-
-      describe '#descendent_nodes' do
-        include_context 'descendent nodes'
-
-        it 'returns an array' do
-          ast.descendent_nodes.should be_an(Array)
-        end
-
-        it 'returns same nodes as #each_descendent_node' do
-          types = ast.descendent_nodes.map(&:type)
-          types.should == expected_types
-        end
-      end
-
-      describe '#each_node' do
-        let(:expected_types) do
-          [:def, :args, :arg, :arg, :block, :send, :int, :args, :send, :lvar]
-        end
-
-        context 'when a block is given' do
-          it 'yields itself and each descendent node with depth first order' do
-            index = 0
-
-            ast.each_node do |node|
-              expected_type = expected_types[index]
-              node.type.should == expected_type
-              index += 1
-            end
-
-            index.should_not == 0
-          end
-
-          it 'returns itself' do
-            returned_value = ast.each_node {}
-            returned_value.should be(ast)
-          end
-        end
-
-        context 'when no block is given' do
-          it 'returns enumerator' do
-            ast.each_node.should be_a(Enumerator)
-          end
-
-          describe 'the returned enumerator' do
-            it 'enumerates the child nodes' do
-              enumerator = ast.each_node
-
-              expected_types.each do |expected_type|
-                enumerator.next.type.should == expected_type
-              end
-            end
-          end
-        end
-      end
-
-      describe '#send_type?' do
-        context 'when the node is send type' do
-          let(:source) do
-            <<-END
-              do_something
-            END
-          end
-
-          it 'returns true' do
-            ast.send_type?.should be_true
-          end
-        end
-
-        context 'when the node is not send type' do
-          let(:source) do
-            <<-END
-              foo = 1
-            END
-          end
-
-          it 'returns false' do
-            ast.send_type?.should be_false
-          end
-        end
-      end
-
-      describe '#defined_type?' do
-        context 'when the node is defined? type' do
-          let(:source) do
-            <<-END
-              defined?(Foo)
-            END
-          end
-
-          it 'returns true' do
-            ast.defined_type?.should be_true
-          end
-        end
-
-        context 'when the node is not defined? type' do
-          let(:source) do
-            <<-END
-              foo = 1
-            END
-          end
-
-          it 'returns false' do
-            ast.defined_type?.should be_false
-          end
-        end
-      end
-    end
-  end
-end