shell_tools 0.1.0 → 0.1.2

data/lib/shell_tools.rb

@@ -22,21 +22,20 @@ module ShellTools
   end
 
   def escape_word(str)
-    if str.empty?
-      "''"
-    elsif %r{\A[0-9A-Za-z+,./:=@_-]+\z} =~ str
-      str
-    else
-      result = ''
-      str.scan(/('+)|[^']+/) {
-        if $1
-          result << %q{\'} * $1.length
-        else
-          result << "'#{$&}'"
-        end
-      }
-      result
-    end
+    # An empty argument will be skipped, so return empty quotes.
+    return "''" if str.empty?
+
+    str = str.dup
+
+    # Process as a single byte sequence because not all shell
+    # implementations are multibyte aware.
+    str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
+
+    # A LF cannot be escaped with a backslash because a backslash + LF
+    # combo is regarded as line continuation and simply ignored.
+    str.gsub!(/\n/, "'\n'")
+
+    return str
   end
 
   def capture
@@ -55,4 +54,22 @@ module ShellTools
     $stdout.reopen(old_out)
     $stderr.reopen(old_err)
   end
+
+  def capture_stdout
+    out, _ = capture { yield }
+    out
+  end
+
+  def capture_all
+    old_out, old_err = STDOUT.dup, STDERR.dup
+    stdall_read, stdall_write = IO.pipe
+    $stdout.reopen(stdall_write)
+    $stderr.reopen(stdall_write)
+    yield
+    stdall_write.close
+    stdall_write.rewind && stdall_write.read rescue ""
+  ensure
+    $stdout.reopen(old_out)
+    $stderr.reopen(old_err)
+  end
 end

data/lib/shell_tools/version.rb

@@ -1,3 +1,3 @@
 module ShellTools
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shell_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70259743014820 !ruby/object:Gem::Requirement
+  requirement: &70162956312120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259743014820
+  version_requirements: *70162956312120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70259743013800 !ruby/object:Gem::Requirement
+  requirement: &70162956311600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259743013800
+  version_requirements: *70162956311600
 description: Some common shell utils.
 email:
 - joshbuddy@gmail.com
@@ -61,24 +61,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -759511355527622154
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -759511355527622154
 requirements: []
 rubyforge_project: shell_tools
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Some common shell utils
 test_files:
 - test/shell_utils_test.rb
 - test/test_helper.rb
+has_rdoc: