imap-backup 1.2.2 → 1.2.3

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Imap::Backup
   module Configuration; end
 
@@ -10,18 +8,18 @@ module Imap::Backup
       super
     end
 
-    def email(default = '')
-      highline.ask('email address: ') do |q|
+    def email(default = "")
+      highline.ask("email address: ") do |q|
         q.default               = default
         q.readline              = true
         q.validate              = EMAIL_MATCHER
-        q.responses[:not_valid] = 'Enter a valid email address '
+        q.responses[:not_valid] = "Enter a valid email address "
       end
     end
 
     def password
-      password     = highline.ask('password: ')        { |q| q.echo = false }
-      confirmation = highline.ask('repeat password: ') { |q| q.echo = false }
+      password     = highline.ask("password: ")        { |q| q.echo = false }
+      confirmation = highline.ask("repeat password: ") { |q| q.echo = false }
       if password != confirmation
         return nil unless highline.agree("the password and confirmation did not match.\nContinue? (y/n) ")
         return self.password
@@ -30,15 +28,15 @@ module Imap::Backup
     end
 
     def backup_path(default, validator)
-      highline.ask('backup directory: ') do |q|
+      highline.ask("backup directory: ") do |q|
         q.default  = default
         q.readline = true
         q.validate = validator
-        q.responses[:not_valid] = 'Choose a different directory '
+        q.responses[:not_valid] = "Choose a different directory "
       end
     end
 
-    def self.email(default = '')
+    def self.email(default = "")
       new(Configuration::Setup.highline).email(default)
     end
 

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

@@ -1,16 +1,14 @@
-# encoding: utf-8
-
 module Imap::Backup
   module Configuration; end
 
   module Configuration::ConnectionTester
     def self.test(account)
       Account::Connection.new(account).imap
-      return 'Connection successful'
+      "Connection successful"
     rescue Net::IMAP::NoResponseError
-      return 'No response'
+      "No response"
     rescue Exception => e
-      return "Unexpected error: #{e}"
+      "Unexpected error: #{e}"
     end
   end
 end

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Imap::Backup
   module Configuration; end
 
@@ -12,20 +10,20 @@ module Imap::Backup
 
     def run
       if connection.nil?
-        Imap::Backup.logger.warn 'Connection failed'
-        highline.ask 'Press a key '
+        Imap::Backup.logger.warn "Connection failed"
+        highline.ask "Press a key "
         return
       end
 
       if folders.nil?
-        Imap::Backup.logger.warn 'Unable to get folder list'
-        highline.ask 'Press a key '
+        Imap::Backup.logger.warn "Unable to get folder list"
+        highline.ask "Press a key "
         return
       end
 
       catch :done do
         loop do
-          system('clear')
+          system("clear")
           show_menu
         end
       end
@@ -35,18 +33,18 @@ module Imap::Backup
 
     def show_menu
       highline.choose do |menu|
-        menu.header = 'Add/remove folders'
+        menu.header = "Add/remove folders"
         menu.index = :number
         add_folders menu
-        menu.choice('return to the account menu') { throw :done }
-        menu.hidden('quit') { throw :done }
+        menu.choice("return to the account menu") { throw :done }
+        menu.hidden("quit") { throw :done }
       end
     end
 
     def add_folders(menu)
       folders.each do |folder|
         name = folder.name
-        mark = is_selected?(name) ? '+' : '-'
+        mark = is_selected?(name) ? "+" : "-"
         menu.choice("#{mark} #{name}") do
           toggle_selection name
         end
@@ -62,7 +60,7 @@ module Imap::Backup
         changed = account[:folders].reject! { |f| f[:name] == folder_name }
         account[:modified] = true if changed
       else
-        account[:folders] << { :name => folder_name }
+        account[:folders] << {name: folder_name}
         account[:modified] = true
       end
     end

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Imap::Backup
   module Configuration; end
 
@@ -42,7 +40,7 @@ module Imap::Backup
       if required_accounts.nil?
         @accounts = config.accounts
       else
-        @accounts = config.accounts.select{ |account| required_accounts.include?(account[:username]) }
+        @accounts = config.accounts.select { |account| required_accounts.include?(account[:username]) }
       end
     end
   end

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

@@ -1,5 +1,4 @@
-# encoding: utf-8
-require 'highline'
+require "highline"
 
 module Imap::Backup
   module Configuration; end
@@ -14,7 +13,7 @@ module Imap::Backup
       Imap::Backup.setup_logging config
       catch :done do
         loop do
-          system('clear')
+          system("clear")
           show_menu
         end
       end
@@ -24,15 +23,15 @@ module Imap::Backup
 
     def show_menu
       self.class.highline.choose do |menu|
-        menu.header = 'Choose an action'
+        menu.header = "Choose an action"
         account_items menu
         add_account_item menu
         toggle_logging_item menu
-        menu.choice('save and exit') do
+        menu.choice("save and exit") do
           config.save
           throw :done
         end
-        menu.choice('exit without saving changes') do
+        menu.choice("exit without saving changes") do
           throw :done
         end
       end
@@ -42,7 +41,7 @@ module Imap::Backup
       config.accounts.each do |account|
         next if account[:delete]
         item = account[:username].clone
-        item << ' *' if account[:modified]
+        item << " *" if account[:modified]
         menu.choice(item) do
           edit_account account[:username]
         end
@@ -50,15 +49,15 @@ module Imap::Backup
     end
 
     def add_account_item(menu)
-      menu.choice('add account') do
+      menu.choice("add account") do
         username = Configuration::Asker.email
         edit_account username
       end
     end
 
     def toggle_logging_item(menu)
-      menu_item = config.debug? ? 'stop logging' : 'start logging'
-      new_setting = ! config.debug?
+      menu_item = config.debug? ? "stop logging" : "start logging"
+      new_setting = !config.debug?
       menu.choice(menu_item) do
         config.debug = new_setting
         Imap::Backup.setup_logging config
@@ -71,10 +70,10 @@ module Imap::Backup
 
     def default_account_config(username)
       account = {
-        :username   => username,
-        :password   => '',
-        :local_path => File.join(config.path, username.gsub('@', '_')),
-        :folders    => []
+        username: username,
+        password: "",
+        local_path: File.join(config.path, username.gsub("@", "_")),
+        folders: []
       }
     end
 

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

@@ -1,16 +1,15 @@
-# encoding: utf-8
-require 'json'
+require "json"
 
 module Imap::Backup
   module Configuration; end
 
   class Configuration::Store
-    CONFIGURATION_DIRECTORY = File.expand_path('~/.imap-backup')
+    CONFIGURATION_DIRECTORY = File.expand_path("~/.imap-backup")
 
     attr_reader :pathname
 
     def self.default_pathname
-      File.join(CONFIGURATION_DIRECTORY, 'config.json')
+      File.join(CONFIGURATION_DIRECTORY, "config.json")
     end
 
     def self.exist?(pathname = default_pathname)
@@ -29,7 +28,7 @@ module Imap::Backup
       mkdir_private path
       remove_modified_flags
       remove_deleted_accounts
-      File.open(pathname, 'w') { |f| f.write(JSON.pretty_generate(data)) }
+      File.open(pathname, "w") { |f| f.write(JSON.pretty_generate(data)) }
       FileUtils.chmod 0600, pathname
     end
 
@@ -56,9 +55,9 @@ module Imap::Backup
       if File.exist?(pathname)
         Utils.check_permissions pathname, 0600
         contents = File.read(pathname)
-        @data = JSON.parse(contents, :symbolize_names => true)
+        @data = JSON.parse(contents, symbolize_names: true)
       else
-        @data = {:accounts => []}
+        @data = {accounts: []}
       end
       @data[:debug] = false unless @data.include?(:debug)
       @data[:debug] = false unless [true, false].include?(@data[:debug])
@@ -74,7 +73,7 @@ module Imap::Backup
     end
 
     def mkdir_private(path)
-      if ! File.directory?(path)
+      if !File.directory?(path)
         FileUtils.mkdir path
       end
       if Utils::stat(path) != 0700

data/lib/imap/backup/downloader.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Imap::Backup
   class Downloader
     attr_reader :folder

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Imap::Backup
   module Serializer
     DIRECTORY_PERMISSIONS = 0700

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

@@ -1,5 +1,4 @@
-# encoding: utf-8
-require 'fileutils'
+require "fileutils"
 
 module Imap::Backup
   module Serializer; end
@@ -11,7 +10,7 @@ module Imap::Backup
     end
 
     def uids
-      return [] if ! File.exist?(directory)
+      return [] if !File.exist?(directory)
 
       d = Dir.open(directory)
       as_strings = d.map do |file|
@@ -27,7 +26,7 @@ module Imap::Backup
 
     def save(uid, message)
       message_filename = filename(uid)
-      File.open(message_filename, 'w') { |f| f.write message.to_json }
+      File.open(message_filename, "w") { |f| f.write message.to_json }
       FileUtils.chmod 0600, message_filename
     end
 

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

@@ -1,6 +1,5 @@
-# encoding: utf-8
-require 'csv'
-require 'email/mboxrd/message'
+require "csv"
+require "email/mboxrd/message"
 
 module Imap::Backup
   module Serializer; end
