dbi-dbrc 1.1.8 → 1.1.9

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.1.9 - 10-Jan-2013
+* Fixed an unused variable warning.
+* Changed the way I check for MS Windows.
+
 == 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.

data/README

@@ -5,10 +5,10 @@
    connections, e.g. ssh, ftp, etc.
 
 == Requirements
-   * Ruby 1.8.2 or later
    * sys-admin
    * win32-file (MS Windows only)
    * win32-dir (MS Windows only)
+   * win32-process (MS Windows only)
 
 == Installation
    gem install dbi-dbrc
@@ -206,7 +206,7 @@ DBRC#dsn=(dsn)
 == Notes for MS Windows Users
    The 'home' directory for Win32 users is determined by ENV['USERPROFILE'].
    If that is not set, ENV['HOME'] is used. If that is not set, then
-   'C:\Documents and Settings\user_name' is used.
+   the directory found by the sys-admin library is used.
 
    To make your file hidden, right click on the .dbrc file in your Explorer
    window, select "Properties" and check the "Hidden" checkbox.
@@ -249,7 +249,7 @@ DBRC#dsn=(dsn)
    If it's not correct, please let me know.
    
 == Copyright
-   (C) Copyright 2002-2009, Daniel J. Berger, all rights reserved.
+   (C) Copyright 2002-2013, Daniel J. Berger, all rights reserved.
    
 = Warranty
    This package is provided "as is" and without any express or

data/Rakefile

@@ -1,6 +1,9 @@
 require 'rake'
+require 'rake/clean'
 require 'rake/testtask'
 
+CLEAN.include("**/*.gem", "**/*.rbc")
+
 namespace :gem do
   desc "Remove any gem files."
   task :clean do
@@ -20,21 +23,23 @@ namespace :gem do
   end
 end
 
-Rake::TestTask.new do |t|
-  t.warning = true
-  t.verbose = true
-end
+namespace :test do
+  Rake::TestTask.new(:all) do |t|
+    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']
-end
+  Rake::TestTask.new(:xml) do |t|
+    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']
+  Rake::TestTask.new(:yml) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList['test/test_dbi_dbrc_yml.rb']
+  end
 end
 
-task :default => :test
+task :default => 'test:all'

data/dbi-dbrc.gemspec

@@ -2,12 +2,12 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'dbi-dbrc'
-  spec.version    = '1.1.8'
+  spec.version    = '1.1.9'
   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.homepage   = 'https://github.com/djberg96/dbi-dbrc'
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
   spec.test_files = Dir['test/test*.rb']
 
@@ -17,11 +17,12 @@ Gem::Specification.new do |spec|
   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
+  if File::ALT_SEPARATOR
     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
+    spec.platform.cpu = 'universal'
   end
 
   spec.description = <<-EOF

data/lib/dbi/dbrc.rb

@@ -1,7 +1,4 @@
-require 'rbconfig'
-require 'rubygems'
-
-if Config::CONFIG['host_os'] =~ /mswin|msdos|win32|mingw|cygwin/i
+if File::ALT_SEPARATOR
   require 'win32/dir'
   require 'win32/file'
   require 'win32/process'
@@ -19,9 +16,9 @@ module DBI
     class Error < StandardError; end
 
     # The version of the dbi-dbrc library
-    VERSION = '1.1.8'
+    VERSION = '1.1.9'
 
-    @@windows = Config::CONFIG['host_os'] =~ /mswin|msdos|win32|mingw|cygwin/i
+    @@windows = File::ALT_SEPARATOR
 
     # The database or host to be connected to.
     attr_accessor :database
@@ -114,11 +111,12 @@ module DBI
         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
+
+      file_was_encrypted = false # Win32 only
 
       @driver   = nil
       @interval = nil
@@ -126,7 +124,7 @@ module DBI
       @maximum_reconnects = nil
 
       check_file()
-         
+
       # Decrypt and re-encrypt the file if we're on MS Windows and the
       # file is encrypted.
       begin
@@ -134,7 +132,7 @@ module DBI
           file_was_encrypted = true
           File.decrypt(@dbrc_file)
         end
-         
+
         parse_dbrc_config_file()
         validate_data()
         convert_numeric_strings()
@@ -149,14 +147,14 @@ module DBI
     # 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| 
+    def inspect
+      str = instance_variables.map{ |iv|
         if iv == '@password'
           "#{iv}=[FILTERED]"
         else
-          "#{iv}=#{instance_variable_get(iv).inspect}" 
+          "#{iv}=#{instance_variable_get(iv).inspect}"
         end
-      }.join(', ') 
+      }.join(', ')
 
       "#<#{self.class}:0x#{(self.object_id*2).to_s(16)} " << str << ">"
     end
@@ -173,7 +171,7 @@ module DBI
         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
@@ -293,7 +291,7 @@ module DBI
         hash.each{ |db,info|
           next unless db == @database
           next unless @user == info["user"] if @user
-          @user       = info["user"]            
+          @user       = info["user"]
           @password   = info["password"]
           @driver     = info["driver"]
           @interval   = info["interval"]

data/test/test_dbi_dbrc.rb

@@ -4,9 +4,6 @@
 # Test suite for the base class of DBI::DBRC. This test case should be
 # run via the 'rake test' task.
 #########################################################################
-require 'rubygems'
-gem 'test-unit'
-
 require 'dbi/dbrc'
 require 'test/unit'
 include DBI
@@ -36,7 +33,7 @@ class TC_DBI_DBRC < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal('1.1.8', DBRC::VERSION)
+    assert_equal('1.1.9', DBRC::VERSION)
   end
 
   def test_bad_dbrc_properties

data/test/test_dbi_dbrc_xml.rb

@@ -4,11 +4,8 @@
 # Test suite for the XML specific version of DBI::DBRC. This test case
 # should be run via the 'rake test' task.
 ########################################################################
-require 'rubygems'
-gem 'test-unit'
-
 require 'dbi/dbrc'
-require 'test/unit'
+require 'test-unit'
 require 'rexml/document'
 include REXML
 include DBI

data/test/test_dbi_dbrc_yml.rb

@@ -4,11 +4,8 @@
 # Test suite for the YAML specific version of DBI::DBRC. You should run
 # this test case via the 'rake test' task.
 #########################################################################
-require 'rubygems'
-gem 'test-unit'
-
 require 'dbi/dbrc'
-require 'test/unit'
+require 'test-unit'
 include DBI
 
 class TC_DBI_DBRC_YML < Test::Unit::TestCase

metadata

@@ -1,64 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dbi-dbrc
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 8
-  version: 1.1.8
+version: !ruby/object:Gem::Version
+  version: 1.1.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Daniel Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-07 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sys-admin
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   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"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - CHANGES
 - MANIFEST
-files: 
+files:
 - CHANGES
 - dbi-dbrc.gemspec
 - examples/plain/test.rb
@@ -71,41 +69,32 @@ files:
 - test/test_dbi_dbrc.rb
 - test/test_dbi_dbrc_xml.rb
 - test/test_dbi_dbrc_yml.rb
-has_rdoc: true
-homepage: http://www.rubyforge.org/projects/shards
-licenses: 
+homepage: https://github.com/djberg96/dbi-dbrc
+licenses:
 - Artistic 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shards
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple way to avoid hard-coding passwords with DBI
-test_files: 
+test_files:
 - test/test_dbi_dbrc.rb
 - test/test_dbi_dbrc_xml.rb
 - test/test_dbi_dbrc_yml.rb