dbi-dbrc 1.1.5 → 1.1.6

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.1.6 - 10-Sep-2009
+* Fixed validation for dbrc_dir argument.
+* Added a test for bogus dbrc_dir arguments.
+
 == 1.1.5 - 3-Sep-2009
 * License changed to Artistic 2.0.
 * Some gemspec updates, including the license and description.

data/dbi-dbrc.gemspec

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

data/lib/dbi/dbrc.rb

@@ -18,7 +18,7 @@ module DBI
       class Error < StandardError; end
 
       # The version of the dbi-dbrc library
-      VERSION = '1.1.5'
+      VERSION = '1.1.6'
 
       @@windows = Config::CONFIG['host_os'] =~ /mswin|win32|dos/i
 
@@ -88,8 +88,6 @@ module DBI
       #
       def initialize(database, user=nil, dbrc_dir=nil)
          if dbrc_dir.nil?
-            raise Error, 'bad directory' unless File.directory?(dbrc_dir)
-
             uid  = Process.uid
             home = ENV['HOME'] || ENV['USERPROFILE']
 
@@ -109,6 +107,7 @@ module DBI
                @dbrc_file = File.join(Sys::Admin.get_user(uid).dir, '.dbrc')
             end
          else
+            raise Error, 'bad directory' unless File.directory?(dbrc_dir)
             @dbrc_file = File.join(dbrc_dir, '.dbrc')
          end
          

data/test/test_dbi_dbrc.rb

@@ -36,7 +36,7 @@ class TC_DBI_DBRC < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.1.5', DBRC::VERSION)
+      assert_equal('1.1.6', DBRC::VERSION)
    end
 
    def test_bad_dbrc_properties
@@ -56,11 +56,15 @@ class TC_DBI_DBRC < Test::Unit::TestCase
    end
 
    def test_bad_database
-      assert_raises(DBRC::Error){ DBRC.new(@db_bad, nil, @dir) }
+      assert_raise(DBRC::Error){ DBRC.new(@db_bad, nil, @dir) }
    end
 
    def test_bad_user
-      assert_raises(DBRC::Error){ DBRC.new(@db1, @user_bad, @dir) }
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbi-dbrc
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors: 
 - Daniel Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -06:00
+date: 2009-09-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency