win32-nio 0.1.1 → 0.1.2

data/lib/win32/windows/functions.rb

@@ -1,27 +1,27 @@
-require 'ffi'
-
-module Windows
-  module Functions
-    extend FFI::Library
-    typedef :ulong, :dword
-    typedef :uintptr_t, :handle
-    typedef :pointer, :ptr
-
-    ffi_lib :kernel32
-    ffi_convention :stdcall
-
-    attach_function :CloseHandle, [:handle], :bool
-    attach_function :CreateFileA, [:string, :dword, :dword, :ptr, :dword, :dword, :handle], :handle
-    attach_function :CreateFileW, [:buffer_in, :dword, :dword, :ptr, :dword, :dword, :handle], :handle
-    attach_function :GetOverlappedResult, [:handle, :ptr, :ptr, :bool], :bool
-    attach_function :GetSystemInfo, [:ptr], :void
-    attach_function :ReadFile, [:handle, :buffer_out, :dword, :ptr, :ptr], :bool
-    attach_function :ReadFileScatter, [:handle, :ptr, :dword, :ptr, :ptr], :bool
-    attach_function :SleepEx, [:dword, :bool], :dword
-    attach_function :VirtualAlloc, [:ptr, :size_t, :dword, :dword], :dword
-    attach_function :VirtualFree, [:dword, :size_t, :dword], :bool
-
-    callback :completion_function, [:dword, :dword, :ptr], :void
-    attach_function :ReadFileEx, [:handle, :buffer_out, :dword, :ptr, :completion_function], :bool
-  end
-end
+require 'ffi'
+
+module Windows
+  module Functions
+    extend FFI::Library
+    typedef :ulong, :dword
+    typedef :uintptr_t, :handle
+    typedef :pointer, :ptr
+
+    ffi_lib :kernel32
+    ffi_convention :stdcall
+
+    attach_function :CloseHandle, [:handle], :bool
+    attach_function :CreateFileA, [:string, :dword, :dword, :ptr, :dword, :dword, :handle], :handle
+    attach_function :CreateFileW, [:buffer_in, :dword, :dword, :ptr, :dword, :dword, :handle], :handle
+    attach_function :GetOverlappedResult, [:handle, :ptr, :ptr, :bool], :bool
+    attach_function :GetSystemInfo, [:ptr], :void
+    attach_function :ReadFile, [:handle, :buffer_out, :dword, :ptr, :ptr], :bool
+    attach_function :ReadFileScatter, [:handle, :ptr, :dword, :ptr, :ptr], :bool
+    attach_function :SleepEx, [:dword, :bool], :dword
+    attach_function :VirtualAlloc, [:ptr, :size_t, :dword, :dword], :dword
+    attach_function :VirtualFree, [:dword, :size_t, :dword], :bool
+
+    callback :completion_function, [:dword, :dword, :ptr], :void
+    attach_function :ReadFileEx, [:handle, :buffer_out, :dword, :ptr, :completion_function], :bool
+  end
+end

data/lib/win32/windows/macros.rb

@@ -1,7 +1,7 @@
-module Windows
-  module Macros
-    def HasOverlappedIoCompleted(overlapped)
-      overlapped[:Internal] != 259 # STATUS_PENDING
-    end
-  end
-end
+module Windows
+  module Macros
+    def HasOverlappedIoCompleted(overlapped)
+      overlapped[:Internal] != 259 # STATUS_PENDING
+    end
+  end
+end

data/lib/win32/windows/structs.rb

@@ -1,39 +1,39 @@
-require 'ffi'
-
-module Windows
-  module Structs
-    extend FFI::Library
-
-    # I'm assuming the anonymous struct for the internal union here.
-    class Overlapped < FFI::Struct
-      layout(
-        :Internal, :ulong,
-        :InternalHigh, :ulong,
-        :Offset, :ulong,
-        :OffsetHigh, :ulong,
-        :hEvent, :ulong
-      )
-    end
-
-    # dwOemId is deprecated. Just assume the nested struct.
-    class SystemInfo < FFI::Struct
-      layout(
-        :wProcessorArchitecture, :ushort,
-        :wReserved, :ushort,
-        :dwPageSize, :ulong,
-        :lpMinimumApplicationAddress, :pointer,
-        :lpMaximumApplicationAddress, :pointer,
-        :dwActiveProcessorMask, :pointer,
-        :dwNumberOfProcessors, :ulong,
-        :dwProcessorType, :ulong,
-        :dwAllocationGranularity, :ulong,
-        :wProcessorLevel, :ushort,
-        :wProcessorRevision, :ushort
-      )
-    end
-
-    class FileSegmentElement < FFI::Union
-      layout(:Buffer, :pointer, :Alignment, :uint64)
-    end
-  end
-end
+require 'ffi'
+
+module Windows
+  module Structs
+    extend FFI::Library
+
+    # I'm assuming the anonymous struct for the internal union here.
+    class Overlapped < FFI::Struct
+      layout(
+        :Internal, :uintptr_t,
+        :InternalHigh, :uintptr_t,
+        :Offset, :ulong,
+        :OffsetHigh, :ulong,
+        :hEvent, :uintptr_t
+      )
+    end
+
+    # dwOemId is deprecated. Just assume the nested struct.
+    class SystemInfo < FFI::Struct
+      layout(
+        :wProcessorArchitecture, :ushort,
+        :wReserved, :ushort,
+        :dwPageSize, :ulong,
+        :lpMinimumApplicationAddress, :pointer,
+        :lpMaximumApplicationAddress, :pointer,
+        :dwActiveProcessorMask, :pointer,
+        :dwNumberOfProcessors, :ulong,
+        :dwProcessorType, :ulong,
+        :dwAllocationGranularity, :ulong,
+        :wProcessorLevel, :ushort,
+        :wProcessorRevision, :ushort
+      )
+    end
+
+    class FileSegmentElement < FFI::Union
+      layout(:Buffer, :pointer, :Alignment, :uint64)
+    end
+  end
+end

data/test/test_win32_nio_read.rb

@@ -1,82 +1,81 @@
-########################################################################
-# test_win32_nio_read.rb
-#
-# Tests for the NIO.read method.
-########################################################################
-require 'test-unit'
-require 'win32/nio'
-require 'test/unit'
-include Win32
-
-class TC_Win32_NIO_Read < Test::Unit::TestCase
-  def self.startup
-    Dir.chdir(File.expand_path(File.dirname(__FILE__)))
-
-    @@file = 'read_test.txt'
-    @@text = "The quick brown fox jumped over the lazy dog's back"
-
-    File.open(@@file, 'w'){ |fh|
-      100.times{ |n| fh.puts @@text + ": #{n}" }
-    }
-  end
-
-  def setup
-    @size  = File.size(@@file)
-  end
-
-  test "version number is set to expected value" do
-    assert_equal('0.1.1', Win32::NIO::VERSION)
-  end
-
-  test "read method basic functionality" do
-    assert_respond_to(NIO, :read)
-    assert_nothing_raised{ NIO.read(@@file) }
-  end
-
-  test "read method accepts a file name and returns a string of the expected size" do
-    assert_kind_of(String, NIO.read(@@file))
-    p @size
-    p NIO.read(@@file).size
-    assert_true(NIO.read(@@file).size == @size)
-  end
-
-  test "read method accepts a length argument and returns a string of that length" do
-    assert_nothing_raised{ NIO.read(@@file, 19) }
-    assert_equal('The quick brown fox', NIO.read(@@file, 19))
-    assert_equal('', NIO.read(@@file, 0))
-  end
-
-  test "read method accepts an offset and returns a string between offset and length" do
-    assert_nothing_raised{ NIO.read(@@file, 19, 4) }
-    assert_equal('quick brown fox', NIO.read(@@file, 15, 4))
-    assert_equal("lazy dog's back: 99\r\n", NIO.read(@@file, nil, @size-21))
-  end
-
-  test "read method requires at least one argument" do
-    assert_raise(ArgumentError){ NIO.read }
-  end
-
-  test "length parameter must be a positive number" do
-    assert_raise(ArgumentError){ NIO.read(@@file, -1) }
-    assert_raise(TypeError){ NIO.read(@@file, 'foo') }
-  end
-
-  test "offset parameter must be a positive number" do
-    assert_raise(Errno::EINVAL, Errno::ENAMETOOLONG){ NIO.read(@@file, 1, -1) }
-    assert_raise(TypeError){ NIO.read(@@file, 1, 'foo') }
-  end
-
-  test "options parameter must be a hash" do
-    assert_raise(TypeError){ NIO.read(@@file, 1, 1, 'foo') }
-  end
-
-  def teardown
-    @size = nil
-  end
-
-  def self.shutdown
-    File.delete(@@file) if File.exists?(@@file)
-    @@file = nil
-    @@text = nil
-  end
-end
+########################################################################
+# test_win32_nio_read.rb
+#
+# Tests for the NIO.read method.
+########################################################################
+require 'test-unit'
+require 'win32/nio'
+include Win32
+
+class TC_Win32_NIO_Read < Test::Unit::TestCase
+  def self.startup
+    Dir.chdir(File.expand_path(File.dirname(__FILE__)))
+
+    @@file = 'read_test.txt'
+    @@text = "The quick brown fox jumped over the lazy dog's back"
+
+    File.open(@@file, 'w'){ |fh|
+      100.times{ |n| fh.puts @@text + ": #{n}" }
+    }
+  end
+
+  def setup
+    @size  = File.size(@@file)
+  end
+
+  test "version number is set to expected value" do
+    assert_equal('0.1.2', Win32::NIO::VERSION)
+  end
+
+  test "read method basic functionality" do
+    assert_respond_to(NIO, :read)
+    assert_nothing_raised{ NIO.read(@@file) }
+  end
+
+  test "read method accepts a file name and returns a string of the expected size" do
+    assert_kind_of(String, NIO.read(@@file))
+    p @size
+    p NIO.read(@@file).size
+    assert_true(NIO.read(@@file).size == @size)
+  end
+
+  test "read method accepts a length argument and returns a string of that length" do
+    assert_nothing_raised{ NIO.read(@@file, 19) }
+    assert_equal('The quick brown fox', NIO.read(@@file, 19))
+    assert_equal('', NIO.read(@@file, 0))
+  end
+
+  test "read method accepts an offset and returns a string between offset and length" do
+    assert_nothing_raised{ NIO.read(@@file, 19, 4) }
+    assert_equal('quick brown fox', NIO.read(@@file, 15, 4))
+    assert_equal("lazy dog's back: 99\r\n", NIO.read(@@file, nil, @size-21))
+  end
+
+  test "read method requires at least one argument" do
+    assert_raise(ArgumentError){ NIO.read }
+  end
+
+  test "length parameter must be a positive number" do
+    assert_raise(ArgumentError){ NIO.read(@@file, -1) }
+    assert_raise(TypeError){ NIO.read(@@file, 'foo') }
+  end
+
+  test "offset parameter must be a positive number" do
+    assert_raise(Errno::EINVAL, Errno::ENAMETOOLONG){ NIO.read(@@file, 1, -1) }
+    assert_raise(TypeError){ NIO.read(@@file, 1, 'foo') }
+  end
+
+  test "options parameter must be a hash" do
+    assert_raise(TypeError){ NIO.read(@@file, 1, 1, 'foo') }
+  end
+
+  def teardown
+    @size = nil
+  end
+
+  def self.shutdown
+    File.delete(@@file) if File.exists?(@@file)
+    @@file = nil
+    @@text = nil
+  end
+end

data/test/test_win32_nio_readlines.rb

@@ -1,66 +1,66 @@
-#######################################################################
-# test_win32_nio_readlines.rb
-#
-# Test case for the Win32::NIO.readlines method.
-#######################################################################
-require 'test-unit'
-require 'win32/nio'
-include Win32
-
-class TC_Win32_NIO_Readlines < Test::Unit::TestCase
-  def self.startup
-    @@line = "The quick brown fox jumped over the lazy dog's back"
-    @@file = "readlines_test.txt"
-    @@size = 10
-
-    File.open(@@file, 'w'){ |fh|
-      1.upto(@@size){ |n|
-        fh.puts @@line + ": #{n}"
-        fh.puts if n % 3 == 0
-      }
-    }
-  end
-
-  def setup
-    @array = nil
-  end
-
-  test "readlines method basic functionality" do
-    assert_respond_to(NIO, :readlines)
-    assert_nothing_raised{ NIO.readlines(@@file) }
-  end
-
-  test "readlines returns an array" do
-    assert_kind_of(Array, NIO.readlines(@@file))
-  end
-
-  test "readlines returns an array of the expected size" do
-    assert_equal(@@size + 3, NIO.readlines(@@file).size)
-    assert_equal(@@line + ': 1', NIO.readlines(@@file).first)
-  end
-
-  test "readlines treats an empty second argument as a paragraph separator" do
-    assert_nothing_raised{ NIO.readlines(@@file, '') }
-    assert_kind_of(Array, NIO.readlines(@@file, ''))
-    assert_equal(4, NIO.readlines(@@file, '').size)
-  end
-
-  test "readlines expects at least one argument" do
-    assert_raise(ArgumentError){ NIO.readlines }
-  end
-
-  test "readlines accepts a maximum of two arguments" do
-    assert_raise(ArgumentError){ NIO.readlines(@@file, '', true) }
-  end
-
-  def teardown
-    @array = nil
-  end
-
-  def self.shutdown
-    File.delete(@@file) if File.exists?(@@file)
-    @@file = nil
-    @@size = nil
-    @@line = nil
-  end
-end
+#######################################################################
+# test_win32_nio_readlines.rb
+#
+# Test case for the Win32::NIO.readlines method.
+#######################################################################
+require 'test-unit'
+require 'win32/nio'
+include Win32
+
+class TC_Win32_NIO_Readlines < Test::Unit::TestCase
+  def self.startup
+    @@line = "The quick brown fox jumped over the lazy dog's back"
+    @@file = "readlines_test.txt"
+    @@size = 10
+
+    File.open(@@file, 'w'){ |fh|
+      1.upto(@@size){ |n|
+        fh.puts @@line + ": #{n}"
+        fh.puts if n % 3 == 0
+      }
+    }
+  end
+
+  def setup
+    @array = nil
+  end
+
+  test "readlines method basic functionality" do
+    assert_respond_to(NIO, :readlines)
+    assert_nothing_raised{ NIO.readlines(@@file) }
+  end
+
+  test "readlines returns an array" do
+    assert_kind_of(Array, NIO.readlines(@@file))
+  end
+
+  test "readlines returns an array of the expected size" do
+    assert_equal(@@size + 3, NIO.readlines(@@file).size)
+    assert_equal(@@line + ': 1', NIO.readlines(@@file).first)
+  end
+
+  test "readlines treats an empty second argument as a paragraph separator" do
+    assert_nothing_raised{ NIO.readlines(@@file, '') }
+    assert_kind_of(Array, NIO.readlines(@@file, ''))
+    assert_equal(4, NIO.readlines(@@file, '').size)
+  end
+
+  test "readlines expects at least one argument" do
+    assert_raise(ArgumentError){ NIO.readlines }
+  end
+
+  test "readlines accepts a maximum of two arguments" do
+    assert_raise(ArgumentError){ NIO.readlines(@@file, '', true) }
+  end
+
+  def teardown
+    @array = nil
+  end
+
+  def self.shutdown
+    File.delete(@@file) if File.exists?(@@file)
+    @@file = nil
+    @@size = nil
+    @@line = nil
+  end
+end

