sfl 2.1 → 2.2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 2.2
+
+* support command lines including shell special characters
+* bugfix: sfl won't re-define Kernel.spawn on Ruby 1.9
+
+# 2.1
+
+* Livence: the 2-clause BSDL or the Ruby licence.
+
 # 2.0
 
 Version 2.0 is done completely by Bernard Lambeau. Thanks!

data/lib/sfl.rb

@@ -1,5 +1,7 @@
 class SFL
-  VERSION = "2.1".freeze
+  VERSION = "2.2".freeze
+
+  SHELL_SPECIALS = %r([\*\?\{\}\[\]<>\(\)~&\|\\\$;'`"\n])m.freeze
 
   attr_reader :command, :environment, :argument, :option
 
@@ -29,9 +31,14 @@ class SFL
     if cmdandarg.size == 1
       cmdandarg = cmdandarg.first
       if String === cmdandarg
-        cmd, *arg = self.class.parse_command_with_arg(cmdandarg)
-        @command = [cmd, cmd]
-        @argument = arg
+        if SHELL_SPECIALS === cmdandarg
+          @command = cmdandarg
+          @argument = []
+        else
+          cmd, *arg = self.class.parse_command_with_arg(cmdandarg)
+          @command = [cmd, cmd]
+          @argument = arg
+        end
       else
         @command = cmdandarg
         @argument = []
@@ -174,7 +181,7 @@ class SFL
   end
 end
 
-if RUBY_VERSION <= "1.9"
+if RUBY_VERSION < "1.9"
   def Kernel.spawn(*x)
     SFL.new(*x).run
   end

data/spec/mocker.rb

@@ -0,0 +1,5 @@
+        require '/home/ujihisa/git/spawn-for-legacy/lib/sfl'
+      
+        pid = Kernel.spawn('cat', {:in => File.expand_path('../../README.md', __FILE__)})
+        Process.wait(pid)
+        

data/spec/mocker_output.txt

@@ -0,0 +1,50 @@
+# Spawn for Legacy
+
+![demo](http://gyazo.com/e22144b2aadbbecfc43761f95c27bf3e.png)
+
+Kernel.spawn in ruby 1.9 solves all issues on asynchronous executions[[1]](http://ujihisa.blogspot.com/2010/03/how-to-run-external-command.html)[[2]](http://ujihisa.blogspot.com/2010/03/all-about-spawn.html).
+But ruby 1.8, the legacy version of MRI, is still used on many environments.
+
+This library provides `spawn()` which is almost perfectly compatible with ruby 1.9's.
+This library is pure ruby; you don't need to build it.
+
+## Install
+
+    gem install sfl
+
+## How to use
+
+    require 'rubygems'
+    require 'sfl'
+    
+    spawn 'ls'
+
+If your ruby is 1.9, `require 'sfl'` doesn't do anything. If your ruby is 1.8, that defines `spawn`.
+
+## How compatible this spawn is?
+
+(I'll put the coverage here later)
+
+## Misc.
+
+* At first I tried to use the name `spawn` as this gem library name, but the name was already used. The `spawn` gem library does not mean ruby 1.9's `spawn` at all.
+* Ruby 1.9's `open3` library, based on `spawn`, is very useful. I would like to port `open3` to ruby 1.8 in my future.
+
+## Supports
+
+* (On MacOS) MRI 1.8.6, 1.8.7, 1.9.1, 1.9.2-rc2 
+* (On UNIX) MRI 1.8.6, 1.8.7, 1.9.1, 1.9.2pre
+* (On Windows) MRI 1.9.1, 1.9.2pre
+
+Currently there are no supports on:
+
+* MRI 1.8 on Windows
+* Other Ruby implementations such as JRuby, Rubinius and MacRuby
+
+## Authors
+
+Tatsuhiro Ujihisa
+<http://ujihisa.blogspot.com/>
+
+Bernard Lambeau
+<http://revision-zero.org/>

data/spec/sfl_spec.rb

@@ -57,6 +57,34 @@ describe 'Kernel.spawn' do
     end
   end
 
+  context 'with command "echo ahi"' do
+    it 'outputs "ahi" on stdout' do
+      mocker(%q|
+        pid = Kernel.spawn('echo ahi')
+        Process.wait(pid)
+        |).chomp.should == "ahi"
+    end
+  end
+
+  context 'with command "true && echo ahi"' do
+    it 'outputs "ahi" on stdout' do
+      mocker(%q|
+        pid = Kernel.spawn('true && echo ahi')
+        Process.wait(pid)
+        |).chomp.should == "ahi"
+    end
+  end
+
+  context 'with command "false || :"' do
+    it 'does not fail' do
+      mocker(%q[
+        pid = Kernel.spawn('false || :')
+        Process.wait(pid)
+        puts 'ahi' if $?.to_i == 0
+        ]).chomp.should == "ahi"
+    end
+  end
+
   # The following test is unsound and lead to spec
   # failures under specific rubies...
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfl
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156998460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156998460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156997600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,12 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2156997600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 description: Spawn For Ruby 1.8
 email: ujihisa at gmail.com
 executables: []
@@ -42,6 +52,8 @@ extra_rdoc_files:
 - README.md
 files:
 - lib/sfl.rb
+- spec/mocker.rb
+- spec/mocker_output.txt
 - spec/sfl_spec.rb
 - sfl.gemspec
 - Rakefile
@@ -67,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Spawn For Ruby 1.8