tailog 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d16334b0b46319a4bb6d4720e7b56fbf592dc52a
-  data.tar.gz: 34f8c3e366866577ab881d52dca2b4a74f915b07
+  metadata.gz: 8c4a061b770009df2e91f93ac5b5dad228187bde
+  data.tar.gz: 46d65f82419ac331348bdcb5025e6d0c0bd8de55
 SHA512:
-  metadata.gz: fb383a70f5fea68ec6c4ebe74a8e3db0335be9bdcea5f75d3f6a8d248534e918711f33d56341782f1ca828a63435b6f0a549f043d2c6ca9f0b379a3abd55c57f
-  data.tar.gz: 2ffe49df29b8fbb5a12b8bfbb98438e131f1791cc82a64fff9f581a2aa21769284c32ccbcea0a7f7a4abfd1f8620c4ee2224ede6c1fa767b08f2d5156b2f8b51
+  metadata.gz: 257905134ec95342d84b7521980e84cd9d428f520dd50ac932f09371c3359d90257f83a6a3b912c1217b1459effcec519120f8563c543bbdee9bc5909daacd63
+  data.tar.gz: cd734694966ded697fa5c4a3cd1492f448ec7b6ace86d7048c2dfd2bab1476f798afb7d3706482e27e2375c73d7514f1c966d35c7b554e5d7c9f83e64a68af72

data/app/views/script/index.erb

@@ -5,9 +5,9 @@
   <div class="pull-right">
     <select name="type" class="form-control" id="mode">
       <option value="ruby">Ruby</option>
-      <option value="ruby_debug">Ruby (Debug Mode)</option>
       <option value="bash">Bash</option>
     </select>
+    <button id="broadcast-button" type="submit" class="btn btn-danger">Broadcast</button>
     <button id="submit-button" type="submit" class="btn btn-primary">Submit</button>
   </div>
   <div>
@@ -35,9 +35,8 @@
     lineNumbers: true
   });
 
-  ModeMap = {
+  var ModeMap = {
     ruby: "ruby",
-    ruby_debug: "ruby",
     bash: "shell"
   };
 
@@ -45,30 +44,101 @@
     editor.setOption("mode", ModeMap[$(this).val()]);
   });
 
+  var $content = $("#content"),
+      $script = $("#script");
 
