wunderbar 0.16.1 → 0.16.2

data/README.md

@@ -310,7 +310,9 @@ are sent individually and as they are produced.
 `_.system` will run an aritrary 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.
+itself.  If the command is an array, the elements of the array will be escaped
+as Shell command arguments.  Nested arrays may be used to hide elements from
+the echoing of the command to stdin.  Nil values are omitted.
 
 Options to `_websocket` are provided as a hash:  
 

data/lib/wunderbar/builder.rb

@@ -179,16 +179,22 @@ module Wunderbar
 
     # execute a system command, echoing stdin, stdout, and stderr
     def system(command, opts={})
-      if command.respond_to? :join
+      if command.respond_to? :flatten
+        flat = command.flatten
+        secret = command - flat
         begin
           # if available, use escape as it does prettier quoting
           require 'escape'
-          command = Escape.shell_command(command).untaint
+          echo = Escape.shell_command(command.compact - secret)
+          command = Escape.shell_command(flat.compact).untaint
         rescue LoadError
           # std-lib function that gets the job done
           require 'shellwords'
-          command = Shellwords.join(command).untaint
+          echo = Shellwords.join(command.compact - secret)
+          command = Shellwords.join(flat.compact).untaint
         end
+      else
+        echo = command
       end
 
       require 'open3'
@@ -198,7 +204,7 @@ module Wunderbar
       stdout = output_class[:stdout] || '_stdout'
       stderr = output_class[:stderr] || '_stderr'
 
-      @_builder.tag! tag, command, :class=>stdin unless opts[:echo] == false
+      @_builder.tag! tag, echo, :class=>stdin unless opts[:echo] == false
 
       require 'thread'
       semaphore = Mutex.new

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.16.1"
+  s.version = "0.16.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   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.21"
+  s.rubygems_version = "1.8.15"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,60 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wunderbar
-version: !ruby/object:Gem::Version 
-  hash: 93
+version: !ruby/object:Gem::Version
+  version: 0.16.2
   prerelease: 
-  segments: 
-  - 0
-  - 16
-  - 1
-  version: 0.16.1
 platform: ruby
-authors: 
+authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &5805260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *5805260
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &5804520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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"
+  prerelease: false
+  version_requirements: *5804520
+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
@@ -75,36 +62,26 @@ files:
 - 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: HTML Generator and CGI application support
 test_files: []
-