imapget 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24c3643da9e9ab040c44f280b07e4f8e9f654ce5
-  data.tar.gz: 99b0c5f0416b2a32ed7cafce338a31155d568a79
+SHA256:
+  metadata.gz: fe656b65453bccee9c4e108fa5c88f00647beeaccaae7b579cf5892f9e8c4236
+  data.tar.gz: d3a01358001af8415f4aff124863f7f5cc59008408cf14a8c2f034298eb043c4
 SHA512:
-  metadata.gz: b16c28b4d1b57ead67cdc88caaff2de8fad7e687ba3f98e72ae124cefb0e3d981ff152f04c0e9e142314ac3e58073306f57c39998ba6648e295df150a30e1400
-  data.tar.gz: 357e07e15487f26cea34867070bae2bc505e416c736a1e8ee842c6e89da80cde11386cdc2c192dc1dcb2e400666f86836817600f2af56401ce7b761b4b098260
+  metadata.gz: 431bc3e4b193c523cc044fcba3c5c49ca8d18daeabd28387170e5eabede4cf674fdec6eb8b95a7fe59bee399b85ef23daa0dd32ee8d15319333f4038a1863a37
+  data.tar.gz: 5a06d9e2e9898dc41bc1ada7ef41c083683d94bb7c5e34ab92c2bc6f5e778d9dcb9d1531123f73d5b91e0a9a434fe89412b9ec8b69d670dc743f9dd2e0bae29b

data/ChangeLog

@@ -2,6 +2,20 @@
 
 = Revision history for imapget
 
+== 0.3.0 [2022-08-19]
+
+* Introduced default config section.
+* Switched config to strings.
+
+== 0.2.1 [2016-03-25]
+
+* Fixed regression introduced in 0.2.0.
+
+== 0.2.0 [2016-02-13]
+
+* Fixed batch fetching.
+* Internal refactoring.
+
 == 0.1.0 [2014-04-14]
 
 * Added options <tt>--dupes</tt> and <tt>--uniq</tt>.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to imapget version 0.1.0
+This documentation refers to imapget version 0.3.0
 
 
 == DESCRIPTION
@@ -14,7 +14,7 @@ server! Thus, it's different from your typical *sync* tool.
 
 == LINKS
 
-Documentation:: https://blackwinter.github.io/imapget/
+Documentation:: https://blackwinter.github.io/imapget
 Source code::   https://github.com/blackwinter/imapget
 RubyGem::       https://rubygems.org/gems/imapget
 
@@ -26,7 +26,7 @@ RubyGem::       https://rubygems.org/gems/imapget
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2009-2014 Jens Wille
+Copyright (C) 2009-2022 Jens Wille
 
 imapget is free software: you can redistribute it and/or modify it under
 the terms of the GNU Affero General Public License as published by the Free

data/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path(%q{../lib/imapget/version}, __FILE__)
+require_relative 'lib/imapget/version'
 
 begin
   require 'hen'
@@ -13,9 +13,9 @@ begin
       email:        %q{jens.wille@gmail.com},
       license:      %q{AGPL-3.0},
       homepage:     :blackwinter,
-      dependencies: %w[cyclops] << ['ruby-nuggets', '>= 0.9.8'],
+      dependencies: { cyclops: '~> 0.3', nuggets: '~> 1.5' },
 
-      required_ruby_version: '>= 1.9.3'
+      required_ruby_version: '>= 2.1'
     }
   }}
 rescue LoadError => err

data/example/config.yaml

@@ -1,27 +1,28 @@
 ### Global settings
 
-:base_dir: /var/backup/mail  # Point to storage location or specify on command-line.
-:strategy: :exclude          # This is the default strategy.
+default_config:
+  base_dir: /var/backup/mail  # Point to storage location or specify on command-line.
+  strategy: exclude           # This is the default strategy.
 
 
 ### Profiles
 
 # Get all mailboxes (via SSL), *except* Spam and Trash.
 you-1:
-  :host: imap.example.com
-  :port: 123
-  :ssl:  true
-  :user: login
-  :exclude:
+  host: imap.example.com
+  port: 123
+  ssl:  true
+  user: login
+  exclude:
     - Spam
     - Trash
 
 # Get *only* mailboxes INBOX, Sent, and Drafts.
 you-2:
-  :host:     imap.example.com
-  :user:     login2
-  :strategy: :include
-  :include:
+  host:     imap.example.com
+  user:     login2
+  strategy: include
+  include:
     - INBOX
     - Sent
     - Drafts

data/lib/imapget/cli.rb

@@ -50,7 +50,7 @@ class IMAPGet
     end
 
     def run(arguments)
