wunderbar 0.21.3 → 0.21.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8badf15d87c160ff80047cf11daa11c075f52cd1
+  data.tar.gz: 49055a8e408472bfa4b868ea45dfbf3133aa09d4
+SHA512:
+  metadata.gz: b325a928ba13e21146b98ecaea45a1eb53e7cece7e37c076f07b278373d9674798420370e295c798be7b20739106a189bba9095373ad45d22d3b0a8e3655eaa2
+  data.tar.gz: 76b378725828ff67d819119459e7aa480b9bd33d0284bd8dae28e37728e7fdcbdeb98f62933ee9f08b23d5993ea1024da7346d792f1e92a7fa3e0d6d2d2a8fd4

data/README.md

@@ -21,6 +21,8 @@ A [tutorial](https://github.com/rubys/wunderbar/blob/master/docs/Introduction1.m
 Additional functionality is provided by
 [extensions](https://github.com/rubys/wunderbar/blob/master/docs/Extensions.md).
 
+[![Build Status](https://travis-ci.org/rubys/wunderbar.svg)](https://travis-ci.org/rubys/wunderbar) 
+
 Overview
 ---
 
@@ -334,7 +336,7 @@ are sent individually and as they are produced.
 `_.recv` or `_.pop` can be used to receive arbitrary strings.  More commonly,
 `_.subscribe` is used to register a block that is used as a callback.
 
-`_.system` will run an aritrary command.  Lines of output are sent across the
+`_.system` will run an arbitrary command.  Lines of output are sent across the
 websocket as they are received as JSON encoded hashes with two values: `type`
 is one of `stdin`, `stdout` or `stderr`; and `line` which contains the line
 itself.  If the command is an array, the elements of the array will be escaped

data/lib/wunderbar/backtick.rb

@@ -0,0 +1,11 @@
+# Redefine backtic in HTML templates to do a Ruby => JS conversion.  Useful
+# when there is a substantial amount of embedded JavaScript, for example
+# when using Angular.js
+
+require 'ruby2js'
+
+class Wunderbar::HtmlMarkup
+  def `(input)
+    Ruby2JS.convert(input)
+  end
+end

data/lib/wunderbar/builder.rb

@@ -27,6 +27,75 @@ module Wunderbar
       end
       Wunderbar.websocket(*args, &block)
     end
+
+    # execute a system command, echoing stdin, stdout, and stderr
+    def system(command, opts={})
+      if command.respond_to? :flatten
+        flat = command.flatten
+        secret = command - flat
+        begin
+          # if available, use escape as it does prettier quoting
+          require 'escape'
+          echo = Escape.shell_command(command.compact - secret)
+        rescue LoadError
+          # std-lib function that gets the job done
+          require 'shellwords'
+          echo = Shellwords.join(command.compact - secret)
+        end
+        command = flat.compact.map(&:dup).map(&:untaint)
+      else
+        echo = command
+        command = [command]
+      end
+
+      patterns = opts[:hilite] || []
+      patterns=[patterns] if String === patterns or Regexp === patterns
+      patterns.map! do |pattern|
+        String === pattern ? Regexp.new(Regexp.escape(pattern)) : pattern
+      end
+
+      yield :stdin, echo unless opts[:echo] == false
+
+      require 'open3'
+      require 'thread'
+      semaphore = Mutex.new
+      Open3.popen3(*command) do |pin, pout, perr, wait|
+        [
+          Thread.new do
+            until pout.eof?
+              out_line = pout.readline.chomp
+              semaphore.synchronize do
+                if patterns.any? {|pattern| out_line =~ pattern}
+                  yield :hilight, out_line
+                else
+                  yield :stdout, out_line
+                end
+              end
+            end
+          end,
+
+          Thread.new do
+            until perr.eof?
+              err_line = perr.readline.chomp
+              semaphore.synchronize do
+                yield :stderr, err_line
+              end
+            end
+          end,
+
+          Thread.new do
+            if opts[:stdin].respond_to? :read
+              require 'fileutils'
+              FileUtils.copy_stream opts[:stdin], pin
+            elsif opts[:stdin]
+              pin.write opts[:stdin].to_s
+            end
+            pin.close
+          end
+        ].each {|thread| thread.join}
+        wait and wait.value.exitstatus
+      end
+    end
   end
 
   class XmlMarkup < BuilderClass
@@ -167,77 +236,15 @@ module Wunderbar
 
     # execute a system command, echoing stdin, stdout, and stderr
     def system(command, opts={})
-      if command.respond_to? :flatten
-        flat = command.flatten
-        secret = command - flat
-        begin
-          # if available, use escape as it does prettier quoting
-          require 'escape'
-          echo = Escape.shell_command(command.compact - secret)
-        rescue LoadError
-          # std-lib function that gets the job done
-          require 'shellwords'
-          echo = Shellwords.join(command.compact - secret)
-        end
-        command = flat.compact.map(&:dup).map(&:untaint)
-      else
-        echo = command
-        command = [command]
-      end
-      
-      patterns = opts[:hilite] || []
-      patterns=[patterns] if String === patterns or Regexp === patterns
-      patterns.map! do |pattern| 
-        String === pattern ? Regexp.new(Regexp.escape(pattern)) : pattern
-      end
-
-      require 'open3'
       tag  = opts[:tag]  || 'pre'
       output_class = opts[:class] || {}
-      stdin  = output_class[:stdin]  || '_stdin'
-      stdout = output_class[:stdout] || '_stdout'
-      stderr = output_class[:stderr] || '_stderr'
-      hilite = output_class[:hilite] || '_stdout _hilite'
-
-      tag! tag, echo, :class=>stdin unless opts[:echo] == false
-
-      require 'thread'
-      semaphore = Mutex.new
-      Open3.popen3(*command) do |pin, pout, perr, wait|
-        [
-          Thread.new do
-            until pout.eof?
-              out_line = pout.readline.chomp
-              semaphore.synchronize do
-                if patterns.any? {|pattern| out_line =~ pattern}
-                  tag! tag, out_line, :class=>hilite
-                else
-                  tag! tag, out_line, :class=>stdout
-                end
-              end
-            end
-          end,
+      output_class[:stdin]  ||= '_stdin'
+      output_class[:stdout] ||= '_stdout'
+      output_class[:stderr] ||= '_stderr'
+      output_class[:hilite] ||= '_stdout _hilite'
 
-          Thread.new do
-            until perr.eof?
-              err_line = perr.readline.chomp
-              semaphore.synchronize do 
-                tag! tag, err_line, :class=>stderr
-              end
-            end
-          end,
-
-          Thread.new do
-            if opts[:stdin].respond_to? :read
-              require 'fileutils'
-              FileUtils.copy_stream opts[:stdin], pin
-            elsif opts[:stdin]
-              pin.write opts[:stdin].to_s
-            end
-            pin.close
-          end
-        ].each {|thread| thread.join}
-        wait and wait.value.exitstatus
+      super do |kind, line|
+        tag! tag, line, class: output_class[kind]
       end
     end
 
@@ -399,6 +406,16 @@ module Wunderbar
       end
     end
 
+    # execute a system command, echoing stdin, stdout, and stderr
+    def system(command, opts={})
+      output_prefix = opts[:prefix] || {}
+      output_prefix[:stdin]  ||= '$ '
+
+      super do |kind, line|
+        @_target.puts "#{output_prefix[kind]}#{line}"
+      end
+    end
+
     def target!
       @_target.string
     end
@@ -503,6 +520,18 @@ module Wunderbar
       end
     end
 
+    # execute a system command, echoing stdin, stdout, and stderr
+    def system(command, opts={})
+      transcript = opts[:transcript]  || 'transcript'
+      output_prefix = opts[:prefix] || {}
+      output_prefix[:stdin]  ||= '$ '
+      @_target[transcript] ||= []
+
+      super do |kind, line|
+        @_target[transcript] << "#{output_prefix[kind]}#{line}"
+      end
+    end
+
     def target!
       begin
         JSON.pretty_generate(@_target)+ "\n"
@@ -510,5 +539,13 @@ module Wunderbar
         @_target.to_json + "\n"
       end
     end
+
+    def target?(type=nil)
+      if Class === type
+        type === @_target
+      else
+        @_target
+      end
+    end
   end
 end

data/lib/wunderbar/cgi-methods.rb

@@ -12,7 +12,7 @@ module Wunderbar
       headers['status'] =  "404 Not Found" if output == {}
     rescue Exception => exception
       headers['status'] =  "500 Internal Server Error"
-      builder._! Hash.new
+      builder._! Hash.new unless builder.target? Hash
       builder._exception exception
     ensure
       out?(scope, headers) { builder.target! }

data/lib/wunderbar/version.rb

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 21
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/wunderbar.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.21.3"
+  s.version = "0.21.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-05-13"
+  s.date = "2014-06-24"
   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/script.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/underscore.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/filter.rb", "lib/wunderbar/jquery/stupidtable.rb", "lib/wunderbar/vendor", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/jquery-1.11.0.min.js", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/websocket.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/version.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/server.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/opal", "lib/wunderbar/opal/browser.rb", "lib/wunderbar/opal/jquery.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/coderay.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/node.rb"]
+  s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/backtick.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/coderay.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/filter.rb", "lib/wunderbar/jquery/stupidtable.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/node.rb", "lib/wunderbar/opal", "lib/wunderbar/opal/browser.rb", "lib/wunderbar/opal/jquery.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/script.rb", "lib/wunderbar/server.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/underscore.rb", "lib/wunderbar/vendor", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/jquery-1.11.0.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/version.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.14"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])

metadata

@@ -1,36 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.21.3
-  prerelease: 
+  version: 0.21.4
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !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"
+description: |2
+      Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode
+      (utf-8), consistently indented, readable applications.  This includes
+      output that conforms to the Polyglot specification and the emerging
+      results from the XML Error Recovery Community Group.
 email: rubys@intertwingly.net
 executables: []
 extensions: []
@@ -39,75 +37,75 @@ files:
 - wunderbar.gemspec
 - README.md
 - COPYING
-- lib/wunderbar.rb
-- lib/wunderbar/script.rb
-- lib/wunderbar/jquery.rb
-- lib/wunderbar/underscore.rb
-- lib/wunderbar/polymer.rb
-- lib/wunderbar/jquery/filter.rb
-- lib/wunderbar/jquery/stupidtable.rb
-- lib/wunderbar/vendor/polymer-v0.0.20131003.min.js
-- lib/wunderbar/vendor/stupidtable.min.js
-- lib/wunderbar/vendor/bootstrap.min.js
-- lib/wunderbar/vendor/Markdown.Converter.js
-- lib/wunderbar/vendor/angular.min.js
-- lib/wunderbar/vendor/bootstrap-theme.min.css
-- lib/wunderbar/vendor/jquery-1.11.0.min.js
-- lib/wunderbar/vendor/angular-resource.min.js
-- lib/wunderbar/vendor/bootstrap.min.css
-- lib/wunderbar/vendor/underscore-min.js
-- lib/wunderbar/vendor/angular-route.min.js
-- lib/wunderbar/websocket.rb
-- lib/wunderbar/environment.rb
-- lib/wunderbar/pagedown.rb
-- lib/wunderbar/version.rb
-- lib/wunderbar/cgi-methods.rb
-- lib/wunderbar/server.rb
+- lib/wunderbar/angularjs/resource.rb
+- lib/wunderbar/angularjs/route.rb
 - lib/wunderbar/angularjs.rb
-- lib/wunderbar/logger.rb
 - lib/wunderbar/asset.rb
-- lib/wunderbar/opal/browser.rb
-- lib/wunderbar/opal/jquery.rb
-- lib/wunderbar/coffeescript.rb
-- lib/wunderbar/markdown.rb
-- lib/wunderbar/opal.rb
-- lib/wunderbar/installation.rb
+- lib/wunderbar/backtick.rb
+- lib/wunderbar/bootstrap/theme.rb
 - lib/wunderbar/bootstrap.rb
-- lib/wunderbar/job-control.rb
-- lib/wunderbar/sinatra.rb
-- lib/wunderbar/rails.rb
-- lib/wunderbar/angularjs/resource.rb
-- lib/wunderbar/angularjs/route.rb
-- lib/wunderbar/rack.rb
-- lib/wunderbar/coderay.rb
 - lib/wunderbar/builder.rb
-- lib/wunderbar/bootstrap/theme.rb
+- lib/wunderbar/cgi-methods.rb
+- lib/wunderbar/coderay.rb
+- lib/wunderbar/coffeescript.rb
 - lib/wunderbar/cssproxy.rb
+- lib/wunderbar/environment.rb
 - lib/wunderbar/html-methods.rb
+- lib/wunderbar/installation.rb
+- lib/wunderbar/job-control.rb
+- lib/wunderbar/jquery/filter.rb
+- lib/wunderbar/jquery/stupidtable.rb
+- lib/wunderbar/jquery.rb
+- lib/wunderbar/logger.rb
+- lib/wunderbar/markdown.rb
 - lib/wunderbar/node.rb
+- lib/wunderbar/opal/browser.rb
+- lib/wunderbar/opal/jquery.rb
+- lib/wunderbar/opal.rb
+- lib/wunderbar/pagedown.rb
+- lib/wunderbar/polymer.rb
+- lib/wunderbar/rack.rb
+- lib/wunderbar/rails.rb
+- lib/wunderbar/script.rb
+- lib/wunderbar/server.rb
+- lib/wunderbar/sinatra.rb
+- lib/wunderbar/underscore.rb
+- lib/wunderbar/vendor/angular-resource.min.js
+- lib/wunderbar/vendor/angular-route.min.js
+- lib/wunderbar/vendor/angular.min.js
+- lib/wunderbar/vendor/bootstrap-theme.min.css
+- lib/wunderbar/vendor/bootstrap.min.css
+- lib/wunderbar/vendor/bootstrap.min.js
+- lib/wunderbar/vendor/jquery-1.11.0.min.js
+- lib/wunderbar/vendor/Markdown.Converter.js
+- lib/wunderbar/vendor/polymer-v0.0.20131003.min.js
+- lib/wunderbar/vendor/stupidtable.min.js
+- lib/wunderbar/vendor/underscore-min.js
+- lib/wunderbar/version.rb
+- lib/wunderbar/websocket.rb
+- lib/wunderbar.rb
 homepage: http://github.com/rubys/wunderbar
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTML Generator and CGI application support
 test_files: []