riserva 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f4d5ec8623ba7581225f4909122d8cb168043f8ea282957a4c9344ca1c33d6
-  data.tar.gz: 918601c9444c915eb2e21a254b375b867df4709926966964c54f48e76765ddfe
+  metadata.gz: 5d12cf9a1a3acc7eabbcfced6e6a7ea4d465ec88a3d70dfdae420ee0805985a6
+  data.tar.gz: 7d8baa45525189353501c81ca3cc7624e0b5610dc260b57d75f9f7b9b8e52911
 SHA512:
-  metadata.gz: d979e4adb68e95e13f4d3a33cfa173808e921341f457e7269f20b0fee9fb45db54d4755ecb3bd748b853bdd80201ab98d4888f79d4b9c528081b91eaa03431f4
-  data.tar.gz: b31cd18f26460963331bfbef68fcba9626edbe386ff27fcbd62ed0ceeaf3e846f63b0c21e24699b2a6969f084fa1a97764d75fb4ffc3ffe679bbf63bbc14eef7
+  metadata.gz: 8cd2c8f78942f05fbf8edb187a2189c3eb8a65aaf5d62d4d83531976564597e2ad9e5af4c2f83b59b050ef50bca1f5f4a9213677a6532b4653ea8a1e4aebbc94
+  data.tar.gz: 67382d492412968b35dae6f3d7e5881f78130c7c9265bb952a9a44e761b327b750027f5825da740a37550570720ac0e07eb3db7e1382af753c8958e06b90c2a0

data/TODO.md

@@ -1,5 +1,5 @@
 ## TODO
 
-* delete old files
 * restore from backup
+* implement deduplication
 * create archives in `/tmp` folder if location is not specified

data/bin/riserva

@@ -12,6 +12,8 @@ class RiservaExecutable
     case Choice[:perform]
     when 'backup' then
       Riserva::Commands::Backup.new.call
+    when 'clean' then
+      Riserva::Commands::Clean.new.call
     end
   end
 end

data/config/samples/riserva.yml.sample

@@ -8,6 +8,8 @@ folders:
 storage:
   google_drive:
     secrets: 'config/google_drive_secrets.json'
+    days_to_keep: 30
 
   dropbox:
     secrets: 'config/dropbox_secrets.json'
+    days_to_keep: 30

data/lib/riserva/command_line.rb

@@ -4,8 +4,8 @@ Choice.options do
   option :perform do
     short '-p'
     long '--perform=OPERATION'
-    desc 'Operation to perform, valid options: backup (default)'
-    valid %w[backup]
+    desc 'Operation to perform, valid options: backup (default), clean'
+    valid %w[backup clean]
     default 'backup'
   end
 

data/lib/riserva/commands/backup.rb

@@ -12,6 +12,9 @@ module Riserva::Commands
       push_to_cloud
 
       success? ? broadcast(:ok) : broadcast(:failed)
+    rescue StandardError => exception
+      broadcast(:failed)
+      raise exception
     end
 
     private

data/lib/riserva/commands/clean.rb

@@ -0,0 +1,11 @@
+module Riserva::Commands
+  class Clean < ApplicationCommand
+    def call
+      Riserva::Config.storages do |storage|
+        broadcast(:start_cleaning, storage)
+
+        storage.clean
+      end
+    end
+  end
+end

data/lib/riserva/listeners/clean.rb

@@ -0,0 +1,19 @@
+module Riserva::Listeners
+  class Clean < ApplicationListener
+    def initialize
+      Riserva.logger.info('Starting cleanup...')
+    end
+
+    def ok
+      Riserva.logger.info('OK')
+    end
+
+    def failed
+      Riserva.logger.info('Failed')
+    end
+
+    def start_cleaning(storage)
+      Riserva.logger.info("Deleting old files on #{storage.title}...")
+    end
+  end
+end

data/lib/riserva/storage/application_storage.rb

@@ -17,5 +17,12 @@ module Riserva::Storage
     def config_secrets
       Riserva::Config.read([:storage, title, :secrets].join('.'))
     end
+
+    def time_to_keep
+      value = Riserva::Config.read([:storage, title, :days_to_keep].join('.'))
+      return unless value
+
+      value.days
+    end
   end
 end

data/lib/riserva/storage/dropbox.rb

@@ -26,6 +26,16 @@ module Riserva::Storage
       data.content_hash == checksum
     end
 
+    def clean
+      return unless time_to_keep
+
+      session.list_folder('').entries.each do |file|
+        next unless file.client_modified < time_to_keep.ago
+
+        session.delete file.path_lower
+      end
+    end
+
     private
 
     def session

data/lib/riserva/storage/google_drive.rb

@@ -20,6 +20,14 @@ module Riserva::Storage
       file.md5_checksum == checksum
     end
 
+    def clean
+      return unless time_to_keep
+
+      session.files.each do |file|
+        file.delete if file.created_time < time_to_keep.ago
+      end
+    end
+
     private
 
     def session

data/lib/riserva/version.rb

@@ -1,3 +1,3 @@
 module Riserva
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/riserva.rb

@@ -2,6 +2,7 @@
 
 require 'riserva/version'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/time'
 require 'pathname'
 
 module Riserva
@@ -11,6 +12,7 @@ module Riserva
   module Commands
     autoload :ApplicationCommand, 'riserva/commands/application_command'
     autoload :Backup, 'riserva/commands/backup'
+    autoload :Clean, 'riserva/commands/clean'
     autoload :CreateArchive, 'riserva/commands/create_archive'
     autoload :UploadFile, 'riserva/commands/upload_file'
   end
@@ -18,6 +20,7 @@ module Riserva
   module Listeners
     autoload :ApplicationListener, 'riserva/listeners/application_listener'
     autoload :Backup, 'riserva/listeners/backup'
+    autoload :Clean, 'riserva/listeners/clean'
     autoload :CreateArchive, 'riserva/listeners/create_archive'
     autoload :UploadFile, 'riserva/listeners/upload_file'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riserva
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Igor Malinovskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,11 +218,13 @@ files:
 - lib/riserva/command_line.rb
 - lib/riserva/commands/application_command.rb
 - lib/riserva/commands/backup.rb
+- lib/riserva/commands/clean.rb
 - lib/riserva/commands/create_archive.rb
 - lib/riserva/commands/upload_file.rb
 - lib/riserva/config.rb
 - lib/riserva/listeners/application_listener.rb
 - lib/riserva/listeners/backup.rb
+- lib/riserva/listeners/clean.rb
 - lib/riserva/listeners/create_archive.rb
 - lib/riserva/listeners/upload_file.rb
 - lib/riserva/log.rb