dbi-dbrc 1.1.6 → 1.1.7

data/CHANGES

@@ -1,3 +1,10 @@
+== 1.1.7 - 6-Oct-2010
+* More robust file decryption/encryption for MS Windows.
+* Better platform checking for MS Windows.
+* Refactored the Rakefile. Removed the old installation tasks and replaced
+  them with a series of gem tasks.
+* Updated the win32 library dependencies.
+
 == 1.1.6 - 10-Sep-2009
 * Fixed validation for dbrc_dir argument.
 * Added a test for bogus dbrc_dir arguments.

data/README

@@ -10,6 +10,9 @@
    * win32-file (MS Windows only)
    * win32-dir (MS Windows only)
 
+== Installation
+   gem install dbi-dbrc
+
 == Synopsis
    require 'dbi/dbrc'
    include DBI
@@ -28,10 +31,6 @@
    puts dbrc.interval
    puts dbrc.dsn
 
-== Installation
-   rake test (optional)
-   rake install (non-gem) or rake install_gem (gem)
-   
 == Notes on the .dbrc file
    This module relies on a file in your home directory called ".dbrc", and it
    is meant to be analogous to the ".netrc" file used by programs such as

data/Rakefile

@@ -1,33 +1,40 @@
 require 'rake'
 require 'rake/testtask'
 
-desc "Install the dbi-dbrc package (non-gem)"
-task :install do
-   dest = File.join(Config::CONFIG['sitelibdir'], 'dbi')
-   Dir.mkdir(dest) unless File.exists? dest
-   cp 'lib/dbi/dbrc.rb', dest, :verbose => true
-end
+namespace :gem do
+  desc "Remove any gem files."
+  task :clean do
+    Dir['*.gem'].each{ |f| File.delete(f) }
+  end
+
+  desc "Create the dbi-dbrc gem"
+  task :create => [:clean] do
+    spec = eval(IO.read('dbi-dbrc.gemspec'))
+    Gem::Builder.new(spec).build
+  end
 
-desc "Install the dbi-dbrc package as a gem"
-task :install_gem do
-   ruby 'dbi-dbrc.gemspec'
-   file = Dir["*.gem"].first
-   sh "gem install #{file}"
+  desc "Install the dbi-dbrc gem"
+  task :install => [:build] do
+    gem = Dir["*.gem"].first
+    sh "gem install #{gem}"
+  end
 end
 
 Rake::TestTask.new do |t|
-   t.warning = true
-   t.verbose = true
+  t.warning = true
+  t.verbose = true
 end
 
 Rake::TestTask.new(:test_xml) do |t|
-   t.warning = true
-   t.verbose = true
-   t.test_files = FileList['test/test_dbi_dbrc_xml.rb']
+  t.warning = true
+  t.verbose = true
+  t.test_files = FileList['test/test_dbi_dbrc_xml.rb']
 end
 
 Rake::TestTask.new(:test_yml) do |t|
-   t.warning = true
-   t.verbose = true
-   t.test_files = FileList['test/test_dbi_dbrc_yml.rb']
+  t.warning = true
+  t.verbose = true
+  t.test_files = FileList['test/test_dbi_dbrc_yml.rb']
 end
+
+task :default => :test

data/dbi-dbrc.gemspec

