io-extra 1.2.3 → 1.2.4

data/CHANGES

@@ -1,3 +1,10 @@
+== 1.2.4 - 22-Mar-2011
+* Use NUM2OFFT where appropriate. Fixes potential 32 vs 64 bit issues. Thanks
+  go to Eric Wong for the spot and patch.
+* Added an example program for IO.pread, and a corresponding Rake task.
+* Config substituted with RbConfig, since the former is apparently going to
+  deprecated in 1.9. Thanks go to Eric Wong for the spot and patch.
+
 == 1.2.3 - 25-Oct-2010
 * Documentation updates to the README.
 * Updates to the Rakefile, including archive tasks, a default task, and

data/Rakefile

@@ -2,33 +2,29 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
+include RbConfig
 
-if Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i
+CLEAN.include(
+  '**/*.gem',               # Gem files
+  '**/*.rbc',               # Rubinius
+  '**/*.o',                 # C object file
+  '**/*.log',               # Ruby extension build log
+  '**/Makefile',            # C Makefile
+  '**/conftest.dSYM',       # OS X build directory
+  "**/*.#{CONFIG['DLEXT']}" # C shared object
+)
+
+if File::ALT_SEPARATOR
   STDERR.puts 'Not supported on this platform. Exiting.'
   exit(-1)
 end
 
-desc "Clean the build files for the io-extra source"
-task :clean do
-  Dir['*.gem'].each{ |f| File.delete(f) }
-  Dir['**/*.rbc'].each{ |f| File.delete(f) } # Rubinius
-  rm_rf('io') if File.exists?('io')
-
-  Dir.chdir('ext') do
-    sh 'make distclean' if File.exists?('extra.o')
-    rm_rf('extra/extra.c') if File.exists?('extra.c')
-    rm_rf('conftest.dSYM') if File.exists?('conftest.dSYM') # OS X
-    build_file = File.join(Dir.pwd, 'io', 'extra.' + Config::CONFIG['DLEXT'])
-    File.delete(build_file) if File.exists?(build_file)
-  end
-end
-
 desc "Build the io-extra library (but don't install it)"
 task :build => [:clean] do
   Dir.chdir('ext') do
     ruby 'extconf.rb'
     sh 'make'
-    build_file = File.join(Dir.pwd, 'extra.' + Config::CONFIG['DLEXT'])
+    build_file = File.join(Dir.pwd, 'extra.' + CONFIG['DLEXT'])
     Dir.mkdir('io') unless File.exists?('io')
     FileUtils.cp(build_file, 'io')
   end
@@ -80,6 +76,13 @@ task :example => [:build] do
   ruby '-Iext examples/example_io_extra.rb'
 end
 
+namespace :example do
+  desc "Run the IO.pread example program."
+  task :pread do
+    ruby '-Iext examples/example_io_extra.rb'
+  end
+end
+
 Rake::TestTask.new do |t|
   task :test => :build
   t.libs << 'ext'

data/examples/example_pread.rb

@@ -0,0 +1,24 @@
+########################################################################
+# example_pread.rb
+#
+# Example program demonstrating the use of IO.pread.
+########################################################################
+require 'io/extra'
+require 'tmpdir'
+
+# Create a temporary file with a little data in it.
+file = File.join(Dir.tmpdir, 'pread_test.txt')
+File.open(file, 'w'){ |fh| 100.times{ |n| fh.puts "Hello: #{n}" } }
+
+# Read from the file using pread.
+begin
+  fh = File.open(file)
+
+  puts "Handle position before read: #{fh.pos}"
+  puts IO.pread(fh.fileno, 18, 0)
+
+  puts "Handle position after read: #{fh.pos}"
+  puts IO.pread(fh.fileno, 18, 0)
+ensure
+  fh.close
+end

data/ext/extconf.rb

@@ -16,7 +16,7 @@ have_func('writev')
 have_func('rb_str_set_len', 'ruby.h')
 have_func('rb_thread_blocking_region')
 
-case Config::CONFIG['host_os']
+case RbConfig::CONFIG['host_os']
 when /darwin/i
    $CPPFLAGS += " -D_MACOS"
 when /linux/i

data/ext/io/extra.c

@@ -324,7 +324,7 @@ static VALUE io_set_directio(VALUE self, VALUE v_advice){
 static VALUE s_io_pread(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 = NUM2ULONG(v_offset);
+   off_t offset = NUM2OFFT(v_offset);
    VALUE str = rb_str_new(NULL, nbyte);
    ssize_t nread = pread(fd, RSTRING_PTR(str), nbyte, offset);
 
@@ -349,7 +349,7 @@ static VALUE s_io_pread(VALUE klass, VALUE v_fd, VALUE v_nbyte, VALUE v_offset){
 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 = NUM2ULONG(v_offset);
+   off_t offset = NUM2OFFT(v_offset);
    uintptr_t* vector = malloc(nbyte + 1);
 
    if(pread(fd, vector, nbyte, offset) == -1)
@@ -378,7 +378,7 @@ static VALUE s_io_pwrite(VALUE klass, VALUE v_fd, VALUE v_buf, VALUE v_offset){
       NUM2INT(v_fd),
       RSTRING_PTR(v_buf),
       RSTRING_LEN(v_buf),
-      NUM2INT(v_offset)
+      NUM2OFFT(v_offset)
    );
 
    if(result == -1)
@@ -544,6 +544,6 @@ void Init_extra(){
    rb_define_singleton_method(rb_cIO, "writev", s_io_writev, 2);
 #endif
 
-   /* 1.2.3: The version of this library. This a string. */
-   rb_define_const(rb_cIO, "EXTRA_VERSION", rb_str_new2("1.2.3"));
+   /* 1.2.4: The version of this library. This a string. */
+   rb_define_const(rb_cIO, "EXTRA_VERSION", rb_str_new2("1.2.4"));
 }

data/io-extra.gemspec

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rbconfig'
 
 Gem::Specification.new do |spec|
-  if Config::CONFIG['host_os'] =~ /mswin|dos|win32|cygwin|mingw/i
+  if RbConfig::CONFIG['host_os'] =~ /mswin|dos|win32|cygwin|mingw/i
     STDERR.puts 'Not supported on this platform. Exiting.'
     exit(-1)
   end
    
   spec.name       = 'io-extra'
-  spec.version    = '1.2.3'
+  spec.version    = '1.2.4'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'

data/test/test_io_extra.rb

@@ -18,19 +18,19 @@ class TC_IO_Extra < Test::Unit::TestCase
     @fh = File.open(@file, 'w+')
     @fh.puts "The quick brown fox jumped over the lazy dog's back"
   end
-     
+
   def test_version
-    assert_equal('1.2.3', IO::EXTRA_VERSION)
+    assert_equal('1.2.4', IO::EXTRA_VERSION)
   end
 
   def test_direct_constant
-    omit_unless(Config::CONFIG['host_os'] =~ /linux/i, 'Linux-only')
+    omit_unless(RbConfig::CONFIG['host_os'] =~ /linux/i, 'Linux-only')
     assert_equal(040000, IO::DIRECT)
     assert_equal(040000, File::DIRECT)
   end
 
   def test_open_direct
-    omit_unless(Config::CONFIG['host_os'] =~ /linux/i, 'Linux-only')
+    omit_unless(RbConfig::CONFIG['host_os'] =~ /linux/i, 'Linux-only')
     assert_nothing_raised do
       fh = File.open(@fh.path, IO::RDWR|IO::DIRECT)
       fh.close
@@ -38,20 +38,20 @@ class TC_IO_Extra < Test::Unit::TestCase
   end
 
   def test_directio
-    omit_if(Config::CONFIG['host_os'] =~ /darwin/i, 'unsupported')
+    omit_if(RbConfig::CONFIG['host_os'] =~ /darwin/i, 'unsupported')
     assert_respond_to(@fh, :directio?)
     assert_nothing_raised{ @fh.directio? }
   end
 
   def test_directio_set
-    omit_if(Config::CONFIG['host_os'] =~ /darwin/i, 'unsupported')
+    omit_if(RbConfig::CONFIG['host_os'] =~ /darwin/i, 'unsupported')
     assert_respond_to(@fh, :directio=)
     assert_raises(StandardError){ @fh.directio = 99 }
     assert_nothing_raised{ @fh.directio = IO::DIRECTIO_ON }
   end
 
   def test_constants
-    omit_if(Config::CONFIG['host_os'] =~ /darwin/i, 'unsupported')
+    omit_if(RbConfig::CONFIG['host_os'] =~ /darwin/i, 'unsupported')
     assert_not_nil(IO::DIRECTIO_ON)
     assert_not_nil(IO::DIRECTIO_OFF)
   end
@@ -61,7 +61,7 @@ class TC_IO_Extra < Test::Unit::TestCase
   end
 
   def test_fdwalk
-    omit_if(Config::CONFIG['host_os'] =~ /darwin/i, 'unsupported')
+    omit_if(RbConfig::CONFIG['host_os'] =~ /darwin/i, 'unsupported')
     assert_respond_to(IO, :fdwalk)
     assert_nothing_raised{ IO.fdwalk(0){ } }
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: io-extra
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -06:00
+date: 2011-03-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,16 +46,17 @@ extra_rdoc_files:
 - MANIFEST
 - ext/io/extra.c
 files: 
-- CHANGES
+- Rakefile
+- README
 - doc/io_extra.txt
+- io-extra.gemspec
+- CHANGES
 - examples/example_io_extra.rb
+- examples/example_pread.rb
+- test/test_io_extra.rb
+- MANIFEST
 - ext/extconf.rb
 - ext/io/extra.c
-- io-extra.gemspec
-- MANIFEST
-- Rakefile
-- README
-- test/test_io_extra.rb
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/shards
 licenses: 
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Adds extra methods to the IO class.