-  var $content = $("#content");
-
-  $("#script").ajaxForm({
-    beforeSend: function() {
-      $content
-        .html("<hr/>")
-        .append('<span class="text-info">Loading...</span>')
-    },
-    error: function() {
-      $content
-        .html("<hr/>")
-        .append('<span class="text-danger">Oops! Something went wrong, please try again later!</span>')
-    },
-    success: function(json) {
-      try {
-        var data = JSON.parse(json);
+  $("#submit-button").click(function(event) {
+    event.preventDefault();
+    editor.save();
+
+    $script.ajaxSubmit({
+      beforeSend: function() {
+        $content
+          .html("<hr/>")
+          .append('<span class="text-info">Loading...</span>');
+      },
+      error: function() {
         $content
           .html("<hr/>")
-          .append('<span class="text-info">' + data.server_hostname + "</span>")
-          .append(ansi_up.ansi_to_html(data.content));
-      } catch (error) {
-        console.error(error)
+          .append('<span class="text-danger">Oops! Something went wrong, please try again later!</span>');
+      },
+      success: function(json) {
+        try {
+          var data = JSON.parse(json);
+          $content
+            .html("<hr/>")
+            .append('<span class="text-info">' + data.server_hostname + " - " + data.process_uuid + "</span>")
+            .append(ansi_up.ansi_to_html(data.content));
+        } catch (error) {
+          console.error(error)
+        }
+      }
+    });
+  });
+
+  $("#broadcast-button").click(function(event) {
+    event.preventDefault();
+    editor.save();
+
+    $content
+      .html("<hr/>")
+      .append('<div class="progress"><div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" style="width: 0%"><span class="progress-bar-indicator">0 / 1 Requests, 0 Instances (0%)</span></div></div>');
+    var $progressBar = $(".progress-bar"),
+        $indicator = $(".progress-bar-indicator");
+
+    var MaxCurrent = 10;
+    var discovered = [],
+        totalEstimate = 1,
+        currentTries = 0,
+        concurrent = 0;
+
+    var ajaxInterval = setInterval(function() {
+      if (currentTries < totalEstimate) {
+        if (concurrent < MaxCurrent) {
+          $script.ajaxSubmit({
+            data: {
+              broadcast: true,
+              discovered_instances: discovered
+            },
+            beforeSend: function() {
+              currentTries += 1;
+              concurrent += 1;
+            },
+            error: function() {
+              $content
+                .html("<hr/>")
+                .append('<span class="text-danger">Oops! Something went wrong, please try again later!</span>')
+            },
+            success: function(json) {
+              try {
+                var data = JSON.parse(json);
+
+                var instanceId = data.instance_id;
+                if (discovered.indexOf(instanceId) < 0) {
+                  totalEstimate += currentTries * 2 + 2;
+                  discovered.push(instanceId);
+
+                  $content
+                    .append('<hr/><span class="text-info">' + data.server_hostname + " - " + data.process_uuid + "</span>")
+                    .append(ansi_up.ansi_to_html(data.content));
+                }
+
+                var percent = +parseFloat(currentTries / totalEstimate * 100).toFixed(2);
+                $indicator.text(currentTries + " / " + totalEstimate + " Requests, " + discovered.length + " Instances (" + percent + "%)");
+                $progressBar.width(percent + "%");
+
+              } catch (error) {
+                console.error(error)
+              }
+            },
+            complete: function() {
+              concurrent -= 1;
+            }
+          });
+        }
+      } else {
+        clearInterval(ajaxInterval);
       }
-    }
+    }, 100);
   });
 </script>

data/app/views/script/ruby.erb

@@ -1,10 +1,19 @@
 <% begin %>
-  <% output = StringIO.new %>
+  <% irb = IRB::Irb.new nil, StringInputMethod.new(script + "\nexit\n") %>
+  <% IRB.conf[:MAIN_CONTEXT] = irb.context %>
+  <% IRB.conf[:OUTPUT] = [] %>
 
   <% begin %>
-    <% output.send :eval, script %>
-    <% output.string.each_line do |line| %>
-      <p><%= h line %></p>
+    <% 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>

data/lib/tailog/ext/irb.rb

@@ -18,6 +18,10 @@ def IRB.evaluate_string string
   irb.eval_input
 end
 
+def IRB.irb_exit irb, ret
+  ret
+end
+
 class IRB::WorkSpace
   def evaluate(context, statements, file = __FILE__, line = __LINE__)
     @after_ruby_debug_erb = false

data/lib/tailog/version.rb

@@ -1,3 +1,3 @@
 module Tailog
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

data/lib/tailog.rb

@@ -20,6 +20,10 @@ module Tailog
     def server_hostname
       @server_hostname ||= Socket.gethostname
     end
+
+    def process_uuid
+      @process_uuid ||= SecureRandom.uuid
+    end
   end
 
   self.log_path = File.expand_path("log", Dir.pwd)
@@ -62,6 +66,7 @@ module Tailog
 
       {
         server_hostname: Tailog.server_hostname,
+        process_uuid: Tailog.process_uuid,
         file_size: file_size,
         content: content
       }.to_json
@@ -76,12 +81,21 @@ module Tailog
     end
 
     post '/script' do
-      content = erb :"script/#{params[:type]}", locals: { script: params[:script] }, layout: false
-
-      {
+      result = {
         server_hostname: Tailog.server_hostname,
-        content: content
-      }.to_json
+        process_uuid: Tailog.process_uuid
+      }
+
+      ignore_content = false
+      if params[:broadcast]
+        instance_id = result[:instance_id] = params[:type] == "bash" ? Tailog.server_hostname : Tailog.process_uuid
+        discovered_instances = params[:discovered_instances] || []
+        ignore_content = true if discovered_instances.include? instance_id
+      end
+
+      result[:content] = erb :"script/#{params[:type]}", locals: { script: params[:script] }, layout: false unless ignore_content
+
+      result.to_json
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailog
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - bbtfr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -91,7 +91,6 @@ files:
 - app/views/script/bash.erb
 - app/views/script/index.erb
 - app/views/script/ruby.erb
-- app/views/script/ruby_debug.erb
 - bin/console
 - bin/setup
 - lib/tailog.rb

data/app/views/script/ruby_debug.erb

@@ -1,28 +0,0 @@
-<% begin %>
-  <% 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 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>
-    <% end %>
-  <% end %>
-
-<% rescue => error %>
-  <%= erb :error, locals: { error: error }, layout: false %>
-<% end %>
-