win32-open3 0.2.8 → 0.2.9

data/CHANGES

@@ -1,10 +1,15 @@
-== 0.2.8 - 27-Feb-2008
+== 0.2.9 - 8-Mar-2009
+* Fixed a bug within an internal function that could cause an exception.
+  Thanks go to Ross Bunker for the spot and patch.
+* Fixed the release dates for 0.2.7 and 0.2.8 (2009, not 2008).
+
+== 0.2.8 - 27-Feb-2009
 * Fixed a potential bug where nil might be returned instead of an actual
   Process::Status object. Thanks go to Benny Bach for the spot.
 * The 'test' Rake task now runs the 'clean' task after the fact.
 * Some updates to the README about precompiled binaries.
 
-== 0.2.7 - 11-Jan-2008
+== 0.2.7 - 11-Jan-2009
 * Fixed a bug that could cause exitstatus to return bogus information. Thanks
   go to Roman Zawada for the spot.
 * Added a 'build_binary_gem' Rake task.

data/Rakefile

@@ -0,0 +1,86 @@
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rbconfig'
+include Config
+
+desc 'Install the win32-open3 library'
+task :install => [:build] do
+   Dir.chdir('ext'){
+      sh 'nmake install'
+   }
+end
+
+desc 'Install the win32-open3 library as a gem'
+task :install_gem do
+   ruby 'win32-open3.gemspec'
+   file = Dir["*.gem"].first
+   sh "gem install #{file}"
+end
+
+desc "Clean any build files for win32-open3"
+task :clean do
+   Dir.chdir('ext') do
+      if File.exists?('open3.so') || File.exists?('win32/open3.so')
+         sh 'nmake distclean'
+         rm 'win32/open3.so' if File.exists?('win32/open3.so') 
+      end
+   end
+end
+
+desc "Build win32-open3 (but don't install it)"
+task :build => [:clean] do
+   Dir.chdir('ext') do
+      ruby 'extconf.rb'
+      sh 'nmake'
+      mv 'open3.so', 'win32' # For the test suite
+   end
+end
+
+desc "Run the sample program"
+task :example => [:build] do |t|
+   Dir.chdir('examples'){
+      sh 'ruby -I../ext open3_test.rb'
+   }
+end
+
+desc "Build a binary gem"
+task :build_binary_gem => [:build] do
+   mkdir_p 'lib/win32'
+   mv 'ext/win32/open3.so', 'lib/win32'
+
+   task :build_binary_gem => [:clean]
+
+   spec = Gem::Specification.new do |gem|
+      gem.name         = "win32-open3"
+      gem.version      = "0.2.9"
+      gem.authors      = ["Park Heesob", "Daniel Berger"]
+      gem.email        = "djberg96@gmail.com"
+      gem.homepage     = "http://www.rubyforge.org/projects/win32utils"
+      gem.rubyforge_project = "win32utils"
+      gem.platform     = Gem::Platform::CURRENT
+      gem.summary      = 'Provides an Open3.popen3 implementation for MS Windows'
+      gem.description  = 'Provides an Open3.popen3 implementation for MS Windows'
+      gem.has_rdoc     = true
+      gem.test_files   = Dir['test/test*']
+      files            = Dir["lib/win32/open3.so"] + Dir["test/*"]
+      files.delete_if{ |f| f.include?('CVS') }
+      gem.files = files
+      gem.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST', 'ext/win32/open3.c']
+      gem.rubyforge_project = 'win32utils'
+      gem.required_ruby_version = '>= 1.8.2'
+   end
+
+   Gem::Builder.new(spec).build
+end
+
+Rake::TestTask.new('test') do |test|
+   task :test => [:build]
+   test.libs << 'ext'
+   test.warning = true
+   test.verbose = true
+end
+
+task :test do
+   Rake.application[:clean].execute
+end

data/examples/win32_open3_example.rb