@@ -1,41 +1,37 @@
-require 'rubygems'
-
-spec = Gem::Specification.new do |s|
-   s.name       = 'dbi-dbrc'
-   s.version    = '1.1.6'
-   s.author     = 'Daniel Berger'
-   s.email      = 'djberg96@gmail.com'
-   s.license    = 'Artistic 2.0'
-   s.summary    = 'A simple way to avoid hard-coding passwords with DBI'
-   s.homepage   = 'http://www.rubyforge.org/projects/shards'
-   s.platform   = Gem::Platform::RUBY
-   s.files      = Dir['**/*'].reject{ |f| f.include?('CVS') }
-   s.test_files = Dir['test/test*.rb']
-   s.has_rdoc   = true
-
-   s.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
-   s.rubyforge_project = 'shards'
-
-   s.add_dependency('sys-admin', '>= 1.5.2')
-   s.add_development_dependency('test-unit')
-
-   if Config::CONFIG['host_os'] =~ /mswin|win32|dos/i
-      s.add_dependency('win32-file', '>= 0.4.2')
-      s.add_dependency('win32-dir', '>= 0.3.0')
-      s.add_dependency('win32-process', '>= 0.6.1')
-      s.platform = Gem::Platform::CURRENT
-   end
-
-   s.description = <<-EOF
-      The dbi-dbrc library provides an interface for storing database
-      connection information, including passwords, in a locally secure
-      file only accessible by you, or root. This allows you to avoid
-      hard coding login and password information in your programs
-      that require such information.
-
-      This library can also be used to store login and password information
-      for logins on remote hosts, not just databases.
-   EOF
-end
-
-Gem::Builder.new(spec).build
+require 'rubygems'
+
+Gem::Specification.new do |spec|
+  spec.name       = 'dbi-dbrc'
+  spec.version    = '1.1.7'
+  spec.author     = 'Daniel Berger'
+  spec.email      = 'djberg96@gmail.com'
+  spec.license    = 'Artistic 2.0'
+  spec.summary    = 'A simple way to avoid hard-coding passwords with DBI'
+  spec.homepage   = 'http://www.rubyforge.org/projects/shards'
+  spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.test_files = Dir['test/test*.rb']
+
+  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
+  spec.rubyforge_project = 'shards'
+
+  spec.add_dependency('sys-admin', '>= 1.5.2')
+  spec.add_development_dependency('test-unit')
+
+  if Config::CONFIG['host_os'] =~ /mswin|msdos|win32|mingw|cygwin/i
+    spec.add_dependency('win32-file', '>= 0.6.6')
+    spec.add_dependency('win32-dir', '>= 0.3.7')
+    spec.add_dependency('win32-process', '>= 0.6.2')
+    spec.platform = Gem::Platform::CURRENT
+  end
+
+  spec.description = <<-EOF
+    The dbi-dbrc library provides an interface for storing database
+    connection information, including passwords, in a locally secure
+    file only accessible by you, or root. This allows you to avoid
+    hard coding login and password information in your programs
+    that require such information.
+
+    This library can also be used to store login and password information
+    for logins on remote hosts, not just databases.
+  EOF
+end

data/lib/dbi/dbrc.rb

@@ -1,9 +1,10 @@
 require 'rbconfig'
+require 'rubygems'
 
-if Config::CONFIG['host_os'] =~ /mswin|win32|dos/i
-   require 'win32/file'
-   require 'win32/dir'
-   require 'win32/process'
+if Config::CONFIG['host_os'] =~ /mswin|msdos|win32|mingw|cygwin/i
+  require 'win32/dir'
+  require 'win32/file'
+  require 'win32/process'
 end
 
 require 'sys/admin'
@@ -11,292 +12,294 @@ require 'sys/admin'
 # The DBI module serves as a namespace only.
 module DBI
 
