bibliotech 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b318d37e5ba7da280c1a0107535d13a84f4e4829
-  data.tar.gz: 4d33472936234fe642d3956fd3eecaf90eb1de26
+  metadata.gz: b04dc447d4669ffeabae2e9ac1038121ff6f2708
+  data.tar.gz: 2d77acb36eee2bca70ad337af529675423a498a0
 SHA512:
-  metadata.gz: d34215be4ff08ebcbd3200b078de05667400eac767454931c8d6240128f9990162545cdeae1d83a0601bc5c5beb63ac14f196130fd6cfdc5a7f70fc050d0caf2
-  data.tar.gz: b20cd62aa59950be169b404345945819123afc7068d61d8dbadb0f89afb3f958f2a8f226ad00b18d97de9bbfe08ecf2787e8de29a3d1e528aab91240e6564f1f
+  metadata.gz: 02fff89fe07d885f4982bb14e740baabf6b0f6f2312e9754f6909dca820e7c5a92085f338be0ef93513d9dbfa960080889461e9f23104dc2317df831f67908fe
+  data.tar.gz: e025eb2eb129bdfef117968848896a4a249f311986f2779b8d2b9d08c2932daf527161e581f3bdaddef0814a1cdcd257fc9d539e1d3c56a644ad7bae75e0cc25

data/lib/bibliotech/builders/postgres.rb

@@ -14,7 +14,12 @@ module BiblioTech
           config.optional{ command.env["PGPASSWORD"] = config.password }
           config.optional{ command.options << "-p #{config.port}" } #ok
 
-          command.options << "-U #{config.username}"
+          if config.local == "development"
+            config.optional{ command.options << "-U #{config.username}" }
+          else
+            command.options << "-U #{config.username}"
+          end
+
           command.options << "#{config.database}"
           command
         end
@@ -32,7 +37,12 @@ module BiblioTech
           config.optional{ command.env["PGPASSWORD"] = config.password }
           config.optional{ command.options << "-p #{config.port}" } #ok
 
-          command.options << "-U #{config.username}"
+          if config.local == "development"
+            config.optional{ command.options << "-U #{config.username}" }
+          else
+            command.options << "-U #{config.username}"
+          end
+
           command.options << "-d #{config.database}"
           command
         end

data/lib/bibliotech/config.rb

@@ -254,7 +254,11 @@ module BiblioTech
     end
 
     def database_config
-      hash["database_config"] ||=
+      local_get(:database_config)
+    end
+
+    def app_db_config
+      @app_db_config ||=
         begin
           db_config = YAML::load(File::read(local_get(:database_config_file)))
           db_config.fetch(local_get(:database_config_env)) do
@@ -264,6 +268,12 @@ module BiblioTech
         end
     end
 
+    def db_get(field)
+      local_get(field)
+    rescue MissingConfig
+      app_db_config.fetch(steps_for(field).last)
+    end
+
     #@group File management
     def backup_file
       local_get(:file)
@@ -294,33 +304,27 @@ module BiblioTech
 
     #@group Database
     def adapter
-      database_config
-      local_get(:db_adapter)
+      db_get(:db_adapter)
     end
 
     def host
-      database_config
-      local_get(:db_host)
+      db_get(:db_host)
     end
 
     def port
-      database_config
-      local_get(:db_port)
+      db_get(:db_port)
     end
 
     def username
-      database_config
-      local_get(:db_username)
+      db_get(:db_username)
     end
 
     def database
-      database_config
-      local_get(:db_database)
+      db_get(:db_database)
     end
 
     def password
-      database_config
-      local_get(:db_password)
+      db_get(:db_password)
     end
     #@endgroup
   end

data/spec/bibliotech/command_generator/postgres_spec.rb

@@ -17,7 +17,9 @@ module BiblioTech
     let   (:base_options){{}}
 
     let :base_config_hash do
