tailog 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8036aae9bdd63431019506197d16da8dc03f8078
-  data.tar.gz: 75a7f2f95b80ae5a4d3e8a78290ba8f2fe3a17c3
+  metadata.gz: dbe0ce3cbc6cfee5b3f0654a74e6c1b7b88e3095
+  data.tar.gz: 64b6ce2ddab91b524011d8d9e826ad70df0c5c42
 SHA512:
-  metadata.gz: 46d340edf38fadf9a8e42a6ea8865d9892fb762d6217c60f76f3f658f2a11124652efa4928483574a0c0e86c802e6c447ad8e30ccd4d99e43014287880aca1d4
-  data.tar.gz: 0722815ec64c24bdb81347e33fa95e6af6626fc6f44eaa979f54d417b24a197f5fc98d15bfd001dd77838b7a45fb4c389acc452fe0afa3e0504e6976fed383b3
+  metadata.gz: 4a8eabf2bd84d64aebb6bf3670ff0a6cfb87b8661b1992838f2a58fdb569754cce0f07f842bb3207554b60f376860a6390998e9fe241af73e5d0d48a86d81821
+  data.tar.gz: 390fb9fbc007d02fd2d6a9acaec2adad9aa4e0e2c011475d8b05a674df2c85081ef852129e7c64e1f0fdb5f84e44ca5920a78bff2275c921fe7c95ce3d569c61

data/app/views/script/index.erb

@@ -8,7 +8,10 @@
       <option value="ruby_debug">Ruby (Debug Mode)</option>
       <option value="bash">Bash</option>
     </select>
-    <button type="submit" class="btn btn-primary">Submit</button>
+    <button id="submit-button" type="submit" class="btn btn-primary">Submit</button>
+  </div>
+  <div>
+    Press <kbd><kbd>Ctrl</kbd> + <kbd>Enter</kbd></kbd> to submit code
   </div>
 </form>
 
@@ -19,14 +22,17 @@
 <script type="text/javascript" src="javascripts/mode/shell.js"></script>
 <link rel="stylesheet" type="text/css" href="stylesheets/codemirror.css">
 <script type="text/javascript">
+  var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
+  CodeMirror.keyMap.default["Tab"] =  function(editor) {
+    var spaces = Array(editor.getOption("indentUnit") + 1).join(" ");
+    editor.replaceSelection(spaces);
+  };
+  CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Enter"] =  function(editor) {
+    $("#submit-button").trigger('click');
+  };
+
   var editor = CodeMirror.fromTextArea($("#editor")[0], {
-    lineNumbers: true,
-    extraKeys: {
-      Tab: function(editor) {
-        var spaces = Array(editor.getOption("indentUnit") + 1).join(" ");
-        editor.replaceSelection(spaces);
-      }
-    }
+    lineNumbers: true
   });
 
   ModeMap = {

data/app/views/script/ruby.erb

@@ -1,12 +1,11 @@
 <% begin %>
-
-  <% input = StringIO.new(script) %>
   <% output = StringIO.new %>
-  <% binding = Object.new.send :binding %>
 
   <% begin %>
-    <% Pry.start binding, input: input, output: output %>
-    <%= h output.string %>
+    <% output.send :eval, script %>
+    <% output.string.each_line do |line| %>
+      <p><%= h line %></p>
+    <% end %>
   <% rescue => error %>
     <p class="text-danger"><%= h error.class %>: <%= h error.message %></p>
     <% error.backtrace.each do |backtrace| %>

data/app/views/script/ruby_debug.erb

@@ -1,16 +1,28 @@
 <% begin %>
-  <% binding = Object.new.send :binding %>
-  <% script.each_line do |line| %>
-    <% next if line.strip.empty? %>
-    <p class="text-info">&gt; <%= h line %></p>
-    <% begin %>
-      <% result = binding.eval(line).inspect %>
-      <p>=> <%= h result %></p>
-    <% rescue => error %>
-      <p class="text-danger"><%= h error.class %>: <%= h error.message %></p>
-      <% break %>
+  <% irb = IRB::Irb.new nil, StringInputMethod.new(script + "\n") %>
+  <% IRB.conf[:MAIN_CONTEXT] = irb.context %>
+  <% IRB.conf[:OUTPUT] = [] %>
+
+  <% begin %>
+    <% irb.eval_input %>
+    <% IRB.Output.each do |key, line| %>
+      <% case key %>
+      <% when :stdin %>
+        <p><%= h line %></p>
+      <% when :stdout %>
+        <p class="text-info"><%= h line %></p>
+      <% when :stderr %>
+        <p class="text-danger"><%= h line %></p>
+      <% end %>
+    <% end %>
+  <% rescue => error %>
+    <p class="text-danger"><%= h error.class %>: <%= h error.message %></p>
+    <% error.backtrace.each do |backtrace| %>
+      <p class="text-danger">    <%= h backtrace %></p>
     <% end %>
   <% end %>
+
 <% rescue => error %>
   <%= erb :error, locals: { error: error }, layout: false %>
 <% end %>
+

data/lib/tailog/ext/irb.rb

@@ -0,0 +1,51 @@
+require 'irb'
+
+IRB.setup nil
+
+def IRB.Output
+  IRB.conf[:OUTPUT]
+end
+
+class IRB::WorkSpace
+  def evaluate(context, statements, file = __FILE__, line = __LINE__)
+    @after_ruby_debug_erb = false
+    eval(statements, @binding, file, line)
+  end
+
+  FILTER_BACKTRACE_REGEX = /#{__FILE__}/
+  def filter_backtrace backtrace
+    return if @after_ruby_debug_erb
+    if backtrace =~ FILTER_BACKTRACE_REGEX
+      @after_ruby_debug_erb = true
+      return
+    else
+      backtrace.sub(/:\s*in `irb_binding'/, '')
+    end
+  end
+end
+
+class IRB::Irb
+  def output_value
+    context = IRB.CurrentContext
+    IRB.Output << [ :stdout, context.return_format % context.inspect_last_value ]
+  end
+
+  def print *args
+    IRB.Output << [ :stderr, args.join ]
+  end
+
+  def printf format, *args
+    IRB.Output << [ :stderr, format % args ]
+  end
+end
+
+class StringInputMethod < StringIO
+  attr_accessor :prompt
+  def encoding; string.encoding end
+
+  def gets
+    line = super
+    IRB.Output << [ :stdin, line ] if line
+    line
+  end
+end

data/lib/tailog/version.rb

@@ -1,3 +1,3 @@
 module Tailog
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/tailog.rb

@@ -4,6 +4,7 @@ require 'tailog/request_id'
 require 'tailog/watch_methods'
 require 'tailog/ext/file'
 require 'tailog/ext/integer'
+require 'tailog/ext/irb'
 
 require 'sinatra/base'
 require 'socket'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailog
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - bbtfr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -98,6 +98,7 @@ files:
 - lib/tailog/eval.rb
 - lib/tailog/ext/file.rb
 - lib/tailog/ext/integer.rb
+- lib/tailog/ext/irb.rb
 - lib/tailog/request_id.rb
 - lib/tailog/version.rb
 - lib/tailog/watch_methods.rb