wunderbar 0.12.3 → 0.13.0

data/lib/wunderbar/job-control.rb

@@ -1,6 +1,6 @@
 # run command/block as a background daemon
 module Wunderbar
-  def submit(cmd=nil)
+  def self.submit(cmd=nil)
     fork do
       # detach from tty
       Process.setsid
@@ -17,8 +17,10 @@ module Wunderbar
 
       # clear environment of cgi cruft
       require 'cgi'
-      ENV.delete_if {|key,value| key =~ /^HTTP_/}
-      CGI::QueryExtension.public_instance_methods.each do |method|
+      ENV.keys.select {|key| key =~ /^HTTP_/}.each do |key|
+        ENV.delete key.dup.untaint
+      end
+      ::CGI::QueryExtension.public_instance_methods.each do |method|
         ENV.delete method.to_s.upcase
       end
 

data/lib/wunderbar/version.rb

@@ -1,8 +1,8 @@
 module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 12
-    TINY  = 3
+    MINOR = 13
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/wunderbar/websocket.rb

@@ -0,0 +1,115 @@
+#!/usr/bin/ruby
+require 'rubygems'
+require 'open3'
+require 'socket'
+
+begin
+  require 'em-websocket'
+rescue LoadError
+  module EM
+    class Channel
+      def initialize
+        require 'em-websocket'
+      end
+    end
+  end
+end
+
+module Wunderbar
+  class Channel < EM::Channel
+    attr_reader :port
+
+    def initialize(port, limit=nil)
+      TCPSocket.new('localhost', port).close
+      raise ArgumentError.new "Socket #{port} is not available"
+    rescue Errno::ECONNREFUSED
+      super()
+      @port = port
+      @memory = []
+      @memory_channel = subscribe do |msg| 
+        @memory << msg.chomp unless Symbol === msg
+        @memory.shift while limit and @memory.length > limit
+      end
+      websocket.run
+    end
+
+    def websocket
+      @websocket ||= Thread.new do
+        EM::WebSocket.start(:host => '0.0.0.0', :port => @port) do |ws|
+          ws.onopen {@memory.each {|msg| ws.send msg }}
+      
+          sid = subscribe do |msg| 
+            if msg == :shutdown
+              ws.close_websocket
+            else
+              ws.send msg
+            end
+          end
+      
+          ws.onclose {unsubscribe sid}
+        end
+      end
+    end
+
+    def _(msg=nil, &block)
+      return self if msg==nil 
+      push(msg.to_json)
+    end
+
+    def system(command)
+      Open3.popen3(command) do |pin, pout, perr|
+        _ :type=>:stdin, :line=>command
+        [
+          Thread.new do
+            pout.sync=true
+            _ :type=>:stdout, :line=>pout.readline.chomp until pout.eof?
+          end,
+          Thread.new do
+            perr.sync=true
+            _ :type=>:stderr, :line=>perr.readline.chomp until perr.eof?
+          end,
+          Thread.new { pin.close }
+        ].each {|thread| thread.join}
+      end
+    end
+
+    def close
+      unsubscribe @memory_channel if @memory_channel
+      push :shutdown
+      sleep 1
+      EM::WebSocket.stop
+      websocket.join    
+    end
+  end
+
+  if defined? EventMachine::WebSocket
+    def self.websocket(port=nil, &block)
+      if not port
+        socket = TCPServer.new(0)
+        port = Socket.unpack_sockaddr_in(socket.getsockname).first
+        socket.close
+      end
+
+      submit do
+        begin
+          channel = Wunderbar::Channel.new(port)
+          channel.instance_eval &block
+        rescue Exception => exception
+          channel._ :type=>:stderr, :line=>exception.inspect
+          exception.backtrace.each do |frame| 
+            next if Wunderbar::CALLERS_TO_IGNORE.any? {|re| frame =~ re}
+            channel._ :type=>:stderr, :line=>"  #{frame}"
+          end
+        ensure
+          channel.push :shutdown
+          sleep 5
+          channel.close if channel
+        end
+      end
+
+      sleep 1
+
+      port
+    end
+  end
+end

data/lib/wunderbar.rb

@@ -11,5 +11,6 @@ require 'wunderbar/installation'
 require 'wunderbar/job-control'
 require 'wunderbar/logger'
 require 'wunderbar/server'
+require 'wunderbar/websocket'
 
 W_ = Wunderbar

data/wunderbar.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.12.3"
+  s.version = "0.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-04-25"
+  s.date = "2012-04-28"
   s.description = "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n    (utf-8), consistently indented, readable applications.  This includes\n    output that conforms to the Polyglot specification and the emerging\n    results from the XML Error Recovery Community Group.\n"
   s.email = "rubys@intertwingly.net"
-  s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/version.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/server.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/cgi-methods.rb"]
+  s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/installation.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/server.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "1.8.21"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,96 +1,110 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: wunderbar
-version: !ruby/object:Gem::Version
-  version: 0.12.3
+version: !ruby/object:Gem::Version 
+  hash: 43
   prerelease: 
+  segments: 
+  - 0
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
-authors:
+authors: 
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: builder
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML,
-  Unicode\n    (utf-8), consistently indented, readable applications.  This includes\n
-  \   output that conforms to the Polyglot specification and the emerging\n    results
-  from the XML Error Recovery Community Group.\n"
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+description: "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n    (utf-8), consistently indented, readable applications.  This includes\n    output that conforms to the Polyglot specification and the emerging\n    results from the XML Error Recovery Community Group.\n"
 email: rubys@intertwingly.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - wunderbar.gemspec
 - README.md
 - COPYING
 - lib/wunderbar.rb
-- lib/wunderbar/version.rb
 - lib/wunderbar/installation.rb
-- lib/wunderbar/cssproxy.rb
-- lib/wunderbar/rack.rb
+- lib/wunderbar/html-methods.rb
+- lib/wunderbar/job-control.rb
+- lib/wunderbar/server.rb
 - lib/wunderbar/logger.rb
+- lib/wunderbar/rack.rb
 - lib/wunderbar/builder.rb
+- lib/wunderbar/websocket.rb
 - lib/wunderbar/sinatra.rb
-- lib/wunderbar/rails.rb
-- lib/wunderbar/server.rb
-- lib/wunderbar/html-methods.rb
-- lib/wunderbar/job-control.rb
 - lib/wunderbar/environment.rb
+- lib/wunderbar/rails.rb
 - lib/wunderbar/cgi-methods.rb
+- lib/wunderbar/cssproxy.rb
+- lib/wunderbar/version.rb
 homepage: http://github.com/rubys/wunderbar
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: HTML Generator and CGI application support
 test_files: []
+