sourcify 0.6.0.rc2 → 0.6.0.rc3

data/HISTORY.txt

@@ -2,7 +2,9 @@
 
 * adds Method#to_source, Method#to_sexp & Method#to_raw_source to MRI-1.9.2 (issue#3)
 * extensive refactoring to existing proc support to support the above
-* fixes incorrect encoding for scanner result (issue#19) [#tomykaira]
+* fixes incorrect encoding for scanner result (issue#19) [@tomykaira]
+* ensures compatibility with pry (issue#22) [@ty, @scooter-dangle]
+* fixes "already initialized const X" in ruby_parser" [@jmettraux]
 
 === 0.5.0 (May 2, 2011)
 

data/lib/sourcify.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'ruby2ruby'
-require 'sexp_processor'
 require 'ruby_parser'
+require 'sexp_processor'
+require 'ruby2ruby'
 require 'file/tail'
 
 begin

data/lib/sourcify/common/parser/raw_scanner/extensions.rb

@@ -21,6 +21,8 @@ module Sourcify
               execute!
             rescue Escape
               @results
+            else
+              @results
             end
           end
 

data/lib/sourcify/common/parser/source_code.rb

@@ -9,7 +9,8 @@ module Sourcify
 
         def to_s
           case file
-          when /\(irb\)/ then from_irb_to_s
+          when /\(irb\)/, /\(irb\#\d+\)/ then from_irb_to_s
+          when /\(pry\)/ then from_pry_to_s
           else from_file_to_s
           end
         end
@@ -27,6 +28,17 @@ module Sourcify
           IRB.CurrentContext.io.line(line.succ .. -1).join
         end
 
+        def from_pry_to_s
+          # NOTE: HACK to reliably construct the lines required, as:
+          # * Pry.line_buffer always fail to show the last entry
+          # * Pry.history deliberately skips duplicated consecutive lines,
+          #   yet it reliably shows the last
+          [
+            Pry.line_buffer,
+            Pry.history.to_a[-1]
+          ].flatten[line.succ .. -1] * ""
+        end
+
       end
     end
   end

data/lib/sourcify/version.rb

@@ -1,3 +1,3 @@
 module Sourcify
-  VERSION = "0.6.0.rc2"
+  VERSION = "0.6.0.rc3"
 end

data/sourcify.gemspec

@@ -16,7 +16,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'sexp_processor', '~> 3.2.0'
   s.add_dependency 'ruby_parser', '~> 2.3.1'
   s.add_dependency 'file-tail', '~> 1.0.10'
+
   s.add_development_dependency 'bacon'
+  s.add_development_dependency 'pry'
 
   # ParseTree (better performance + dynamic goodness, but not supported on java & 1.9.*),
   # optional for any 1.8.*.

data/spec/method/encoding_from_def_end_block_spec.rb

@@ -2,6 +2,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Encoding (from def..end block)" do
+  next unless Sourcify::IS_19x
 
   should "handle body as UTF-8 string" do
     def m1; "こんにちは"; end

data/spec/method/encoding_from_define_method_spec.rb

@@ -2,6 +2,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Encoding (from define_method)" do
+  next unless Sourcify::IS_19x
 
   before { @thing = Object.new }
 

data/spec/method/to_sexp_from_def_end_block_within_pry_spec.rb

@@ -0,0 +1,38 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Method#to_sexp (from def..end block)' do
+  describe 'within PRY' do
+
+    class << self
+
+      def pry_eval(string)
+        pry_exec(string)[-1]
+      end
+
+      def equal_to(expected)
+        lambda {|found| found == expected }
+      end
+
+    end
+
+    should 'handle non var' do
+      pry_eval(%(
+        def m1; x; end
+        method(:m1).to_sexp
+      )).should.be equal_to(
+        s(:defn, :m1, s(:args), s(:scope, s(:block, s(:call, nil, :x, s(:arglist)))))
+      )
+    end
+
+    should 'not handle local var' do
+      pry_eval(%(
+        x = :lx
+        def m2; x; end
+        method(:m2).to_sexp
+      )).should.be equal_to(
+        s(:defn, :m2, s(:args), s(:scope, s(:block, s(:call, nil, :x, s(:arglist)))))
+      )
+    end
+
+  end
+end

data/spec/method/to_sexp_from_define_method_within_pry_spec.rb

@@ -0,0 +1,42 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Method#to_sexp (from define_method)' do
+  describe 'within PRY' do
+
+    class << self
+
+      def pry_eval(string)
+        pry_exec(string)[-1]
+      end
+
+      def equal_to(expected)
+        lambda {|found| found == expected }
+      end
+
+    end
+
+    should 'handle non var' do
+      pry_eval(%\
+        thing = Object.new
+        blk = lambda { x }
+        thing.class.send(:define_method, :m1, &blk)
+        thing.method(:m1).to_sexp
+      \).should.be equal_to(
+        s(:defn, :m1, s(:args), s(:scope, s(:block, s(:call, nil, :x, s(:arglist)))))
+      )
+    end
+
+    should 'not handle local var' do
+      pry_eval(%\
+        thing = Object.new
+        x = :lx
+        blk = lambda { x }
+        thing.class.send(:define_method, :m2, &blk)
+        thing.method(:m2).to_sexp
+      \).should.be equal_to(
+        s(:defn, :m2, s(:args), s(:scope, s(:block, s(:call, nil, :x, s(:arglist)))))
+      )
+    end
+
+  end
+end

data/spec/method/to_source_from_def_end_block_within_pry_spec.rb

@@ -0,0 +1,45 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Method#to_source (from def..end block)' do
+  describe 'within PRY' do
+
+    class << self
+
+      def pry_eval(string)
+        pry_exec(string)[-1]
+      end
+
+      def equal_to(expected)
+        lambda {|found| normalize_code(found) == normalize_code(expected) }
+      end
+
+    end
+
+    should 'handle' do
+      pry_eval(%(
+        def m1; x; end
+        method(:m1).to_source
+      )).should.be equal_to(%(
+        def m1
+          x
+        end
+      ))
+    end
+
+    should 'handle upward scroll' do
+      pry_eval(%Q(
+        def m1; x1; end
+        def m2; x2; end
+        method(:m1)
+        method(:m1).to_source
+        method(:m2).to_source
+        
+      )).should.be equal_to(%(
+        def m1
+          x1
+        end
+      ))
+    end
+  
+  end
+end

data/spec/method/to_source_from_define_method_within_pry_spec.rb

@@ -0,0 +1,49 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Method#to_source (from define_method)' do
+  describe 'within PRY' do
+
+    class << self
+
+      def pry_eval(string)
+        pry_exec(string)[-1]
+      end
+
+      def equal_to(expected)
+        lambda {|found| normalize_code(found) == normalize_code(expected) }
+      end
+
+    end
+
+    should 'handle' do
+      pry_eval(%\
+        thing = Object.new
+        blk = lambda { x }
+        thing.class.send(:define_method, :m1, &blk)
+        thing.method(:m1).to_source
+      \).should.be equal_to(%(
+        def m1
+          x
+        end
+      ))
+    end
+
+    should 'handle upward scroll' do
+      pry_eval(%Q(
+        thing = Object.new
+        b1 = lambda { x1 }
+        b2 = lambda { x2 }
+        thing.class.send(:define_method, :m1, &b1)
+        thing.class.send(:define_method, :m2, &b2)
+        thing.method(:m1).to_source
+        thing.method(:m2).to_source
+        
+      )).should.be equal_to(%(
+        def m1
+          x1
+        end
+      ))
+    end
+  
+  end
+end

data/spec/proc/encoding_spec.rb

@@ -6,6 +6,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Encoding" do
+  next unless Sourcify::IS_19x
 
   should "handle proc with UTF-8 string" do
     lambda { "こんにちは" }.should.be having_sexp(

data/spec/proc/to_sexp_within_pry_spec.rb

@@ -0,0 +1,149 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe "Proc#to_sexp within PRY" do
+
+  class << self
+
+    def pry_eval(string)
+      pry_exec(string)[-1]
+    end
+
+    def equal_to(expected)
+      lambda {|found| found == expected }
+    end
+
+  end
+
+  should 'handle non var' do
+    expected = s(:iter, s(:call, nil, :proc, s(:arglist)), nil, s(:call, nil, :x, s(:arglist)))
+    pry_eval(%Q(
+      # NOTE: this line is needed to fix one-liner issue w pry
+      lambda { x }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'handle local var' do
+    expected = s(:iter, s(:call, nil, :proc, s(:arglist)), nil, s(:lvar, :x))
+    pry_eval(%Q(
+      x = 'lx'
+      lambda { x }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'handle class_eval scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:iter,
+          s(:call, s(:const, :Object), :class_eval, s(:arglist)),
+          s(:lasgn, :x),
+          s(:lasgn, :y, s(:lvar, :x))))
+    pry_eval(%Q(
+      x = 1
+      lambda { Object.class_eval {|x| y = x } }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'handle instance_eval scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:iter,
+          s(:call, s(:str, "aa"), :instance_eval, s(:arglist)),
+          s(:lasgn, :x),
+          s(:lasgn, :y, s(:lvar, :x))))
+    pry_eval(%Q(
+      x = 1
+      lambda { 'aa'.instance_eval {|x| y = x } }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'handle define_method scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:iter,
+          s(:call,
+            s(:const, :Object),
+            :send,
+            s(:arglist, s(:lit, :define_method), s(:lit, :aa))),
+            s(:lasgn, :x),
+            s(:lasgn, :y, s(:lvar, :x))))
+    pry_eval(%Q(
+      x = 1
+      lambda { Object.send(:define_method, :aa) {|x| y = x } }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle class scoped local var (simple)' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:class, :AA, nil, s(:scope, s(:lasgn, :y, s(:call, nil, :x, s(:arglist))))))
+    pry_eval(%Q(
+      x = 1
+      lambda { class AA ; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle class scoped local var (w inheritance)' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:class,
+          :AA,
+          s(:const, :Object),
+          s(:scope, s(:lasgn, :y, s(:call, nil, :x, s(:arglist))))))
+    pry_eval(%Q(
+      x = 1
+      lambda { class AA < Object; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle class scoped local var (w singleton)' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:sclass,
+          s(:str, "AA"),
+          s(:scope, s(:lasgn, :y, s(:call, nil, :x, s(:arglist))))))
+    pry_eval(%Q(
+      x = 1
+      lambda { class << 'AA'; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle module scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:module, :AA, s(:scope, s(:lasgn, :y, s(:call, nil, :x, s(:arglist))))))
+    pry_eval(%Q(
+      x = 1
+      lambda { module AA ; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+  should 'not handle method scoped local var' do
+    expected =
+      s(:iter,
+        s(:call, nil, :proc, s(:arglist)),
+        nil,
+        s(:defn,
+          :aa,
+          s(:args),
+          s(:scope, s(:block, s(:lasgn, :y, s(:call, nil, :x, s(:arglist)))))))
+    pry_eval(%Q(
+      x = 1
+      lambda { def aa ; y = x ; end }.to_sexp
+    )).should.be equal_to(expected)
+  end
+
+end

data/spec/proc/to_source_within_pry_spec.rb

@@ -0,0 +1,61 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe "Proc#to_source within PRY" do
+
+  class << self
+
+    def pry_eval(string)
+      pry_exec(string)[-1]
+    end
+
+    def equal_to(expected)
+      lambda {|found| normalize_code(found) == normalize_code(expected) }
+    end
+
+  end
+
+  should 'handle basic' do
+    pry_eval(%Q(
+      x = lambda { 1+2 }
+      y = lambda { 2+3 }
+      z = lambda { 3+4 }
+      y.to_source
+    )).should.be equal_to('proc { 2+3 }')
+  end
+
+  should 'handle magic variable __FILE__' do
+    pry_eval(%Q(
+      # NOTE: this line is needed to fix one-liner issue w pry
+      lambda { __FILE__ }.to_source
+    )).should.be equal_to('proc { "(pry)" }')
+  end
+
+  should 'handle magic variable __LINE__' do
+    pry_eval(%Q(
+      # NOTE: this line is needed to fix one-liner issue w pry
+      lambda { __LINE__ }.to_source
+    )).should.be equal_to('proc { 2 }')
+  end
+
+
+  # NOTE: The rest address issue#22, kudos goes to @scooter-dangle
+  # for providing such detailed examples :)
+  should 'handle a single upward scroll' do
+   pry_eval(%Q(
+     a = lambda { |proc| proc.to_source }
+     a[(lambda { 0 })]
+     a[(lambda { 1 })]
+     
+   )).should.be equal_to('proc { 1 }')
+  end
+  
+  should 'handle a double upward scroll' do
+   pry_eval(%Q(
+     a = lambda { |proc| proc.to_source }
+     a[(lambda { 0 })]
+     a[(lambda { 1 })]
+     
+   )).should.be equal_to('proc { 0 }')
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'ruby_parser'
 require 'ruby2ruby'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -108,3 +109,22 @@ def irb_exec(stdin_str)
   (values[-1].nil? && RUBY_VERSION =~ /1.9.(2|3)/) ? values[0 .. -2] : values
 end
 
+def pry_exec(stdin_str)
+  sourcify_rb = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'sourcify.rb')
+  pry_opts = '--simple-prompt --no-color'
+  results = []
+
+  %x(echo "#{stdin_str}" | pry #{pry_opts} -r #{sourcify_rb}).
+    split("\n").each do |line|
+      case line
+      when /^((?:>> |)=> )/
+        results << [line.sub($1,'')]
+      when /^( )/
+        results[-1] << line
+      end
+    end
+
+  results = results.map{|lines| eval(lines.join) }
+  results[-1].nil? ? results[0..-2] : results
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sourcify
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc2
+  version: 0.6.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - ngty77@gmail.com
@@ -170,9 +186,11 @@ files:
 - spec/method/to_raw_source_w_specified_strip_enclosure_spec.rb
 - spec/method/to_sexp_from_def_end_block_w_variables_spec.rb
 - spec/method/to_sexp_from_def_end_block_within_irb_spec.rb
+- spec/method/to_sexp_from_def_end_block_within_pry_spec.rb
 - spec/method/to_sexp_from_define_method_w_multi_blocks_and_specified_attached_to_spec.rb
 - spec/method/to_sexp_from_define_method_w_variables_spec.rb
 - spec/method/to_sexp_from_define_method_within_irb_spec.rb
+- spec/method/to_sexp_from_define_method_within_pry_spec.rb
 - spec/method/to_sexp_w_specified_strip_enclosure_spec.rb
 - spec/method/to_source_from_def_end_block_w_19_extras_spec.rb
 - spec/method/to_source_from_def_end_block_w_nested_begin_spec.rb
@@ -189,6 +207,7 @@ files:
 - spec/method/to_source_from_def_end_block_w_nested_while_spec.rb
 - spec/method/to_source_from_def_end_block_w_singleton_method_spec.rb
 - spec/method/to_source_from_def_end_block_within_irb_spec.rb
+- spec/method/to_source_from_def_end_block_within_pry_spec.rb
 - spec/method/to_source_from_def_end_w_multi_blocks_and_many_matches_spec.rb
 - spec/method/to_source_from_def_end_w_multi_blocks_and_single_match_spec.rb
 - spec/method/to_source_from_define_method_w_braced_block_spec.rb
@@ -204,6 +223,7 @@ files:
 - spec/method/to_source_from_define_method_w_multi_blocks_and_specified_body_matcher_and_single_match_spec.rb
 - spec/method/to_source_from_define_method_w_multi_blocks_and_specified_ignore_nested_spec.rb
 - spec/method/to_source_from_define_method_within_irb_spec.rb
+- spec/method/to_source_from_define_method_within_pry_spec.rb
 - spec/method/to_source_magic_file_var_spec.rb
 - spec/method/to_source_magic_line_var_spec.rb
 - spec/method/to_source_w_specified_strip_enclosure_spec.rb
@@ -232,6 +252,7 @@ files:
 - spec/proc/to_sexp_variables_spec.rb
 - spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb
 - spec/proc/to_sexp_within_irb_spec.rb
+- spec/proc/to_sexp_within_pry_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb
 - spec/proc/to_source_from_braced_block_wo_nesting_complication_spec.rb
@@ -264,6 +285,7 @@ files:
 - spec/proc/to_source_variables_spec.rb
 - spec/proc/to_source_w_specified_strip_enclosure_spec.rb
 - spec/proc/to_source_within_irb_spec.rb
+- spec/proc/to_source_within_pry_spec.rb
 - spec/raw_scanner/block_comment_shared_spec.rb
 - spec/raw_scanner/double_colons_shared_spec.rb
 - spec/raw_scanner/double_quote_str_w_interpolation_shared_spec.rb
@@ -325,9 +347,11 @@ test_files:
 - spec/method/to_raw_source_w_specified_strip_enclosure_spec.rb
 - spec/method/to_sexp_from_def_end_block_w_variables_spec.rb
 - spec/method/to_sexp_from_def_end_block_within_irb_spec.rb
+- spec/method/to_sexp_from_def_end_block_within_pry_spec.rb
 - spec/method/to_sexp_from_define_method_w_multi_blocks_and_specified_attached_to_spec.rb
 - spec/method/to_sexp_from_define_method_w_variables_spec.rb
 - spec/method/to_sexp_from_define_method_within_irb_spec.rb
+- spec/method/to_sexp_from_define_method_within_pry_spec.rb
 - spec/method/to_sexp_w_specified_strip_enclosure_spec.rb
 - spec/method/to_source_from_def_end_block_w_19_extras_spec.rb
 - spec/method/to_source_from_def_end_block_w_nested_begin_spec.rb
@@ -344,6 +368,7 @@ test_files:
 - spec/method/to_source_from_def_end_block_w_nested_while_spec.rb
 - spec/method/to_source_from_def_end_block_w_singleton_method_spec.rb
 - spec/method/to_source_from_def_end_block_within_irb_spec.rb
+- spec/method/to_source_from_def_end_block_within_pry_spec.rb
 - spec/method/to_source_from_def_end_w_multi_blocks_and_many_matches_spec.rb
 - spec/method/to_source_from_def_end_w_multi_blocks_and_single_match_spec.rb
 - spec/method/to_source_from_define_method_w_braced_block_spec.rb
@@ -359,6 +384,7 @@ test_files:
 - spec/method/to_source_from_define_method_w_multi_blocks_and_specified_body_matcher_and_single_match_spec.rb
 - spec/method/to_source_from_define_method_w_multi_blocks_and_specified_ignore_nested_spec.rb
 - spec/method/to_source_from_define_method_within_irb_spec.rb
+- spec/method/to_source_from_define_method_within_pry_spec.rb
 - spec/method/to_source_magic_file_var_spec.rb
 - spec/method/to_source_magic_line_var_spec.rb
 - spec/method/to_source_w_specified_strip_enclosure_spec.rb
@@ -387,6 +413,7 @@ test_files:
 - spec/proc/to_sexp_variables_spec.rb
 - spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb
 - spec/proc/to_sexp_within_irb_spec.rb
+- spec/proc/to_sexp_within_pry_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb
 - spec/proc/to_source_from_braced_block_wo_nesting_complication_spec.rb
@@ -419,6 +446,7 @@ test_files:
 - spec/proc/to_source_variables_spec.rb
 - spec/proc/to_source_w_specified_strip_enclosure_spec.rb
 - spec/proc/to_source_within_irb_spec.rb
+- spec/proc/to_source_within_pry_spec.rb
 - spec/raw_scanner/block_comment_shared_spec.rb
 - spec/raw_scanner/double_colons_shared_spec.rb
 - spec/raw_scanner/double_quote_str_w_interpolation_shared_spec.rb