webtail 0.0.2 → 0.0.3

data/bin/webtail

@@ -4,7 +4,7 @@ require "slop"
 argv = ARGV.dup
 slop = Slop.new(:strict => true, :help => true)
 slop.banner "$ tail -f ... | webtail [options]"
-slop.on :p, :port, "port number for http server (default is 9999)"
+slop.on :p, :port=, "port number for http server (default is 9999)"
 begin
   slop.parse!(argv)
 rescue => e

data/lib/webtail/app.rb

@@ -18,7 +18,9 @@ module Webtail
 
     class Server < ::Sinatra::Base
       path = File.expand_path("~/.webtailrc")
-      set :webtailrc, File.exist?(path) && File.read(path)
+      set :webtailrc do
+        File.exist?(path) && File.read(path)
+      end
       set :root, File.expand_path("../../../", __FILE__)
 
       get "/" do

data/lib/webtail/stdin.rb

@@ -2,9 +2,16 @@ module Webtail
   module Stdin
     extend self
 
+    ENTITY_MAP = {
+      "&lt;" => "<",
+      "&gt;" => ">",
+    }
+
     def run
       STDIN.each do |line|
-        Webtail.channel << strip_ansi_sequence(line)
+        line = unescape_entity(line)
+        line = strip_ansi_sequence(line)
+        Webtail.channel << line
       end
     end
 
@@ -13,5 +20,9 @@ module Webtail
     def strip_ansi_sequence(str)
       str.gsub(/\e\[.*?m/, "")
     end
+
+    def unescape_entity(str)
+      str.gsub(/#{Regexp.union(ENTITY_MAP.keys)}/o) {|key| ENTITY_MAP[key] }
+    end
   end
 end

data/lib/webtail/version.rb

@@ -1,3 +1,3 @@
 module Webtail
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/public/js/webtail.js

@@ -3,14 +3,15 @@ var Webtail = {
     var self = this;
     jQuery(function($) {
       var socket = new (WebSocket || MozWebSocket)('ws://localhost:' + port);
+      var context = {};
       socket.onmessage = function(message) {
-        $.each(self.onmessages, function() { this(message) });
+          $.each(self.onmessages, function() { this(message, context) });
       };
     });
   },
 
   onmessages: [
-    function(message) {
+    function(message, context) {
       // To ignore serial empty lines
       if (message.data == '\n' && $('pre:last').text() == '\n') return;
 

data/views/index.erb

@@ -10,7 +10,7 @@
     <script type="text/javascript" src="/js/webtail.js"></script>
     <script type="text/javascript">
       <% if @webtailrc %>
-      Webtail.onmessages.push(function() {
+      Webtail.onmessages.push(function(message, context) {
         <%= @webtailrc %>
       });
       <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webtail
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70139463093720 !ruby/object:Gem::Requirement
+  requirement: &70318316704200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139463093720
+  version_requirements: *70318316704200
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70139463093220 !ruby/object:Gem::Requirement
+  requirement: &70318316701640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139463093220
+  version_requirements: *70318316701640
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70139463092740 !ruby/object:Gem::Requirement
+  requirement: &70318316700780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139463092740
+  version_requirements: *70318316700780
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70139463092300 !ruby/object:Gem::Requirement
+  requirement: &70318316700060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139463092300
+  version_requirements: *70318316700060
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70139463091780 !ruby/object:Gem::Requirement
+  requirement: &70318316698040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70139463091780
+  version_requirements: *70318316698040
 description: Stdin to your browser by WebSocket
 email:
 - r7kamura@gmail.com