bup 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad9ad97e6299973d7d4a1ccdcd262671f14a12ec2ceedd952b265450b09e0c52
-  data.tar.gz: f73201e37284194441f64c990f2a278e0e1d07e3827cf8c416e03062a4692f71
+  metadata.gz: c9226e1ffb057342aaf45173d2ecaafc78537d19a25db5e25ae8275311e3c46f
+  data.tar.gz: 74a4207d1606adbca58e7f2650a01f3ae422a8c9c752832c1e684faf817fd6a8
 SHA512:
-  metadata.gz: 0ff5725cd4472470b23af3c7b6c36c5b181c8da73234026b86c654fa40eca15ff6d41e7966aa830efa27f534a5c1fbf538f8e5cd30578621f99662c9250e09c2
-  data.tar.gz: d8c496a3d4e64be4d6fc1484100767137fed12409611eade931431a6c7a45c6cb37c95d1a36f0b4f8a7d15dd2501a1f20ff0e1f6e39c8ce1206f59e645248676
+  metadata.gz: 6d0c35ab5eb84c7a1a68527fe49e28f1347f6c0e9cc38017aa160ff31f41046afba36674cf5ce42cf6c6f1e30b2bad0c4f62108b54734253a490c21d5e73c8b1
+  data.tar.gz: 835d1ec79c3c4fcd7b42d9632b4e8c649ee41cefcac949fd658d8874d50c25edd7b99768e461e230fe7d0b385997f4a8dd6772d2f4d8d4e6835d603da2f3e448

data/CHANGELOG.md

@@ -1,10 +1,15 @@
 ## [Unreleased]
 
-## [0.4.0]
+## [0.5.0] - 2021-11-13
+
+- Allow for a history size of 0.
+- Add default_profile setting.
+
+## [0.4.0] - 2021-11-13
 
 - Bug fix for empty post_cmds list.
 
-## [0.3.0]
+## [0.3.0] - 2021-11-13
 
 - Communicate the backup file base name through the environment variable BUP_FILENAME.
 - Rubocop fixes or ignore files.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bup (0.4.0)
+    bup (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -14,6 +14,7 @@ Create a file ~/.buprc with the default contents...
 
 ```yaml
 ---
+default_profile: default
 profiles:
   default:
     description: Simple backup of critical files.

data/buprc

@@ -1,4 +1,5 @@
 ---
+default_profile: default
 profiles:
   default:
     description: Simple backup of critical files.

data/exe/bup

@@ -6,6 +6,7 @@ require "optparse"
 
 configfile = File.join(ENV["HOME"], ".buprc")
 config = Bup::Config.new
+profile = nil
 
 OptParse.new do |opt|
   opt.banner = "#{$PROGRAM_NAME} #{Bup::VERSION}"
@@ -15,7 +16,7 @@ OptParse.new do |opt|
   end
 
   opt.on("-p", "--profile=profile", String, "Profile name.") do |p|
-    config.runtime["profile"] = p
+    profile = p
   end
 
   opt.on("-t", "--type=type", String, "Type of backup.") do |t|
@@ -29,6 +30,13 @@ end.parse!
 
 config.load(configfile) if File.exist?(configfile)
 
+if profile
+  config.runtime["profile"] = profile
+elsif config.config["default_profile"]
+  config.runtime["profile"] = config.config["default_profile"]
+end
+
+
 case config.runtime["action"]
 when "list"
   config.config["profiles"].each do |key, profile|

data/lib/bup/tar.rb

@@ -44,32 +44,46 @@ module Bup
 
       history = @config.profile(profile_name)["history"] || 0
 
-      if type == "full" && history.positive?
+      if type == "full" 
+        if history.positive?
+          prune_history(profile_name, destination, filename_base, history)
+        elsif history == 0
+          clear_history(profile_name, destination)
+        end
+      end
 
-        oldest_kept_file = nil
+      filename
+    end
 
-        # Keep some full backups and remove the others.
-        # We capture the oldest full backup and get rid of preceeding incrementals.
-        Dir["#{destination}/#{filename_base}*"].sort.reverse.each_with_index do |fullbackup, idx|
-          if idx < history
-            oldest_kept_file = fullbackup
-          else
-            File.delete(fullbackup)
-          end
-        end
+    def clear_history(profile_name, destination)
+      Dir["#{destination}/#{profile_name}*"].each do |backup|
+        File.delete(backup)
+      end
+    end
 
-        # Remove all incremental files that are older than the oldest kept full backup.
-        if oldest_kept_file
-          remove_before = File.stat(oldest_kept_file).ctime
-          Dir["#{destination}/#{profile_name}*"].each do |backupfile|
-            File.delete(backupfile) if File.stat(backupfile).ctime < remove_before
-          end
+    def prune_history(profile_name, destination, filename_base, history)
+      oldest_kept_file = nil
+
+      # Keep some full backups and remove the others.
+      # We capture the oldest full backup and get rid of preceeding incrementals.
+      Dir["#{destination}/#{filename_base}*"].sort.reverse.each_with_index do |fullbackup, idx|
+        if idx < history
+          oldest_kept_file = fullbackup
+        else
+          File.delete(fullbackup)
         end
       end
 
-      filename
+      # Remove all incremental files that are older than the oldest kept full backup.
+      if oldest_kept_file
+        remove_before = File.stat(oldest_kept_file).ctime
+        Dir["#{destination}/#{profile_name}*"].each do |backupfile|
+          File.delete(backupfile) if File.stat(backupfile).ctime < remove_before
+        end
+      end
     end
 
+    # Run tar.
     def call(profile_name = nil)
       profile_name ||= @config.runtime["profile"]
       profile = @config.config["profiles"][profile_name]
@@ -106,6 +120,7 @@ module Bup
       end
     end
 
+    # Exec and run a command in a standard way.
     def run_cmd(*args)
       Open3.popen3(*args) do |stdin, stdout, stderr, wait_thr|
         stdin.close

data/lib/bup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bup
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sam Baskinger