techinform 1.1.5 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b46a86627ff6c858e3be17cca5fb11f49e6360be7e4cb3150fe6d14e71e46e7
-  data.tar.gz: 9b1f8d2f5b26a79c9eff1d9de42d006b1c8687e5e348a425e1325ac56b960aeb
+  metadata.gz: a5feb947d3f7cfd7fc1684ffedde7cdd0e8f11bf98cb7d8fdeb9a8acd9e6ab09
+  data.tar.gz: '0548eaae7d279ed149c67eccc7bbf1f862fbe2c0e800512d8ca7317f543070fa'
 SHA512:
-  metadata.gz: 80b1c0905170c7ac239013e5c2413a8a22c58ab3ba5fa9820ad000aecfde3d884da221a504df442109deda1737621aae82cd740af8628a0b45405861ec1f3c61
-  data.tar.gz: a6c9290269b5d74fee1293ce55dbe628e49c7fb95bfb2f4b5db7f24b7b39cff3982c9a956ee452824bce60456d3a0301f05802a5cec7da9a729fa363ebcdd531
+  metadata.gz: c35eb62de6a8c4501558102b88a75f745402b3d0cdc420733e1666183b119ddbd7811750048edd7ffbc8c28eb2c5f77f54b95029fce6f403d5672a1e26018a5b
+  data.tar.gz: 25df7864b78286c8800b31f811ad46799a3d56b33386fa939291cbd78bd52ea5bff1da9b4d187b8df8e76d2545d749b7d28d91c29b31c4e2b3090b522e423bdd

data/lib/backup/backup.rb

@@ -1,5 +1,6 @@
 require 'date'
 require_relative '../techinform/defaults'
+require 'highline'
 
 class Backup
   DATE_FORMAT = '%Y-%m-%d-%H-%M'
@@ -73,7 +74,8 @@ class Backup
   end
 
   def get_datetime_from_filename filename
-    DateTime.strptime(filename.split('-')[2], DATE_FORMAT)
+    puts 'Filename: ' + filename.split('.').first.split('-')[2..6].join('-')
+    DateTime.strptime(filename.split('.').first.split('-')[2..6].join('-'), DATE_FORMAT)
   end
 
   def print_info
@@ -88,34 +90,62 @@ class Backup
     puts output unless output.empty?
   end
 
+  # Change it in child class
+  def minimum_backup_size
+    50
+  end
+
+  # It worth to redefine that method to better check backup integrity
+  # Return true if everything ok
+  def verify_backup
+    File.size(filepath) > minimum_backup_size
+  end
 
-  def clean_files
+  def clean_files(prefix = 'local', dry_run = true)
+    puts(dry_run ? 'Performing dry run' : '!!!! Cleaning backups !!!!')
     result = {} # true - delete file, false - do not delete
     months_taken = []
     days_taken = []
-    files = Dir.entries(path) - ['.', '..']
-    files.each do |file|
-      datetime = get_datetime_from_filename(file)
-      day_id = datetime.strftime('%Y-%m-%d')
-      month_id = datetime.strftime('%Y-%m')
-      if datetime < (DateTime.now << 2)     # 2 month ago
-        if datetime.day == 1 && !(months_taken.include? month_id)
-          result[file] = false
-          months_taken << month_id
-        else
-          result[file] = true
+    # Process each backup type
+    Dir["#{Techinform::BACKUPS_PREFIX}/#{prefix}/*"].each do |type|
+      puts "Type: #{type}"
+      # Get all backup name
+      Dir["#{type}/*"].each do |name|
+        puts "Name: #{name}"
+        # Get all files
+        Dir["#{name}/*"].sort.each do |file|
+          datetime = get_datetime_from_filename(file)
+          day_id = datetime.strftime('%Y-%m-%d')
+          month_id = datetime.strftime('%Y-%m')
+          if datetime < (DateTime.now << 2)     # 2 month ago
+            if datetime.day == 1 && !(months_taken.include? month_id)
+              result[file] = false
+              months_taken << month_id
+            else
+              result[file] = true
+            end
+          elsif datetime < DateTime.now - 14 # 2 weeks ago
+            if [1, 7, 14, 21].include?(datetime.day) && !(days_taken.include?(day_id))
+              result[file] = false
+              days_taken << day_id
+            else
+              result[file] = true
+            end
+          end
+        end
+        result.each do |file, delete|
+          puts "#{file} #{"*" if delete}"
         end
-      elsif datetime < DateTime.now - 14 # 2 weeks ago
-        if [1, 7, 14, 21].include?(datetime.day) && !(days_taken.include?(day_id))
-          result[file] = false
-          days_taken << day_id
-        else
-          result[file] = true
+        unless dry_run
+          return unless HighLine.new.agree "Delete #{result.select{|file, delete| delete}.keys.size} files - Are you sure? (yes/no)"
+          # Actually delete files
+          result.select{|file, delete| delete}.keys.each do |file|
+            puts `rm #{file}`
+          end
         end
       end
     end
 
-    puts "Candidates to removal: #{result.select{|file, delete| delete }.keys.inspect}"
   end
 end
 

data/lib/techinform/version.rb

@@ -1,3 +1,3 @@
 module Techinform
-  VERSION = "1.1.5"
+  VERSION = "1.2.1"
 end

data/lib/techinform.rb

@@ -40,6 +40,11 @@ module Techinform
     subcommand :projects, Techinform::Projects
     desc 'backup', 'Backup'
     subcommand :backup, Techinform::BackupCommand
+    desc "clean [prefix]", 'Clean old backup files (default prefix: local)'
+    option :delete, type: :boolean, desc: 'Actually delete files'
+    def clean(prefix = 'local')
+      puts Backup.new.clean_files(prefix, !options[:delete])
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: techinform
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.1
 platform: ruby
 authors:
 - Alexey Chernikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -130,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Console tools, useful at Techinform