windows-pr 1.0.9 → 1.1.0

data/CHANGES

@@ -1,3 +1,8 @@
+= 1.1.0 - 5-Nov-2010
+* Added the get_volume_type method to the Windows::Volume module.
+* Added more tests for the Windows::Volume module.
+* Removed the non-gem installation task and added a clean task.
+
 = 1.0.9 - 6-Feb-2010
 * A couple of modules that were checking against $KCODE now check against
   __ENCODING__ or the string encoding for Ruby 1.9.x.

data/Rakefile

@@ -1,55 +1,8 @@
 require 'rake'
+require 'rake/clean'
 require 'rake/testtask'
-require 'rbconfig'
-include Config
 
-desc "Install the windows-pr library (non-gem)"
-task :install do
-  sitelibdir         = CONFIG["sitelibdir"]
-  installdir         = File.join(sitelibdir, 'windows')
-  installdir_msvcrt  = File.join(installdir, 'msvcrt')
-  installdir_gdi     = File.join(installdir, 'gdi')
-  installdir_com     = File.join(installdir, 'com')
-  installdir_network = File.join(installdir, 'network')
-  installdir_window  = File.join(installdir, 'window')
-  installdir_ntfs    = File.join(installdir, 'ntfs')
-   
-  FileUtils.mkdir_p(installdir)
-  FileUtils.mkdir_p(installdir_msvcrt)
-  FileUtils.mkdir_p(installdir_gdi)
-  FileUtils.mkdir_p(installdir_com)
-  FileUtils.mkdir_p(installdir_network)
-  FileUtils.mkdir_p(installdir_window)
-  FileUtils.mkdir_p(installdir_ntfs)
-   
-  Dir["lib/windows/*.rb"].each{ |file|
-    FileUtils.cp(file, installdir, :verbose => true)
-  }
-   
-  Dir["lib/windows/msvcrt/*.rb"].each{ |file|
-    FileUtils.cp(file, installdir_msvcrt, :verbose => true)
-  }
-   
-  Dir["lib/windows/gdi/*.rb"].each{ |file|
-    FileUtils.cp(file, installdir_gdi, :verbose => true)
-  }
-   
-  Dir["lib/windows/com/*.rb"].each{ |file|
-    FileUtils.cp(file, installdir_com, :verbose => true)
-  }
-   
-  Dir["lib/windows/network/*.rb"].each{ |file|
-    FileUtils.cp(file, installdir_network, :verbose => true)
-  }
-   
-  Dir["lib/windows/window/*.rb"].each{ |file|
-    FileUtils.cp(file, installdir_window, :verbose => true)
-  } 
-   
-  Dir["lib/windows/ntfs/*.rb"].each{ |file|
-    FileUtils.cp(file, installdir_ntfs, :verbose => true)
-  }           
-end
+CLEAN << FileList['*.gem']
 
 namespace 'gem' do
   desc 'Build the windows-pr gem'
@@ -82,4 +35,12 @@ namespace 'test' do
     t.verbose = true
     t.test_files = FileList['test/tc_unicode.rb']
   end
+
+  Rake::TestTask.new('volume') do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList['test/tc_volume.rb']
+  end
 end
+
+task :default => 'test:all'

data/lib/windows/volume.rb

@@ -1,48 +1,59 @@
 require 'windows/api'
 
 module Windows
-   module Volume
-      API.auto_namespace = 'Windows::Volume'
-      API.auto_constant  = true
-      API.auto_method    = true
-      API.auto_unicode   = true
+  module Volume
+    API.auto_namespace = 'Windows::Volume'
+    API.auto_constant  = true
+    API.auto_method    = true
+    API.auto_unicode   = true
 
-      DRIVE_UNKNOWN     = 0
-      DRIVE_NO_ROOT_DIR = 1
-      DRIVE_REMOVABLE   = 2
-      DRIVE_FIXED       = 3
-      DRIVE_REMOTE      = 4
-      DRIVE_CDROM       = 5
-      DRIVE_RAMDISK     = 6
-      
-      API.new('DefineDosDevice', 'LSS', 'B')
-      API.new('DeleteVolumeMountPoint', 'S', 'B')
-      API.new('FindFirstVolume', 'PL', 'L')
-      API.new('FindFirstVolumeMountPoint', 'SPL', 'L')
-      API.new('FindNextVolume', 'LPL', 'B')
-      API.new('FindNextVolumeMountPoint', 'LPL', 'B')
-      API.new('FindVolumeClose', 'L', 'B')
-      API.new('FindVolumeMountPointClose', 'L', 'B')
-      API.new('GetDriveType', 'S', 'I')
-      API.new('GetLogicalDrives', 'V', 'L')
-      API.new('GetLogicalDriveStrings', 'LP', 'L')
-      API.new('GetVolumeInformation', 'SPLPPPPL', 'B')      
-      API.new('GetVolumeNameForVolumeMountPoint', 'SPL', 'B')
-      API.new('GetVolumePathName', 'PPL', 'B')
-      API.new('QueryDosDevice', 'SPL', 'L')
-      API.new('SetVolumeLabel', 'SS', 'B')
-      API.new('SetVolumeMountPoint', 'SS', 'B')
+    DRIVE_UNKNOWN     = 0
+    DRIVE_NO_ROOT_DIR = 1
+    DRIVE_REMOVABLE   = 2
+    DRIVE_FIXED       = 3
+    DRIVE_REMOTE      = 4
+    DRIVE_CDROM       = 5
+    DRIVE_RAMDISK     = 6
+    
+    API.new('DefineDosDevice', 'LSS', 'B')
+    API.new('DeleteVolumeMountPoint', 'S', 'B')
+    API.new('FindFirstVolume', 'PL', 'L')
+    API.new('FindFirstVolumeMountPoint', 'SPL', 'L')
+    API.new('FindNextVolume', 'LPL', 'B')
+    API.new('FindNextVolumeMountPoint', 'LPL', 'B')
+    API.new('FindVolumeClose', 'L', 'B')
+    API.new('FindVolumeMountPointClose', 'L', 'B')
+    API.new('GetDriveType', 'S', 'I')
+    API.new('GetLogicalDrives', 'V', 'L')
+    API.new('GetLogicalDriveStrings', 'LP', 'L')
+    API.new('GetVolumeInformation', 'SPLPPPPL', 'B')      
+    API.new('GetVolumeNameForVolumeMountPoint', 'SPL', 'B')
+    API.new('GetVolumePathName', 'PPL', 'B')
+    API.new('QueryDosDevice', 'SPL', 'L')
+    API.new('SetVolumeLabel', 'SS', 'B')
+    API.new('SetVolumeMountPoint', 'SS', 'B')
 
-      begin
-         API.new('GetVolumePathNamesForVolumeName', 'SPLL', 'B')
-      rescue Win32::API::LoadLibraryError
-         # Windows XP or later
-      end
+    begin
+      API.new('GetVolumePathNamesForVolumeName', 'SPLL', 'B')
+    rescue Win32::API::LoadLibraryError
+      # Windows XP or later
+    end
 
-      begin
-         API.new('GetVolumeInformationByHandleW', 'LPLPPPPL', 'B')
-      rescue Win32::API::LoadLibraryError
-         # Windows Vista or later
-      end 
-   end
+    begin
+       API.new('GetVolumeInformationByHandleW', 'LPLPPPPL', 'B')
+    rescue Win32::API::LoadLibraryError
+       # Windows Vista or later
+    end
+
+    # Returns the volume type for +vol+ or the volume of the current
+    # process if no volume is specified.
+    #
+    # Returns nil if the function fails for any reason.
+    #
+    def get_volume_type(vol = nil)
+      buf = 0.chr * 256
+      bool = GetVolumeInformation(vol, nil, nil, nil, nil, nil, buf, buf.size)
+      bool ? buf.strip : nil
+    end
+  end
 end

data/test/tc_volume.rb

@@ -6,20 +6,42 @@
 require 'windows/volume'
 require 'test/unit'
 
-class VolumeFoo
-   include Windows::Volume
-end
-
 class TC_Windows_Volume < Test::Unit::TestCase
-   def setup
-      @foo = VolumeFoo.new
-   end
-   
-   def test_method_constants
-      assert_not_nil(VolumeFoo::GetVolumeInformation)
-   end
-   
-   def teardown
-      @foo = nil
-   end
+  include Windows::Volume
+
+  def test_constants
+    assert_equal(0, DRIVE_UNKNOWN)
+    assert_equal(1, DRIVE_NO_ROOT_DIR)
+    assert_equal(2, DRIVE_REMOVABLE)
+    assert_equal(3, DRIVE_FIXED)
+    assert_equal(4, DRIVE_REMOTE)
+    assert_equal(5, DRIVE_CDROM)
+    assert_equal(6, DRIVE_RAMDISK)
+  end
+
+  def test_method_constants
+    assert_not_nil(DefineDosDevice)
+    assert_not_nil(DeleteVolumeMountPoint)
+    assert_not_nil(FindFirstVolume)
+    assert_not_nil(FindFirstVolumeMountPoint)
+    assert_not_nil(FindNextVolume)
+    assert_not_nil(FindNextVolumeMountPoint)
+    assert_not_nil(FindVolumeClose)
+    assert_not_nil(FindVolumeMountPointClose)
+    assert_not_nil(GetDriveType)
+    assert_not_nil(GetLogicalDrives)
+    assert_not_nil(GetLogicalDriveStrings)
+    assert_not_nil(GetVolumeInformation)
+    assert_not_nil(GetVolumeNameForVolumeMountPoint)
+    assert_not_nil(GetVolumePathName)
+    assert_not_nil(QueryDosDevice)
+    assert_not_nil(SetVolumeLabel)
+    assert_not_nil(SetVolumeMountPoint)
+  end
+
+  def test_get_volume_type
+    assert_respond_to(self, :get_volume_type)
+    assert_nothing_raised{ get_volume_type }
+    assert_kind_of(String, get_volume_type)
+  end
 end

data/windows-pr.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'windows-pr'
-  spec.version    = '1.0.9'
+  spec.version    = '1.1.0'
   spec.license    = 'Artistic 2.0'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: windows-pr
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,29 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -07:00
+date: 2010-11-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: windows-api
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: win32-api
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 4
+        - 5
         version: 1.4.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: "    The windows-pr library is a collection of Windows functions and constants\n    pre-defined for you using the windows-api library. It also autogenerates\n    explicit ANSI and Wide character versions of those functions, as well as\n    constants that can be used as methods, e.g. CloseHandle() instead of\n    CloseHandle.call().\n"
 email: djberg96@gmail.com
 executables: []
@@ -162,6 +180,7 @@ files:
 - test/tc_window_message.rb
 - test/tc_window_properties.rb
 - test/tc_window_timer.rb
+- windows-pr-1.1.0.gem
 - windows-pr.gemspec
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/win32utils
@@ -173,21 +192,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Windows functions and constants bundled via Win32::API