imap-backup 9.3.0 → 9.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87355fbc67849a32cdb0def02245d0101198089a15e8fcffbeadcb717413af26
-  data.tar.gz: 55c13492ab22718193472e76a5d79ee30c3d3ee444ca1240220c687939c07339
+  metadata.gz: 35c15f0cf7b9909868b55bb5c9ec928cb5c22e6943a9856fbf52b1bd9fb0212b
+  data.tar.gz: d4cfaf196b031f91c0e745a55def95cdc480906c7b387a888949c80bc607867f
 SHA512:
-  metadata.gz: a4583f55d69565cf81552a0ba295ba21983be0d2ad2d3a83f65e0d1c7970df6cd73ced117b625de04d858e7d71c39f386b020ce437e10fa6c9d7b734b13e3715
-  data.tar.gz: a02472800916ad71c7f8129084bb1a2920624c0c87fc672bebb009990e21ecf1055d8d0a8d80b42481038f3694bab3ad32c4386006a108f2dd928553420c9606
+  metadata.gz: bca6edbdf041a3795d9f97ba1df9f63feaeee7d024df73da389990cc2a235b73a0379096261b1c515344746cb256380f79c7b2a99abdd78b2a279049b6184bbf
+  data.tar.gz: 966e04781677d2f281810a2160a5f56dfea17dd69c7694948cf8a36e96616685708d5c599e8bb661f7441fbdf7a0accc66fbcbb9d278bbe375c685af62e8a0b7

data/docs/development.md

@@ -21,6 +21,12 @@ Before running the test suite, it needs to be started:
 $ docker-compose up -d
 ```
 
+or, with Podman
+
+```sh
+$ podman-compose -f docker-compose.yml up -d
+```
+
 ```sh
 $ rake
 ```

data/lib/imap/backup/cli.rb

@@ -20,8 +20,31 @@ module Imap::Backup
 
     include Helpers
 
+    VERSION_ARGUMENTS = %w(-v --version).freeze
+
     default_task :backup
 
+    def self.start(*args)
+      version_argument = ARGV & VERSION_ARGUMENTS
+      if version_argument.any?
+        new.version
+        exit 0
+      end
+
+      # By default, commands like `imap-backup help foo bar`
+      # are handled by listing all `foo` methods, whereas the user
+      # probably wants the detailed help for the `bar` method.
+      # Move initial "help" argument to after any subcommand,
+      # so we get help for the requested subcommand method.
+      first_argument_is_help = ARGV[0] == "help"
+      second_argument_is_subcommand = subcommands.include?(ARGV[1])
+      if first_argument_is_help && second_argument_is_subcommand
+        help, subcommand = ARGV.shift(2)
+        ARGV.unshift(subcommand, help)
+      end
+      super
+    end
+
     def self.exit_on_failure?
       true
     end
@@ -212,5 +235,10 @@ module Imap::Backup
 
     desc "utils SUBCOMMAND [OPTIONS]", "Various utilities"
     subcommand "utils", Utils
+
+    desc "version", "Print the imap-backup version"
+    def version
+      Kernel.puts "imap-backup #{Imap::Backup::VERSION}"
+    end
   end
 end

data/lib/imap/backup/serializer.rb

@@ -30,14 +30,20 @@ module Imap::Backup
     def initialize(path, folder)
       @path = path
       @folder = folder
+      @validated = nil
     end
 
     # Returns true if there are existing, valid files
     # false otherwise (in which case any existing files are deleted)
     def validate!
+      return if @validated
+
       optionally_migrate2to3
 
-      return true if imap.valid? && mbox.valid?
+      if imap.valid? && mbox.valid?
+        @validated = true
+        return true
+      end
 
       delete
 
@@ -113,7 +119,7 @@ module Imap::Backup
         # NOOP
         nil
       else
-        apply_new_uid_validity value
+        apply_new_uid_validity(value)
       end
     end
 

data/lib/imap/backup/version.rb

@@ -3,7 +3,7 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 9
   MINOR    = 3
-  REVISION = 0
+  REVISION = 2
   PRE      = nil
   VERSION  = [MAJOR, MINOR, REVISION, PRE].compact.map(&:to_s).join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.3.2
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline