shr 0.1.2 → 0.1.3

data/lib/shr/command.rb

@@ -31,11 +31,17 @@ module Shr
     end
 
     # xxx
-    def run(environment)
-      pid = spawn(self.to_s, environment)
+    def run(environment, command_out)
+      io_r, io_w = IO.pipe
+      options = { :out => io_w }
+      options[:in] = command_out if command_out
+      options.merge!(environment)
+
+      pid = spawn(self.to_s, options)
       watcher = Process.detach(pid)
-      environment[:out].close if environment[:out].kind_of?(IO)
-      watcher
+      io_w.close
+
+      [io_r, watcher]
     end
 
     # xxx

data/lib/shr/shell.rb

@@ -5,7 +5,7 @@ module Shr
   class Shell
 
     def initialize
-      @promise = []
+      @commands = []
     end
 
     def method_missing(name, *args)
@@ -25,7 +25,7 @@ module Shr
     end
 
     def inspect
-      command_line = @promise.join(' | ').strip
+      command_line = @commands.join(' | ').strip
       force
       res =  "#<Shr::Shell>"
       res << "<:command => #{command_line}>" if command_line.size > 0
@@ -68,34 +68,24 @@ module Shr
     end
 
     def delay(command)
-      @promise << command
+      @commands << command
     end
 
-    # xxx
     def force(args={})
-      return if @promise.empty?
+      return if @commands.empty?
 
-      @promise.each do |promise|
-        io_r, io_w = IO.pipe
-        environment = { :out => io_w }
-        environment[:in] = @command_out if @command_out
-        environment.merge!(args)
-
-        watcher = promise.run(environment)
-
-        @command_out = io_r
-        @wait_thread = watcher
+      @commands.each do |command|
+        @command_out, @wait_thread = command.run(args, @command_out)
       end
-
-      @promise.clear
+      @wait_thread.join
+      @commands.clear
     end
 
-    # xxx
     def force!
-      return if @promise.empty?
+      return if @commands.empty?
 
-      @promise[-1].run!
-      @promise.clear
+      @commands[-1].run!
+      @commands.clear
     end
   end
 end

data/lib/shr/version.rb

@@ -1,3 +1,3 @@
 module Shr
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/lib/shr/command_spec.rb

@@ -28,7 +28,8 @@ module Shr
 
     describe '#to_s' do
       it 'returns the command and parsed options' do
-        cmd.to_s.should eq('ls -l -t -r')
+        cmd.to_s.should eq('ls -l -t -r') unless OS.windows?
+        cmd.to_s.should eq('ls /l /t /r') if OS.windows?
       end
     end
 

data/spec/lib/shr/shell_spec.rb

@@ -84,7 +84,7 @@ module Shr
         it 'redirecs result of command to file' do
           tempfile = Tempfile.new('temp')
           sh.pwd.redirect_to(tempfile.path)
-          sh.cat(tempfile.path).to_s.should eq(`pwd`)
+          sh.cat.redirect_from(tempfile.path).to_s.should eq(`pwd`)
           tempfile.close!
         end
       end

data/spec/lib/shr/shell_win_spec.rb

@@ -67,7 +67,7 @@ module Shr
         it 'redirecs result of command to file' do
           tempfile = Tempfile.new('temp')
           sh.chdir.redirect_to(tempfile.path)
-          sh.type(tempfile.path.gsub('/', '\\')).to_s.should eq(`chdir`)
+          sh.more.redirect_from(tempfile.path).to_s.should eq(`chdir`)
           tempfile.close!
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -35,7 +35,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .swp
 - Gemfile
 - Guardfile
 - LICENSE.md