sfl 1.1 → 1.2

data/lib/sfl.rb

@@ -1,31 +1,46 @@
 class SFL
   attr_reader :command, :environment, :argument, :option
 
+  # SFL.new('ls', '-a') becomes
+  #   @environment = {}
+  #   @command = ['ls', 'ls']
+  #   @argument = ['-a']
+  #   @option = {}
   def initialize(*cmdandarg)
     raise ArgumentError if cmdandarg.size == 0
     cmdandarg = cmdandarg.dup
 
-    tmp = cmdandarg.shift
-    if Hash === tmp
-      @environment = tmp
-      tmp = cmdandarg.shift
-    else
-      @environment = {}
-    end
+    @environment =
+      if Hash === cmdandarg.first
+        cmdandarg.shift
+      else
+        {}
+      end
 
-    if String === tmp
-      @command = [tmp, tmp]
-    else
-      @command = tmp
-    end
+    @option =
+      if Hash === cmdandarg.last
+        cmdandarg.pop
+      else
+        {}
+      end
 
-    if Hash === cmdandarg.last
-      @option = cmdandarg.pop
+    if cmdandarg.size == 1
+      cmdandarg = cmdandarg.first
+      if String === cmdandarg
+        cmd, *arg = self.class.parse_command_with_arg(cmdandarg)
+        @command = [cmd, cmd]
+        @argument = arg
+      else
+        @command = cmdandarg
+        @argument = []
+      end
     else
-      @option = {}
+      # 'ls', '.' -> [['ls', 'ls'], '.']
+      cmd = cmdandarg.shift
+      cmd = (String === cmd) ? [cmd, cmd] : cmd
+      @command = cmd
+      @argument = cmdandarg
     end
-
-    @argument = cmdandarg
   end
 
   def run
@@ -98,17 +113,48 @@ class SFL
         ast
       end
     end
+
+    def parse_command_with_arg(x)
+      in_squote = false
+      in_dquote = false
+      tmp = ''
+      cmdargs = []
+      x.strip.split(//).each do |c|
+        case c
+        when '"'
+          if in_dquote
+            in_dquote = false
+          else
+            in_dquote = true
+          end
+        when "'"
+          if in_squote
+            in_squote = false
+          else
+            in_squote = true
+          end
+        when ' '
+          if in_dquote || in_squote
+            tmp << ' '
+          else
+            cmdargs << tmp
+            tmp = ''
+          end
+        else
+          tmp << c
+        end
+      end
+      cmdargs << tmp
+    end
   end
 end
 
-if RUBY_VERSION < '1.9'
-  def spawn(*x)
-    SFL.new(*x).run
-  end
+def spawn(*x)
+  SFL.new(*x).run
+end
 
-  def Process.spawn(*x)
-    SFL.new(*x).run
-  end
+def Process.spawn(*x)
+  SFL.new(*x).run
 end
 
 if RUBY_VERSION <= '1.8.6'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sfl
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  hash: 11
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - ujihisa
@@ -34,21 +39,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Spawn For Ruby 1.8