-      profiles, default_config = config.partition { |k,| k.is_a?(String) }
+      default_config, profiles = config.delete(:default_config), config.to_a
 
       (arguments.empty? ? profiles.map(&:first) : arguments).each { |profile|
         profile_config = profile_config(profile, profiles, default_config) or next
@@ -67,7 +67,7 @@ class IMAPGet
           } }
         else
           imapget.get(options[:directory] ||
-            File.join(profile_config[:base_dir] || '.', profile))
+            File.join(profile_config[:base_dir] || '.', profile.to_s))
         end
       }
     end

data/lib/imapget/version.rb

@@ -3,7 +3,7 @@ class IMAPGet
   module Version
 
     MAJOR = 0
-    MINOR = 1
+    MINOR = 3
     TINY  = 0
 
     class << self

data/lib/imapget.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # imapget -- Download IMAP mails                                              #
 #                                                                             #
-# Copyright (C) 2009-2014 Jens Wille                                          #
+# Copyright (C) 2009-2016 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -68,7 +68,7 @@ class IMAPGet
       end)
     }
 
-    @strategy = options.fetch(:strategy, DEFAULT_STRATEGY)
+    @strategy = options.fetch(:strategy, DEFAULT_STRATEGY).to_sym
   end
 
   def mailboxes
@@ -90,9 +90,12 @@ class IMAPGet
       else raise TypeError, "MailboxList or String expected, got #{mailbox.class}"
     end
 
+    _excl = excl && name =~ excl
+    _incl = incl && name =~ incl
+
     case strategy
-      when :include then (excl && name =~ excl) || !(incl && name =~ incl)
-      when :exclude then (excl && name =~ excl) && !(incl && name =~ incl)
+      when :include then _excl || !_incl
+      when :exclude then _excl && !_incl
     end
   end
 
@@ -130,26 +133,23 @@ class IMAPGet
       }
     }
 
-    dupes = hash.flat_map { |_, uids| uids.drop(1) if uids.size > 1 }.compact
-
-    log "#{name}: #{dupes.size}" unless quiet
-
-    dupes
+    hash.flat_map { |_, uids| uids.drop(1) if uids.size > 1 }.tap { |dupes|
+      dupes.compact!; log "#{name}: #{dupes.size}" unless quiet
+    }
   end
 
   def delete!(name, uids)
-    unless uids.empty?
-      log "#{name}: #{uids.size}"
+    return if uids.empty?
 
-      yield if block_given?
+    log "#{name}: #{uids.size}"
 
-      imap.select(name)
-      count = imap.store(uids, '+FLAGS', [Net::IMAP::DELETED]).size
+    yield if block_given?
 
-      log "#{count} DELETED!"
+    imap.select(name)
 
-      count
-    end
+    imap.store(uids, '+FLAGS', [Net::IMAP::DELETED]).size.tap { |count|
+      log "#{count} DELETED!"
+    }
   end
 
   def uniq!(name, &block)
@@ -169,22 +169,21 @@ class IMAPGet
   end
 
   def fetch_batch(batch, fetch_attr = FETCH_ATTR, &block)
-    if batch.size == 1
-      case set = batch.first
-        when Array
-          batch = set.first .. (set.first + set.last - 1)
-        when Range
-          batch = set.first .. (set.last - 1) if set.exclude_end?
-      end
-    end
+    case set = batch.first
+      when Array
+        batch = set.first .. (set.first + set.last - 1)
+      when Range
+        batch = set.first .. (set.last - 1) if set.exclude_end?
+    end if batch.size == 1
 
-    imap.uid_fetch(batch, fetch_attr).each(&block)
+    mails = imap.uid_fetch(batch, fetch_attr)
+    mails.each(&block) if mails
   end
 
   def fetch(mail, dir, name)
     uid    = mail.attr['UID'].to_s
     file   = File.join(dir, uid)
-    exists = File.exists?(file)
+    exists = File.exist?(file)
 
     if deleted?(mail)
       if exists

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: imapget
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jens Wille
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyclops
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  name: nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,19 +97,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  imapget-0.1.0 [2014-04-14]:
+  imapget-0.3.0 [2022-08-19]:
 
-  * Added options <tt>--dupes</tt> and <tt>--uniq</tt>.
-  * Added STARTTLS support.
-  * Added LOGIN as fallback for AUTHENTICATE.
-  * Added +batch_size+ option.
-  * Dropped +use_ssl+ options; use +ssl+ instead.
-  * Dropped support for Ruby 1.8.
-  * Internal refactoring.
+  * Introduced default config section.
+  * Switched config to strings.
 
 rdoc_options:
 - "--title"
-- imapget Application documentation (v0.1.0)
+- imapget Application documentation (v0.3.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -116,16 +117,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.5
+signing_key:
 specification_version: 4
 summary: Get IMAP mails.
 test_files: []
+...