@@ -37,12 +36,12 @@ module Imap::Backup
       # invalidate cache
       @uids = nil
 
-      body = message['RFC822']
+      body = message["RFC822"]
       mboxrd_message = Email::Mboxrd::Message.new(body)
       mbox = imap = nil
       begin
-        mbox = File.open(mbox_pathname, 'ab')
-        imap = File.open(imap_pathname, 'ab')
+        mbox = File.open(mbox_pathname, "ab")
+        imap = File.open(imap_pathname, "ab")
         mbox.write mboxrd_message.to_s
         imap.write uid + "\n"
       rescue => e
@@ -58,18 +57,18 @@ module Imap::Backup
     def assert_files
       mbox = mbox_exist?
       imap = imap_exist?
-      raise '.imap file missing' if mbox and not imap
-      raise '.mbox file missing' if imap and not mbox
+      raise ".imap file missing" if mbox && (not imap)
+      raise ".mbox file missing" if imap && (not mbox)
     end
 
     def create_containing_directory
       mbox_relative_path = File.dirname(mbox_relative_pathname)
-      return if mbox_relative_path == '.'
+      return if mbox_relative_path == "."
       Utils.make_folder(path, mbox_relative_path, Serializer::DIRECTORY_PERMISSIONS)
     end
 
     def exist?
-      mbox_exist? and imap_exist?
+      mbox_exist? && imap_exist?
     end
 
     def mbox_exist?
@@ -81,7 +80,7 @@ module Imap::Backup
     end
 
     def mbox_relative_pathname
-      folder + '.mbox'
+      folder + ".mbox"
     end
 
     def mbox_pathname
@@ -89,7 +88,7 @@ module Imap::Backup
     end
 
     def imap_pathname
-      filename = folder + '.imap'
+      filename = folder + ".imap"
       File.join(path, filename)
     end
 

data/lib/imap/backup/utils.rb

@@ -1,5 +1,4 @@
-# encoding: utf-8
-require 'fileutils'
+require "fileutils"
 
 module Imap::Backup
   module Utils
@@ -20,7 +19,7 @@ module Imap::Backup
     end
 
     def self.make_folder(base_path, path, permissions)
-      parts = path.split('/')
+      parts = path.split("/")
       return if parts.size == 0
       full_path = File.join(base_path, path)
       FileUtils.mkdir_p full_path

data/lib/imap/backup/version.rb

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

data/spec/spec_helper.rb

@@ -1,19 +1,19 @@
 require "codeclimate-test-reporter"
-require 'rspec'
+require "rspec"
 
 CodeClimate::TestReporter.start
 
 spec_path = File.dirname(__FILE__)
-$LOAD_PATH << File.expand_path('../lib', spec_path)
+$LOAD_PATH << File.expand_path("../lib", spec_path)
 
-support_glob = File.join(spec_path, 'support', '**', '*.rb')
+support_glob = File.join(spec_path, "support", "**", "*.rb")
 Dir[support_glob].each { |f| require f }
 
-require 'simplecov'
+require "simplecov"
 SimpleCov.start do
-  add_filter '/spec/'
+  add_filter "/spec/"
 end
 
-require 'imap/backup'
+require "imap/backup"
 
 silence_logging

data/spec/support/higline_test_helpers.rb

@@ -1,6 +1,6 @@
 module HighLineTestHelpers
   def prepare_highline
-    @input = double('stdin', :eof? => false, :gets => "q\n")
+    @input = double("stdin", eof?: false, gets: "q\n")
     @output = StringIO.new
     Imap::Backup::Configuration::Setup.highline = HighLine.new(@input, @output)
     [@input, @output]

data/spec/support/shared_examples/account_flagging.rb

@@ -1,23 +1,23 @@
-shared_examples 'it flags the account as modified' do
-  it 'flags that the account has changed' do
+shared_examples "it flags the account as modified" do
+  it "flags that the account has changed" do
     expect(account[:modified]).to be_truthy
   end
 end
 
 shared_examples "it doesn't flag the account as modified" do
-  it 'does not flag that the account has changed' do
+  it "does not flag that the account has changed" do
     expect(account[:modified]).to be_falsey
   end
 end
 
-shared_examples 'it flags the account to be deleted' do
-  it 'flags that the account is to be deleted' do
+shared_examples "it flags the account to be deleted" do
+  it "flags that the account is to be deleted" do
     expect(account[:delete]).to be_truthy
   end
 end
 
 shared_examples "it doesn't flag the account to be deleted" do
-  it 'does not flags that the account is to be deleted' do
+  it "does not flags that the account is to be deleted" do
     expect(account[:delete]).to be_falsey
   end
 end