-      { "database_config" =>
+      {
+        "local" => "production",
+        "database_config" =>
         {
           "adapter" => :postgres,
           "database" => db_name,

data/spec/bibliotech/config_spec.rb

@@ -1,64 +1,92 @@
 require 'valise'
 require 'spec_helper'
+require 'file-sandbox'
 
 module BiblioTech
   describe Config do
     include FileSandbox
 
-    describe 'initialization' do
+    describe "datatbase.yml" 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',
-          }
-        })
+            "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" => "config/database.yml",
-              "database_config_env" => "development",
-            }
+      describe 'initialization' do
+        let :valise do
+          Valise.define do
+            defaults do
+              file "config.yaml", {
+                "database_config_file" => "config/database.yml",
+                "database_config_env" => "development",
+              }
+            end
           end
         end
-      end
 
-      subject :config do
-        BiblioTech::Config.new(valise)
-      end
+        subject :config do
+          BiblioTech::Config.new(valise)
+        end
+
+        context "if the file contains database configs" do
+          context "with default(development) environment" do
+            it "should make the development hash available at config" do
+              expect(config.database).to eql "dev_db"
+            end
+          end
 
-      context "if the file contains database configs" do
-        context "with default(development) environment" do
-          it "should make the development hash available at config" do
-            expect(config.database).to eql "dev_db"
+          context "with specified environment" do
+            it "should make the string-specified hash available at config" do
+              expect(config.merge("database_config_env" => "production").database).to eql "prod_db"
+            end
           end
         end
 
-        context "with specified environment" do
-          it "should make the string-specified hash available at config" do
-            expect(config.merge("database_config_env" => "production").database).to eql "prod_db"
+        context "when the file contains bad configs" do
+          context "with no matching environment" do
+            it "should raise an error" do
+              expect do
+                config.merge("database_config_env" => "only_for_pretend").database
+              end.to raise_error(KeyError)
+            end
           end
         end
       end
 
-      context "when the file contains bad configs" do
-        context "with no matching environment" do
-          it "should raise an error" do
-            expect do
-              config.merge("database_config_env" => "only_for_pretend").database
-            end.to raise_error(KeyError)
+      describe "partial override of database.yml" do
+        let :valise do
+          Valise.define do
+            defaults do
+              file "config.yaml", {
+                "database_config_file" => "config/database.yml",
+                "database_config_env" => "development",
+                "database_config" => {
+                  "username" => "codemonkey"
+                }
+              }
+            end
           end
         end
+
+        subject :config do
+          BiblioTech::Config.new(valise)
+        end
+
+        it "should blend the bibliotech config and Rails config" do
+          expect(config.database).to eql("dev_db")
+          expect(config.username).to eql("codemonkey")
+        end
       end
     end
 
@@ -83,9 +111,9 @@ module BiblioTech
         { "backups" => {
           "frequency" => 60,
           "keep" => {
-          60 => 24,
-          1440 => 7
-        }}}
+            60 => 24,
+            1440 => 7
+          }}}
       end
 
       let :schedule_array do
@@ -105,9 +133,9 @@ module BiblioTech
           { "backups" => {
             "frequency" => 59,
             "keep" => {
-            60 => 24,
-            1440 => 7
-          }}}
+              60 => 24,
+              1440 => 7
+            }}}
         end
 
         it "should raise an error" do
@@ -122,10 +150,10 @@ module BiblioTech
           { "backups" => {
             "frequency" => "sometimes",
             "keep" => {
-            "often" => 24,
-            "regular" => 7,
-            "chocolate" => 4
-          }}}
+              "often" => 24,
+              "regular" => 7,
+              "chocolate" => 4
+            }}}
         end
 
         it "should raise an error" do
@@ -140,11 +168,11 @@ module BiblioTech
           { "backups" => {
             "frequency" => "hourly",
             "keep" => {
-            "hourlies" => 24,
-            "daily" => 7,
-            "weeklies" => 4,
-            "monthly" => "all"
-          }}}
+              "hourlies" => 24,
+              "daily" => 7,
+              "weeklies" => 4,
+              "monthly" => "all"
+            }}}
         end
 
         it "should produce correct schedule" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliotech
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Evan Dorn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caliph
@@ -130,7 +130,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- bibliotech-0.4.1 Documentation
+- bibliotech-0.5.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement