io-extra 1.2.5 → 1.2.6

data/CHANGES

@@ -1,3 +1,10 @@
+== 1.2.6 - 22-May-2011
+* Fixed a potential memory leak in the pread_ptr method where malloc'ed
+  memory was not freed if the pread function call failed. Thanks go to
+  Eric Wong for the spot.
+* Added the IO#ttyname method.
+* Added the (empty) .gemtest file for test.rubygems.org.
+
 == 1.2.5 - 23-Mar-2011
 * Use rb_thread_blocking_region internally for IO.pread and IO.pwrite. Thanks
   go to Eric Wong for the patch.

data/MANIFEST

@@ -7,4 +7,5 @@
 * examples/example_io_extra.rb
 * ext/extconf.rb
 * ext/io/extra.c
-* test/test_io_extra.rb
+* test/test_io_extra.rb
+*.gemtest

data/ext/extconf.rb

@@ -15,6 +15,7 @@ have_func('pwrite')
 have_func('writev')
 have_func('rb_str_set_len', 'ruby.h')
 have_func('rb_thread_blocking_region')
+have_func('ttyname')
 
 case RbConfig::CONFIG['host_os']
 when /darwin/i

data/ext/io/extra.c

@@ -367,15 +367,17 @@ static VALUE s_io_pread(VALUE klass, VALUE fd, VALUE nbyte, VALUE offset){
  * address with pure Ruby.
  */
 static VALUE s_io_pread_ptr(VALUE klass, VALUE v_fd, VALUE v_nbyte, VALUE v_offset){
-   int fd = NUM2INT(v_fd);
-   size_t nbyte = NUM2ULONG(v_nbyte);
-   off_t offset = NUM2OFFT(v_offset);
-   uintptr_t* vector = malloc(nbyte + 1);
+  int fd = NUM2INT(v_fd);
+  size_t nbyte = NUM2ULONG(v_nbyte);
+  off_t offset = NUM2OFFT(v_offset);
+  uintptr_t* vector = malloc(nbyte + 1);
 
-   if(pread(fd, vector, nbyte, offset) == -1)
-      rb_sys_fail("pread");
+  if(pread(fd, vector, nbyte, offset) == -1){
+    free(vector);
+    rb_sys_fail("pread");
+  }
 
-   return ULL2NUM(vector[0]);
+  return ULL2NUM(vector[0]);
 }
 #endif
 
@@ -538,6 +540,29 @@ static VALUE s_io_writev(VALUE klass, VALUE fd, VALUE ary) {
 }
 #endif
 
+#ifdef HAVE_TTYNAME
+/*
+ * io.ttyname
+ *
+ * Returns the ttyname associated with the IO object, or nil if the IO
+ * object isn't associated with a tty.
+ *
+ * Example:
+ *
+ *  STDOUT.ttyname # => '/dev/ttyp1'
+ */
+static VALUE io_get_ttyname(VALUE self){
+  VALUE v_return = Qnil;
+
+  int fd = NUM2INT(rb_funcall(self, rb_intern("fileno"), 0, 0));
+
+  if(isatty(fd))
+    v_return = rb_str_new2(ttyname(fd));
+
+  return v_return;
+}
+#endif
+
 /* Adds the IO.closefrom, IO.fdwalk class methods, as well as the IO#directio
  * and IO#directio? instance methods (if supported on your platform).
  */
@@ -579,6 +604,10 @@ void Init_extra(){
    rb_define_singleton_method(rb_cIO, "writev", s_io_writev, 2);
 #endif
 
-   /* 1.2.5: The version of this library. This a string. */
-   rb_define_const(rb_cIO, "EXTRA_VERSION", rb_str_new2("1.2.5"));
+#ifdef HAVE_TTYNAME
+  rb_define_method(rb_cIO, "ttyname", io_get_ttyname, 0);
+#endif
+
+   /* 1.2.6: The version of this library. This a string. */
+   rb_define_const(rb_cIO, "EXTRA_VERSION", rb_str_new2("1.2.6"));
 }

data/io-extra.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   end
    
   spec.name       = 'io-extra'
-  spec.version    = '1.2.5'
+  spec.version    = '1.2.6'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.summary    = 'Adds extra methods to the IO class.'
   spec.test_file  = 'test/test_io_extra.rb'
   spec.extensions = ['ext/extconf.rb']
-  spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.files      = Dir['**/*'] << '.gemtest'
 
   spec.extra_rdoc_files = [
     'CHANGES',
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
    
   spec.description = <<-EOF
     Adds the IO.closefrom, IO.fdwalk, IO.pread, IO.pread_ptr, IO.pwrite, and
-    IO.writev singleton methods as well as the IO#directio and IO#directio?
-    instance methods (for those platforms that support them).
+    IO.writev singleton methods as well as the IO#directio, IO#directio? and
+    IO#ttyname instance methods (for those platforms that support them).
   EOF
 end

data/test/test_io_extra.rb

@@ -20,7 +20,7 @@ class TC_IO_Extra < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal('1.2.5', IO::EXTRA_VERSION)
+    assert_equal('1.2.6', IO::EXTRA_VERSION)
   end
 
   def test_direct_constant
@@ -147,6 +147,12 @@ class TC_IO_Extra < Test::Unit::TestCase
     end
   end
 
+  def test_ttyname
+    assert_respond_to(@fh, :ttyname)
+    assert_nil(@fh.ttyname)
+    assert_kind_of(String, STDOUT.ttyname)
+  end
+
   def teardown
     @fh.close rescue nil
     @fh = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: io-extra
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -06:00
-default_executable: 
+date: 2011-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
@@ -34,7 +33,7 @@ dependencies:
         version: 2.1.1
   type: :development
   version_requirements: *id001
-description: "    Adds the IO.closefrom, IO.fdwalk, IO.pread, IO.pread_ptr, IO.pwrite, and\n    IO.writev singleton methods as well as the IO#directio and IO#directio?\n    instance methods (for those platforms that support them).\n"
+description: "    Adds the IO.closefrom, IO.fdwalk, IO.pread, IO.pread_ptr, IO.pwrite, and\n    IO.writev singleton methods as well as the IO#directio, IO#directio? and\n    IO#ttyname instance methods (for those platforms that support them).\n"
 email: djberg96@gmail.com
 executables: []
 
@@ -46,18 +45,18 @@ extra_rdoc_files:
 - MANIFEST
 - ext/io/extra.c
 files: 
-- Rakefile
-- README
-- doc/io_extra.txt
-- io-extra.gemspec
 - CHANGES
+- doc/io_extra.txt
 - examples/example_io_extra.rb
 - examples/example_pread.rb
-- test/test_io_extra.rb
-- MANIFEST
 - ext/extconf.rb
 - ext/io/extra.c
-has_rdoc: true
+- io-extra.gemspec
+- MANIFEST
+- Rakefile
+- README
+- test/test_io_extra.rb
+- .gemtest
 homepage: http://www.rubyforge.org/projects/shards
 licenses: 
 - Artistic 2.0
@@ -89,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.6.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Adds extra methods to the IO class.