imap-backup 9.3.2 → 9.4.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35c15f0cf7b9909868b55bb5c9ec928cb5c22e6943a9856fbf52b1bd9fb0212b
-  data.tar.gz: d4cfaf196b031f91c0e745a55def95cdc480906c7b387a888949c80bc607867f
+  metadata.gz: bd7a94d72f09a4364d3fd424b2e7fabbf4885726b07f0ffbb3e28a6a08e1507f
+  data.tar.gz: ddc3624e1e7441422b93be0d5b651b80b4e7f78268e267573338cec557de2ae2
 SHA512:
-  metadata.gz: bca6edbdf041a3795d9f97ba1df9f63feaeee7d024df73da389990cc2a235b73a0379096261b1c515344746cb256380f79c7b2a99abdd78b2a279049b6184bbf
-  data.tar.gz: 966e04781677d2f281810a2160a5f56dfea17dd69c7694948cf8a36e96616685708d5c599e8bb661f7441fbdf7a0accc66fbcbb9d278bbe375c685af62e8a0b7
+  metadata.gz: '09734ca2ee62e60830358a0d5404d2a5d4f8b8f47b1002cf5373c41a6f4f42cbd3487c66fd7c964c193b41b5b99fa81a173ae3061d43ebcfd8ca56eaee66010d'
+  data.tar.gz: 1ebccf8170e1830222ba9f720be48668b067288bfe89754a98f0bc0146ed96086e8df2fb943c4ecd4f7ed7c4d75297b456a61f96225701e74d79c7aaba39529d

data/docs/development.md

@@ -21,12 +21,6 @@ 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/email/mboxrd/message.rb

@@ -38,7 +38,7 @@ module Email::Mboxrd
     end
 
     def subject
-      parsed.subject
+      parsed.subject&.force_encoding(Encoding::ASCII_8BIT)
     end
 
     def imap_body
@@ -62,9 +62,8 @@ module Email::Mboxrd
 
     def best_from
       return first_from if first_from
-      return parsed.sender if parsed.sender
-      return parsed.envelope_from if parsed.envelope_from
-      return parsed.return_path if parsed.return_path
+      return sender if sender
+      return return_path if return_path
 
       ""
     end
@@ -72,7 +71,16 @@ module Email::Mboxrd
     def first_from
       return nil if !parsed.from.is_a?(Enumerable)
 
-      parsed.from.find { |from| from }
+      first = parsed.from.compact.first
+      first&.force_encoding(Encoding::ASCII_8BIT)
+    end
+
+    def return_path
+      parsed.return_path&.force_encoding(Encoding::ASCII_8BIT)
+    end
+
+    def sender
+      parsed.sender&.force_encoding(Encoding::ASCII_8BIT)
     end
 
     def mboxrd_body

data/lib/imap/backup/cli.rb

@@ -20,17 +20,9 @@ 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.
@@ -235,10 +227,5 @@ 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,20 +30,14 @@ 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
 
-      if imap.valid? && mbox.valid?
-        @validated = true
-        return true
-      end
+      return true if imap.valid? && mbox.valid?
 
       delete
 
@@ -119,7 +113,7 @@ module Imap::Backup
         # NOOP
         nil
       else
-        apply_new_uid_validity(value)
+        apply_new_uid_validity value
       end
     end
 
@@ -222,7 +216,7 @@ module Imap::Backup
       Logger.logger.info <<~MESSAGE
         Local metadata for folder '#{folder_path}' is currently stored in the version 2 format.
 
-        This will now be transformed into the version 3 format.
+        Migrating the version 3 format...
       MESSAGE
 
       migrator.run

data/lib/imap/backup/version.rb

@@ -2,8 +2,8 @@ module Imap; end
 
 module Imap::Backup
   MAJOR    = 9
-  MINOR    = 3
-  REVISION = 2
-  PRE      = nil
+  MINOR    = 4
+  REVISION = 0
+  PRE      = "pre1"
   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.2
+  version: 9.4.0.pre1
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-08 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -300,9 +300,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: