win32-open3 0.2.9 → 0.3.0

data/CHANGES

@@ -1,3 +1,10 @@
+== 0.3.0 - 22-Jun-2009
+* Fixed an issue where the block form of the Open3.popen3 method did not
+  return the exit value.
+* Fixed the version number.
+* Added a test to validate the exit value in block form.
+* Updated the gemspec description.
+
 == 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.

data/MANIFEST

@@ -8,4 +8,4 @@
 * ext/extconf.rb
 * ext/win32/open3.c
 * ext/win32/open3.h
-* test/tc_open3.rb
+* test/test_win32_open3.rb

data/Rakefile

@@ -53,22 +53,39 @@ task :build_binary_gem => [:build] do
 
    spec = Gem::Specification.new do |gem|
       gem.name         = "win32-open3"
-      gem.version      = "0.2.9"
+      gem.version      = "0.3.0"
       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.extra_rdoc_files = [
+         'README',
+         'CHANGES',
+         'MANIFEST',
+         'doc/open3.txt',
+         'ext/win32/open3.c'
+      ]
+
       gem.rubyforge_project = 'win32utils'
       gem.required_ruby_version = '>= 1.8.2'
+
+      gem.description = <<-EOF
+         The win32-open3 library provides a working implemetation of the open3
+         library for MS Windows. In addition, it provides the Open4 class, which
+         also returns pid information.
+      
+         Note that this library is largely unnecessary with Ruby 1.9.x because of
+         its support for native threads.
+      EOF
    end
 
    Gem::Builder.new(spec).build

data/ext/win32/open3.c

@@ -136,8 +136,7 @@ static VALUE win32_popen3(int argc, VALUE *argv, VALUE klass)
 
    // 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 rb_ensure(rb_yield_splat, v_port, io_close, v_port);
    }
 
    return v_port;

data/ext/win32/open3.h

@@ -1,4 +1,4 @@
-#define WIN32_OPEN3_VERSION "0.2.8"
+#define WIN32_OPEN3_VERSION "0.3.0"
 #define MAX_STRING 512
 
 static VALUE io_alloc _((VALUE));

data/test/test_win32_open3.rb

@@ -17,11 +17,12 @@ class TC_Win32_Open3 < Test::Unit::TestCase
       @stdin    = nil
       @stdout   = nil
       @stderr   = nil
+      @value    = nil
    end
 
    def test_open3_version
-      assert_equal('0.2.8', Open3::WIN32_OPEN3_VERSION)
-      assert_equal('0.2.8', Open4::WIN32_OPEN3_VERSION)
+      assert_equal('0.3.0', Open3::WIN32_OPEN3_VERSION)
+      assert_equal('0.3.0', Open4::WIN32_OPEN3_VERSION)
    end
    
    def test_open3_basic
@@ -94,8 +95,19 @@ class TC_Win32_Open3 < Test::Unit::TestCase
       assert_nil(fout.gets)
    end
    
+   def test_exit_status_in_block_form_popen4
+      assert_nothing_raised{ @value = Open3.popen3('dir'){ |x,y,z| 1 } }
+      assert_equal(1, @value)
+   end
+   
+   def test_exit_status_in_block_form_popen4
+      assert_nothing_raised{ @value = Open4.popen4('dir'){ |x,y,z,a| 1 } }
+      assert_equal(1, @value)
+   end
+   
    def teardown
       @good_cmd = nil
       @bad_cmd  = nil
+      @value    = nil
    end
 end

data/win32-open3.gemspec

@@ -1,19 +1,35 @@
 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'
+   gem.name      = 'win32-open3'
+   gem.version   = '0.3.0'
+   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.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'
+   
+   gem.description = <<-EOF
+      The win32-open3 library provides a working implemetation of the open3
+      library for MS Windows. In addition, it provides the Open4 class, which
+      also returns pid information.
+      
+      Note that this library is largely unnecessary with Ruby 1.9.x because of
+      its support for native threads.
+   EOF
 
    files = Dir["**/*"]
    files.delete_if{ |item| item.include?('CVS') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-open3
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors: 
 - Park Heesob
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-07 23:00:00 -07:00
+date: 2009-06-22 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
-description: Provides an Open3.popen3 implementation for MS Windows
+description: "      The win32-open3 library provides a working implemetation of the open3\n      library for MS Windows. In addition, it provides the Open4 class, which\n      also returns pid information.\n      \n      Note that this library is largely unnecessary with Ruby 1.9.x because of\n      its support for native threads.\n"
 email: djberg96@gmail.com
 executables: []
 
@@ -28,34 +28,20 @@ extra_rdoc_files:
 - ext/win32/open3.c
 files: 
 - CHANGES
-- doc
 - doc/open3.txt
-- 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
-- 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
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -76,9 +62,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Provides an Open3.popen3 implementation for MS Windows
 test_files: 
 - test/test_win32_open3.rb

data/ext/Makefile

@@ -1,181 +0,0 @@
-
-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

@@ -1,19 +0,0 @@
-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

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