stella 0.8.5.002 → 0.8.6.001

data/CHANGES.txt

@@ -10,10 +10,17 @@ STELLA, CHANGES
 * TODO: request block conditions. 
 * TODO: process templates for calls to set in get blocks
 
-#### 0.8.6 (2010-04-??) ###############################
+#### 0.8.6 (2010-04-14) ###############################
 
-* ADDED: Stella::Testplan#userid
+* FIXED: Wait option and hosts on CLI were not being passed correctly
 * CHANGE: Stella::Testplan#userid now used in digest calculation.
+* CHANGE: Moved ProcSource to Storable
+* CHANGE: Don't auto freeze testrun.
+* CHANGE: Store Stella::Data::HTTP::Request#wait as a Range
+* ADDED: Stella::Testplan#userid
+* ADDED: Stella.post
+* ADDED: Stella::Logger.debug
+* ADDED: Print wait time for each request at verbose level 3 (-vvv)
 
 
 #### 0.8.5 (2010-03-27) ###############################

data/Rakefile

@@ -25,11 +25,11 @@ begin
     gem.email = "delano@solutious.com"
     gem.homepage = "http://blamestella.com/"
     gem.authors = ["Delano Mandelbaum"]
-    gem.add_dependency("gibbler",    ">= 0.7.6")
+    gem.add_dependency("gibbler",    ">= 0.8.1")
     gem.add_dependency("drydock",    ">= 0.6.9")
-    gem.add_dependency("benelux",    ">= 0.5.12")
+    gem.add_dependency("benelux",    ">= 0.5.15")
     gem.add_dependency('sysinfo',    '>= 0.7.3')
-    gem.add_dependency('storable',   '>= 0.6.4')
+    gem.add_dependency('storable',   '>= 0.7.3')
     gem.add_dependency("nokogiri")
 
     #gem.add_development_dependency("rspec", ">= 1.2.9")

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :MAJOR: 0
 :MINOR: 8
-:PATCH: 5
-:BUILD: '002'
+:PATCH: 6
+:BUILD: '001'

data/lib/stella.rb

@@ -1,9 +1,9 @@
 
 STELLA_LIB_HOME = File.expand_path File.dirname(__FILE__) unless defined?(STELLA_LIB_HOME)
 
-%w{attic hexoid storable sysinfo gibbler benelux}.each do |dir|
-  $:.unshift File.join(STELLA_LIB_HOME, '..', '..', dir, 'lib')
-end
+#%w{attic hexoid storable sysinfo gibbler benelux}.each do |dir|
+#  $:.unshift File.join(STELLA_LIB_HOME, '..', '..', dir, 'lib')
+#end
 
 autoload :SysInfo, 'sysinfo'
 autoload :Drydock, 'drydock'
@@ -17,6 +17,8 @@ require 'gibbler/aliases'  # important for run time digests and freezes
 require 'benelux'
 require 'proc_source'
 
+class OpenStruct;                include Gibbler::Object;    end
+
 module Stella
   module VERSION
     def self.to_s
@@ -128,10 +130,9 @@ module Stella
   autoload :Client, 'stella/client'
   autoload :Service, 'stella/service'
   
-  def get(uri, query={}, &blk)
-    require 'stella/client'
-    http_client = HTTPClient.new :agent_name => "Opera/9.51 (Windows NT 5.1; U; en)"
-    res = http_client.get(uri, query)
+  def get(uri, params={}, headers={}, &blk)
+    http_client = HTTPClient.new :agent_name => Stella.agent
+    res = http_client.get(uri, params, headers)
     if blk.nil?
       res.body.content
     else
@@ -143,29 +144,23 @@ module Stella
     nil
   end
   
-end
-
-Stella.stdout.lev = Stella.quiet? ? 0 : 1
-Stella.stdout.autoflush!
-
-
-
-class Storable
-  # These methods are used by Storable objects. 
-  # See Stella::Testplan
-  module DefaultProcessors
-    # If the object already has a value for +@id+
-    # use it, otherwise return the current digest.
-    #
-    # This allows an object to have a preset ID. 
-    #
-    def gibbler_id_processor
-      Proc.new do |val|
-        @id || self.gibbler
-      end
+  def post(uri, params={}, headers={}, &blk)
+    http_client = HTTPClient.new :agent_name => Stella.agent
+    res = http_client.post(uri, params, headers)
+    if blk.nil?
+      res.body.content
+    else
+      blk.call res 
     end
+  rescue => ex
+    STDERR.puts ex.message
+    STDERR.puts ex.backtrace if Stella.debug?
+    nil
   end
+  
 end
 
+Stella.stdout.lev = Stella.quiet? ? 0 : 1
+Stella.stdout.autoflush!
 
 

data/lib/stella/cli.rb

@@ -22,7 +22,7 @@ class Stella::CLI < Drydock::Command
   def run(mode)
     opts = { :mode => mode }
     opts[:hosts] = @hosts
-    [:nowait, :clients, :repetitions, :duration, :arrival, :granularity].each do |opt|
+    [:nowait, :clients, :repetitions, :duration, :arrival, :granularity, :'wait'].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
     [:'notemplates', :'nostats', :'noheader', :'noparam'].each do |opt|
@@ -87,16 +87,14 @@ class Stella::CLI < Drydock::Command
       raise "Bad variable format: #{var}" if n.nil? || !n.match(/[a-z]+/i)
       Stella::Testplan.global(n.to_sym, v)
     end
+    @hosts = @argv.collect { |uri|; 
+      uri = 'http://' << uri unless uri.match /^https?:\/\//i
+      URI.parse uri; 
+    }
     if @option.testplan
-      @hosts = @argv.collect { |uri|; 
-        uri = 'http://' << uri unless uri.match /^https?:\/\//i
-        URI.parse uri; 
-      }
       @testplan = Stella::Testplan.load_file @option.testplan
     else
-      opts = {}
-      opts[:wait] = @option.wait if @option.wait
-      @testplan = Stella::Testplan.new(@argv)
+      @testplan = Stella::Testplan.new(@hosts)
     end
     @testplan.check!  # raise errors, update usecase ratios
     @testplan.freeze  # cascades through usecases and requests

data/lib/stella/client.rb

@@ -154,8 +154,15 @@ module Stella
           next
         end
         
-        wait = (req.wait != 0) ? req.wait : @opts[:wait]
+        if (req.wait.is_a?(::Range) && req.wait.last > 0) ||
+           (Numeric === req.wait && req.wait > 0)
+          wait = req.wait
+        else
+          wait = @opts[:wait]
+        end
+         
         run_sleeper(wait, asset_duration) unless nowait?
+
         
         # TODO: consider throw/catch
         case ret.class.to_s
@@ -212,7 +219,7 @@ module Stella
     end
   
     def run_sleeper(wait, already_waited=0)
-      return if wait == 0
+      return if (wait.is_a?(::Range) && wait.last == 0) || wait == 0
       # The time it took to download the assets can
       # be removed from the specified wait time.
       if wait.is_a?(::Range)
@@ -221,6 +228,7 @@ module Stella
       else
         ms = wait * 1000
       end
+      Stella.stdout.info3 "   WAIT: #{ms}ms"
       sec = ms / 1000
       Stella.ld "WAIT ADJUSTED FROM %.1f TO: %.1f" % [sec, (sec - already_waited)]
       sleep (sec - already_waited) if (sec - already_waited) > 0
@@ -297,7 +305,12 @@ module Stella
       # $ stella verify -p plan.rb http://localhost/basicauth
       if URI::Generic === base_uri && base_uri.path
         if uri.path.nil? || uri.path.empty?
-          uri.path = base_uri.path
+          begin
+            uri.path = base_uri.path
+          rescue => ex
+            Stella.stdout.info "#{ex.class}: #{self.base_uri}"
+            exit
+          end
         else
           a = base_uri.path.gsub(/\/$/, '')
           b = uri.path.gsub(/^\//, '')

data/lib/stella/data/http.rb

@@ -21,16 +21,16 @@ module Stella::Data::HTTP
     attic :description
     field :description
     
-    field :header 
+    field :header => Hash
     field :uri
-    field :wait
-    field :params
+    field :wait => Range
+    field :params => Hash
     field :body 
     field :http_method
     field :http_version
     field :content_type
     field :http_auth
-    field :timeout
+    field :timeout => Float
     
     field :autofollow  # boolean. Was this an auto generated follow request. 
 
@@ -49,7 +49,7 @@ module Stella::Data::HTTP
       @header, @params, @response_handler = {}, {}, {}
       @resources = {}
       @autofollow = false
-      @wait = 0
+      @wait = 0..0
       self.description = "Request"
       instance_eval &definition unless definition.nil?
     end

data/lib/stella/engine.rb

@@ -95,7 +95,7 @@ class Stella::Testrun < Storable
   field :duration => Integer
   field :arrival => Float
   field :repetitions => Integer
-  field :wait => Float
+  field :wait => Range
   field :nowait => TrueClass
   field :logsize => Integer
   field :granularity => Integer
@@ -184,6 +184,7 @@ class Stella::Testrun < Storable
     end
     
     @start_time ||= Time.now.to_i
+    @end_time ||= 0
     
     @event_probes.collect! { |event| event.to_s }
     
@@ -194,7 +195,6 @@ class Stella::Testrun < Storable
     @duration &&= @duration.to_i
     @arrival &&= @arrival.to_f
     @repetitions &&= @repetitions.to_i
-    @wait &&= @wait.to_f
     
     @mode &&= @mode.to_sym
     
@@ -269,7 +269,7 @@ class Stella::Testrun < Storable
     end
     engine.run self
     @status = "done"
-    self.freeze
+    #self.freeze
     self
   end
   
@@ -417,7 +417,8 @@ class Stella::Testrun < Storable
       me.stats.each_pair { |ucid,uchash| 
         uchash.each_pair { |reqid,reqhash|
           if me.stats[ucid][reqid].has_key? 'status'
-             me.stats[ucid][reqid]['status'].each_pair do |status,value|
+             me.stats[ucid][reqid]['status'].keys do |status|
+               value = me.stats[ucid][reqid]['status'][status]
                me.stats[ucid][reqid]['status'].delete status
                me.stats[ucid][reqid]['status'][status.to_i] = value.to_i
              end

data/lib/stella/engine/functional.rb

@@ -53,8 +53,8 @@ module Stella::Engine
                                     req.http_method, container.status, uri.to_s,
                                     params, container.response.request.header.dump, 
                                     container.response.header.dump, 
-                                    container.response.body.dump
-
+                                    container.response.body.content
+      
       Benelux.thread_timeline.add_message log, :status => container.status, :kind => :log
       
       msg = '  %-6s %-53s ' % [req.http_method, uri]

data/lib/stella/engine/load.rb

@@ -49,6 +49,7 @@ module Stella::Engine
       Stella.stdout.head 'Hosts', testrun.hosts.join(', ')
       Stella.stdout.head 'Clients', counts[:total]
       Stella.stdout.head 'Limit', timing
+      Stella.stdout.head 'Wait', testrun.wait
       Stella.stdout.head 'Arrival', testrun.arrival if testrun.arrival
       
       @dumper.start

data/lib/stella/logger.rb

@@ -58,6 +58,11 @@ module Stella
     def info3(*msg)  puts 3, *msg end
     def info4(*msg)  puts 4, *msg end
     
+    def debug(*msg)  
+      return unless Stella.debug?
+      puts 1, *msg 
+    end
+      
     def tinfo(templ, *args)
       info template(templ) % args
     end

data/lib/stella/testplan.rb

@@ -59,6 +59,10 @@ class Testplan < Storable
     end
   end
   
+  def postprocess
+    @id &&= Gibbler::Digest.new @id
+  end
+  
   def self.load_file(path)
     conf = File.read path
     plan = Stella::Testplan.new

data/stella.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stella}
-  s.version = "0.8.5.002"
+  s.version = "0.8.6.001"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
      "examples/exceptions/plan.rb",
      "examples/timeout/plan.rb",
      "examples/variables/plan.rb",
-     "lib/proc_source.rb",
      "lib/stella.rb",
      "lib/stella/cli.rb",
      "lib/stella/client.rb",
@@ -98,26 +97,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gibbler>, [">= 0.7.6"])
+      s.add_runtime_dependency(%q<gibbler>, [">= 0.8.1"])
       s.add_runtime_dependency(%q<drydock>, [">= 0.6.9"])
-      s.add_runtime_dependency(%q<benelux>, [">= 0.5.12"])
+      s.add_runtime_dependency(%q<benelux>, [">= 0.5.15"])
       s.add_runtime_dependency(%q<sysinfo>, [">= 0.7.3"])
-      s.add_runtime_dependency(%q<storable>, [">= 0.6.4"])
+      s.add_runtime_dependency(%q<storable>, [">= 0.7.3"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
     else
-      s.add_dependency(%q<gibbler>, [">= 0.7.6"])
+      s.add_dependency(%q<gibbler>, [">= 0.8.1"])
       s.add_dependency(%q<drydock>, [">= 0.6.9"])
-      s.add_dependency(%q<benelux>, [">= 0.5.12"])
+      s.add_dependency(%q<benelux>, [">= 0.5.15"])
       s.add_dependency(%q<sysinfo>, [">= 0.7.3"])
-      s.add_dependency(%q<storable>, [">= 0.6.4"])
+      s.add_dependency(%q<storable>, [">= 0.7.3"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gibbler>, [">= 0.7.6"])
+    s.add_dependency(%q<gibbler>, [">= 0.8.1"])
     s.add_dependency(%q<drydock>, [">= 0.6.9"])
-    s.add_dependency(%q<benelux>, [">= 0.5.12"])
+    s.add_dependency(%q<benelux>, [">= 0.5.15"])
     s.add_dependency(%q<sysinfo>, [">= 0.7.3"])
-    s.add_dependency(%q<storable>, [">= 0.6.4"])
+    s.add_dependency(%q<storable>, [">= 0.7.3"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
   end
 end

data/vendor/httpclient-2.1.5.2/httpclient/http.rb

@@ -233,9 +233,11 @@ module HTTP
         else
           str = response_status_line
         end
-        str + @header_item.collect { |key, value|
+        ret = str + @header_item.collect { |key, value|
           "#{ key }: #{ value }#{ CRLF }"
         }.join
+        #ret.force_encoding("ASCII-8BIT") if RUBY_VERSION >= "1.9"
+        ret
       end
 
       # Adds a header.  Addition order is preserved.
@@ -508,6 +510,7 @@ module HTTP
 
       # Returns a message body itself.
       def content
+        #@body.force_encoding("ASCII-8BIT") if RUBY_VERSION >= "1.9"
         @body
       end
 

data/vendor/httpclient-2.1.5.2/httpclient/session.rb

@@ -590,12 +590,13 @@ class HTTPClient
         read_header if @state == :META
         return nil if @state != :DATA
         if @chunked
-          read_body_chunked(&block)
+          ret = read_body_chunked(&block)
         elsif @content_length
-          read_body_length(&block)
+          ret = read_body_length(&block)
         else
-          read_body_rest(&block)
+          ret = read_body_rest(&block)
         end
+        p [:ret, ret.encoding.name] if ret
       rescue
         close
         raise

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.8.5.002
+  version: 0.8.6.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.6
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: drydock
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.12
+        version: 0.5.15
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.4
+        version: 0.7.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -101,7 +101,6 @@ files:
 - examples/exceptions/plan.rb
 - examples/timeout/plan.rb
 - examples/variables/plan.rb
-- lib/proc_source.rb
 - lib/stella.rb
 - lib/stella/cli.rb
 - lib/stella/client.rb

data/lib/proc_source.rb

@@ -1,470 +0,0 @@
-
-require 'stringio'
-require 'irb/ruby-lex'
-#SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
-
-class ProcString < String
-  attr_accessor :file, :lines, :arity, :kind
-  def to_proc(kind="proc")
-    result = eval("#{kind} #{self}")
-    result.source = self
-    result
-  end
-  def to_lambda
-    to_proc "lamda"
-  end
-end
-
-class RubyToken::Token
-  
-    # These EXPR_BEG tokens don't have associated end tags
-  FAKIES = [RubyToken::TkWHEN, RubyToken::TkELSIF, RubyToken::TkTHEN]
-  
-  def open_tag?
-    return false if @name.nil? || get_props.nil?
-    a = (get_props[1] == RubyToken::EXPR_BEG) &&
-          self.class.to_s !~ /_MOD/  && # ignore onliner if, unless, etc...
-          !FAKIES.member?(self.class)  
-    a 
-  end
-  
-  def get_props
-    RubyToken::TkReading2Token[@name]
-  end
-  
-end
-
-# Based heavily on code from http://github.com/imedo/background
-# Big thanks to the imedo dev team!
-#
-module ProcSource
-  
-  def self.find(filename, start_line=0, block_only=true)
-    lines, lexer = nil, nil
-    retried = 0
-    loop do
-      lines = get_lines(filename, start_line)
-      #p [start_line, lines[0]]
-      if !line_has_open?(lines.join) && start_line >= 0
-        start_line -= 1 and retried +=1 and redo 
-      end
-      lexer = RubyLex.new
-      lexer.set_input(StringIO.new(lines.join))
-      break
-    end
-    stoken, etoken, nesting = nil, nil, 0
-    while token = lexer.token
-      n = token.instance_variable_get(:@name)
-      
-      if RubyToken::TkIDENTIFIER === token
-        #nothing
-      elsif token.open_tag? || RubyToken::TkfLBRACE === token
-        nesting += 1
-        stoken = token if nesting == 1
-      elsif RubyToken::TkEND === token || RubyToken::TkRBRACE === token
-        if nesting == 1
-          etoken = token 
-          break
-        end
-        nesting -= 1
-      elsif RubyToken::TkBITOR === token && stoken
-        #nothing
-      elsif RubyToken::TkNL === token && stoken && etoken
-        break if nesting <= 0
-      else
-        #p token
-      end
-    end
-#     puts lines if etoken.nil?
-    lines = lines[stoken.line_no-1 .. etoken.line_no-1]
-    
-    # Remove the crud before the block definition. 
-    if block_only
-      spaces = lines.last.match(/^\s+/)[0] rescue ''
-      lines[0] = spaces << lines[0][stoken.char_no .. -1]
-    end
-    ps = ProcString.new lines.join
-    ps.file, ps.lines = filename, start_line .. start_line+etoken.line_no-1
-    
-    ps
-  end
-  
-  # A hack for Ruby 1.9, otherwise returns true.
-  #
-  # Ruby 1.9 returns an incorrect line number
-  # when a block is specified with do/end. It
-  # happens b/c the line number returned by 
-  # Ruby 1.9 is based on the first line in the
-  # block which contains a token (i.e. not a
-  # new line or comment etc...). 
-  #
-  # NOTE: This won't work in cases where the 
-  # incorrect line also contains a "do". 
-  #
-  def self.line_has_open?(str)
-    return true unless RUBY_VERSION >= '1.9'
-    lexer = RubyLex.new
-    lexer.set_input(StringIO.new(str))
-    success = false
-    while token = lexer.token
-      case token
-      when RubyToken::TkNL
-        break
-      when RubyToken::TkDO
-        success = true
-      when RubyToken::TkCONSTANT
-        if token.instance_variable_get(:@name) == "Proc" &&
-           lexer.token.is_a?(RubyToken::TkDOT)
-          method = lexer.token
-          if method.is_a?(RubyToken::TkIDENTIFIER) &&
-             method.instance_variable_get(:@name) == "new"
-            success = true
-          end
-        end
-      end
-    end
-    success
-  end
-  
-  
-  def self.get_lines(filename, start_line = 0)
-    case filename
-      when nil
-        nil
-      ## NOTE: IRB AND EVAL LINES NOT TESTED
-      ### special "(irb)" descriptor?
-      ##when "(irb)"
-      ##  IRB.conf[:MAIN_CONTEXT].io.line(start_line .. -2)
-      ### special "(eval...)" descriptor?
-      ##when /^\(eval.+\)$/
-      ##  EVAL_LINES__[filename][start_line .. -2]
-      # regular file
-      else
-        # Ruby already parsed this file? (see disclaimer above)
-        if defined?(SCRIPT_LINES__) && SCRIPT_LINES__[filename]
-          SCRIPT_LINES__[filename][(start_line - 1) .. -1]
-        # If the file exists we're going to try reading it in
-        elsif File.exist?(filename)
-          begin
-            File.readlines(filename)[(start_line - 1) .. -1]
-          rescue
-            nil
-          end
-        end
-    end
-  end
-end
-
-class Proc #:nodoc:
-  attr_reader :file, :line
-  attr_writer :source
-  
-  def source_descriptor
-    unless @file && @line
-      if md = /^#<Proc:0x[0-9A-Fa-f]+@(.+):(\d+)(.+?)?>$/.match(inspect)
-        @file, @line = md.captures
-      end
-    end
-    [@file, @line.to_i]
-  end
-  
-  def source
-    @source ||= ProcSource.find(*self.source_descriptor)
-  end
-  
-
-end
-
-if $0 == __FILE__
-  def store(&blk)
-    @blk = blk
-  end
-
-  store do |blk|
-    puts "Hello Rudy1"
-  end
-
-  a = Proc.new() { |a|
-    puts  "Hello Rudy2" 
-  }
- 
-  b = Proc.new() do |b|
-    puts { "Hello Rudy3" } if true
-  end
-  
-  puts @blk.inspect, @blk.source
-  puts [a.inspect, a.source]
-  puts b.inspect, b.source
-  
-  proc = @blk.source.to_proc
-  proc.call(1)
-end
-
-
-__END__
-
-# THE FOLLOWING WAS TAKEN FROM
-# http://github.com/imedo/background
-# AND IS THE BASIS OF THE CODE ABOVE. 
-#
-
-require 'stringio'
-require 'irb/ruby-lex'
- 
-# Tell the ruby interpreter to load code lines of required files
-# into this filename -> lines Hash. This behaviour seems to be
-# very undocumented and therefore shouldn't really be relied on.
-SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
- 
-module ProcSource #:nodoc:
-  def get_lines(filename, start_line = 0)
-    case filename
-      when nil
-        nil
-      # special "(irb)" descriptor?
-      when "(irb)"
-        IRB.conf[:MAIN_CONTEXT].io.line(start_line .. -1)
-      # special "(eval...)" descriptor?
-      when /^\(eval.+\)$/
-        EVAL_LINES__[filename][start_line .. -1]
-      # regular file
-      else
-        # Ruby already parsed this file? (see disclaimer above)
-        if lines = SCRIPT_LINES__[filename]
-          lines[(start_line - 1) .. -1]
-        # If the file exists we're going to try reading it in
-        elsif File.exist?(filename)
-          begin
-            File.readlines(filename)[(start_line - 1) .. -1]
-          rescue
-            nil
-          end
-        end
-    end
-  end
- 
-  def handle(proc)
-    filename, line = proc.source_descriptor
-    lines = get_lines(filename, line) || []
- 
-    lexer = RubyLex.new
-    lexer.set_input(StringIO.new(lines.join))
- 
-    state = :before_constructor
-    nesting_level = 1
-    start_token, end_token = nil, nil
-    found = false
-    while token = lexer.token
-      p token
-      # we've not yet found any proc-constructor -- we'll try to find one.
-      if [:before_constructor, :check_more].include?(state)
-        # checking more and newline? -> done
-        if token.is_a?(RubyToken::TkNL) and state == :check_more
-          state = :done
-          break
-        end
-        # token is Proc?
-        if token.is_a?(RubyToken::TkCONSTANT) and
-           token.instance_variable_get(:@name) == "Proc"
-          # method call?
-          if lexer.token.is_a?(RubyToken::TkDOT)
-            method = lexer.token
-            # constructor?
-            if method.is_a?(RubyToken::TkIDENTIFIER) and
-               method.instance_variable_get(:@name) == "new"
-              unless state == :check_more
-                # okay, code will follow soon.
-                state = :before_code
-              else
-                # multiple procs on one line
-                return
-              end
-            end
-          end
-        # token is lambda or proc call?
-        elsif token.is_a?(RubyToken::TkIDENTIFIER) and
-              %w{proc lambda}.include?(token.instance_variable_get(:@name))
-          unless state == :check_more
-            # okay, code will follow soon.
-            state = :before_code
-          else
-            # multiple procs on one line
-            return
-          end
-        elsif token.is_a?(RubyToken::TkfLBRACE) or token.is_a?(RubyToken::TkDO)
-          # found the code start, update state and remember current token
-          state = :in_code
-          start_token = token
-        end
- 
-      # we're waiting for the code start to appear.
-      elsif state == :before_code
-        
-        if token.is_a?(RubyToken::TkfLBRACE) or token.is_a?(RubyToken::TkDO)
-          # found the code start, update state and remember current token
-          state = :in_code
-          start_token = token
-        end
- 
-      # okay, we're inside code
-      elsif state == :in_code
-        if token.is_a?(RubyToken::TkRBRACE) or token.is_a?(RubyToken::TkEND)
-          nesting_level -= 1
-          if nesting_level == 0
-            # we're done!
-            end_token = token
-            # parse another time to check if there are multiple procs on one line
-            # we can't handle that case correctly so we return no source code at all
-            state = :check_more
-          end
-        elsif token.is_a?(RubyToken::TkfLBRACE) or token.is_a?(RubyToken::TkDO) or
-              token.is_a?(RubyToken::TkBEGIN) or token.is_a?(RubyToken::TkCASE) or
-              token.is_a?(RubyToken::TkCLASS) or token.is_a?(RubyToken::TkDEF) or
-              token.is_a?(RubyToken::TkFOR) or token.is_a?(RubyToken::TkIF) or
-              token.is_a?(RubyToken::TkMODULE) or token.is_a?(RubyToken::TkUNLESS) or
-              token.is_a?(RubyToken::TkUNTIL) or token.is_a?(RubyToken::TkWHILE) or
-              token.is_a?(RubyToken::TklBEGIN)
-          nesting_level += 1
-        end
-      end
-    end
- 
-    if start_token and end_token
-      start_line, end_line = start_token.line_no - 1, end_token.line_no - 1
-      source = lines[start_line .. end_line]
-      start_offset = start_token.char_no
-      start_offset += 1 if start_token.is_a?(RubyToken::TkDO)
-      end_offset = -(source.last.length - end_token.char_no)
-      source.first.slice!(0 .. start_offset)
-      source.last.slice!(end_offset .. -1)
- 
-      # Can't use .strip because newline at end of code might be important
-      # (Stuff would break when somebody does proc { ... #foo\n})
-      proc.source = source.join.gsub(/^ | $/, "")
-    end
-  end
- 
-  module_function :handle, :get_lines
-end
- 
-class Proc #:nodoc:
-  attr_reader :file, :line
-  
-  def source_descriptor
-    return @file, @line.to_i if @file && @line
-    md = /^#<Proc:0x[0-9A-Fa-f]+@(.+):(\d+)(.+?)?>$/.match(old_inspect)
-    if md 
-      @file, @line = md.captures
-      return @file, @line.to_i
-    end
-  end
-  
-  def self.source_cache
-    @source_cache ||= {}
-  end
- 
-  def source=(code)
-    @source = Proc.source_cache[source_descriptor.join('/')] = code
-  end
- 
-  def source
-    @source = Proc.source_cache[source_descriptor.join('/')]
-    ProcSource.handle(self) #unless @source
-    @source
-  end
- 
-  alias :old_inspect :inspect
-  def inspect
-    if source
-      "proc {#{source}}"
-    else
-      old_inspect
-    end
-  end
- 
-  def ==(other)
-    if self.source && other.respond_to?(:source) && other.source
-      self.source == other.source
-    else
-      self.object_id == other.object_id
-    end
-  end
- 
-  def _dump(depth = 0)
-    if source
-      source
-    else
-      raise(TypeError, "Can't serialize Proc with unknown source code.")
-    end
-  end
- 
-  def to_yaml(*args)
-    #self.source # force @source to be set
-    a = super
-    a.sub!("object:Proc", "proc") if a.respond_to? :sub
-    a
-  end
- 
-  def self.allocate; from_string ""; end
- 
-  def self.from_string(string)
-    result = eval("proc {#{string}}")
-    result.source = string
-    return result
-  end
- 
-  def self._load(code)
-    self.from_string(code)
-  end
- 
-  def self.marshal_load; end
-  def marshal_load; end
-end
- 
-require 'yaml'
-YAML.add_ruby_type(/^proc/) do |type, val|
-  Proc.from_string(val["source"])
-end
- 
-# EVAL_LINES__ = Hash.new
-#
-# alias :old_eval :eval
-# def eval(code, *args)
-# context, descriptor, start_line, *more = *args
-# descriptor ||= "(eval#{code.hash})"
-# start_line ||= 0
-# lines ||= code.grep(/.*/)
-# EVAL_LINES__[descriptor] ||= Array.new
-# EVAL_LINES__[descriptor][start_line, lines.length] = lines
-# old_eval(code, context, descriptor, start_line, *more)
-# end
- 
-
-if __FILE__ == $0 then
-  require "pstore"
- 
-  code = Proc.new() {
-     puts "Hello World!"
-   }
-
-  
-  File.open("proc.marshalled", "w") { |file| Marshal.dump(code, file) }
-  code = File.open("proc.marshalled") { |file| Marshal.load(file) }
- 
-  code.call
- 
-  store = PStore.new("proc.pstore")
-  store.transaction do
-    store["proc"] = code
-  end
-  store.transaction do
-    code = store["proc"]
-  end
-  
-  code.call
-  
-  File.open("proc.yaml", "w") { |file| YAML.dump(code) }
-  #code = File.open("proc.yaml") { |file| YAML.load(file) }
-  
-  code.call
-end