bibliotech 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5cd8c3faadcd6085476fbc3dac6f1d4454ce634
-  data.tar.gz: e4cd40ae88b8e3e24f85ab1bcf5d22ee838735b3
+  metadata.gz: 804c1ec222cfcce3715ea70417d454d27f101d28
+  data.tar.gz: 9192572724a7195c5fae93b584ac4918faf7c1bd
 SHA512:
-  metadata.gz: bbe5696146f64efdb9c3c0cc54b9c14f64da721f428fb8f5ae12537cc2a747759584866105a713920e2239867337c55fc2b2a2aee06e87e3d4dbadf864d43467
-  data.tar.gz: 6bced695414d447ec449eaa40fc3c3a20742b70f6640e8e4b1767fcb38e648a9d9a7322b0e1a5bb061a9edddbe7ede0734e3899e0163338354fa3ebb952a0fbe
+  metadata.gz: c06ed0372a7bbb3bca55b97679876745fdfa41fca057b918c237fe022ff8b0535830e47cfee74afeb9892e04a5790f749ef780d2f22e345664adbbdd5628fc63
+  data.tar.gz: 92f31cb44424be653504b1bf5c7cab93ddf20b1600b7960072d51a22d265a64bebd72ad47ce28a62bb329a8f4cf0f48b0ff25913f73f28a75b212e3b55152a77

data/lib/bibliotech/application.rb

@@ -72,7 +72,8 @@ module BiblioTech
       @shell.run(commands.export(options))
     end
 
-    def create_backup(options)
+    def create_backup(options=nil)
+      options ||= {}
       time = Time.now.utc
       log.warn{ "Creating a backup at #{time}" }
       pruner = pruner(options)

data/lib/bibliotech/cli.rb

@@ -21,6 +21,12 @@ module BiblioTech
       app.import(:backups => { :filename => file })
     end
 
+    desc "backup", "Create a database backup if needed"
+    def backup()
+      app = App.new
+      app.create_backup
+    end
+
     desc "config", "Dumps the configuration as parsed"
     def config
       require 'yaml'

data/lib/bibliotech/config.rb

@@ -105,8 +105,8 @@ module BiblioTech
       steps = steps_for(key)
       steps_chain =
         begin
-          [steps, [local] + steps]
-        rescue MissingConfig
+          [[local] + steps, steps]
+        rescue MissingConfig => mc
           [steps]
         end
       extract(*steps_chain)

data/lib/bibliotech/rake_lib.rb

@@ -81,6 +81,7 @@ module BiblioTech
         namespace :remote_sync do
           desc "Pull the latest DB dump from the remote server into our local DB"
           task :down do
+            app.remote_cli(remote, "create_backup").must_succeed!
             result = app.remote_cli(remote, "latest")
             result.must_succeed!
             filename = result.stdout.chomp

data/spec/bibliotech/config_spec.rb

@@ -6,10 +6,11 @@ module BiblioTech
   describe Config do
     include FileSandbox
 
-    describe "datatbase.yml" do
+    describe "database.yml" do
       before :each do
         sandbox.new :file => 'config/database.yml', :with_contents => YAML::dump(
           {
+
             "development" =>
             { "username" => 'root',
               "database"  => 'dev_db',
@@ -128,6 +129,29 @@ module BiblioTech
         end
       end
 
+      context "environment overrides" do
+        let :config_hash do
+          { "backups" => {
+            "frequency" => 60,
+            "keep" => {
+              "hourly" => 1
+            }},
+            "production" => {
+              "backups" => {
+                "keep" => {
+                  "hourly" => 12
+                }
+              }
+            },
+            "local" => "production"
+          }
+        end
+
+        it "should prefer the local config" do
+          expect(schedule_array).to contain_exactly([60, 12])
+        end
+      end
+
       context "mismatched frequency" do
         let :config_hash do
           { "backups" => {

metadata

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