sourcify 0.3.0 → 0.4.0

data/spec/proc_scanner/heredoc_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 unless has_parsetree?
 describe "Heredoc (wo indent)" do

data/spec/proc_scanner/kw_do_alias1_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 unless has_parsetree?
 describe "Keyword do alias #1 (incrementing do...end counter by 1)" do

data/spec/proc_scanner/kw_do_alias2_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 unless has_parsetree?
 describe "Keyword do alias #2 (increment do..end block counter by 0..1)" do

data/spec/proc_scanner/per_line_comment_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 unless has_parsetree?
 describe "Per line comment (# ...)" do

data/spec/proc_scanner/single_quote_str_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 unless has_parsetree?
 describe 'Single quote strings (\', %q & %w)' do

data/spec/proc_scanner/slash_operator_spec.rb

@@ -0,0 +1,75 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+unless has_parsetree?
+describe "Shash operator" do
+
+  should 'handle w preceding variable' do
+    process(%Q(a / b)).should.include([:op, '/'])
+  end
+
+  should 'handle w preceding constant' do
+    process(%Q(A / b)).should.include([:op, '/'])
+  end
+
+  should 'handle w preceding symbol' do
+    process(%Q(:a / b)).should.include([:op, '/'])
+  end
+
+  should 'handle w preceding digit' do
+    process(%Q(0 / b)).should.include([:op, '/'])
+  end
+
+  should 'handle w preceding a~f' do
+    process(%Q(0xa / b)).should.include([:op, '/'])
+    process(%Q(0xb / b)).should.include([:op, '/'])
+    process(%Q(0xc / b)).should.include([:op, '/'])
+    process(%Q(0xd / b)).should.include([:op, '/'])
+    process(%Q(0xe / b)).should.include([:op, '/'])
+    process(%Q(0xf / b)).should.include([:op, '/'])
+  end
+
+  should 'handle w preceding dstring' do
+    process(%Q("a" / b)).should.include([:op, '/'])
+  end
+
+  should 'handle w preceding sstring' do
+    process(%Q('a' / b)).should.include([:op, '/'])
+  end
+
+  should "handle w preceding ')' char" do
+    process(%Q{) / b}).should.include([:op, '/'])
+
+  end
+
+  should "handle w preceding ']' char" do
+    process(%Q(] / b)).should.include([:op, '/'])
+  end
+
+  should "handle w preceding '}' char" do
+    process(%Q(} / b)).should.include([:op, '/'])
+  end
+
+  should "not handle w preceding newline" do
+    process(%Q(
+      / b /
+    )).should.not.include([:op, '/'])
+  end
+
+  should "not handle w preceding ';' char" do
+    process(%Q(; / b /)).should.not.include([:op, '/'])
+  end
+
+  should "not handle w preceding '(' char" do
+    process(%Q{( / b /}).should.not.include([:op, '/'])
+  end
+
+  should "not handle w preceding '{' char" do
+    process(%Q({ / b /)).should.not.include([:op, '/'])
+  end
+
+  should "not handle w preceding '[' char" do
+    process(%Q([ / b /)).should.not.include([:op, '/'])
+  end
+
+end
+end

data/spec/proc_scanner/spec_helper.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'spec_helper')
 
 module Sourcify::Proc::Scanner
   class << self ; attr_reader :tokens ; end

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 require 'rubygems'
-require 'bacon'
 require 'ruby2ruby'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'sourcify'
 
+# ///////////////////////////////////////////////////////////
+# Regenerate ragel-based scanner
+# ///////////////////////////////////////////////////////////
+
 ragel_dir = File.join(File.dirname(__FILE__), '..', 'lib', 'sourcify', 'proc')
 ragel_file = File.join(ragel_dir, 'scanner.rl')
 ruby_file = File.join(ragel_dir, 'scanner.rb')
@@ -18,8 +21,36 @@ rescue LoadError
   raise $!
 end
 
+# ///////////////////////////////////////////////////////////
+# Bacon
+# ///////////////////////////////////////////////////////////
+
+require 'bacon'
+Bacon.extend(Bacon::TestUnitOutput)
 Bacon.summary_on_exit
 
+# Removing the extra noises in output, making bacon even less verbose !!
+if ENV['MUTE_BACON'] == 'true'
+  Bacon.extend(Module.new {
+
+    def handle_requirement(description)
+      unless (error = yield).empty?
+        print error[0..0]
+      end
+    end
+
+    def handle_summary
+      puts "", "  %d tests, %d assertions, %d failures, %d errors" %
+        Bacon::Counter.values_at(:specifications, :requirements, :failed, :errors)
+    end
+
+  })
+end
+
+# ///////////////////////////////////////////////////////////
+# Spec helpers & matchers
+# ///////////////////////////////////////////////////////////
+
 def has_parsetree?
   Object.const_defined?(:ParseTree)
 end
@@ -42,16 +73,24 @@ def normalize_code(code)
   Ruby2Ruby.new.process(code_to_sexp(code))
 end
 
-def having_source(expected)
+def having_source(expected, opts={}, &matcher)
   lambda do |_proc|
-    normalize_code(_proc.to_source) == normalize_code(expected)
+    if block_given?
+      normalize_code(_proc.to_source(&matcher)) == normalize_code(expected)
+    else
+      normalize_code(_proc.to_source(opts)) == normalize_code(expected)
+    end
   end
 end
 
-def having_sexp(expected)
+def having_sexp(expected, opts={}, &matcher)
   lambda do |_proc|
     expected = eval(expected) if expected.is_a?(String)
-    _proc.to_sexp.inspect == expected.inspect
+    if block_given?
+      _proc.to_sexp(&matcher).inspect == expected.inspect
+    else
+      _proc.to_sexp(opts).inspect == expected.inspect
+    end
   end
 end
 
@@ -68,44 +107,13 @@ def capture(stdin_str = '')
 end
 
 def irb_exec(stdin_str)
-  begin
-    require 'otaku'
-
-    Otaku.start do |data|
-      # Otaku takes a SerializableProc (see http://github.com/ngty/serializable_proc),
-      # we don't want any variables isolation
-      @@_not_isolated_vars = :all
-
-      # Since we are now in another process, need to explicitely require current dev sourcify
-      require 'lib/sourcify'
-
-      # Get a unique tmp file (what we really want is the path)
-      require 'tempfile'
-      tf = Tempfile.new('otaku')
-
-      begin
-        $o_stdin, $o_stdout = $stdin, $stdout # Backup the existing stdin/stdout
-        $stdin, $stdout = %w{in out}.map{|s| File.new("#{tf.path}~std#{s}",'w+') } # drying up
-        $stdin.puts [data, 'exit', ''].join("\n")
-        $stdin.rewind
-
-        require 'irb'
-        ARGV.clear # Need this to prevent IRB from blowing up
-        IRB.start(__FILE__)
-
-        $stdout.rewind
-        irb_feedback = /^ => / # irb feedback string looks like this
-        $stdout.readlines.join.split("\n").
-          grep(irb_feedback).map{|s| eval(s.sub(irb_feedback,'').strip) }
-      ensure
-        [$stdin, $stdout, tf].each{|f| File.delete(f.path) }
-        $stdin, $stdout = $o_stdin, $o_stdout
-      end
-    end
-
-    Otaku.process(stdin_str)
-
-  ensure
-    Otaku.stop
-  end
+  # See http://tyenglog.heroku.com/2010/9/how-to-test-irb-specific-support &
+  # http://tyenglog.heroku.com/2010/9/how-to-test-irb-specific-support-2-
+  sourcify_rb = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'sourcify.rb')
+  irb_feedback = /^ => /
+  values = %x(echo "#{stdin_str}" | irb -r #{sourcify_rb}).split("\n").
+    grep(irb_feedback).map{|s| eval(s.sub(irb_feedback,'').strip) }
+  # IRB behaves slightly differently in 1.9.2 for appending newline
+  (values[-1].nil? && RUBY_VERSION.include?('1.9.2')) ? values[0 .. -2] : values
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sourcify
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - NgTzeYang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +08:00
+date: 2010-10-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,47 +35,48 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: sexp_processor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
+        - 3
         - 0
-        version: "0"
-  type: :development
+        - 5
+        version: 3.0.5
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: otaku
+  name: bacon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 0
-        - 4
-        - 0
-        version: 0.4.0
+        version: "0"
   type: :development
   version_requirements: *id003
 description: ""
 email: ngty77@gmail.com
 executables: []
 
-extensions: 
-- ext/sourcify/extconf.rb
+extensions: []
+
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
 - .document
 - .gitignore
+- .infinity_test
 - HISTORY.txt
 - LICENSE
 - README.rdoc
@@ -83,6 +84,10 @@ files:
 - VERSION
 - lib/sourcify.rb
 - lib/sourcify/proc.rb
+- lib/sourcify/proc/methods.rb
+- lib/sourcify/proc/methods/source_location.rb
+- lib/sourcify/proc/methods/to_sexp.rb
+- lib/sourcify/proc/methods/to_source.rb
 - lib/sourcify/proc/parser.rb
 - lib/sourcify/proc/scanner.rb
 - lib/sourcify/proc/scanner.rl
@@ -97,7 +102,10 @@ files:
 - spec/proc/created_on_the_fly_proc_spec.rb
 - spec/proc/others_spec.rb
 - spec/proc/readme
+- spec/proc/spec_helper.rb
+- spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb
 - 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_source_from_braced_block_w_nested_braced_block_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb
@@ -117,10 +125,19 @@ files:
 - spec/proc/to_source_from_do_end_block_wo_nesting_complication_spec.rb
 - spec/proc/to_source_from_multi_blocks_w_many_matches_spec.rb
 - spec/proc/to_source_from_multi_blocks_w_single_match_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_many_matches_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_no_match_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_single_match_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_attached_to_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_many_matches_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_no_match_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_single_match_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_ignore_nested_spec.rb
 - spec/proc/to_source_from_multi_do_end_blocks_w_single_match_spec.rb
 - spec/proc/to_source_magic_file_var_spec.rb
 - spec/proc/to_source_magic_line_var_spec.rb
 - 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_scanner/block_comment_spec.rb
 - spec/proc_scanner/double_colons_spec.rb
@@ -131,9 +148,9 @@ files:
 - spec/proc_scanner/kw_do_alias2_spec.rb
 - spec/proc_scanner/per_line_comment_spec.rb
 - spec/proc_scanner/single_quote_str_spec.rb
+- spec/proc_scanner/slash_operator_spec.rb
 - spec/proc_scanner/spec_helper.rb
 - spec/spec_helper.rb
-- ext/sourcify/extconf.rb
 has_rdoc: true
 homepage: http://github.com/ngty/sourcify
 licenses: []
@@ -173,6 +190,7 @@ summary: Workarounds before ruby-core officially supports Proc#to_source (& frie
 test_files: 
 - spec/proc_scanner/kw_do_alias1_spec.rb
 - spec/proc_scanner/single_quote_str_spec.rb
+- spec/proc_scanner/slash_operator_spec.rb
 - spec/proc_scanner/kw_do_alias2_spec.rb
 - spec/proc_scanner/double_colons_spec.rb
 - spec/proc_scanner/block_comment_spec.rb
@@ -182,6 +200,8 @@ test_files:
 - spec/proc_scanner/spec_helper.rb
 - spec/proc_scanner/double_quote_str_wo_interpolation_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_until_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_single_match_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_no_match_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_begin_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb
 - spec/proc/created_on_the_fly_proc_spec.rb
@@ -193,18 +213,28 @@ test_files:
 - spec/proc/to_sexp_within_irb_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_module_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_do_end_block_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_attached_to_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_method_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_class_spec.rb
 - spec/proc/to_source_within_irb_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_case_spec.rb
 - spec/proc/to_source_magic_line_var_spec.rb
+- spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_many_matches_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_literal_keyword_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_unless_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_no_match_spec.rb
 - spec/proc/others_spec.rb
 - spec/proc/19x_extras.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_many_matches_spec.rb
 - spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb
 - spec/proc/to_source_from_do_end_block_wo_nesting_complication_spec.rb
 - spec/proc/to_source_variables_spec.rb
+- spec/proc/to_source_w_specified_strip_enclosure_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_single_match_spec.rb
+- spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb
+- spec/proc/to_source_from_multi_blocks_w_specified_ignore_nested_spec.rb
+- spec/proc/spec_helper.rb
 - spec/proc/to_sexp_variables_spec.rb
 - spec/proc/to_source_magic_file_var_spec.rb
 - spec/proc/to_source_from_do_end_block_w_nested_if_spec.rb

data/ext/sourcify/extconf.rb

@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('sourcify/sourcify')