imap-backup 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69ed28d85dda7c3d30cd6c8d4a9888e9f477eedd6f8ff08741fcc7d27cf087f8
-  data.tar.gz: 1a99e7143052a1d0b1b2d58381c5f9da0db2b1e0e3882c24e56036cebead043f
+  metadata.gz: 6eebcf60acbb2e97a007e5da03c63fb7c32e24413397f28d3ec9f94154b8def5
+  data.tar.gz: 5f81961b55811c8c9fadabf2def11e1e00ab8572fd844f44b8fda371aa190bbb
 SHA512:
-  metadata.gz: deb80ed5d629c81253574d96a7da0dcc6382eb6d5216c1f317b8083ca0f4dac80a3188cbc0b7f46ffbc01229dad9ab913858649558ca7b3a29bf7b81395bcce3
-  data.tar.gz: 2e6b2b8d2c67c6bc1e3ff5dcbb91c4eec92d0edb87ff33ad6e8a360b6635895c72cc7eb4cc68a7ff24bcfbad5a3533bda0a916e3c4d0c40ee67de70a010d4b2b
+  metadata.gz: 6ebb0d93413c0911487235584837f76f6409d66cc06a64ad9e7db7ec0a4ccca2694b9be363e02922bbf1c981d944a9772e6705190ad92b461252d7b57bf1e4b0
+  data.tar.gz: 6f29640122bf11c098050476e60caa073ebb868a0859624d6e7b74df435e85a1d6ebbcf964840058c6978a42d16034d86341741caead66d99722554ffc2ca4a3

data/lib/email/provider/apple_mail.rb

@@ -1,6 +1,6 @@
-require "email/provider/default"
+require "email/provider/base"
 
-class Email::Provider::AppleMail < Email::Provider::Default
+class Email::Provider::AppleMail < Email::Provider::Base
   def host
     "imap.mail.me.com"
   end

data/lib/email/provider/base.rb

@@ -0,0 +1,8 @@
+module Email; end
+class Email::Provider; end
+
+class Email::Provider::Base
+  def options
+    {port: 993, ssl: {ssl_version: :TLSv1_2}}
+  end
+end

data/lib/email/provider/fastmail.rb

@@ -1,6 +1,6 @@
-require "email/provider/default"
+require "email/provider/base"
 
-class Email::Provider::Fastmail < Email::Provider::Default
+class Email::Provider::Fastmail < Email::Provider::Base
   def host
     "imap.fastmail.com"
   end

data/lib/email/provider/gmail.rb

@@ -1,6 +1,6 @@
-require "email/provider/default"
+require "email/provider/base"
 
-class Email::Provider::GMail < Email::Provider::Default
+class Email::Provider::GMail < Email::Provider::Base
   def host
     "imap.gmail.com"
   end

data/lib/email/provider/{default.rb → unknown.rb}

@@ -1,7 +1,6 @@
-module Email; end
-class Email::Provider; end
+require "email/provider/base"
 
-class Email::Provider::Default
+class Email::Provider::Unknown < Email::Provider::Base
   # We don't know how to guess the IMAP server
   def host
   end

data/lib/email/provider.rb

@@ -1,7 +1,7 @@
-require "email/provider/default"
 require "email/provider/apple_mail"
 require "email/provider/fastmail"
 require "email/provider/gmail"
+require "email/provider/unknown"
 
 module Email; end
 
@@ -21,7 +21,7 @@ class Email::Provider
     when address.end_with?("@me.com")
       Email::Provider::AppleMail.new
     else
-      Email::Provider::Default.new
+      Email::Provider::Unknown.new
     end
   end
 end

data/lib/imap/backup/account.rb

@@ -0,0 +1,103 @@
+module Imap::Backup
+  class Account
+    attr_reader :username
+    attr_reader :password
+    attr_reader :local_path
+    attr_reader :folders
+    attr_reader :server
+    attr_reader :connection_options
+    attr_reader :changes
+    attr_reader :marked_for_deletion
+
+    def initialize(options)
+      @username = options[:username]
+      @password = options[:password]
+      @local_path = options[:local_path]
+      @folders = options[:folders]
+      @server = options[:server]
+      @connection_options = options[:connection_options]
+      @changes = {}
+      @marked_for_deletion = false
+    end
+
+    def valid?
+      username && password
+    end
+
+    def modified?
+      changes.any?
+    end
+
+    def clear_changes!
+      @changes = {}
+    end
+
+    def mark_for_deletion!
+      @marked_for_deletion = true
+    end
+
+    def marked_for_deletion?
+      @marked_for_deletion
+    end
+
+    def to_h
+      h = {
+        username: @username,
+        password: @password,
+      }
+      h[:local_path] = @local_path if @local_path
+      h[:folders] = @folders if @folders
+      h[:server] = @server if @server
+      h[:connection_options] = @connection_options if @connection_options
+      h
+    end
+
+    def username=(value)
+      update(:username, value)
+    end
+
+    def password=(value)
+      update(:password, value)
+    end
+
+    def local_path=(value)
+      update(:local_path, value)
+    end
+
+    def folders=(value)
+      raise "folders must be an Array" if !value.is_a?(Array)
+      update(:folders, value)
+    end
+
+    def server=(value)
+      update(:server, value)
+    end
+
+    def connection_options=(value)
+      parsed = JSON.parse(value)
+      update(:connection_options, parsed)
+    end
+
+    private
+
+    def update(field, value)
+      if changes[field]
+        change = changes[field]
+        if change[:from] == value
+          changes.delete(field)
+        else
+          set_field!(field, value)
+        end
+      else
+        set_field!(field, value)
+      end
+    end
+
+    def set_field!(field, value)
+      key = :"@#{field}"
+      current = instance_variable_get(key)
+      changes[field] = {from: current, to: value}
+      instance_variable_set(key, value)
+    end
+  end
+end

data/lib/imap/backup/configuration/account.rb

@@ -148,7 +148,7 @@ module Imap::Backup
     def default_server(username)
       provider = Email::Provider.for_address(username)
 
-      if provider.is_a?(Email::Provider::Default)
+      if provider.is_a?(Email::Provider::Unknown)
         Kernel.puts "Can't decide provider for email address '#{username}'"
         return nil
       end

data/lib/imap/backup/version.rb

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

data/spec/unit/email/provider/{default_spec.rb → base_spec.rb}

@@ -1,10 +1,4 @@
 describe Email::Provider::Default do
-  describe "#host" do
-    it "is unset" do
-      expect(subject.host).to be_nil
-    end
-  end
-
   describe "#options" do
     it "returns options" do
       expect(subject.options).to be_a(Hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -182,10 +182,12 @@ files:
 - lib/email/mboxrd/message.rb
 - lib/email/provider.rb
 - lib/email/provider/apple_mail.rb
-- lib/email/provider/default.rb
+- lib/email/provider/base.rb
 - lib/email/provider/fastmail.rb
 - lib/email/provider/gmail.rb
+- lib/email/provider/unknown.rb
 - lib/imap/backup.rb
+- lib/imap/backup/account.rb
 - lib/imap/backup/account/connection.rb
 - lib/imap/backup/account/folder.rb
 - lib/imap/backup/cli.rb
@@ -239,7 +241,7 @@ files:
 - spec/support/silence_logging.rb
 - spec/unit/email/mboxrd/message_spec.rb
 - spec/unit/email/provider/apple_mail_spec.rb
-- spec/unit/email/provider/default_spec.rb
+- spec/unit/email/provider/base_spec.rb
 - spec/unit/email/provider/fastmail_spec.rb
 - spec/unit/email/provider/gmail_spec.rb
 - spec/unit/email/provider_spec.rb
@@ -290,8 +292,8 @@ test_files:
 - spec/fixtures/connection.yml
 - spec/unit/email/provider/gmail_spec.rb
 - spec/unit/email/provider/apple_mail_spec.rb
-- spec/unit/email/provider/default_spec.rb
 - spec/unit/email/provider/fastmail_spec.rb
+- spec/unit/email/provider/base_spec.rb
 - spec/unit/email/provider_spec.rb
 - spec/unit/email/mboxrd/message_spec.rb
 - spec/unit/imap/backup_spec.rb