wunderbar 0.16.7 → 0.16.8

data/lib/wunderbar/builder.rb

@@ -194,15 +194,15 @@ module Wunderbar
           # if available, use escape as it does prettier quoting
           require 'escape'
           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'
           echo = Shellwords.join(command.compact - secret)
-          command = Shellwords.join(flat.compact).untaint
         end
+        command = flat.compact.map(&:untaint)
       else
         echo = command
+        command = [command]
       end
       
       patterns = opts[:hilite] || []
@@ -223,7 +223,7 @@ module Wunderbar
 
       require 'thread'
       semaphore = Mutex.new
-      Open3.popen3(command) do |pin, pout, perr|
+      Open3.popen3(*command) do |pin, pout, perr, wait|
         [
           Thread.new do
             until pout.eof?
@@ -257,6 +257,7 @@ module Wunderbar
             pin.close
           end
         ].each {|thread| thread.join}
+        wait and wait.value.exitstatus
       end
     end
 

data/lib/wunderbar/cssproxy.rb

@@ -46,6 +46,10 @@ module Wunderbar
       args.push(@attrs)
       args = @args + args unless block or String === args.first
 
+      if @sym == :pre
+        args.first.chomp! if String === args.first and args.first.end_with? "\n"
+      end
+
       while @stream.length > @original_stream_length
         @stream.pop
       end

data/lib/wunderbar/html-methods.rb

@@ -198,6 +198,7 @@ module Wunderbar
     end
     
     def _pre(*args, &block)
+      args.first.chomp! if String === args.first and args.first.end_with? "\n"
       @x.disable_indentation! { @x.tag! :pre, *args, &block }
     end
 

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.16.7"
+  s.version = "0.16.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-06-06"
+  s.date = "2012-06-11"
   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/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"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 79
   prerelease: 
   segments: 
   - 0
   - 16
-  - 7
-  version: 0.16.7
+  - 8
+  version: 0.16.8
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder