thin_out_backups 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80968eaf01eaf6a957e6e7a9a9861729e8edf7d4e59b922c4ee1eb4e8d07257
-  data.tar.gz: e4c3c24943da7ba7d050e1b524dd8b336b163dfbdfc1468c3815af1d6561c1bc
+  metadata.gz: 44d0bc06671e26f04c1aadea17a36ed97f634a4ee600ca74aa25d46ee37a33c4
+  data.tar.gz: 1ecb7d651527191a1b3698019295413d90b57f5ed19a38be5da5120d7690c65a
 SHA512:
-  metadata.gz: 66ab9f66ce03dbd2d4888a1e976e6e60e037f078bfbbc4520e9cbcec8e530c619d1f75180a0214eae7e083c310b3b9d1e7f9a1660ae01358593f4e5bd1ae260c
-  data.tar.gz: 8330c192dcb242366c66cbae5c427747fff1834643ba204f7e150e62fccfbf74e4b34c2421861918bf41d4b5aa4e842c8389d4a582ef5153961a32b2ca45f91b
+  metadata.gz: 415595c279a2cb7d59b001b0c95838f23fd0075231eb2bac8ea509a6b7ee407232067b39bece0427a950968a0a4de4b9c3dce3198262bbf9a5930122ab412c9a
+  data.tar.gz: 0440b71875c0e58fa27f0feef5fc51716f6d603d55d2da7cf1bc2c7fe444964faec966264c68ecfd85502f780367710861110fee72f3f3815640650c9254e6aa

data/bin/thin_out_backups

@@ -13,8 +13,6 @@ Before any other deletes, it should search for/delete duplicates. If --duplicate
 =end
 
 require 'getoptlong'
-#require 'rubygems'
-#require 'facets'
 require 'thin_out_backups'
 
 def help
@@ -154,7 +152,7 @@ opts.each do | opt, arg |
     ThinOutBackups::Command.force = true
 
   when '--no-color'
-    ThinOutBackups::Command.color = false
+    Rainbow.enabled = false
 
   when *ThinOutBackups::Command.options.map {|o| "--#{o.to_s.gsub(/_/, '-')}"}
     name = opt.gsub(/^--/, '').to_sym

data/lib/thin_out_backups/version.rb

@@ -1,3 +1,3 @@
 module ThinOutBackups
-  Version = "0.0.7"
+  Version = "0.1.0"
 end

data/lib/thin_out_backups.rb

@@ -5,13 +5,14 @@ require "thin_out_backups/version"
 require 'fileutils'
 require 'pathname'
 require 'delegate'
+require 'rainbow'
 
-#require 'rubygems'
 require 'facets/time'
+require 'active_support' # Without this, we get error when we try to cherry pick: undefined method `deprecator' for ActiveSupport:Module
 require 'active_support/time'
-require 'colored'
 require 'active_support/core_ext/module/attribute_accessors'
 
+
 class ThinOutBackups::Command
   #---------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -20,7 +21,7 @@ class ThinOutBackups::Command
 
   #---------------------------------------------------------------------------------------------------------------------------------------------------
   # Options
-  @@options = [:get_time_from, :ignore_files ,:verbosity, :time_format, :now, :force, :no_color]
+  @@options = [:get_time_from, :ignore_files ,:verbosity, :time_format, :now, :force]
   mattr_reader :options
   mattr_accessor *@@options
 
@@ -33,13 +34,12 @@ class ThinOutBackups::Command
   @@ignore_files = nil
   @@verbosity = 1
   @@force = false
-  @@color = true
 
   @@now = Time.now
   def self.now=(new)
     time = DateTime.strptime('2008-11-12 07:45:00', '%Y-%m-%d %H:%M:%S').to_time
     @@now = new
-    puts "Using alternate now: #{@@now}"
+    puts "Using alternate now: #{@@now}" if @@verbosity >= 1
   end
 
   @@time_format = /(\d{4})[^\d]?(\d{2})[^\d]?(\d{2})T(\d{2})[^\d]?(\d{2})[^\d]?(\d{2})?/
@@ -180,7 +180,7 @@ class ThinOutBackups::Command
       @buckets[name] = Bucket.new(self, name, quota) unless quota.nil?
     end
 
-    puts "Processing #{@dir}/*".magenta
+    puts Rainbow("Processing #{@dir}/*").magenta
     files = Dir["#{@dir}/*"].map { |filename|
       file = File.new(filename)
     }
@@ -213,9 +213,9 @@ class ThinOutBackups::Command
     #raise "Didn't find any files to keep?!" unless keepers.any?
     files_with_times.each do |file|
       if (buckets = buckets_with_file(file)).any?
-        puts "#{file.full_path}: in buckets: #{buckets.map(&:name).join(', ')}".green
+        puts Rainbow("#{file.full_path}: in buckets: #{buckets.map(&:name).join(', ')}").green
       else
-        puts "#{file.full_path}: delete".red
+        puts Rainbow("#{file.full_path}: delete").red
       end
     end
 
@@ -252,31 +252,33 @@ class ThinOutBackups::Command
 
     # Fill each bucket until its quota is met
     buckets.each do |bucket|
-      puts "Trying to fill bucket '#{bucket.name}' (quota: #{bucket.quota})...".magenta
+      puts Rainbow("Trying to fill bucket '#{bucket.name}' (quota: #{bucket.quota})...").magenta if verbosity >= 1
 
       time_max = bucket.start_time
       time_min = time_max.shift(-1, bucket.unit)
 
       #puts "Earliest_file_time: #{earliest_file_time}"
       while time_max > earliest_file_time
-        print "Checking range (#{time_min} .. #{time_max})... ".yellow if verbosity >= 1
         new_keeper = files_with_times.detect {|file|
           #print "#{file}? "
           time_min <= file.time &&
                       file.time < time_max
         }
+        if verbosity >= 2 || (verbosity >= 1 && new_keeper)
+          print Rainbow("Checking range (#{time_min} .. #{time_max})... ").yellow
+        end
         if new_keeper
-          puts "found keeper #{new_keeper}".green if verbosity >= 1
+          puts Rainbow("found keeper #{new_keeper}").green if verbosity >= 1
           bucket.keep new_keeper
         else
-          #puts "found no keepers".red if verbosity >= 1
-          puts "" if verbosity >= 1
+          #puts Rainbow("found no keepers").red if verbosity >= 1
+          puts "" if verbosity >= 2
         end
 
         time_max = time_min
         #puts "Stepping back from #{time_min} by 1 #{bucket.unit} => #{time_min.shift(-1, bucket.unit)}"
         time_min = time_min.shift(-1, bucket.unit)
-        (puts 'Filled quota!'.green; break) if bucket.satisfied?
+        (puts Rainbow('Filled quota!').green; break) if bucket.satisfied?
       end
     end
 

data/spec/thin_out_backups_spec.rb

@@ -1,21 +1,19 @@
 require 'tmpdir'
-#require 'rubygems'
 require 'rspec'
-require 'facets'
 require_relative '../lib/thin_out_backups'
 
 $now = Time.utc(2008,11,12, 7,45,19)
 
 describe '.time_format' do
   subject { ThinOutBackups::Command.time_format }
-  it { 'db_dump_20080808T0303.sql'.should match subject }
-  it { 'db_dump_2008-08-08T0303.sql'.should match subject }
-  it { 'db_backup.2016-04-28T01:04.sql.gz'.should match subject }
+  it { expect('db_dump_20080808T0303.sql').to match subject }
+  it { expect('db_dump_2008-08-08T0303.sql').to match subject }
+  it { expect('db_backup.2016-04-28T01:04.sql.gz').to match subject }
 end
 
 describe Time, "#beginning_of_week(:sunday)" do
   it "should return a Sunday" do
-    Time.utc(2008,11,12).beginning_of_week(:sunday).should == Time.utc(2008,11,9)
+    expect(Time.utc(2008,11,12).beginning_of_week(:sunday)).to eq(Time.utc(2008,11,9))
   end
 end
 
@@ -35,27 +33,28 @@ describe ThinOutBackups::Command::Bucket, "time interval alignment" do
   before do
     @command = ThinOutBackups::Command.new('bogus_dir', sample_quotas)
     @now = $now
-    @command.stub!(:now).and_return(@now)
+    allow(@command).to receive(:now).and_return(@now)
   end
 
   it "should use the time specified by our test" do
-    @command.now.should == @now
+    expect(@command.now).to eq(@now)
   end
 
   it "hour interval should start on the hour, etc." do
-    @command.bucket(:minutely).start_time.should == Time.utc(2008,11,12, 7,46,0)
-    @command.bucket(:hourly).  start_time.should == Time.utc(2008,11,12, 8,0,0)
-    @command.bucket(:daily).   start_time.should == Time.utc(2008,11,13, 0,0,0)
-    @command.bucket(:weekly).  start_time.should == Time.utc(2008,11,16, 0,0,0)
-    @command.bucket(:monthly). start_time.should == Time.utc(2008,12, 1, 0,0,0)
-    @command.bucket(:yearly).  start_time.should == Time.utc(2009, 1, 1, 0,0,0)
+    expect(@command.bucket(:minutely).start_time).to eq(Time.utc(2008,11,12, 7,46,0))
+    expect(@command.bucket(:hourly).  start_time).to eq(Time.utc(2008,11,12, 8,0,0))
+    expect(@command.bucket(:daily).   start_time).to eq(Time.utc(2008,11,13, 0,0,0))
+    expect(@command.bucket(:weekly).  start_time).to eq(Time.utc(2008,11,16, 0,0,0))
+    expect(@command.bucket(:monthly). start_time).to eq(Time.utc(2008,12, 1, 0,0,0))
+    expect(@command.bucket(:yearly).  start_time).to eq(Time.utc(2009, 1, 1, 0,0,0))
   end
 
 end
 
 
 $command = <<End
-thin_out_backups --force --daily=3 --weekly=3 --monthly=* \
+  ruby -Ilib bin/thin_out_backups --force --daily=3 --weekly=3 --monthly=* \
+                --no-color \
                 --now='#{$now.strftime("%Y-%m-%d %H:%M:%S")}'\
                 spec/test_dir/db_dumps \
                 spec/test_dir/maildir
@@ -120,21 +119,90 @@ describe ThinOutBackups::Command, "when calling `#{$command}`" do
       system "touch    #{dir}/#{subdir}/some_other_folder"
     end
 
-    #puts %($command=#{($command).inspect})
-    output = `#{$command}`
-    # TODO: also check output against expected
+    @output = `#{$command}`
+    expect($?.success?).to eq true
   end
 
