wolfe 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8eca5f25a417d9be289940dbd9293b12d37a05a
-  data.tar.gz: 680d98ac9ff0c28edcb0cea1b3388a0707ee8b07
+SHA256:
+  metadata.gz: 9ce9fa333a51ce60859ae813dbfb4308c90eadbd41ee179a3e3eadf743ecf109
+  data.tar.gz: db8bcfc7a54747e164a9e045c8eec8b0867b1b00039f0232568dd174e8bfd353
 SHA512:
-  metadata.gz: 40901c950e77768b131b859fc80bc66e71ca9d5c73ed5b0932efdfd352de01a9a4c7e5e22c9344d64b28a59ee925a19263f1c764849537eb52d1ae84ed73d5d1
-  data.tar.gz: 04073e08e15428e1ce63711fa42bb6ca59ab2429b02d74ad8212e6d6bceb90601e3afdbfd086055af842d652a439d8eb286cc7c99a28802c076f35af7a9fe4bb
+  metadata.gz: 7d7377bdcd4332ce20d928137a308fe390e4f4714856c2c9f4f5ec32d39d177339a29e9c4ea6bd0bbd6d5b376c269720ec373db5073e658627442bdac688f5a3
+  data.tar.gz: 78888639767e3bd22287db106dde4d08d8ba5ad45ca5eddc0e3b86e8c811eedc6d4ad0d43165e176ae3edcc5dfc7e1ec8698c0ff11a60ed3cb3a6c703ff51f30

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.2.0 (2018-09-05)
+
+Changes:
+
+	- modify gem not to clean backups if the last backup is empty
+	- modify gem to have the option of not keeping one backup
+	- improve readability
+
 ## 1.1.1 (2015-10-16)
 
 Changes:

data/lib/wolfe/cleanup.rb

@@ -1,11 +1,14 @@
 require "active_support"
 require "active_support/core_ext"
 require "fileutils"
+require "wolfe/timespan_from_configuration"
 
 module Wolfe
   class Cleanup
     attr_accessor :configuration
 
+    BACKUP_FIRST_CUTOFF_DATE = Date.today - 5.years
+
     def initialize(configuration)
       @configuration = configuration
       validate_configuration
@@ -49,32 +52,42 @@ module Wolfe
       # cleanup
       #
 
-      def cleanup( config )
-        daily_date = Date.today - eval( config['one_per_day_timespan'] )
-        monthly_date = Date.today - eval( config['one_per_month_timespan'] )
-        first_relevant_date = Date.today - 5.years
+      def cleanup(config)
+        daily_date = Date.today - TimespanFromConfiguration.new(config['one_per_day_timespan']).timespan
+        monthly_date = calculate_monthly_date(config['one_per_month_timespan'])
+        keep_one = TimespanFromConfiguration.new(config['one_per_month_timespan']).keep_one_backup?
 
         if File.directory?(config['path'])
-          clean_monthly( monthly_date, daily_date, config )
-          clean_yearly( first_relevant_date, monthly_date, config )
+          clean_monthly(monthly_date, daily_date, config, keep_one)
+          clean_yearly(monthly_date, config, keep_one) if keep_one
         else
           puts "Path '#{config['path']}' is not a directory."
         end
       end
 
-      def clean_monthly( monthly_date, daily_date, config )
-        monthly_date.upto( daily_date ) do |date|
-          delete_but_keep_one_per_month( config['path'], config['filename'], date )
+      def calculate_monthly_date(one_per_month_timespan)
+        timespan = TimespanFromConfiguration.new(one_per_month_timespan).timespan
+
+        if Date.today - timespan == Date.today
+          BACKUP_FIRST_CUTOFF_DATE
+        else
+          Date.today - timespan
         end
       end
 
-      def clean_yearly( first_relevant_date, monthly_date, config )
-        first_relevant_date.upto( monthly_date ) do |date|
-          delete_but_keep_one_per_year( config['path'], config['filename'], date )
+      def clean_monthly(monthly_date, daily_date, config, keep_one)
+        monthly_date.upto(daily_date) do |date|
+          delete_monthly(config['path'], config['filename'], date, keep_one)
         end
       end
 
-      def delete_but_keep_one_per_month( path, filename, date )
+      def clean_yearly(monthly_date, config, keep_one)
+        BACKUP_FIRST_CUTOFF_DATE.upto(monthly_date) do |date|
+          delete_yearly(config['path'], config['filename'], date, keep_one)
+        end
+      end
+
+      def delete_monthly(path, filename, date, keep_one)
         filename_month = filename % { year: date.strftime('%Y'),
                                      month: date.strftime('%m'),
                                        day: '*',
@@ -83,10 +96,11 @@ module Wolfe
                                    month: date.strftime('%m'),
                                      day: date.strftime('%d'),
                                     hour: '*' }