-   # The DBRC class encapsulates a database resource config file.
-   class DBRC
-
-      # This error is raised if anything fails trying to read the config file.
-      class Error < StandardError; end
-
-      # The version of the dbi-dbrc library
-      VERSION = '1.1.6'
-
-      @@windows = Config::CONFIG['host_os'] =~ /mswin|win32|dos/i
-
-      # The database or host to be connected to.
-      attr_accessor :database
-
-      # The user name used for the database or host connection.
-      attr_accessor :user
-
-      # The password associated with the database or host.
-      attr_accessor :password
-
-      # The driver associated with the database. This is used to internally to
-      # construct the DSN.
-      attr_accessor :driver
-
-      # Data source name, e.g. "dbi:OCI8:your_database".
-      attr_accessor :dsn
-
-      # The maximum number of reconnects a program should make before
-      # giving up.
-      attr_accessor :maximum_reconnects
-
-      # The timeout, in seconds, for each connection attempt.
-      attr_accessor :timeout
-
-      # The interval, in seconds, between each connection attempt.
-      attr_accessor :interval
-
-      # The directory where the .dbrc file is stored.
-      attr_accessor :dbrc_dir
-
-      # The full path to the .dbrc file.
-      attr_accessor :dbrc_file
-
-      # Returns a new DBI::DBRC object. The contents of the object depend on
-      # the arguments passed to the constructor. If only a database name is
-      # passed, then the first entry found in the .dbrc file that matches that
-      # database is parsed. If a user name is also included, then the first
-      # entry that matches both the database and user name is parsed.
-      #
-      # If a directory is passed as the third argument, then DBRC will look
-      # in that directory, instead of the default directory, for the .dbrc
-      # file.
-      #
-      # If an entry cannot be found for the database, or database plus user
-      # combination, then a Error is raised.  If the .dbrc file cannot
-      # be found, or is setup improperly with regards to permissions or
-      # properties, a DBI::DBRC::Error is raised.
-      #
-      # See the README for the rules regarding .dbrc files and permissions.
-      #
-      # Note that this library can also be used as a general password
-      # storage mechanism. In that case simply treat the 'database' as the
-      # host name, and ignore the DBI::DBRC#dsn and DBI::DBRC#driver methods.
-      #
-      # Examples:
-      #
-      #   # Find the first match for 'some_database'
-      #   DBI::DBRC.new('some_database')
-      #
-      #   # Find the first match for 'foo_user@some_database'
-      #   DBI::DBRC.new('some_database', 'foo_user')
-      #
-      #   # Find the first match for 'foo_user@some_database' under /usr/local
-      #   DBI::DBRC.new('some_database', 'foo_usr', '/usr/local')
-      #
-      def initialize(database, user=nil, dbrc_dir=nil)
-         if dbrc_dir.nil?
-            uid  = Process.uid
-            home = ENV['HOME'] || ENV['USERPROFILE']
-
-            if home.nil?
-               if @@windows
-                  home ||= Sys::Admin.get_user(uid, :localaccount => true).dir
-               else
-                  home ||= Sys::Admin.get_user(uid).dir
-               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')
-            end
-         else
-            raise Error, 'bad directory' unless File.directory?(dbrc_dir)
-            @dbrc_file = File.join(dbrc_dir, '.dbrc')
-         end
+  # The DBRC class encapsulates a database resource config file.
+  class DBRC
+
+    # This error is raised if anything fails trying to read the config file.
+    class Error < StandardError; end
+
+    # The version of the dbi-dbrc library
+    VERSION = '1.1.7'
+
+    @@windows = Config::CONFIG['host_os'] =~ /mswin|msdos|win32|mingw|cygwin/i
+
+    # The database or host to be connected to.
+    attr_accessor :database
+
+    # The user name used for the database or host connection.
+    attr_accessor :user
+
+    # The password associated with the database or host.
+    attr_accessor :password
+
+    # The driver associated with the database. This is used to internally to
+    # construct the DSN.
+    attr_accessor :driver
+
+    # Data source name, e.g. "dbi:OCI8:your_database".
+    attr_accessor :dsn
+
+    # The maximum number of reconnects a program should make before giving up.
+    attr_accessor :maximum_reconnects
+
+    # The timeout, in seconds, for each connection attempt.
+    attr_accessor :timeout
+
+    # The interval, in seconds, between each connection attempt.
+    attr_accessor :interval
+
+    # The directory where the .dbrc file is stored.
+    attr_accessor :dbrc_dir
+
+    # The full path to the .dbrc file.
+    attr_accessor :dbrc_file
+
+    # Returns a new DBI::DBRC object. The contents of the object depend on
+    # the arguments passed to the constructor. If only a database name is
+    # passed, then the first entry found in the .dbrc file that matches that
+    # database is parsed. If a user name is also included, then the first
+    # entry that matches both the database and user name is parsed.
+    #
+    # If a directory is passed as the third argument, then DBRC will look
+    # in that directory, instead of the default directory, for the .dbrc
+    # file.
+    #
+    # If an entry cannot be found for the database, or database plus user
+    # combination, then a Error is raised.  If the .dbrc file cannot be
+    # found, or is setup improperly with regards to permissions or properties
+    # then a DBI::DBRC::Error is raised.
+    #
+    # See the README for the rules regarding .dbrc files and permissions.
+    #
+    # Note that this library can also be used as a general password
+    # storage mechanism. In that case simply treat the 'database' as the
+    # host name, and ignore the DBI::DBRC#dsn and DBI::DBRC#driver methods.
+    #
+    # Examples:
+    #
+    #   # Find the first match for 'some_database'
+    #   DBI::DBRC.new('some_database')
+    #
+    #   # Find the first match for 'foo_user@some_database'
+    #   DBI::DBRC.new('some_database', 'foo_user')
+    #
+    #   # Find the first match for 'foo_user@some_database' under /usr/local
+    #   DBI::DBRC.new('some_database', 'foo_usr', '/usr/local')
+    #
+    def initialize(database, user=nil, dbrc_dir=nil)
+      if dbrc_dir.nil?
+        uid  = Process.uid
+        home = ENV['HOME'] || ENV['USERPROFILE']
+
+        if home.nil?
+          if @@windows
+            home ||= Sys::Admin.get_user(uid, :localaccount => true).dir
+          else
+            home ||= Sys::Admin.get_user(uid).dir
+          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')
+        end
+      else
+        raise Error, 'bad directory' unless File.directory?(dbrc_dir)
+        @dbrc_file = File.join(dbrc_dir, '.dbrc')
+      end
          
-         @dbrc_dir  = dbrc_dir
-         @database  = database
-         @user      = user
-         encrypted  = false # Win32 only
+      @dbrc_dir  = dbrc_dir
+      @database  = database
+      @user      = user
+      encrypted  = false # Win32 only
 
-         @driver   = nil
-         @interval = nil
-         @timeout  = nil
-         @maximum_reconnects = nil
+      @driver   = nil
+      @interval = nil
+      @timeout  = nil
+      @maximum_reconnects = nil
 
-         check_file()
-         
-         # If on Win32 and the file is encrypted, decrypt it.
-         if @@windows && File.encrypted?(@dbrc_file)
-            encrypted = true
-            File.decrypt(@dbrc_file)
-         end
+      check_file()
          
-         parse_dbrc_config_file()
-         validate_data()
-         convert_numeric_strings()
-         create_dsn_string()
+      # Decrypt and re-encrypt the file if we're on MS Windows and the
+      # file is encrypted.
+      begin
+        if @@windows && File.encrypted?(@dbrc_file)
+          file_was_encrypted = true
+          File.decrypt(@dbrc_file)
+        end
          
-         # If on Win32 and the file was encrypted, re-encrypt it
-         if @@windows && encrypted
-            File.encrypt(@dbrc_file)
-         end
+        parse_dbrc_config_file()
+        validate_data()
+        convert_numeric_strings()
+        create_dsn_string()
+      ensure
+        if @@windows && file_was_encrypted
+          File.encrypt(@dbrc_file)
+        end
       end
-
-      # Inspection of the DBI::DBRC object. This is identical to the standard
-      # Ruby Object#inspect, except that the password field is filtered.
-      #
-      def inspect 
-         str = instance_variables.map{ |iv| 
-            if iv == '@password'
-               "#{iv}=[FILTERED]"
-            else
-               "#{iv}=#{instance_variable_get(iv).inspect}" 
-            end
-         }.join(', ') 
-
-         "#<#{self.class}:0x#{(self.object_id*2).to_s(16)} " << str << ">"
+    end
+
+    # Inspection of the DBI::DBRC object. This is identical to the standard
+    # Ruby Object#inspect, except that the password field is filtered.
+    #
+    def inspect 
+      str = instance_variables.map{ |iv| 
+        if iv == '@password'
+          "#{iv}=[FILTERED]"
+        else
+          "#{iv}=#{instance_variable_get(iv).inspect}" 
+        end
+      }.join(', ') 
+
+      "#<#{self.class}:0x#{(self.object_id*2).to_s(16)} " << str << ">"
+    end
+
+    private
+
+    # Ensure that the user/password has been set
+    def validate_data
+      unless @user
+        raise Error, "no user found associated with #{@database}"
       end
 
-      private
-
-      # Ensure that the user/password has been set
-      def validate_data
-         unless @user
-            raise Error, "no user found associated with #{@database}"
-         end
-
-         unless @password
-            raise Error, "password not defined for #{@user}@#{@database}"
-         end
+      unless @password
+        raise Error, "password not defined for #{@user}@#{@database}"
       end
+    end
    
