imap-backup 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d7ae3ede8a09591fcf4380f2849e47fcae3229f8
-  data.tar.gz: 627e9eb647200db2ab5417ca0f6de19a9f51e743
+SHA256:
+  metadata.gz: 85975662cee269fb87e3de1150cd3a02c123e729e2d2f4e1a2e4905de477a897
+  data.tar.gz: 06aa1c25d470bc8f38cf78e124d00f90f498e9ba2e803804ebf7a58ce9f81579
 SHA512:
-  metadata.gz: 75cc2e8b096739cd8c3d74f3372df3faa50be3f0373cbf3b0eed2d2a80231ffce4c548e072ab92ac1a17b0def9d831c48df62ba7126654d8fbde7a08d0ab532c
-  data.tar.gz: 1699f0b9eb410f46a40a8880cc5c0e4e6295cf3e45dbe4a6143fd30db4c30a53bae500e8737291fe7a7953f1c64ea7bc4d2c45c5f3b88e94823dbe46f059e275
+  metadata.gz: c75aff4a749a5630fe86bca252f676be0338c30c492ce3fdbe654c895143dcd7846ab654733f2aeb3a4316fe4b8f630d3ca0a1db0227c7d06918e7362d17970b
+  data.tar.gz: b3b267870e606d407931ac337c36865aaccf430b1b91ab0a9a3dfe49e1db65ae159ddaeaf2f22041715e6998a8d00db8d76b02dafc6ac0a11dcd91218129a62e

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.4
-  - 2.3.0
-  - 2.4.1
+  - 2.1.10
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 branches:
   only:
     - master

data/README.md

@@ -24,7 +24,8 @@ $ gem install 'imap-backup'
 
 # Setup
 
-In order to do backups, you need to add accounts and specify the folders to backup.
+In order to do backups, you need to add accounts via a menu-driven command
+line program:
 
 Run:
 
@@ -32,9 +33,14 @@ Run:
 $ imap-backup setup
 ```
 
-The setup system is a menu-driven command line application.
+## Folders
 
-It creates ~/.imap-backup directory and configuration file. E.g.:
+By default, all folders are backed-up. You can override this by choosing
+specific folders.
+
+## Configuration file
+
+`setup` creates ~/.imap-backup directory and configuration file. E.g.:
 
 ```json
 {

data/Rakefile

@@ -7,11 +7,3 @@ task :default => :spec
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
-
-if RUBY_VERSION < '1.9'
-  RSpec::Core::RakeTask.new('spec:coverage') do |t|
-    t.pattern   = 'spec/**/*_spec.rb'
-    t.rcov      = true
-    t.rcov_opts = ['--exclude', 'spec/,/gems/,vendor/']
-  end
-end

data/bin/imap-backup

@@ -34,6 +34,11 @@ opts = OptionParser.new do |opts|
     puts opts
     exit
   end
+
+  opts.on_tail("--version", "Show version" ) do
+    puts Imap::Backup::VERSION
+    exit
+  end
 end
 opts.parse!
 

data/imap-backup.gemspec

@@ -18,12 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'highline'
-  if RUBY_VERSION > '2'
-    gem.add_runtime_dependency 'mail'
-  else
-    gem.add_runtime_dependency 'mime-types', '~> 2.6'
-    gem.add_runtime_dependency 'mail', '~> 2.6.3'
-  end
+  gem.add_runtime_dependency 'mail'
 
   gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.8'
   gem.add_development_dependency 'rspec',  '>= 3.0.0'

data/lib/email/mboxrd/message.rb

@@ -8,7 +8,7 @@ module Email::Mboxrd
 
     def initialize(supplied_body)
       @supplied_body = supplied_body.clone
-      @supplied_body.force_encoding('binary') if RUBY_VERSION >= '1.9.0'
+      @supplied_body.force_encoding('binary')
     end
 
     def to_s

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

@@ -33,9 +33,12 @@ module Imap::Backup
 
     def fetch(uid)
       imap.examine(name)
-      message = imap.uid_fetch([uid.to_i], REQUESTED_ATTRIBUTES)[0][1]
-      message['RFC822'].force_encoding('utf-8') if RUBY_VERSION > '1.9'
-      message
+      fetch_data_items = imap.uid_fetch([uid.to_i], REQUESTED_ATTRIBUTES)
+      return nil if fetch_data_items.nil?
+      fetch_data_item = fetch_data_items[0]
+      attributes = fetch_data_item.attr
+      attributes['RFC822'].force_encoding('utf-8')
+      attributes
     rescue Net::IMAP::NoResponseError => e
       Imap::Backup.logger.warn "Folder '#{name}' does not exist"
       nil

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

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'rubygems' if RUBY_VERSION < '1.9'
 require 'highline'
 
 module Imap::Backup

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

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'rubygems' if RUBY_VERSION < '1.9'
 require 'json'
 
 module Imap::Backup

data/lib/imap/backup/serializer/mbox.rb

@@ -46,7 +46,7 @@ module Imap::Backup
         mbox.write mboxrd_message.to_s
         imap.write uid + "\n"
       rescue => e
-        Imap::Backup.logger.warn "[#{folder}] failed to save message #{uid}:\n#{body}. #{e}"
+        Imap::Backup.logger.warn "[#{folder}] failed to save message #{uid}:\n#{body}. #{e}:\n#{e.backtrace.join("\n")}"
       ensure
         mbox.close if mbox
         imap.close if imap

data/lib/imap/backup/version.rb

@@ -3,6 +3,6 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 1
   MINOR    = 2
-  REVISION = 1
+  REVISION = 2
   VERSION  = [MAJOR, MINOR, REVISION].map(&:to_s).join('.')
 end

data/spec/unit/account/connection_spec.rb

@@ -105,10 +105,11 @@ describe Imap::Backup::Account::Connection do
   context '#run_backup' do
     let(:folder) { double('folder', name: 'folder') }
     let(:serializer) { double('serializer') }
-    let(:downloader) { double('downloader', :run => nil) }
+    let(:downloader) { double(Imap::Backup::Downloader, :run => nil) }
 
     before do
-      allow(Imap::Backup::Downloader).to receive(:new).and_return(downloader)
+      allow(Imap::Backup::Downloader).
+        to receive(:new).with(folder, serializer) { downloader }
     end
 
     context 'with supplied backup_folders' do
@@ -141,8 +142,8 @@ describe Imap::Backup::Account::Connection do
 
         before { subject.run_backup }
 
-        it 'runs the downloader' do
-          expect(downloader).to have_received(:run)
+        it 'runs the downloader for each folder' do
+          expect(downloader).to have_received(:run).exactly(:once)
         end
       end
 
@@ -151,8 +152,8 @@ describe Imap::Backup::Account::Connection do
 
         before { subject.run_backup }
 
-        it 'runs the downloader' do
-          expect(downloader).to have_received(:run)
+        it 'runs the downloader for each folder' do
+          expect(downloader).to have_received(:run).exactly(:once)
         end
       end
 

data/spec/unit/account/folder_spec.rb

@@ -30,12 +30,23 @@ describe Imap::Backup::Account::Folder do
 
   context '#fetch' do
     let(:message_body) { double('the body', :force_encoding => nil) }
-    let(:message) { {'RFC822' => message_body, 'other' => 'xxx'} }
+    let(:attributes) { {'RFC822' => message_body, 'other' => 'xxx'} }
+    let(:fetch_data_item) do
+      instance_double(Net::IMAP::FetchData, attr: attributes)
+    end
 
-    before { allow(imap).to receive(:uid_fetch).and_return([[nil, message]]) }
+    before { allow(imap).to receive(:uid_fetch) { [fetch_data_item] } }
 
     it 'returns the message' do
-      expect(subject.fetch(123)).to eq(message)
+      expect(subject.fetch(123)).to eq(attributes)
+    end
+
+    context "if the server responds with nothing" do
+      before { allow(imap).to receive(:uid_fetch) { nil } }
+
+      it 'is nil' do
+        expect(subject.fetch(123)).to be_nil
+      end
     end
 
     context "if the mailbox doesn't exist" do
@@ -46,12 +57,10 @@ describe Imap::Backup::Account::Folder do
       end
     end
 
-    if RUBY_VERSION > '1.9'
-      it 'sets the encoding on the message' do
-        subject.fetch(123)
+    it 'sets the encoding on the message' do
+      subject.fetch(123)
 
-        expect(message_body).to have_received(:force_encoding).with('utf-8')
-      end
+      expect(message_body).to have_received(:force_encoding).with('utf-8')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Backup GMail (or other IMAP) accounts to disk