bibliotech 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9552ff1e32b9c14d8cbde2fe7281c62f52c195d
-  data.tar.gz: 4609e1b88f0e2e79e27b2a0464d46e3b23b8ecf8
+  metadata.gz: 919a784cbc71ae6bc45f971f18a27f1af5c481e7
+  data.tar.gz: cf153fa187fc464dfbca7d2651d358cb339dd18b
 SHA512:
-  metadata.gz: 0d056aff58cc52edb9c3bf9384cba9d97b2070d2279ce18af055d340b58c6686e464181ad9784cf00fee5ad00e21fcb42eb027935cf861d160f6635d66aa6cb7
-  data.tar.gz: 9dda9ab623eb889499d02ae8b49ceb5d876ad13ba0d98391d86ecab47fd6439d4d763a7c93042118a60ed991c46145f0fa0a6b428b482281184f3c469bcc54e5
+  metadata.gz: 8c92e75621478014eafff6776da25d10423f92b5cf47a4561b7688358010403d5982eab03a1b53f176bf2f8528e151fe2bce2623ea93bcbe65c65189b41d0858
+  data.tar.gz: 8e6083d0a358b9518132518e2dd86031595bdf71b0c95ec9b0ec2f0be64710e9caeb6784f959155d19033ba29f6cff6f68c11fc3357cc4560a556fa96914d51e

data/lib/bibliotech/config.rb

@@ -203,7 +203,14 @@ module BiblioTech
     end
 
     def database_config
-      hash["database_config"] ||= valise.contents(local_get(:database_config_file))[local_get(:database_config_env)]
+      hash["database_config"] ||=
+        begin
+          db_config = YAML::load(File::read(local_get(:database_config_file)))
+          db_config.fetch(local_get(:database_config_env)) do
+            require 'pp'
+            raise KeyError, "No #{local_get(:database_config_env)} in #{db_config.pretty_inspect}"
+          end
+        end
     end
 
     #@group File management

data/spec/bibliotech/config_spec.rb

@@ -3,26 +3,32 @@ require 'spec_helper'
 
 module BiblioTech
   describe Config do
+    include FileSandbox
+
     describe 'initialization' do
+      before :each do
+        sandbox.new :file => 'config/database.yml', :with_contents => YAML::dump(
+          {
+          "development" =>
+          { "username" => 'root',
+            "database"  => 'dev_db',
+            "adapter"   => 'mysql',
+          },
+          "production" =>
+          { "username" => 'root',
+            "database"  => 'prod_db',
+            "adapter"   => 'mysql2',
+          }
+        })
+      end
+
       let :valise do
         Valise.define do
           defaults do
             file "config.yaml", {
-              "database_config_file" => "database.yml",
+              "database_config_file" => "config/database.yml",
               "database_config_env" => "development",
             }
-            file "database.yml", {
-              "development" =>
-              { "username" => 'root',
-                "database"  => 'dev_db',
-                "adapter"   => 'mysql',
-              },
-              "production" =>
-              { "username" => 'root',
-                "database"  => 'prod_db',
-                "adapter"   => 'mysql2',
-              }
-            }
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliotech
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Evan Dorn
@@ -128,7 +128,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- bibliotech-0.2.5 Documentation
+- bibliotech-0.2.6 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement