oci8_simple 0.8.5 → 0.9.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oci8_simple (0.8.5)
+    oci8_simple (0.9.0)
       ruby-oci8 (~> 2.1.2)
 
 GEM

data/README.rdoc

@@ -21,10 +21,11 @@ You can also use oci8_simple in your Ruby scripts by creating an instance of <co
   gem install oci8_simple
 
 == Configuration
-To configure environments and schema settings, edit the 
-database.yml file in <code>~/.oci8_simple/</code>.
-The database.yml format is compatible with the Rails format, so you may just symlink
-an existing file into this directory if you already have one.
+Oci8Simple will look in three places for your database configuration, in the following order:
+* Dir.pwd + database.yml
+* Dir.pwd + config/database.yml
+* ~/.oci8_simple/database.yml
+The database.yml format is compatible with the Rails format.
   development:
     database: oracle.hostname:1521/sid
     username: foo_dev

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.9.0

data/lib/oci8_simple/client.rb

@@ -36,7 +36,7 @@ module Oci8Simple
   #     SQL
   class Client
     USER_DIR = File.join(ENV["HOME"], ".oci8_simple")
-    CONFIG_FILE = File.join(USER_DIR, "database.yml")
+    CONFIG   = Config.new
     LOG_FILE = File.join(USER_DIR, "oci8_simple.log")
   
     attr_accessor :log_file, :env
@@ -97,17 +97,7 @@ module Oci8Simple
     end
 
     def config
-      @config ||= YAML.load_file(CONFIG_FILE)[env]
-    rescue Errno::ENOENT => e
-      raise ConfigError.new <<-ERR
-File #{CONFIG_FILE} doesn't exist - use the following template:
-
-environment:
-  database: 192.168.1.3:1521/sid
-  username: foo_user
-  password: foobar
-
-ERR
+      @config ||= CONFIG[  env]
     end
     
     # Create and return raw Oci8 connection
@@ -117,8 +107,6 @@ ERR
     
     private
     
-
-    
     def new_connection
       c = OCI8.new(config["username"], config["password"], config["database"])
       c.autocommit = true

data/lib/oci8_simple/config.rb

@@ -0,0 +1,43 @@
+module Oci8Simple
+  ##
+  # Config will look in three places for your database.yml file. Here is the order: 
+  #   Dir.pwd + database.yml
+  #   Dir.pwd + config/database.yml
+  #   ~/.oci8_simple/database.yml
+  #
+  class Config
+    USER_DIR = File.join(ENV["HOME"], ".oci8_simple")
+
+    def [](key)
+      @raw_config[key]
+    end
+
+    def initialize
+      load_yaml 
+    end
+
+    def database_yaml_path
+      path = File.join(Dir.pwd, "database.yml")
+      return path if File.exists?(path)
+      path = File.join(Dir.pwd, "config", "database.yml")
+      return path if File.exists?(path)
+      File.join(USER_DIR, "database.yml")
+    end
+
+    def load_yaml
+      begin
+        @raw_config = YAML.load_file(database_yaml_path)
+      rescue Errno::ENOENT => e
+        raise ConfigError.new <<-ERR
+File #{CONFIG_FILE} doesn't exist - use the following template:
+
+environment:
+  database: 192.168.1.3:1521/sid
+  username: foo_user
+  password: foobar
+
+ERR
+      end
+    end
+  end
+end

data/lib/oci8_simple.rb

@@ -9,6 +9,7 @@ require 'yaml'
 gem 'ruby-oci8'
 require 'oci8'
 
+require 'oci8_simple/config'
 require 'oci8_simple/command'
 require 'oci8_simple/cli'
 require 'oci8_simple/client'

data/oci8_simple.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/oci8_simple/cli.rb",
     "lib/oci8_simple/client.rb",
     "lib/oci8_simple/command.rb",
+    "lib/oci8_simple/config.rb",
     "lib/oci8_simple/describe.rb",
     "lib/oci8_simple/show.rb",
     "oci8_simple.gemspec",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oci8_simple
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-oci8
@@ -54,6 +54,7 @@ files:
 - lib/oci8_simple/cli.rb
 - lib/oci8_simple/client.rb
 - lib/oci8_simple/command.rb
+- lib/oci8_simple/config.rb
 - lib/oci8_simple/describe.rb
 - lib/oci8_simple/show.rb
 - oci8_simple.gemspec
@@ -77,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -303796649655696785
+      hash: -178540163749839115
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -303796649655696785
+      hash: -178540163749839115
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25