-        delete_but_keep_one( full_path( path, filename_month ), full_path( path, filename_day ) )
+
+        select_file_for_deletion(keep_one, path, filename_day, date, filename_month, nil)
       end
 
-      def delete_but_keep_one_per_year( path, filename, date )
+      def delete_yearly(path, filename, date, keep_one)
         filename_year = filename % { year: date.strftime('%Y'),
                                     month: '*',
                                       day: '*',
@@ -95,20 +109,69 @@ module Wolfe
                                    month: date.strftime('%m'),
                                      day: date.strftime('%d'),
                                     hour: '*' }
-        delete_but_keep_one( full_path( path, filename_year ), full_path( path, filename_day ) )
+
+        select_file_for_deletion(keep_one, path, filename_day, date, nil, filename_year)
+      end
+
+      def select_file_for_deletion(keep_one, path, filename_day, date, filename_month, filename_year)
+        if keep_one
+          select_file(full_path(path, filename_month), delete_path: full_path(path, filename_day)) if filename_month
+          select_file(full_path(path, filename_year), delete_path: full_path(path, filename_day)) if filename_year
+        else
+          select_file(delete_path: full_path( path, filename_day))
+        end
       end
 
-      def full_path( path, filename )
+      def full_path(path, filename)
         File.expand_path(File.join(path, filename))
       end
 
-      def delete_but_keep_one( keep_path, delete_path )
+      def select_file(keep_path=nil, delete_path:)
         Dir.glob(delete_path).each do |f|
-          if Dir.glob(keep_path).count > 1
-            puts "Delete: #{f}"
-            FileUtils.rm(f)
+          if File.size(Dir.glob(month_path(f)).sort.last) > 0
+            if keep_path
+              delete_but_keep_one(f, keep_path)
+            else
+              delete_without_keeping_one(f)
+            end
           end
         end
       end
+
+      def delete_but_keep_one(file, keep_path)
+        if Dir.glob(keep_path).count > 1
+          delete(file)
+        end
+      end
+
+      def delete_without_keeping_one(file)
+        if File.size(Dir.glob(next_file_path(file)).last) > 0
+          delete(file)
+        end
+      end
+
+      def delete(file)
+        puts "Delete: #{file}"
+        FileUtils.rm(file)
+      end
+
+      def month_path(file)
+        file_splitted = file.split('-')
+        file_splitted[-2] = "*"
+        file_splitted[-1] = "*"
+        file_splitted.join('-')
+      end
+
+      def date_from_file(file)
+        file_splitted = file.split('-')
+        file_splitted[-4..-2].join('.').to_date
+      end
+
+      def next_file_path(file_path)
+        next_file = file_path.dup
+        date = date_from_file(file_path)
+        next_file[-13..-4] = date.next.to_s
+        next_file
+      end
   end
 end

data/lib/wolfe/timespan_from_configuration.rb

@@ -0,0 +1,33 @@
+module Wolfe
+  class TimespanFromConfiguration
+    SUPPORTED_TIME_UNITS = %w(hours days months years).freeze
+
+    def initialize(config)
+      config = split_duration_and_unit(config)
+
+      @duration = Integer(config['duration'])
+      @unit = config['unit']
+      @unit = (@unit.to_s << 's').to_sym unless @unit.to_s.end_with? 's'
+
+      raise ArgumentError.new("Invalid time unit #{config['unit'].inspect}, expected one of #{SUPPORTED_TIME_UNITS.join(', ')}") unless supported_time_unit?
+    end
+
+    def timespan
+      @duration.send(@unit)
+    end
+
+    def keep_one_backup?
+      @duration.to_i != 0
+    end
+
+    private
+
+      def supported_time_unit?
+        SUPPORTED_TIME_UNITS.include?(@unit.to_s)
+      end
+
+      def split_duration_and_unit(config)
+        { 'duration' => config.split('.')[0].to_i, 'unit' => config.split('.')[1].to_sym }
+      end
+  end
+end

data/lib/wolfe/version.rb

@@ -1,3 +1,3 @@
 module Wolfe
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wolfe
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Emhofer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -120,6 +120,7 @@ files:
 - lib/wolfe.rb
 - lib/wolfe/cleanup.rb
 - lib/wolfe/cli.rb
+- lib/wolfe/timespan_from_configuration.rb
 - lib/wolfe/version.rb
 - wolfe.gemspec
 homepage: http://github.com/lomography/wolfe
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Cleanup (backup) files by date.