@@ -0,0 +1,34 @@
+##############################################################################
+# win32_open3_example.rb
+#
+# Test script for the win32-open3 library. You should run this via the
+# 'rake example' Rakefile task.
+#
+# Modify as you see fit.
+##############################################################################
+require 'win32/open3'
+
+puts "VERSION: " + Open3::WIN32_OPEN3_VERSION
+
+cmd1 = 'ver'   # valid
+cmd2 = 'verb'  # invalid
+cmd3 = "ruby -e 'exit 1'" # valid, with explicit exit status
+
+# Try each command as you like...
+Open3.popen3(cmd3){ |io_in, io_out, io_err|
+   error = io_err.read
+   if error && error.length > 0
+      puts 'Error: ' + error
+      break
+   else
+      output = io_out.read
+      puts 'Output: ' + output if output
+   end
+}
+
+p $?.class
+p $? >> 8
+p $?.stopped?
+p $?.exited?
+p $?.exitstatus
+p $?.pid

data/ext/Makefile

@@ -0,0 +1,181 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = win32
+topdir = C:/Ruby/lib/ruby/1.8/i386-mswin32
+hdrdir = $(topdir)
+VPATH = $(srcdir);$(topdir);$(hdrdir)
+
+DESTDIR = C:
+prefix = $(DESTDIR)/Ruby
+exec_prefix = $(prefix)
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+datadir = $(prefix)/share
+includedir = $(prefix)/include
+infodir = $(prefix)/info
+sysconfdir = $(prefix)/etc
+mandir = $(prefix)/man
+libdir = $(exec_prefix)/lib
+sharedstatedir = $(DESTDIR)/etc
+oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+localstatedir = $(DESTDIR)/var
+bindir = $(exec_prefix)/bin
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = cl -nologo
+LIBRUBY = $(RUBY_SO_NAME).lib
+LIBRUBY_A = $(RUBY_SO_NAME)-static.lib
+LIBRUBYARG_SHARED = $(LIBRUBY)
+LIBRUBYARG_STATIC = $(LIBRUBY_A)
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -MD -Zi -O2b2xg- -G6 
+INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS = -DHAVE_TYPE_RB_PID_T 
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS =  -link -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH) -def:$(DEFFILE) -implib:$(*F:.so=)-$(arch).lib -pdb:$(*F:.so=)-$(arch).pdb 
+LDSHARED = cl -nologo -LD
+AR = lib -nologo
+EXEEXT = .exe
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = msvcrt-ruby18
+arch = i386-mswin32
+sitearch = i386-msvcrt
+ruby_version = 1.8
+ruby = C:/Ruby/bin/ruby
+RUBY = $(ruby:/=\)
+RM = $(RUBY) -run -e rm -- -f
+MAKEDIRS = @$(RUBY) -run -e mkdir -- -p
+INSTALL = @$(RUBY) -run -e install -- -vp
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 0644
+COPY = copy > nul
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -libpath:"." -libpath:"$(libdir)"
+DEFFILE = $(TARGET)-$(arch).def
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = vc*.pdb $(DEFFILE)
+
+extout = 
+extout_prefix = 
+target_prefix = /win32
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib  
+SRCS = open3.c
+OBJS = open3.obj
+TARGET = open3
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.obj *.lib *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS:/=\) $(CLEANOBJS:/=\) $(CLEANFILES:/=\)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES:/=\)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB:/=\) $(RUBYARCHDIR:/=\)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .obj
+
+{$(srcdir)}.cc{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cc{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cc{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cc.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cxx{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cxx{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cxx{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cxx.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cpp{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cpp{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cpp{}.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cpp.obj:
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.c{}.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+{$(topdir)}.c{}.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+{$(hdrdir)}.c{}.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+.c.obj:
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+$(DLLIB): $(DEFFILE) $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) -Fe$(@) $(OBJS) $(LIBS) $(LOCAL_LIBS) $(DLDFLAGS)
+
+
+
+$(DEFFILE): 
+	$(RUBY) -e "puts 'EXPORTS', 'Init_$(TARGET)'"  > $@
+
+$(OBJS): {.;$(srcdir);$(topdir);$(hdrdir)}ruby.h {.;$(srcdir);$(topdir);$(hdrdir)}defines.h

data/ext/mkmf.log

@@ -0,0 +1,19 @@
+have_type: checking for rb_pid_t in ruby.h... -------------------- yes
+
+"cl -nologo -I. -IC:/Ruby/lib/ruby/1.8/i386-mswin32 -I.  -MD -Zi -O2b2xg- -G6   -c conftest.c"
+conftest.c
+checked program was:
+/* begin */
+1: #define WIN32_LEAN_AND_MEAN
+2: #define WIN32
+3: #include <winsock2.h>
+4: #include <windows.h>
+5: #include <ruby.h>
+6: 
+7: /*top*/
+8: typedef rb_pid_t conftest_type;
+9: static conftest_type conftestval[sizeof(conftest_type)?1:-1];
+/* end */
+
+--------------------
+

data/ext/open3-i386-mswin32.def

@@ -0,0 +1,2 @@
+EXPORTS
+Init_open3

data/ext/win32/open3.c

@@ -74,7 +74,7 @@ static char* rb_io_modenum_mode(int flags, char* mode){
       }
       else{
          mode[1] = 'b'; mode[2] = '\0';
-      }      
+      }
    }
 #endif
    return mode;
@@ -96,15 +96,15 @@ static VALUE io_close(VALUE val) {
  * call-seq:
  *    Open3.popen3(cmd, mode='t', show=false)
  *    Open3.popen3(cmd, mode='t', show=false){ |io_in, io_out, io_err| ... }
- * 
+ *
  * Executes 'command', returning an array of three IO handles representing
  * STDIN, STDOUT and STDERR, respectively.  In block form these IO handles
  * are yielded back to the block and automatically closed at the end of the
  * block.
- *  
+ *
  * You may optionally pass a mode flag of 't' (text, the default) or 'b'
  * (binary) to this method.
- *  
+ *
  * If the 'show' variable is set to true, then a console window is shown.
  */
 static VALUE win32_popen3(int argc, VALUE *argv, VALUE klass)
@@ -133,13 +133,13 @@ static VALUE win32_popen3(int argc, VALUE *argv, VALUE klass)
       tm = _O_BINARY;
 
    v_port = ruby_popen(StringValuePtr(v_name), tm, v_show_window);
-   
+
    // Ensure handles are closed in block form
    if(rb_block_given_p()){
       rb_ensure(rb_yield_splat, v_port, io_close, v_port);
       return win32_last_status;
    }
-   
+
    return v_port;
 }
 
@@ -168,7 +168,7 @@ static BOOL RubyCreateProcess(char *cmdstring, HANDLE hStdin, HANDLE hStdout,
 
       ++comshell;
 
-      // Windows 95, 98 and ME are not supported      
+      // Windows 95, 98 and ME are not supported
       if(GetVersion() < 0x80000000 && _stricmp(comshell, "command.com") != 0){
          x = i + strlen(s3) + strlen(cmdstring) + 1;
          s2 = ALLOCA_N(char, x);
@@ -246,7 +246,7 @@ static BOOL RubyCreateProcess(char *cmdstring, HANDLE hStdin, HANDLE hStdout,
    rb_raise(rb_eRuntimeError, "CreateProcess() failed: %s",
       ErrorDescription(GetLastError())
    );
-   
+
    return FALSE;
 }
 
@@ -281,9 +281,9 @@ static void win32_pipe_finalize(OpenFile *file, int noraise)
 
    if(pid_handle != NULL){
       GetExitCodeProcess(pid_handle, &status);
-      CloseHandle(pid_handle);
 
       if(status != STILL_ACTIVE){
+    	 CloseHandle(pid_handle);
          pid_handle = NULL;
          win32_set_last_status(status, file->pid);
       }
@@ -522,7 +522,7 @@ static VALUE ruby_popen(char *cmdstring, int mode, VALUE v_show_window)
          ErrorDescription(GetLastError())
       );
    }
-   
+
    return port;
 }
 
@@ -533,15 +533,15 @@ static VALUE ruby_popen(char *cmdstring, int mode, VALUE v_show_window)
 void Init_open3()
 {
    VALUE mOpen3 = rb_define_module("Open3");
-   
+
    VALUE mOpen4 = rb_define_module("Open4");
 
    rb_define_module_function(mOpen3, "popen3", win32_popen3, -1);
    rb_define_module_function(mOpen4, "popen4", win32_popen3, -1);
-   
-   /* 0.2.8: The version of this library */
+
+   /* 0.2.9: The version of this library */
    rb_define_const(mOpen3, "WIN32_OPEN3_VERSION", rb_str_new2(WIN32_OPEN3_VERSION));
-   
-   /* 0.2.8: The version of this library */
+
+   /* 0.2.9: The version of this library */
    rb_define_const(mOpen4, "WIN32_OPEN3_VERSION", rb_str_new2(WIN32_OPEN3_VERSION));
 }

data/win32-open3.gemspec

@@ -0,0 +1,28 @@
+require 'rubygems'
+
+spec = Gem::Specification.new do |gem|
+   gem.name             = 'win32-open3'
+   gem.version          = '0.2.9'
+   gem.authors          = ['Park Heesob', 'Daniel J. Berger']
+   gem.email            = 'djberg96@gmail.com'
+   gem.homepage         = 'http://www.rubyforge.org/projects/win32utils'
+   gem.platform         = Gem::Platform::RUBY
+   gem.summary          = 'Provides an Open3.popen3 implementation for MS Windows'
+   gem.description      = 'Provides an Open3.popen3 implementation for MS Windows'
+   gem.test_file        = 'test/test_win32_open3.rb'
+   gem.has_rdoc         = true
+   gem.extra_rdoc_files = ['CHANGES', 'README', 'MANIFEST', 'doc/open3.txt', 'ext/win32/open3.c']
+   gem.rubyforge_project      = 'win32utils'
+   gem.required_ruby_version  = '>= 1.8.2'
+
+   files = Dir["**/*"]
+   files.delete_if{ |item| item.include?('CVS') }
+
+	gem.extensions = ['ext/extconf.rb']
+   gem.files = files
+end
+
+if $PROGRAM_NAME == __FILE__
+   Gem.manage_gems if Gem::RubyGemsVersion.to_f < 1.0
+   Gem::Builder.new(spec).build
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-open3
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Park Heesob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -07:00
+date: 2009-03-07 23:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,15 +27,33 @@ extra_rdoc_files:
 - doc/open3.txt
 - ext/win32/open3.c
 files: 
+- CHANGES
+- doc
 - doc/open3.txt
-- test/test_win32_open3.rb
+- examples
+- examples/win32_open3_example.rb
+- ext
 - ext/extconf.rb
+- ext/Makefile
+- ext/mkmf.log
+- ext/open3-i386-mswin32.def
+- ext/open3-i386-mswin32.exp
+- ext/open3-i386-mswin32.lib
+- ext/open3-i386-mswin32.pdb
+- ext/open3.obj
+- ext/vc60.pdb
 - ext/win32
 - ext/win32/open3.c
 - ext/win32/open3.h
-- CHANGES
-- README
+- lib
+- lib/win32
+- lib/win32/open3.so
 - MANIFEST
+- Rakefile
+- README
+- test
+- test/test_win32_open3.rb
+- win32-open3.gemspec
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/win32utils
 post_install_message: 
@@ -58,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Provides an Open3.popen3 implementation for MS Windows