bibliotech 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 444a5754d4af68e747d403e3b05908eda8338bfd
-  data.tar.gz: 6dd387a940620c2f3c509b3f5a46d39a5d928876
+  metadata.gz: 29396006a12015a3a5d1e6473d119743e05df2a6
+  data.tar.gz: 8cca90411e64dc5a4bcbf647e7a838be7ad9c4e1
 SHA512:
-  metadata.gz: ff31dabedf2301badc381b7acae5bcab637385fd8f24c92597324fff64263a9ab68e2c4e716b110153a688ea693a6630207591561aa322964084841689e962e1
-  data.tar.gz: c72c661fab2d7d72b62cf0b17bbb5393e5393a90d556d8462333640a42658d89d554bd62ae19441ea261134f9a8df4e294b3226a8b5a9612ec333d24805e7965
+  metadata.gz: bf5b1c8544ae1d3ac98a7dd67265a7ed7925b23781aa788958edd64d7c6bc19490cd015094941299f9c68a8b6d8662b7b984785946f1fa98811f0ca0bfe4cfde
+  data.tar.gz: 37607ddddabd0e2fc8c196b4e739d1d026c605d9741b8b8e291d20cf3e0dd3f71dc2d401345d5a8945a4b3d86859209332e4d816e11524c681355af709a1ba8a

data/default_configuration/config.yaml

@@ -9,7 +9,7 @@ backups:
   prefix: backup
 log:
   target: stderr
-  level: debug
+  level: warn
 
 production:
   backups:

data/lib/bibliotech/backups/prune_list.rb

@@ -45,7 +45,7 @@ module BiblioTech
             parsed_time = Time::utc(*timespec)
             return FileRecord.new(File::join(path, file), parsed_time)
           else
-            raise "File prefixed #{prefix} doesn't match #{prefix_timestamp_re.to_s}: #{File::join(path, file)}"
+            raise "File prefixed #{prefix} doesn't match #{prefix_timestamp_re.inspect}: #{File::join(path, file)}"
           end
         else
           if file !~ TIMESTAMP_REGEX

data/lib/bibliotech/backups/pruner.rb

@@ -29,8 +29,23 @@ module BiblioTech
 
       def backup_needed?(time)
         most_recent = most_recent()
-        return true if most_recent.nil?
-        (time - most_recent.timestamp) > (frequency * 60)
+        log.info{ "backup_needed?: most_recent is #{most_recent.path rescue "<nil>"}" }
+        if most_recent.nil?
+          log.warn{ "backup_needed?: no backups yet -> YES" }
+          return true
+        end
+
+        difference = time - most_recent.timestamp
+        freq_seconds = frequency * 60
+        if difference >= freq_seconds
+          log.warn{ "backup_needed?: check time: #{time.inspect} most_recent timestamp: #{most_recent.timestamp.inspect}" }
+          log.warn{ "backup_needed?: delta: #{difference} frequency: #{freq_seconds} -> YES" }
+          return true
+        else
+          log.info{ "backup_needed?: check time: #{time.inspect} most_recent timestamp: #{most_recent.timestamp.inspect}" }
+          log.info{ "backup_needed?: delta: #{difference} frequency: #{freq_seconds} -> NO" }
+          return false
+        end
       end
 
       def list
@@ -59,9 +74,11 @@ module BiblioTech
           log.warn{ "No backup files in #{path} / #{name} !" }
         end
         list.each do |record|
-          log.info{
-            "#{record.path} #{record.timestamp} #{record.keep ? "kept: #{record.scheduled_by.inspect}" : "discarding"}"
-          }
+          if record.keep
+            log.info{ "#{record.path} #{record.timestamp} kept: #{record.scheduled_by.inspect}" }
+          else
+            log.warn{ "#{record.path} #{record.timestamp} discarding" }
+          end
         end
         list.select do |record|
           !record.keep?

data/lib/bibliotech/config.rb

@@ -39,7 +39,7 @@ module BiblioTech
     attr_writer :hash
 
     def hash
-      @hash ||= stringify_keys(valise.contents("config.yaml"))
+      @hash ||= stringify_keys(valise.exts(".yaml", ".yml").contents("config"))
     end
 
     def stringify_keys(hash) # sym -> string

data/lib/bibliotech/logger.rb

@@ -2,8 +2,21 @@ require 'logger'
 
 module BiblioTech
   module Logging
+    class NullLogger < BasicObject
+      def method_missing(method, *args, &block)
+      end
+    end
+
     def self.logger
-      return @logger
+      return (@logger || null_logger)
+    end
+
+    def self.null_logger
+      @null_logger ||=
+        begin
+          warn "Logging to a NullLogger (because logger didn't get set up)"
+          NullLogger.new
+        end
     end
 
     def self.logger=(value)

data/lib/bibliotech/railtie.rb

@@ -0,0 +1,17 @@
+begin
+  require 'rails'
+  raise LoadError unless defined? Rails
+
+  module BiblioTech
+    class Railtie < Rails::Railtie
+      #XXX Consider adding Rails options for bibliotech
+      #Would probably need to be exclusive with config files
+      rake_tasks do
+        require 'bibliotech/rake_lib'
+
+        BiblioTech::Tasklib.new
+      end
+    end
+  end
+rescue LoadError
+end

data/lib/bibliotech/rake_lib.rb

@@ -23,10 +23,15 @@ module BiblioTech
       configured_state = to_hash
       configured_state.delete(:app)
       configured_state.delete(:config_path)
-      case [config_path == app.config_path, configured_state == to_hash.delete(:config_path)]
-      when [false, false]
+
+      case [config_path == app.config_path, configured_state == @default_state]
       when [true, true]
-        raise "Cannot both change to config path and any other setting (sorry) - put configs in a file"
+      when [false, false]
+        raise "Won't both change config path and any other setting (sorry) - put configs in a file"
+        # The rationale here is that it would introduce two conflicting sets of
+        # configs, which would only enhance the level of confusion possible.
+        # XXX by that reasoning, if there are any non-default config files, we
+        # should reject Rakefile configs, but we don't
       when [true, false]
         app.config.hash.merge!(configured_state)
       when [false, true]

data/lib/bibliotech.rb

@@ -5,3 +5,4 @@ require 'bibliotech/config'
 require 'bibliotech/command_generator'
 require 'bibliotech/command_runner'
 require 'bibliotech/compression'
+require 'bibliotech/railtie' if defined?(Rails)

data/spec/bibliotech/backup_pruner_spec.rb

@@ -6,13 +6,14 @@ module BiblioTech
   describe Backups::Pruner do
     include FileSandbox
 
+    let :app do
+      App.new
+    end
+
     before :each do
       sandbox.new :directory => "db_backups"
       sandbox.new :file => '.bibliotech/config.yaml', :with_contents => "log:\n  target: ../tmp/test.log"
-    end
-
-    let :app do
-      App.new
+      app.log
     end
 
     let :schedule do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rspec'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'bibliotech')
 
+Dir.mkdir('tmp') unless File.directory?('tmp')
 File.open('tmp/test.log', "w") do |logfile|
   logfile.truncate(0)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliotech
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Evan Dorn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caliph
@@ -101,6 +101,7 @@ files:
 - lib/bibliotech/backups/file_record.rb
 - lib/bibliotech/application.rb
 - lib/bibliotech/cli.rb
+- lib/bibliotech/railtie.rb
 - lib/bibliotech.rb
 - bin/bibliotech
 - spec/spec_helper.rb
@@ -129,7 +130,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- bibliotech-0.3.3 Documentation
+- bibliotech-0.4.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement