dbi-dbrc 1.1.7 → 1.1.8

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.1.8 - 7-Oct-2010
+* Fixed a logic bug in the constructor that primarily affected MS Windows with
+  regards to determining the user's home directory.
+
 == 1.1.7 - 6-Oct-2010
 * More robust file decryption/encryption for MS Windows.
 * Better platform checking for MS Windows.

data/Rakefile

@@ -14,7 +14,7 @@ namespace :gem do
   end
 
   desc "Install the dbi-dbrc gem"
-  task :install => [:build] do
+  task :install => [:create] do
     gem = Dir["*.gem"].first
     sh "gem install #{gem}"
   end

data/dbi-dbrc.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'dbi-dbrc'
-  spec.version    = '1.1.7'
+  spec.version    = '1.1.8'
   spec.author     = 'Daniel Berger'
   spec.email      = 'djberg96@gmail.com'
   spec.license    = 'Artistic 2.0'

data/lib/dbi/dbrc.rb

@@ -19,7 +19,7 @@ module DBI
     class Error < StandardError; end
 
     # The version of the dbi-dbrc library
-    VERSION = '1.1.7'
+    VERSION = '1.1.8'
 
     @@windows = Config::CONFIG['host_os'] =~ /mswin|msdos|win32|mingw|cygwin/i
 
@@ -99,13 +99,17 @@ module DBI
           end
         end
 
-        # Default to the app data directory on Windows if no home dir found
-        if @@windows && home.nil?
-          @dbrc_file = File.join(File.basename(Dir::APPDATA), '.dbrc')
-        else
-          uid = Process.uid
-          @dbrc_file = File.join(Sys::Admin.get_user(uid).dir, '.dbrc')
+        # Default to the app data directory on Windows, or root on Unix, if
+        # no home dir can be found.
+        if home.nil?
+          if @@windows
+            home = Dir::APPDATA
+          else
+            home = '/'
+          end
         end
+
+        @dbrc_file = File.join(home, '.dbrc')
       else
         raise Error, 'bad directory' unless File.directory?(dbrc_dir)
         @dbrc_file = File.join(dbrc_dir, '.dbrc')

data/test/test_dbi_dbrc.rb

@@ -12,190 +12,190 @@ require 'test/unit'
 include DBI
 
 class TC_DBI_DBRC < Test::Unit::TestCase
-   def self.startup
-      @@windows = File::ALT_SEPARATOR
-   end
-
-   def setup
-      @dir      = File.join(Dir.pwd, 'examples/plain')
-      @file     = File.join(@dir, '.dbrc')
-      @db1      = 'foo'
-      @db2      = 'bar'
-      @user1    = 'user1'
-      @user2    = 'user2'
-      @db_bad   = 'blah'  # Doesn't exist
-      @user_bad = 'user8' # Doesn't exist
+  def self.startup
+    @@windows = File::ALT_SEPARATOR
+  end
+
+  def setup
+    @dir      = File.join(Dir.pwd, 'examples/plain')
+    @file     = File.join(@dir, '.dbrc')
+    @db1      = 'foo'
+    @db2      = 'bar'
+    @user1    = 'user1'
+    @user2    = 'user2'
+    @db_bad   = 'blah'  # Doesn't exist
+    @user_bad = 'user8' # Doesn't exist
      
-      if @@windows && File.respond_to?(:set_attr)
-         File.set_attr(@file, File::HIDDEN)
-      else
-         File.chmod(0600, @file)
-      end
+    if @@windows && File.respond_to?(:set_attr)
+      File.set_attr(@file, File::HIDDEN)
+    else
+      File.chmod(0600, @file)
+    end
       
-      @dbrc = DBRC.new(@db1, nil, @dir)
-   end
-
-   def test_version
-      assert_equal('1.1.7', DBRC::VERSION)
-   end
-
-   def test_bad_dbrc_properties
-      if @@windows
-         File.unset_attr(@file, File::HIDDEN)
-         assert_raises(DBRC::Error){ DBRC.new(@db1, @user1, @dir) }
-      else
-         File.chmod(0555,@file)
-         assert_raises(DBRC::Error){ DBRC.new(@db1, @user1, @dir) }
-      end
-   end
-
-   def test_constructor
-      assert_raises(ArgumentError){ DBRC.new }
-      assert_nothing_raised{ DBRC.new(@db1, @user1, @dir) }
-      assert_nothing_raised{ DBRC.new(@db1, nil, @dir) }
-   end
-
-   def test_bad_database
-      assert_raise(DBRC::Error){ DBRC.new(@db_bad, nil, @dir) }
-   end
-
-   def test_bad_user
-      assert_raise(DBRC::Error){ DBRC.new(@db1, @user_bad, @dir) }
-   end
-
-   def test_bad_dir
-      assert_raise(DBI::DBRC::Error){ DBI::DBRC.new(@db1, @user1, '/bogusXX') }
-   end
-
-   def test_database
-      assert_respond_to(@dbrc, :database)
-      assert_respond_to(@dbrc, :database=)
-      assert_respond_to(@dbrc, :db)
-      assert_respond_to(@dbrc, :db=)
-      assert_kind_of(String, @dbrc.db)
-   end
-
-   def test_host_alias
-      assert_respond_to(@dbrc, :host)
-      assert_equal(true, @dbrc.method(:host) == @dbrc.method(:database))
-   end
-
-   def test_dbrc_dir
-      assert_respond_to(@dbrc, :dbrc_dir)
-      assert_equal(@dir, @dbrc.dbrc_dir)
-   end
-
-   def test_dbrc_file
-      assert_respond_to(@dbrc, :dbrc_file)
-      assert_equal('.dbrc', File.basename(@dbrc.dbrc_file))
-   end
-
-   def test_dsn
-      assert_respond_to(@dbrc, :dsn)
-      assert_respond_to(@dbrc, :dsn=)
-   end
-
-   def test_user
-      assert_respond_to(@dbrc, :user)
-      assert_respond_to(@dbrc, :user=)
-      assert_kind_of(String, @dbrc.user)
-   end
-
-   def test_password
-      assert_respond_to(@dbrc, :password)
-      assert_respond_to(@dbrc, :password=)
-      assert_respond_to(@dbrc, :passwd)
-      assert_respond_to(@dbrc, :passwd=)
-      assert_kind_of(String, @dbrc.password)
-   end
-
-   def test_driver
-      assert_respond_to(@dbrc, :driver)
-      assert_respond_to(@dbrc, :driver=)
-      assert_kind_of(String, @dbrc.driver)
-   end
-
-   def test_interval
-      assert_respond_to(@dbrc, :interval)
-      assert_respond_to(@dbrc, :interval=)
-      assert_kind_of(Fixnum, @dbrc.interval)
-   end
-
-   def test_timeout
-      assert_respond_to(@dbrc, :timeout)
-      assert_respond_to(@dbrc, :timeout=)
-      assert_respond_to(@dbrc, :time_out)
-      assert_respond_to(@dbrc, :time_out=)
-      assert_kind_of(Fixnum, @dbrc.timeout)
-   end
-
-   def test_max_reconn
-      assert_respond_to(@dbrc, :max_reconn)
-      assert_respond_to(@dbrc, :max_reconn=)
-      assert_respond_to(@dbrc, :maximum_reconnects)
-      assert_respond_to(@dbrc, :maximum_reconnects=)
-      assert_kind_of(Fixnum, @dbrc.maximum_reconnects)
-   end
-
-   def test_sample_values
-      assert_equal("foo", @dbrc.database)
-      assert_equal("user1", @dbrc.user)
-      assert_equal("pwd1", @dbrc.passwd)
-      assert_equal("Oracle", @dbrc.driver)
-      assert_equal(60, @dbrc.interval)
-      assert_equal(40, @dbrc.timeout)
-      assert_equal(3, @dbrc.max_reconn)
-      assert_equal("dbi:Oracle:foo", @dbrc.dsn)
-   end
-
-   # Same database, different user
-   def test_duplicate_database
-      db = DBRC.new("foo", "user2", @dir) 
-      assert_equal("user2", db.user)
-      assert_equal("pwd2", db.passwd)
-      assert_equal("OCI8", db.driver)
-      assert_equal(60, db.interval)
-      assert_equal(60, db.timeout)
-      assert_equal(4, db.max_reconn)
-      assert_equal("dbi:OCI8:foo", db.dsn)
-   end
-
-   # Different database, different user
-   def test_different_database
-      db = DBRC.new("bar", "user1", @dir)
-      assert_equal("user1", db.user)
-      assert_equal("pwd3", db.passwd)
-      assert_equal("Oracle", db.driver)
-      assert_equal(30, db.interval)
-      assert_equal(30, db.timeout)
-      assert_equal(2, db.max_reconn)
-      assert_equal("dbi:Oracle:bar", db.dsn)
-   end
-
-   # A database with only a couple fields defined
-   def test_nil_values
-      db = DBRC.new("baz", "user3", @dir) 
-      assert_equal("user3", db.user)
-      assert_equal("pwd4", db.passwd)
-      assert_nil(db.driver)
-      assert_nil(db.interval)
-      assert_nil(db.timeout)
-      assert_nil(db.max_reconn)
-      assert_nil(db.dsn)
-   end
-
-   def teardown
-      @dir      = nil
-      @db1      = nil
-      @db2      = nil
-      @user1    = nil
-      @user2    = nil
-      @db_bad   = nil
-      @user_bad = nil
-      @dbrc     = nil
-   end
-
-   def self.shutdown
-      @@windows = nil
-   end
+    @dbrc = DBRC.new(@db1, nil, @dir)
+  end
+
+  def test_version
+    assert_equal('1.1.8', DBRC::VERSION)
+  end
+
+  def test_bad_dbrc_properties
+    if @@windows
+      File.unset_attr(@file, File::HIDDEN)
+      assert_raises(DBRC::Error){ DBRC.new(@db1, @user1, @dir) }
+    else
+      File.chmod(0555,@file)
+      assert_raises(DBRC::Error){ DBRC.new(@db1, @user1, @dir) }
+    end
+  end
+
+  def test_constructor
+    assert_raises(ArgumentError){ DBRC.new }
+    assert_nothing_raised{ DBRC.new(@db1, @user1, @dir) }
+    assert_nothing_raised{ DBRC.new(@db1, nil, @dir) }
+  end
+
+  def test_bad_database
+    assert_raise(DBRC::Error){ DBRC.new(@db_bad, nil, @dir) }
+  end
+
+  def test_bad_user
+    assert_raise(DBRC::Error){ DBRC.new(@db1, @user_bad, @dir) }
+  end
+
+  def test_bad_dir
+    assert_raise(DBI::DBRC::Error){ DBI::DBRC.new(@db1, @user1, '/bogusXX') }
+  end
+
+  def test_database
+    assert_respond_to(@dbrc, :database)
+    assert_respond_to(@dbrc, :database=)
+    assert_respond_to(@dbrc, :db)
+    assert_respond_to(@dbrc, :db=)
+    assert_kind_of(String, @dbrc.db)
+  end
+
+  def test_host_alias
+    assert_respond_to(@dbrc, :host)
+    assert_equal(true, @dbrc.method(:host) == @dbrc.method(:database))
+  end
+
+  def test_dbrc_dir
+    assert_respond_to(@dbrc, :dbrc_dir)
+    assert_equal(@dir, @dbrc.dbrc_dir)
+  end
+
+  def test_dbrc_file
+    assert_respond_to(@dbrc, :dbrc_file)
+    assert_equal('.dbrc', File.basename(@dbrc.dbrc_file))
+  end
+
+  def test_dsn
+    assert_respond_to(@dbrc, :dsn)
+    assert_respond_to(@dbrc, :dsn=)
+  end
+
+  def test_user
+    assert_respond_to(@dbrc, :user)
+    assert_respond_to(@dbrc, :user=)
+    assert_kind_of(String, @dbrc.user)
+  end
+
+  def test_password
+    assert_respond_to(@dbrc, :password)
+    assert_respond_to(@dbrc, :password=)
+    assert_respond_to(@dbrc, :passwd)
+    assert_respond_to(@dbrc, :passwd=)
+    assert_kind_of(String, @dbrc.password)
+  end
+
+  def test_driver
+    assert_respond_to(@dbrc, :driver)
+    assert_respond_to(@dbrc, :driver=)
+    assert_kind_of(String, @dbrc.driver)
+  end
+
+  def test_interval
+    assert_respond_to(@dbrc, :interval)
+    assert_respond_to(@dbrc, :interval=)
+    assert_kind_of(Fixnum, @dbrc.interval)
+  end
+
+  def test_timeout
+    assert_respond_to(@dbrc, :timeout)
+    assert_respond_to(@dbrc, :timeout=)
+    assert_respond_to(@dbrc, :time_out)
+    assert_respond_to(@dbrc, :time_out=)
+    assert_kind_of(Fixnum, @dbrc.timeout)
+  end
+
+  def test_max_reconn
+    assert_respond_to(@dbrc, :max_reconn)
+    assert_respond_to(@dbrc, :max_reconn=)
+    assert_respond_to(@dbrc, :maximum_reconnects)
+    assert_respond_to(@dbrc, :maximum_reconnects=)
+    assert_kind_of(Fixnum, @dbrc.maximum_reconnects)
+  end
+
+  def test_sample_values
+    assert_equal("foo", @dbrc.database)
+    assert_equal("user1", @dbrc.user)
+    assert_equal("pwd1", @dbrc.passwd)
+    assert_equal("Oracle", @dbrc.driver)
+    assert_equal(60, @dbrc.interval)
+    assert_equal(40, @dbrc.timeout)
+    assert_equal(3, @dbrc.max_reconn)
+    assert_equal("dbi:Oracle:foo", @dbrc.dsn)
+  end
+
+  # Same database, different user
+  def test_duplicate_database
+    db = DBRC.new("foo", "user2", @dir) 
+    assert_equal("user2", db.user)
+    assert_equal("pwd2", db.passwd)
+    assert_equal("OCI8", db.driver)
+    assert_equal(60, db.interval)
+    assert_equal(60, db.timeout)
+    assert_equal(4, db.max_reconn)
+    assert_equal("dbi:OCI8:foo", db.dsn)
+  end
+
+  # Different database, different user
+  def test_different_database
+    db = DBRC.new("bar", "user1", @dir)
+    assert_equal("user1", db.user)
+    assert_equal("pwd3", db.passwd)
+    assert_equal("Oracle", db.driver)
+    assert_equal(30, db.interval)
+    assert_equal(30, db.timeout)
+    assert_equal(2, db.max_reconn)
+    assert_equal("dbi:Oracle:bar", db.dsn)
+  end
+
+  # A database with only a couple fields defined
+  def test_nil_values
+    db = DBRC.new("baz", "user3", @dir) 
+    assert_equal("user3", db.user)
+    assert_equal("pwd4", db.passwd)
+    assert_nil(db.driver)
+    assert_nil(db.interval)
+    assert_nil(db.timeout)
+    assert_nil(db.max_reconn)
+    assert_nil(db.dsn)
+  end
+
+  def teardown
+    @dir      = nil
+    @db1      = nil
+    @db2      = nil
+    @user1    = nil
+    @user2    = nil
+    @db_bad   = nil
+    @user_bad = nil
+    @dbrc     = nil
+  end
+
+  def self.shutdown
+    @@windows = nil
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbi-dbrc
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Daniel Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -06:00
+date: 2010-10-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency