backupsss 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84877b8b75bdabc883f3be4c41d09a1caad32f51
-  data.tar.gz: b43a5d76c1d291c39973e0c3da5d688768a4ad4d
+  metadata.gz: e188c88c729cebff877b177c50f6b87e9a570bbb
+  data.tar.gz: 853c193df4f897313ef3ef77a13ec00ae3a15616
 SHA512:
-  metadata.gz: 7d1e1b4b6ee3568c3e572a68688b7c34efe516f2dbfaf5473764fa9164202f9ca423d13ba1a3cf983db3cd80dbb94070d82c07649976aeae566cb2caa8f86b4c
-  data.tar.gz: 75a6564856a994a39e8db00023bbcc0f0792b9e569e81802b4c87382360a7d1ff1b2d993aadf4c5a4747c40a60c94f3ab5a3f7efdf99d3e97230846ec53bad56
+  metadata.gz: af5e3ff5f9c5e4269257294da0229d25f2a7d9f7bbe9066d6be43e87e281982583f3464d079116b8e8b08f33ef61ff3de7249521495bd4a46255c9629b751aa0
+  data.tar.gz: 22aff21ccfe7f0302384ccaa6f459bf2448ab9f8453e730a5a6f3008c988d58d1b3528d2a125a6385911836fc58c8200a6862629b65e8778f54d6efe41bb3510

data/backupsss.gemspec

@@ -42,5 +42,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'aws-sdk', '~> 2.7.0'
   spec.add_runtime_dependency 'parallel', '~> 1.10.0'
-  spec.add_runtime_dependency 'rufus-scheduler', '~> 3.3.2'
+  spec.add_runtime_dependency 'rufus-scheduler', '3.4.0'
 end

data/exe/backupsss

@@ -3,4 +3,4 @@
 require 'backupsss'
 $stdout.sync = true
 $stderr.sync = true
-Backupsss.run
+Backupsss::Runner.new.run

data/lib/backupsss/configuration.rb

@@ -40,7 +40,7 @@ module Backupsss
     end
 
     def throwout_nils(attrs)
-      attrs.reject { |_, v| v.nil? }
+      attrs.reject { |k, v| v.nil? && k != :backup_freq }
     end
 
     def attrs

data/lib/backupsss/version.rb

@@ -1,3 +1,3 @@
 module Backupsss
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/backupsss.rb

@@ -10,11 +10,20 @@ require 'backupsss/configuration'
 
 # A utility for backing things up to S3.
 module Backupsss
-  class << self
-    def config
-      @config ||= Backupsss::Configuration.new
+  # A Class for running this backup utility
+  class Runner
+    attr_accessor :config
+
+    def initialize
+      @config = Backupsss::Configuration.new
+    end
+
+    def run
+      config.backup_freq ? run_scheduled : run_oneshot
     end
 
+    private
+
     def call
       push_backup(*prep_for_backup)
       cleanup_local
@@ -63,17 +72,25 @@ module Backupsss
       remote_janitor.rm_garbage(remote_janitor.sift_trash)
     end
 
-    def run
+    def run_scheduled
+      $stdout.puts "Schedule provided, running with #{config.backup_freq}"
+
       scheduler = Rufus::Scheduler.new
-      scheduler.cron(config.backup_freq, blocking: true) do
-        begin
-          call
-        rescue => exc
-          $stderr.puts "ERROR - backup failed: #{exc.message}"
-          $stderr.puts exc.backtrace.join("\n\t")
-        end
-      end
+      scheduler.cron(config.backup_freq, blocking: true) { make_call }
       scheduler.join
     end
+
+    def run_oneshot
+      $stdout.puts 'No Schedule provided, running one time task'
+
+      make_call
+    end
+
+    def make_call
+      call
+    rescue => exc
+      $stderr.puts "ERROR - backup failed: #{exc.message}"
+      $stderr.puts exc.backtrace.join("\n\t")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backupsss
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Reppard Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,16 +198,16 @@ dependencies:
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 3.4.0
 description: Backup any file or directory as a tar and push the tar to a specificed
   S3 bucket.
 email: