ruined 0.0.1 → 0.0.2

data/ChangeLog

@@ -1,3 +1,6 @@
+Mon Oct 11 18:38:00 2010 arton	
+ * lib/ruined/ruinmain.rb
+	change version => 0.0.2 for new gem
 Mon Oct 11 15:51:00 2010 arton
 	start brwoser (suggested by knu and n0kada, thanks)
 Mon Oct 11 01:37:00 2010 arton

data/lib/ruined/html/main.html

@@ -92,6 +92,13 @@ function stepProc(command) {
       $('button').button('disable');
       return;
     }
+    if (data['break'] || data['event'] == 'exit') {
+      stopRun();
+      if (data['event'] == 'exit') {
+        $('button').button('disable');
+        alert('program exit');
+      }
+    }
     if (files[data.file] == null) {
       files[data.file] = addFile(data.file, data.line, command);
     } else {
@@ -105,9 +112,6 @@ function stepProc(command) {
     span = document.createElement('span');
     $('#stdout')[0].appendChild(span);
     span.scrollIntoView(true);
-    if (data['break']) {
-      stopRun();
-    }
   });
 }
 function contProc(command) {
@@ -152,7 +156,11 @@ $(document).ready(function() {
     if (contTimer != null) {
       stopRun();
     }
-    alert('error');
+    $('#vars').tabs({
+      show: function(envet, ui) {
+        alert('program terminated');
+      }
+    });
   });
   stepProc('stepping');
 });
@@ -194,6 +202,6 @@ $(document).ready(function() {
   <hr>
   <div id="waiting"></div>
   <address id="ruby-platform"></address>
-  <!-- hhmts start --> Last modified: Mon Oct 11 12:42:26 +0900 2010 <!-- hhmts end -->
+  <!-- hhmts start --> Last modified: Mon Oct 11 17:22:50 +0900 2010 <!-- hhmts end -->
 </div>    
 </body> </html>

data/lib/ruined/ruinmain.rb

@@ -1,243 +1,271 @@
-#!/usr/local/bin/ruby -Ku
-# coding: utf-8
-
-require 'webrick'
-require 'json'
-require 'thread'
-require 'monitor'
-require 'stringio'
-
-module Ruined
-  RUINED_VERSION = '0.0.1'
-  
-  @queue = [Queue.new, Queue.new]
-  @breakpoints = []
-  @monitor = Monitor.new
-  include WEBrick
-  svr = HTTPServer.new(:Port => 8383,
-                       :ServerType => Thread,
-                       :Logger => ($DEBUG) ? Log.new(nil, BasicLog::DEBUG) : Log.new,
-                       :DocumentRoot => File.dirname(__FILE__))
-  trap('INT') do 
-    svr.shutdown
-  end
-  
-  class DebugServlet <  HTTPServlet::AbstractServlet
-    include WEBrick::HTMLUtils
-    def service(req, res)
-      if req.addr[3] == '127.0.0.1'      
-        super
-      else
-        bye(res)
-      end
-    end
-    def do_GET(req, res)
-      m = %r|/debug/([^/]+)/?(.*)\Z|.match(req.path)
-      if m
-        res.body = __send__(m[1].to_sym, *(m[2].split('/')))
-      else
-        bye(res)        
-      end
-    end
-
-    def break(*a)
-      if a.size < 3
-        bye(response)
-      else
-        point = [a[1..(a.size - 2)].join('/'), a[a.size - 1].to_i]
-        if a[0] == 'true'
-          Ruined.breakpoints << point
-        else
-          Ruined.breakpoints.delete point
-        end
-        JSON(point)
-      end
-    end
-
-    def run(*a)
-    end
-
-    def stop(*a)
-    end
-
-    def stepping(*a)
-      Ruined.wait 1      
-      JSON(Ruined.current)
-    end
-
-    def cont(*a)
-      Ruined.release 0
-      Ruined.wait 1
-      JSON(Ruined.current)
-    end
-
-    def step(*a)
-      cont(a)
-    end
-        
-    def file(*a)
-      r = '<table>'
-      File.open(a.join('/')).each_line do |line|
-        r << "<tr><td><pre>#{escape(line)}</pre></td></tr>"
-      end.close
-      r + '</table>'
-    end
-    
-    def locals(*a)
-      s = '<table class="vars"><tr><th>Name</th><th>Value</th></tr>'
-      Ruined.local_vars.each do |e|
-        s << "<tr><td>#{escape(e[:name])}</td><td>#{escape(e[:value].to_s)}</td></tr>"
-      end
-      s + '</table>'
-    end
-    
-    def globals(*a)
-      s = '<table class="vars"><tr><th>Name</th><th>Value</th></tr>'
-      Ruined.global_vars.each do |e|
-        s << "<tr><td>#{e[:name]}</td><td>#{escape(e[:value].to_s)}</td></tr>"
-      end
-      s + '</table>'
-    end
-
-    def self(*a)
-      s = '<table class="vars"><tr><th>Name</th><th>Value</th></tr>'
-      Ruined.self_vars.each do |e|
-        s << "<tr><td>#{e[:name]}</td><td>#{escape(e[:value].to_s)}</td></tr>"
-      end
-      s + '</table>'
-    end
-    
-    def start(*a)
-      '<html>start</html>'
-    end
-    
-    private
-    
-    def bye(res)
-      res.status = 404
-      res.body = '<html>bye</html>'
-    end
-  end
-
-  def self.current
-    @current
-  end
-  
-  def self.breakpoints
-    @breakpoints
-  end
-  
-  def self.local_vars
-    script = <<EOD
-local_variables.map do |v|
-  (v == :_) ? nil : { :name => v.to_s, :value => eval(v.to_s) }
-end - [nil]
-EOD
-    @current_binding ? eval(script, @current_binding) : []
-  end
-  
-  def self.self_vars
-    script = <<EOD
-[{ :name => 'class', :value => self.class.to_s }] +
-instance_variables.map do |v|
-  { :name => v.to_s, :value => instance_eval(v.to_s) }
-end +
-self.class.class_variables.map do |v|
-  { :name => v.to_s, :value => instance_eval(v.to_s) }
-end
-EOD
-    @current_binding ? eval(script, @current_binding) : []
-  end
-  
-  def self.global_vars
-    script = <<EOD
-global_variables.map do |v|
-  (v == :_) ? nil : { :name => v.to_s, :value => eval(v.to_s) }
-end
-EOD
-    eval(script)
-  end
-
-  def self.wait(t)
-    @monitor.synchronize {        
-      unless @queue[t].empty?
-        @queue[t].clear
-        logger.debug("------------not wait exit #{t}")
-        return
-      end
-    }
-    logger.debug("------------wait #{t}")
-    @queue[t].pop
-    logger.debug("------------wait exit #{t}")
-  end
-
-  def self.release(t)
-    logger.debug("------------release #{t}")
-    @monitor.synchronize {    
-      @queue[t].push nil
-    }
-    logger.debug("------------release exit #{t}")
-  end
-  
-  def self.output
-    return '' unless StringIO === $stdout
-    out = $stdout
-    $stdout = StringIO.new
-    out.pos = 0
-    ret = ''
-    out.each_line do |x|
-      ret << "#{x.chomp}<br/>"
-    end
-    ret
-  end
-
-  svr.mount('/debug', DebugServlet)
-  svr.mount_proc('/quit') do |req, res|
-    if req.addr[3] == '127.0.0.1'
-      set_trace_func(nil)
-      c = 0
-      if req.path =~ %r|/(\d+)|
-        c = $1.to_i
-      end
-      res.body = '<html>bye</html>'
-      Thread.start do
-        @monitor.synchronize {        
-          @queue = nil
-        }
-        Thread.pass
-        svr.shutdown
-        exit(c)
-      end
-    else
-      res.status = 404
-    end
-  end
-  
-  define_method(:logger) do
-    return svr.logger
-  end
-  module_function(:logger)
-
-  svr.start
-
-  main_thread = Thread.current
-
-  set_trace_func Proc.new {|event, file, line, id, binding, klass|
-    unless file =~ %r#(lib/ruby|webrick|internal)# || main_thread != Thread.current
-      if event.index('c-') != 0
-        if file == $0 && !$stdout.instance_of?(StringIO)
-          $stdout = StringIO.new
-        end
-        b = breakpoints.include? [file, line]
-        @current_binding = binding
-        @current = { 'event' => event, 'file' => file, 'line' => line, 
-          'id' => id.to_s, 'break' => b, 'stdout' => output }
-        svr.logger.debug(@current.inspect)
-        release 1
-        wait 0
-        svr.logger.debug('continue...')
-      end
-    end
-  }
-end
-
+#!/usr/local/bin/ruby -Ku
+# coding: utf-8
+
+require 'webrick'
+require 'json'
+require 'thread'
+require 'monitor'
+require 'stringio'
+
+module Ruined
+  RUINED_VERSION = '0.0.2'
+  
+  @queue = [Queue.new, Queue.new]
+  @breakpoints = []
+  @monitor = Monitor.new
+  @tlses = { '$!' => nil, '$?' => nil, '$@' => nil, '$SAFE' => nil}
+  IGNORES = [:$&, :$', :$+, :$_, :$`, :$~, :$KCODE, :$= ]
+  
+  include WEBrick
+  svr = HTTPServer.new(:Port => 8383,
+                       :ServerType => Thread,
+                       :Logger => ($DEBUG) ? Log.new(nil, BasicLog::DEBUG) : Log.new,
+                       :DocumentRoot => File.dirname(__FILE__))
+  trap('INT') do 
+    svr.shutdown
+  end
+  
+  class DebugServlet <  HTTPServlet::AbstractServlet
+    include WEBrick::HTMLUtils
+    def service(req, res)
+      if req.addr[3] == '127.0.0.1'      
+        super
+      else
+        bye(res)
+      end
+    end
+    def do_GET(req, res)
+      m = %r|/debug/([^/]+)/?(.*)\Z|.match(req.path)
+      if m
+        res.body = __send__(m[1].to_sym, *(m[2].split('/')))
+      else
+        bye(res)        
+      end
+    end
+
+    def break(*a)
+      if a.size < 3
+        bye(response)
+      else
+        point = [a[1..(a.size - 2)].join('/'), a[a.size - 1].to_i]
+        if a[0] == 'true'
+          Ruined.breakpoints << point
+        else
+          Ruined.breakpoints.delete point
+        end
+        JSON(point)
+      end
+    end
+
+    def run(*a)
+    end
+
+    def stop(*a)
+    end
+
+    def stepping(*a)
+      Ruined.wait 1      
+      JSON(Ruined.current)
+    end
+
+    def cont(*a)
+      Ruined.release 0
+      Ruined.wait 1
+      JSON(Ruined.current)
+    end
+
+    def step(*a)
+      cont(a)
+    end
+        
+    def file(*a)
+      r = '<table>'
+      File.open(a.join('/')).each_line do |line|
+        r << "<tr><td><pre>#{escape(line)}</pre></td></tr>"
+      end.close
+      r + '</table>'
+    end
+    
+    def locals(*a)
+      s = '<table class="vars"><tr><th>Name</th><th>Value</th></tr>'
+      Ruined.local_vars.each do |e|
+        s << "<tr><td>#{escape(e[:name])}</td><td>#{escape(e[:value].inspect)}</td></tr>"
+      end
+      s + '</table>'
+    end
+    
+    def globals(*a)
+      s = '<table class="vars"><tr><th>Name</th><th>Value</th></tr>'
+      Ruined.global_vars.each do |e|
+        s << "<tr><td>#{e[:name]}</td><td>#{escape(e[:value].inspect)}</td></tr>"
+      end
+      s + '</table>'
+    end
+
+    def self(*a)
+      s = '<table class="vars"><tr><th>Name</th><th>Value</th></tr>'
+      Ruined.self_vars.each do |e|
+        s << "<tr><td>#{e[:name]}</td><td>#{escape(e[:value].inspect)}</td></tr>"
+      end
+      s + '</table>'
+    end
+    
+    def start(*a)
+      '<html>start</html>'
+    end
+    
+    private
+    
+    def bye(res)
+      res.status = 404
+      res.body = '<html>bye</html>'
+    end
+  end
+
+  def self.current
+    @current
+  end
+  
+  def self.breakpoints
+    @breakpoints
+  end
+  
+  def self.local_vars
+    script = <<EOD
+local_variables.map do |v|
+  (v == :_) ? nil : { :name => v.to_s, :value => eval(v.to_s) }
+end - [nil]
+EOD
+    @current_binding ? eval(script, @current_binding) : []
+  end
+  
+  def self.self_vars
+    script = <<EOD
+[{ :name => 'class', :value => self.class.to_s }] +
+instance_variables.map do |v|
+  { :name => v.to_s, :value => instance_eval(v.to_s) }
+end +
+self.class.class_variables.map do |v|
+  { :name => v.to_s, :value => instance_eval(v.to_s) }
+end
+EOD
+    @current_binding ? eval(script, @current_binding) : []
+  end
+  
+  def self.global_vars
+    script = <<EOD
+(global_variables - Ruined::IGNORES).map do |v|
+  if v.to_s =~ /\\A\\$[1-9]/
+    nil
+  else
+    { :name => v.to_s, :value => eval(v.to_s) }
+  end
+end - [nil]
+EOD
+    a = eval(script)
+    0.upto(a.size - 1) do |i|
+      if @tlses.has_key?(a[i][:name])
+        a[i][:value] = @tlses[a[i][:name]]
+      end
+    end
+    a
+  end
+  
+  def self.tls_vars
+    @@tlses
+  end
+
+  def self.wait(t)
+    @monitor.synchronize {        
+      unless @queue[t].empty?
+        @queue[t].clear
+        logger.debug("------------not wait exit #{t}")
+        return
+      end
+    }
+    logger.debug("------------wait #{t}")
+    @queue[t].pop
+    logger.debug("------------wait exit #{t}")
+  end
+
+  def self.release(t)
+    logger.debug("------------release #{t}")
+    @monitor.synchronize {    
+      @queue[t].push nil
+    }
+    logger.debug("------------release exit #{t}")
+  end
+  
+  def self.output
+    return '' unless StringIO === $stdout
+    out = $stdout
+    $stdout = StringIO.new
+    out.pos = 0
+    ret = ''
+    out.each_line do |x|
+      ret << "#{x.chomp}<br/>"
+    end
+    ret
+  end
+
+  svr.mount('/debug', DebugServlet)
+  svr.mount_proc('/quit') do |req, res|
+    if req.addr[3] == '127.0.0.1'
+      set_trace_func(nil)
+      c = 0
+      if req.path =~ %r|/(\d+)|
+        c = $1.to_i
+      end
+      res.body = '<html>bye</html>'
+      Thread.start do
+        @monitor.synchronize {        
+          @queue = nil
+        }
+        Thread.pass
+        svr.shutdown
+        exit(c)
+      end
+    else
+      res.status = 404
+    end
+  end
+  
+  define_method(:logger) do
+    return svr.logger
+  end
+  module_function(:logger)
+
+  svr.start
+
+  main_thread = Thread.current
+
+  set_trace_func Proc.new {|event, file, line, id, binding, klass|
+    unless file =~ %r#(lib/ruby|webrick|internal)# || main_thread != Thread.current
+      if event.index('c-') != 0
+        if file == $0 && !$stdout.instance_of?(StringIO)
+          $stdout = StringIO.new
+        end
+        @tlses.each do |k, v|
+          @tlses[k] = eval(k)
+        end
+        b = breakpoints.include? [file, line]
+        @current_binding = binding
+        @current = { 'event' => event, 'file' => file, 'line' => line, 
+          'id' => id.to_s, 'break' => b, 'stdout' => output }
+        svr.logger.debug(@current.inspect)
+        release 1
+        wait 0
+        svr.logger.debug('continue...')
+      end
+    end
+  }
+  at_exit { 
+    if @current
+      @current['event'] = 'exit'
+      @current['stdout'] = output
+      release 1
+      wait 0
+    end
+  }
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruined
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - arton