tailog 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1794b84df23a5eb4dcc558ad01c5d4af80300272
-  data.tar.gz: 0f92833be4360d0da7e60ab3b909ca2ec6d140b9
+  metadata.gz: f16beba202bc6b12214c29111e8902b13d4d57f9
+  data.tar.gz: e9dff97596dfb7da548391f802943a498c944da7
 SHA512:
-  metadata.gz: 6309d780432e92dfddcebd5878736b88898bcf8525e0f15f700e7230a741e6ce968f51afefbe37ce463827da2d86f0a2251d2ec4fba7e24d5cf6d718163f64f3
-  data.tar.gz: 75bbe56d2a776238f00214b10de67e632b02d4e244800200070c78d31897fbe2f908494fa8338a9fd0625d6a15aecdf63bc95e47d7f3da331bc81820afe049fa
+  metadata.gz: 99b581a2eb9737d4433601b9c64d6e77f0c2fc213566cbf768bfc0680642a33ef9dfcf6f8908c4a323e3412e901f34819abf267a97207fefadaeb8233e6037b3
+  data.tar.gz: 48909e91421c2ae410385c893ceb1a0e7ab7a649560d2930edf1ced629fa9025692b53f18533cf0dba5c047bf4211b4a1efade72dee7482353064cefee783867

data/app/views/script/bash.erb

@@ -1,21 +1,13 @@
 <% begin %>
-  <% Open3.popen3("bash -x -e") do |stdin, stdout, stderr, wait_thr| %>
-    <% output = [] %>
-    <% Thread.new do until (line = stdout.gets).nil? do output << [ :stdout, line ] end end %>
-    <% Thread.new do until (line = stderr.gets).nil? do output << [ :stderr, line ] end end %>
-
-    <% stdin.puts script %>
-    <% stdin.puts "exit" %>
-    <% wait_thr.join %>
-
-    <% output.each do |key, line| %>
-      <% if key == :stdout %>
-        <p><%= h line %></p>
-      <% elsif line =~ /^\+ (.*)/ %>
-        <p class="text-info">$ <%= h $1 %></p>
-      <% else %>
-        <p class="text-danger"><%= h line %></p>
-      <% end %>
+  <% output = Bash.evaluate_string script %>
+  <% output.each do |key, line| %>
+    <% case key
+       when :stdin %>
+      <p class="text-info"><%= h line %></p>
+    <% when :stdout %>
+      <p><%= h line %></p>
+    <% when :stderr %>
+      <p class="text-danger"><%= h line %></p>
     <% end %>
   <% end %>
 <% rescue => error %>

data/app/views/script/ruby.erb

@@ -1,28 +1,15 @@
 <% begin %>
-  <% irb = IRB::Irb.new nil, StringInputMethod.new(script + "\nexit\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 class="text-info"><%= h line %></p>
-      <% when :stdout %>
-        <p><%= 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>
+  <% output = IRB.evaluate_string script %>
+  <% output.each do |key, line| %>
+    <% case key
+       when :stdin %>
+      <p class="text-info"><%= h line %></p>
+    <% when :stdout %>
+      <p><%= h line %></p>
+    <% when :stderr %>
+      <p class="text-danger"><%= h line %></p>
     <% end %>
   <% end %>
-
 <% rescue => error %>
   <%= erb :error, locals: { error: error }, layout: false %>
 <% end %>
-

data/lib/tailog/ext/bash.rb

@@ -0,0 +1,23 @@
+module Bash
+  def self.evaluate_string script
+    output = []
+
+    Open3.popen3("bash -x -e") do |stdin, stdout, stderr, wait_thr|
+      Thread.new do until (line = stdout.gets).nil? do output << [ :stdout, line ] end end
+      Thread.new do until (line = stderr.gets).nil? do output << [ :stderr, line ] end end
+
+      stdin.puts script
+      stdin.puts "exit"
+
+      wait_thr.join
+    end
+
+    output.map do |key, line|
+      if key == :stderr && line =~ /^\+ (.*)/
+        [:stdin, line]
+      else
+        [key, line]
+      end
+    end
+  end
+end

data/lib/tailog/ext/irb.rb

@@ -1,8 +1,6 @@
 require 'irb'
 
 IRB.init_config nil
-IRB.conf[:PROMPT_MODE] = :DEFAULT
-IRB.conf[:VERBOSE] = false
 
 class << IRB
   def Output
@@ -14,9 +12,13 @@ class << IRB
     conf[:VERBOSE] = false
     conf[:OUTPUT] = []
 
-    irb = Irb.new nil, StringInputMethod.new(string + "\n")
+    irb = IRB::Irb.new nil, StringInputMethod.new(string + "\nexit\n")
     conf[:MAIN_CONTEXT] = irb.context
     irb.eval_input
+
+    result = conf[:OUTPUT]
+    conf[:OUTPUT] = nil
+    result
   end
 
   alias_method :raw_irb_exit, :irb_exit

data/lib/tailog/version.rb

@@ -1,3 +1,3 @@
 module Tailog
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 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/bash'
 require 'tailog/ext/irb'
 
 require 'sinatra/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailog
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - bbtfr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -95,6 +95,7 @@ files:
 - bin/setup
 - lib/tailog.rb
 - lib/tailog/eval.rb
+- lib/tailog/ext/bash.rb
 - lib/tailog/ext/file.rb
 - lib/tailog/ext/integer.rb
 - lib/tailog/ext/irb.rb