ruined 0.0.9 → 0.1.0

data/ChangeLog

@@ -1,3 +1,14 @@
+Tue Nov 9 2:42:30 2010 arton
+ * ruined/ruinmain.rb
+	write file with binary mode for voiding bad conversion (\r\n -> \r\r\n)
+ * uined.rb
+	return waitcline.html if restart
+ * ruined/html/main.html
+	implements edit command
+Mon Oct 25 22:41:20 2010 arton
+ * ruined/ruinmain.rb
+	version 0.0.9 => 0.1.0
+	convert file, variable's value and output into utf-8
 Sun Oct 17 19:24:00 2010 arton	
  * ruined/ruinmain.rb
 	version 0.0.8 => 0.0.9

data/lib/ruined/css/ruin.css

@@ -38,13 +38,13 @@ div.vars-pane {
 
 div#button-panel {
   float: left;
-  width: 40%;
+  width: 65%;
   height: 40px
 }
 
 div#speed-panel {
   float: left;
-  width: 50%; 
+  width: 30%; 
   height: 40px
 }
 
@@ -72,7 +72,8 @@ div#output {
 
 div#threads {
   overflow: scroll;
-  height: 120px;
+  height: 100px;
+  padding: 10px;
 }
 
 div.footer {

data/lib/ruined/html/main.html

@@ -12,24 +12,25 @@ var files = new Object();
 var priorLine = { line: null, index: null };
 var interval = 1000;
 var contTimer = null;
+var editing = null;
 function addFile(name, line, command) {
   var a = name.split('/');
   $('#lists').tabs('add' , '/debug/file/' + name , a[a.length - 1]);
   var index = $('#lists').tabs('length') - 1;
   $('#lists').tabs('select', index);
   $('td').bind('click', function(ev) {
+    var bgclr = '';
     var sub = 'false';
     if (ev.currentTarget.style.backgroundColor == '') {
       sub = 'true';
+      bgclr = 'saddlebrown';
+    } else if (ev.currentTarget.style.backgroundColor == 'yellow') {
+      sub = 'true';
+      bgclr = 'olive';
+    } else if (ev.currentTarget.style.backgroundColor == 'olive') {
+      bgclr = 'yellow';
     }
-    var index = $('#lists').tabs('option', 'selected');
-    var key, file;
-    for (key in files) {
-      if (files[key] == index) {
-        file = key;
-        break;
-      }
-    }
+    var file = selectFile();
     if (file != null) {
       var line = 0;
       var list = $('#ui-tabs-' + (index * 2 + 2) + ' > table > tbody > tr > td');
@@ -40,10 +41,8 @@ function addFile(name, line, command) {
         }
       }
       $.get('/debug/break/' + sub + '/' + file + '/' + line, function() {
-        var bgclr = '';
         var clr = '';
         if (sub == 'true') {
-          bgclr = 'saddlebrown';
           clr = 'white';
         }
         ev.currentTarget.style.backgroundColor = bgclr;
@@ -53,11 +52,24 @@ function addFile(name, line, command) {
   });
   return index;
 }
+function selectFile() {
+  var index = $('#lists').tabs('option', 'selected');
+  var key, file;
+  for (key in files) {
+    if (files[key] == index) {
+      file = key;
+      break;
+    }
+  }
+  return file;
+}
 function changeTab(index) {
   $('#lists').tabs('select', index);
 }
 function lineColor(command, brk) {
-  if (command == 'cont' && !brk) {
+  if (brk) {
+    return 'olive';
+  } else if (command == 'cont') {
     return 'aquamarine';
   }
   return 'yellow';
@@ -66,6 +78,7 @@ function stopRun() {
   clearTimeout(contTimer);
   contTimer = null;
   $('#run').button('option', 'label', 'run');
+  $('#edit').button('option', 'disabled', false);
 }
 function setLine(index, line, command, brk) {
   if (line > 0) {
@@ -85,7 +98,24 @@ function setLine(index, line, command, brk) {
   style.color = '';
   $('#ui-tabs-' + (index * 2 + 2) + ' > table > tbody > tr > td')[line].scrollIntoView(true);
 }
+function runProc(command) {
+  if (isEditMode()) {
+    saveProc(command, false);
+  } else {
+    if (contTimer == null) {
+      contProc('cont');
+      $('#run').button('option', 'label', 'stop');
+      $('#edit').button('option', 'disabled', true);
+    } else {
+      stopRun();
+    }
+  }
+}
 function stepProc(command) {
+  if (isEditMode()) {
+    saveProc(command, true);
+    return;
+  }
   $.getJSON('/debug/' + command, function(data) {
     if (data == null || data.file == null) {
       if (contTimer != null) stopRun();
@@ -132,6 +162,65 @@ function contProc(command) {
   stepProc(command);
   contTimer = setTimeout('contProc("' + command + '");', interval);
 }
+function editProc(command) {
+  var emode = isEditMode();
+  if (emode) {
+    var root = $('#ui-tabs-' + (editing * 2 + 2))[0];
+    if (root.codeTable) {
+      root.replaceChild(root.codeTable, root.childNodes(0));
+    }
+  } else {
+    editing = $('#lists').tabs('option', 'selected');
+    var root = $('#ui-tabs-' + (editing * 2 + 2))[0];
+    $.get('/debug/file/' + selectFile(), function(data) {
+      root.codeTable = root.childNodes(0);
+      var txa = document.createElement('textarea');
+      txa.style.fontSize = '11pt';
+      txa.rows = 22;
+      txa.cols = 68;
+      txa.innerHTML = data;
+      root.replaceChild(txa, root.codeTable);
+      root.originalCode = data;
+    }, 'text');
+  }  
+  editMode(emode);
+}
+function saveProc(command, rst) {
+  var root = $('#ui-tabs-' + (editing * 2 + 2))[0];
+  var newText = root.childNodes(0).innerHTML;
+  var anew = newText.split(/\r?\n/)
+  var aorg = root.originalCode.split(/\r?\n/)
+  if (anew.length == aorg.length && isSameArray(anew, aorg)) {
+    alert('no save is needed');
+  } else {
+    $.post('/debug/file/' + selectFile(), newText, function(data) {
+      if (rst) {
+        document.location.href = 'http://localhost.:8384/restart';
+      }
+    }, 'text');
+  }  
+  editMode(isEditMode());
+  if (root.codeTable) {
+    root.replaceChild(root.codeTable, root.childNodes(0));
+  }
+}
+function isSameArray(a0, a1) {
+  // assert a0.length == a1.length
+  for (var i = 0; i < a0.length; i++) {
+    if (a0[i] != a1[i]) return false;
+  }
+  return true;
+}
+function isEditMode() {
+  return $('#edit').button('option', 'label') == 'Disc';
+}
+function editMode(b) {
+  var btn = new Array('#step', '#run', '#edit');  
+  var label = (b) ? new Array('Step', 'Run', 'Edit') : new Array('Save Rst', 'Save Cont', 'Disc');
+  for (var i = 0; i < 3; i++) {  
+    $(btn[i]).button('option', 'label', label[i]);
+  }
+}
 function initTabs(elm) {
   elm.tabs();
   elm.tabs({ajaxOptions: {async: false}});
@@ -179,17 +268,15 @@ $(document).ready(function() {
   $.ajaxSetup({cache: false});
 
   $('button').button();
-  $('#run').click(function() {
-    if (contTimer == null) {
-      contProc('cont');
-      $('#run').button('option', 'label', 'stop');
-    } else {
-      stopRun();
-    }
-  });
   $('#step').click(function() {
     stepProc('step');
   });
+  $('#run').click(function() {
+    runProc('run');
+  });
+  $('#edit').click(function() {
+    editProc('edit');
+  });
   $('#waiting').ajaxError(function() {
     if (contTimer != null) {
       stopRun();
@@ -205,6 +292,7 @@ $(document).ready(function() {
     <div class="console">
       <button id="step">Step</button>
       <button id="run">Run</button>
+      <button id="edit">Edit</button>
     </div>
   </div>
   <div id="speed-panel">
@@ -239,6 +327,6 @@ $(document).ready(function() {
   <hr>
   <div id="waiting"></div>
   <address id="ruby-platform"></address>
-  <!-- hhmts start --> Last modified: Sun Oct 17 19:05:48 +0900 2010 <!-- hhmts end -->
+  <!-- hhmts start --> Last modified: Tue Nov 09 02:37:01 +0900 2010 <!-- hhmts end -->
 </div>    
 </body> </html>

data/lib/ruined/ruinmain.rb

@@ -7,9 +7,10 @@ require 'json'
 require 'thread'
 require 'monitor'
 require 'stringio'
+require 'fileutils'
 
 module Ruined
-  RUINED_VERSION = '0.0.9'
+  RUINED_VERSION = '0.1.0'
   
   @queue = [Queue.new, Queue.new]
   @breakpoints = []
@@ -68,7 +69,11 @@ module Ruined
     include WEBrick::HTMLUtils
     def service(req, res)
       if Ruined.local_call?(req.addr)
+        @response = res
+        @request = req
         super
+        @response = nil
+        @request = nil
       else
         bye(res)
       end
@@ -76,15 +81,21 @@ module Ruined
     def do_GET(req, res)
       m = %r|/debug/([^/?]+)/?([^?]*).*\Z|.match(req.unparsed_uri)
       if m
-        @response = res
         res.body = __send__(m[1].to_sym, *(m[2].split('/').map{|x|URI.decode(x)}))
       else
         bye(res)        
       end
-      @response = nil
+    end
+    def do_POST(req, res)
+      m = %r|/debug/([^/?]+)/?([^?]*).*\Z|.match(req.unparsed_uri)
+      if m && m[1] == 'file'
+        res.body = __send__(m[1].to_sym, *(m[2].split('/').map{|x|URI.decode(x)}))
+      else
+        bye(res)        
+      end
     end
 
-    attr_reader :response
+    attr_reader :response, :request
 
     def break(*a)
       if a.size < 3
@@ -122,11 +133,29 @@ module Ruined
     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>'
+      file = a.join('/')
+      if request.request_method == 'GET'
+        request.accept.each do |accept|
+          if accept =~ /html/i
+            break
+          elsif accept =~ %r|text/plain|i
+            File.open(file) do |f|
+              return Ruined::to_utf8(f.read)
+            end
+          end
+        end
+        to_html(file)
+      else
+        # TODO: newline and charset justify
+        # wb is workaround for inhibit to put addition \r
+        File.open("#{file}.new", 'wb') do |f|
+          f.write(request.body)
+        end
+        FileUtils.cp file, "#{file}.bak", :verbose => true
+        FileUtils.cp "#{file}.new", file, :verbose => true
+        FileUtils.rm "#{file}.new"
+        "save #{file}"
+      end  
     end
     
     def locals(*a)
@@ -164,7 +193,8 @@ module Ruined
     def create_varlist(t)
       s = '<table class="vars"><tr><th>Name</th><th>Value</th></tr>'
       t.each do |e|
-        s << "<tr><td>#{e[:name]}</td><td class=\"var-value\">#{escape(e[:value].inspect)}</td></tr>"
+        v = Ruined.to_utf8(e[:value].inspect)
+        s << "<tr><td>#{e[:name]}</td><td class=\"var-value\">#{escape(v)}</td></tr>"
       end
       s + '</table>'
     end
@@ -177,6 +207,14 @@ module Ruined
       end
     end
     
+    def to_html(file)
+      r = '<table>'
+      File.open(file).each_line do |line|
+        r << "<tr><td><pre>#{escape(Ruined::to_utf8(line))}</pre></td></tr>"
+      end.close
+      r + '</table>'
+    end
+    
     def bye(res)
       res.status = 404
       res.body = '<html>bye</html>'
@@ -265,11 +303,15 @@ EOD
     out.pos = 0
     ret = ''
     out.each_line do |x|
-      ret << "#{HTMLUtils.escape(x.chomp)}<br/>"
+      ret << "#{HTMLUtils.escape(to_utf8(x.chomp))}<br/>"
     end
     ret
   end
   
+  def self.to_utf8(s)
+    (s.encoding != Encoding::UTF_8) ? s.encode(Encoding::UTF_8) : s
+  end
+  
   def self.add_unbreakable(t)
     @monitor.synchronize {
       @unbreakable_threads << t

data/lib/uined.rb

@@ -45,7 +45,7 @@ else
     end
     sleep(1.5)
     run_app
-    res.body = '<html>restart</html>'
+    res.body = IO::read("#{File.dirname(__FILE__)}/ruined/html/waitclient.html")
   end
   svr.mount_proc('/quit') do |req, res|
     begin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruined
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - arton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 +09:00
+date: 2010-11-09 00:00:00 +09:00
 default_executable: 
 dependencies: []