-      # Converts strings that should be numbers into actual numbers
-      def convert_numeric_strings
-         @interval   = @interval.to_i if @interval
-         @timeout    = @timeout.to_i if @timeout
-         @maximum_reconnects = @maximum_reconnects.to_i if @maximum_reconnects
-      end
-
-      # Create the dsn string if the driver is defined
-      def create_dsn_string
-         @dsn = "dbi:#{@driver}:#{@database}" if @driver
-      end
-
-      # Check ownership and permissions
-      def check_file(file=@dbrc_file)
-         File.open(file){ |f|
-
-            # Permissions must be set to 600 or better on Unix systems.
-            # Must be hidden on Win32 systems.
-            if @@windows
-               unless File.hidden?(file)
-                  raise Error, "The .dbrc file must be hidden"
-               end
-            else
-               unless (f.stat.mode & 077) == 0
-                  raise Error, "Bad .dbrc file permissions"
-               end
-            end
-
-            # Only the owner may use it
-            unless f.stat.owned?
-               raise Error, "Not owner of .dbrc file"
-            end
-         }
-      end
-
-      # Parse the text out of the .dbrc file.  This is the only method you
-      # need to redefine if writing your own config handler.
-      def parse_dbrc_config_file(file=@dbrc_file)
-         IO.foreach(file){ |line|
-            next if line =~ /^#/    # Ignore comments
-            db, user, pwd, driver, timeout, max, interval = line.split
-
-            next unless @database == db
-
-            if @user
-               next unless @user == user
-            end
-
-            @user               = user
-            @password           = pwd
-            @driver             = driver
-            @timeout            = timeout
-            @maximum_reconnects = max
-            @interval           = interval
-            return
-         }
-
-         # If we reach here it means the database and/or user wasn't found
-         if @user
-            err = "no record found for #{@user}@#{@database}"
-         else
-            err = "no record found for #{@database}"
-         end
-
-         raise Error, err
-      end
-
-      alias_method(:db, :database)
-      alias_method(:db=, :database=)
-      alias_method(:passwd, :password)
-      alias_method(:passwd=, :password=)
-      alias_method(:max_reconn, :maximum_reconnects)
-      alias_method(:max_reconn=, :maximum_reconnects=)
-      alias_method(:time_out, :timeout)
-      alias_method(:time_out=, :timeout=)
-      alias_method(:host, :database)
-   end
-
-   # A subclass of DBRC designed to handle .dbrc files in XML format.  The
-   # public methods of this class are identical to DBRC.
-   class XML < DBRC
-      require "rexml/document"
-      include REXML
-      private
-      def parse_dbrc_config_file(file=@dbrc_file)
-         doc = Document.new(File.new(file))
-         fields = %w/user password driver interval timeout maximum_reconnects/
-         doc.elements.each("/dbrc/database"){ |element|
-            next unless element.attributes["name"] == database
-            if @user
-               next unless element.elements["user"].text == @user
-            end
-            fields.each{ |field|
-               val = element.elements[field]
-               unless val.nil?
-                  send("#{field}=",val.text)
-               end
-            }
-            return
-         }
-         # If we reach here it means the database and/or user wasn't found
-         raise Error, "No record found for #{@user}@#{@database}"
-      end
-   end
-
-   # A subclass of DBRC designed to handle .dbrc files in YAML format. The
-   # public methods of this class are identical to DBRC.
-   class YML < DBRC
-      require "yaml"
-      private
-      def parse_dbrc_config_file(file=@dbrc_file)
-         config = YAML.load(File.open(file))
-         config.each{ |hash|
-            hash.each{ |db,info|
-               next unless db == @database
-               if @user
-                  next unless @user == info["user"]
-               end
-               @user       = info["user"]            
-               @password   = info["password"]
-               @driver     = info["driver"]
-               @interval   = info["interval"]
-               @timeout    = info["timeout"]
-               @maximum_reconnects = info["max_reconn"]
-               return
-            }
-         }
-         # If we reach this point, it means the database wasn't found
-         raise Error, "No entry found for #{@user}@#{@database}"
-      end
-   end
+    # Converts strings that should be numbers into actual numbers
+    def convert_numeric_strings
+      @interval   = @interval.to_i if @interval
+      @timeout    = @timeout.to_i if @timeout
+      @maximum_reconnects = @maximum_reconnects.to_i if @maximum_reconnects
+    end
+
+    # Create the dsn string if the driver is defined
+    def create_dsn_string
+      @dsn = "dbi:#{@driver}:#{@database}" if @driver
+    end
+
+    # Check ownership and permissions
+    def check_file(file=@dbrc_file)
+      File.open(file){ |f|
+        # Permissions must be set to 600 or better on Unix systems.
+        # Must be hidden on Win32 systems.
+        if @@windows
+          unless File.hidden?(file)
+            raise Error, "The .dbrc file must be hidden"
+          end
+        else
+          unless (f.stat.mode & 077) == 0
+            raise Error, "Bad .dbrc file permissions"
+          end
+        end
+
+        # Only the owner may use it
+        unless f.stat.owned?
+          raise Error, "Not owner of .dbrc file"
+        end
+      }
+    end
+
+    # Parse the text out of the .dbrc file.  This is the only method you
+    # need to redefine if writing your own config handler.
+    def parse_dbrc_config_file(file=@dbrc_file)
+       IO.foreach(file){ |line|
+          next if line =~ /^#/    # Ignore comments
+          db, user, pwd, driver, timeout, max, interval = line.split
+
+          next unless @database == db
+
+          if @user
+             next unless @user == user
+          end
+
+          @user               = user
+          @password           = pwd
+          @driver             = driver
+          @timeout            = timeout
+          @maximum_reconnects = max
+          @interval           = interval
+          return
+       }
+
+       # If we reach here it means the database and/or user wasn't found
+       if @user
+          err = "no record found for #{@user}@#{@database}"
+       else
+          err = "no record found for #{@database}"
+       end
+
+       raise Error, err
+    end
+
+    alias_method(:db, :database)
+    alias_method(:db=, :database=)
+    alias_method(:passwd, :password)
+    alias_method(:passwd=, :password=)
+    alias_method(:max_reconn, :maximum_reconnects)
+    alias_method(:max_reconn=, :maximum_reconnects=)
+    alias_method(:time_out, :timeout)
+    alias_method(:time_out=, :timeout=)
+    alias_method(:host, :database)
+  end
+
+  # A subclass of DBRC designed to handle .dbrc files in XML format.  The
+  # public methods of this class are identical to DBRC.
+  class XML < DBRC
+    require "rexml/document"
+    include REXML
+
+    private
+
+    def parse_dbrc_config_file(file=@dbrc_file)
+      doc = Document.new(File.new(file))
+      fields = %w/user password driver interval timeout maximum_reconnects/
+      doc.elements.each("/dbrc/database"){ |element|
+        next unless element.attributes["name"] == database
+        if @user
+          next unless element.elements["user"].text == @user
+        end
+        fields.each{ |field|
+          val = element.elements[field]
+          unless val.nil?
+            send("#{field}=",val.text)
+          end
+        }
+       return
+      }
+      # If we reach here it means the database and/or user wasn't found
+      raise Error, "No record found for #{@user}@#{@database}"
+    end
+  end
+
+  # A subclass of DBRC designed to handle .dbrc files in YAML format. The
+  # public methods of this class are identical to DBRC.
+  class YML < DBRC
+    require "yaml"
+
+    private
+
+    def parse_dbrc_config_file(file=@dbrc_file)
+      config = YAML.load(File.open(file))
+      config.each{ |hash|
+        hash.each{ |db,info|
+          next unless db == @database
+          next unless @user == info["user"] if @user
+          @user       = info["user"]            
+          @password   = info["password"]
+          @driver     = info["driver"]
+          @interval   = info["interval"]
+          @timeout    = info["timeout"]
+          @maximum_reconnects = info["max_reconn"]
+          return
+        }
+      }
+      # If we reach this point, it means the database wasn't found
+      raise Error, "No entry found for #{@user}@#{@database}"
+    end
+  end
 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.6', DBRC::VERSION)
