childprocess 0.3.2 → 0.3.3

data/lib/childprocess/abstract_process.rb

@@ -19,6 +19,11 @@ module ChildProcess
     #
     attr_reader :environment
 
+    #
+    # Set the child's current working directory.
+    #
+    attr_accessor :cwd
+
     #
     # Create a new process with the given args.
     #

data/lib/childprocess/jruby/process.rb

@@ -66,7 +66,7 @@ module ChildProcess
       def launch_process(&blk)
         pb = java.lang.ProcessBuilder.new(@args)
 
-        pb.directory java.io.File.new(Dir.pwd)
+        pb.directory java.io.File.new(@cwd || Dir.pwd)
         set_env pb.environment
 
         begin

data/lib/childprocess/unix/fork_exec_process.rb

@@ -18,6 +18,10 @@ module ChildProcess
         end
 
         @pid = fork {
+          if @cwd
+            Dir.chdir(@cwd)
+          end
+
           exec_r.close
           set_env
 

data/lib/childprocess/unix/posix_spawn_process.rb

@@ -1,10 +1,13 @@
 require 'ffi'
+require 'thread'
 
 module ChildProcess
   module Unix
     class PosixSpawnProcess < Process
       private
 
+      @@cwd_lock = Mutex.new
+
       def launch_process
         pid_ptr = FFI::MemoryPointer.new(:pid_t)
         actions = Lib::FileActions.new
@@ -41,21 +44,26 @@ module ChildProcess
         argv = Argv.new(@args)
         envp = Envp.new(ENV.to_hash.merge(@environment))
 
-        if ChildProcess.jruby?
-          # on JRuby, the current working directory is for some reason not inherited.
-          # We'll work around it by making a chdir call through FFI.
-          # TODO: report this to JRuby
-          Lib.chdir Dir.pwd
-        end
+        ret = 0
+        @@cwd_lock.synchronize do
+          Dir.chdir(@cwd || Dir.pwd) do
+            if ChildProcess.jruby?
+              # on JRuby, the current working directory is for some reason not inherited.
+              # We'll work around it by making a chdir call through FFI.
+              # TODO: report this to JRuby
+              Lib.chdir Dir.pwd
+            end
 
-        ret = Lib.posix_spawnp(
-          pid_ptr,
-          @args.first, # TODO: not sure this matches exec() behaviour
-          actions,
-          attrs,
-          argv,
-          envp
-        )
+            ret = Lib.posix_spawnp(
+              pid_ptr,
+              @args.first, # TODO: not sure this matches exec() behaviour
+              actions,
+              attrs,
+              argv,
+              envp
+            )
+          end
+        end
 
         if duplex?
           io._stdin = writer

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/childprocess/windows/process.rb

@@ -53,6 +53,7 @@ module ChildProcess
         builder.detach      = detach?
         builder.duplex      = duplex?
         builder.environment = @environment unless @environment.empty?
+        builder.cwd         = @cwd
 
         if @io
           builder.stdout      = @io.stdout

data/lib/childprocess/windows/process_builder.rb

@@ -1,7 +1,7 @@
 module ChildProcess
   module Windows
     class ProcessBuilder
-      attr_accessor :inherit, :detach, :duplex, :environment, :stdout, :stderr
+      attr_accessor :inherit, :detach, :duplex, :environment, :stdout, :stderr, :cwd
       attr_reader :stdin
 
       def initialize(args)
@@ -11,6 +11,7 @@ module ChildProcess
         @detach      = false
         @duplex      = false
         @environment = nil
+        @cwd         = nil
 
         @stdout      = nil
         @stderr      = nil
@@ -19,11 +20,13 @@ module ChildProcess
         @flags       = 0
         @cmd_ptr     = nil
         @env_ptr     = nil
+        @cwd_ptr     = nil
       end
 
       def start
         create_command_pointer
         create_environment_pointer
+        create_cwd_pointer
 
         setup_detach
         setup_io
@@ -63,6 +66,10 @@ module ChildProcess
         @env_ptr.put_bytes 0, env_str, 0, env_str.bytesize
       end
 
+      def create_cwd_pointer
+        @cwd_ptr = FFI::MemoryPointer.from_string(@cwd || Dir.pwd)
+      end
+
       def create_process
         ok = Lib.create_process(
           nil,          # application name
@@ -72,7 +79,7 @@ module ChildProcess
           @inherit,     # inherit handles
           @flags,       # creation flags
           @env_ptr,     # environment
-          cwd,          # current directory
+          @cwd_ptr,     # current directory
           startup_info, # startup info
           process_info  # process info
         )
@@ -94,10 +101,6 @@ module ChildProcess
         @flags |= DETACHED_PROCESS if @detach
       end
 
-      def cwd
-        @cwd ||= FFI::MemoryPointer.from_string(Dir.pwd)
-      end
-
       def setup_io
         if @stdout || @stderr
           startup_info[:dwFlags] ||= 0
@@ -173,4 +176,4 @@ module ChildProcess
       end
     end # ProcessBuilder
   end # Windows
-end # ChildProcess
+end # ChildProcess

data/spec/childprocess_spec.rb

@@ -168,4 +168,25 @@ describe ChildProcess do
     lambda { process.poll_for_exit(0.1) }.should raise_error(ChildProcess::TimeoutError)
   end
 
+  it "can change working directory" do
+    process = ruby "print Dir.pwd"
+
+    with_tmpdir { |dir|
+      process.cwd = dir
+
+      orig_pwd = Dir.pwd
+
+      Tempfile.open('cwd') do |file|
+        process.io.stdout = file
+
+        process.start
+        process.wait
+
+        file.rewind
+        file.read.should == dir
+      end
+
+      Dir.pwd.should == orig_pwd
+    }
+  end
 end

data/spec/spec_helper.rb

@@ -123,6 +123,17 @@ module ChildProcessSpecHelper
     port
   end
 
+  def with_tmpdir(&blk)
+    name = "#{Time.now.strftime("%Y%m%d")}-#{$$}-#{rand(0x100000000).to_s(36)}"
+    FileUtils.mkdir_p(name)
+
+    begin
+      yield File.expand_path(name)
+    ensure
+      FileUtils.rm_rf name
+    end
+  end
+
   def wait_until(timeout = 10, &blk)
     end_time = Time.now + timeout
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: childprocess
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: childprocess
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This gem aims at being a simple and reliable solution for controlling external