-  it "keeps/removes the correct files" do
-    Dir['spec/test_dir/db_dumps/*'].should =~
-     ["spec/test_dir/db_dumps/db_dump_2008-11-12T0303.sql",
-      "spec/test_dir/db_dumps/db_dump_2008-11-08T0303.sql",
-      "spec/test_dir/db_dumps/db_dump_2008-10-31T0303.sql",
-      "spec/test_dir/db_dumps/db_dump_2008-11-10T0303.sql",
+  it do
+    #puts @output
+
+    expect(@output).to eq <<~End
+      Using alternate now: 2008-11-12 07:45:19
+      Processing spec/test_dir/db_dumps/*
+      Trying to fill bucket 'daily' (quota: 3)...
+      Checking range (2008-11-12 00:00:00 -0800 .. 2008-11-13 00:00:00 -0800)... found keeper db_dump_2008-11-12T0303.sql
+      Checking range (2008-11-11 00:00:00 -0800 .. 2008-11-12 00:00:00 -0800)... found keeper db_dump_2008-11-11T0303.sql
+      Checking range (2008-11-10 00:00:00 -0800 .. 2008-11-11 00:00:00 -0800)... found keeper db_dump_2008-11-10T0303.sql
+      Filled quota!
+      Trying to fill bucket 'weekly' (quota: 3)...
+      Checking range (2008-11-09 00:00:00 -0800 .. 2008-11-16 00:00:00 -0800)... found keeper db_dump_2008-11-12T0303.sql
+      Checking range (2008-11-02 00:00:00 -0700 .. 2008-11-09 00:00:00 -0800)... found keeper db_dump_2008-11-08T0303.sql
+      Checking range (2008-10-26 00:00:00 -0700 .. 2008-11-02 00:00:00 -0700)... found keeper db_dump_2008-11-01T0303.sql
+      Filled quota!
+      Trying to fill bucket 'monthly' (quota: *)...
+      Checking range (2008-11-01 23:00:00 -0700 .. 2008-12-02 00:00:00 -0800)... found keeper db_dump_2008-11-12T0303.sql
+      Checking range (2008-10-01 23:00:00 -0700 .. 2008-11-01 23:00:00 -0700)... found keeper db_dump_2008-11-01T0303.sql
+      Checking range (2008-09-01 23:00:00 -0700 .. 2008-10-01 23:00:00 -0700)... found keeper db_dump_2008-09-10T0303.sql
+      Checking range (2008-08-01 23:00:00 -0700 .. 2008-09-01 23:00:00 -0700)... found keeper db_dump_2008-09-01T0303.sql
+      spec/test_dir/db_dumps/db_dump_2008-11-12T0303.sql: in buckets: daily, weekly, monthly
+      spec/test_dir/db_dumps/db_dump_2008-11-11T0303.sql: in buckets: daily
+      spec/test_dir/db_dumps/db_dump_2008-11-10T0303.sql: in buckets: daily
+      spec/test_dir/db_dumps/db_dump_2008-11-09T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-11-08T0303.sql: in buckets: weekly
+      spec/test_dir/db_dumps/db_dump_2008-11-07T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-11-06T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-11-05T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-11-04T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-11-03T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-11-02T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-11-01T0303.sql: in buckets: weekly, monthly
+      spec/test_dir/db_dumps/db_dump_2008-10-31T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-30T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-29T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-28T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-27T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-26T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-25T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-24T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-23T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-22T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-21T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-20T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-19T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-18T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-17T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-16T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-10-15T0303.sql: delete
+      spec/test_dir/db_dumps/db_dump_2008-09-10T0303.sql: in buckets: monthly
+      spec/test_dir/db_dumps/db_dump_2008-09-01T0303.sql: in buckets: monthly
+      spec/test_dir/db_dumps/db_dump_2008-08-08T0303.sql: delete
+      Processing spec/test_dir/maildir/*
+      Trying to fill bucket 'daily' (quota: 3)...
+      Checking range (2008-11-11 00:00:00 -0800 .. 2008-11-12 00:00:00 -0800)... found keeper 2008-11-11T0303
+      Checking range (2008-11-10 00:00:00 -0800 .. 2008-11-11 00:00:00 -0800)... found keeper 2008-11-10T0303
+      Checking range (2008-11-09 00:00:00 -0800 .. 2008-11-10 00:00:00 -0800)... found keeper 2008-11-09T0303
+      Filled quota!
+      Trying to fill bucket 'weekly' (quota: 3)...
+      Checking range (2008-11-09 00:00:00 -0800 .. 2008-11-16 00:00:00 -0800)... found keeper 2008-11-11T0303
+      Trying to fill bucket 'monthly' (quota: *)...
+      Checking range (2008-11-01 23:00:00 -0700 .. 2008-12-02 00:00:00 -0800)... found keeper 2008-11-11T0303
+      spec/test_dir/maildir/2008-11-11T0303: in buckets: daily, weekly, monthly
+      spec/test_dir/maildir/2008-11-10T0303: in buckets: daily
+      spec/test_dir/maildir/2008-11-09T0303: in buckets: daily
+    End
+
+    # It keeps/removes the correct files
+    expect(Dir['spec/test_dir/db_dumps/*']).to match_array(
       "spec/test_dir/db_dumps/db_dump_2008-08-08T0303.sql",
-      "spec/test_dir/db_dumps/db_dump_2008-11-01T0303.sql",
+      "spec/test_dir/db_dumps/db_dump_2008-09-01T0303.sql",
       "spec/test_dir/db_dumps/db_dump_2008-09-10T0303.sql",
+      "spec/test_dir/db_dumps/db_dump_2008-10-31T0303.sql",
+      "spec/test_dir/db_dumps/db_dump_2008-11-01T0303.sql",
+      "spec/test_dir/db_dumps/db_dump_2008-11-08T0303.sql",
+      "spec/test_dir/db_dumps/db_dump_2008-11-10T0303.sql",
       "spec/test_dir/db_dumps/db_dump_2008-11-11T0303.sql"]
+     ["spec/test_dir/db_dumps/db_dump_2008-11-12T0303.sql",
+    )
   end
 
   after do

data/thin_out_backups.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = ThinOutBackups::Version
 
   gem.add_dependency 'facets'
-  gem.add_dependency 'colored'
+  gem.add_dependency 'rainbow'
   gem.add_dependency 'activesupport'
 
   gem.add_development_dependency 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin_out_backups
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Tyler Rick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-05 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.1
 signing_key: 
 specification_version: 4
 summary: Thin out a directory full of backups, only keeping a specified number from