data/win32-nio.gemspec

@@ -1,28 +1,28 @@
-require 'rubygems'
-
-Gem::Specification.new do |spec|
-  spec.name     = 'win32-nio'
-  spec.version  = '0.1.1'
-  spec.author   = 'Daniel J. Berger'
-  spec.license  = 'Artistic 2.0'
-  spec.email    = 'djberg96@gmail.com'
-  spec.homepage = 'https://github.com/djberg96/win32-nio'
-  spec.summary  = 'Native IO for MS Windows'
-  spec.files    = Dir['**/*'].reject{ |f| f.include?('git') }
-
-  spec.rubyforge_project = 'Win32Utils'
-  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
-  spec.required_ruby_version = '> 1.9.0'
-
-  spec.add_dependency('ffi')
-  spec.add_dependency('win32-event', '>= 0.6.0')
-
-  spec.add_development_dependency('test-unit')
-
-  spec.description = <<-EOF
-    The win32-nio library implements certain IO methods using native
-    Windows function calls rather than using the POSIX compatibility
-    layer that MRI typically uses. In addition, some methods provide
-    additional event handling capability.
-  EOF
-end
+require 'rubygems'
+
+Gem::Specification.new do |spec|
+  spec.name     = 'win32-nio'
+  spec.version  = '0.1.2'
+  spec.author   = 'Daniel J. Berger'
+  spec.license  = 'Artistic 2.0'
+  spec.email    = 'djberg96@gmail.com'
+  spec.homepage = 'https://github.com/djberg96/win32-nio'
+  spec.summary  = 'Native IO for MS Windows'
+  spec.files    = Dir['**/*'].reject{ |f| f.include?('git') }
+
+  spec.rubyforge_project = 'Win32Utils'
+  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
+  spec.required_ruby_version = '> 1.9.0'
+
+  spec.add_dependency('ffi')
+  spec.add_dependency('win32-event', '>= 0.6.0')
+
+  spec.add_development_dependency('test-unit')
+
+  spec.description = <<-EOF
+    The win32-nio library implements certain IO methods using native
+    Windows function calls rather than using the POSIX compatibility
+    layer that MRI typically uses. In addition, some methods provide
+    additional event handling capability.
+  EOF
+end