+      assert_equal('1.1.7', DBRC::VERSION)
    end
 
    def test_bad_dbrc_properties

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbi-dbrc
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  hash: 29
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Daniel Berger
@@ -9,30 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 -06:00
+date: 2010-10-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sys-admin
-  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: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: "      The dbi-dbrc library provides an interface for storing database\n      connection information, including passwords, in a locally secure\n      file only accessible by you, or root. This allows you to avoid\n      hard coding login and password information in your programs\n      that require such information.\n\n      This library can also be used to store login and password information\n      for logins on remote hosts, not just databases.\n"
+  type: :development
+  version_requirements: *id002
+description: "    The dbi-dbrc library provides an interface for storing database\n    connection information, including passwords, in a locally secure\n    file only accessible by you, or root. This allows you to avoid\n    hard coding login and password information in your programs\n    that require such information.\n\n    This library can also be used to store login and password information\n    for logins on remote hosts, not just databases.\n"
 email: djberg96@gmail.com
 executables: []
 
@@ -43,18 +59,18 @@ extra_rdoc_files:
 - CHANGES
 - MANIFEST
 files: 
-- lib/dbi/dbrc.rb
-- examples/xml/test_xml.rb
-- examples/plain/test.rb
-- examples/yml/test_yml.rb
 - CHANGES
 - dbi-dbrc.gemspec
+- examples/plain/test.rb
+- examples/xml/test_xml.rb
+- examples/yml/test_yml.rb
+- lib/dbi/dbrc.rb
+- MANIFEST
+- Rakefile
 - README
-- test/test_dbi_dbrc_xml.rb
 - test/test_dbi_dbrc.rb
+- test/test_dbi_dbrc_xml.rb
 - test/test_dbi_dbrc_yml.rb
-- MANIFEST
-- Rakefile
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/shards
 licenses: 
@@ -65,25 +81,31 @@ 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: shards
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple way to avoid hard-coding passwords with DBI
 test_files: 
-- test/test_dbi_dbrc_xml.rb
 - test/test_dbi_dbrc.rb
+- test/test_dbi_dbrc_xml.rb
 - test/test_dbi_dbrc_yml.rb