inbox-sync 0.1.0 → 0.2.0

data/lib/inbox-sync/mail_item.rb

@@ -5,32 +5,51 @@ module InboxSync
   class MailItem
 
     def self.find(imap)
-      imap.uid_search(['ALL']).
-        map do |uid|
-          [uid, imap.uid_fetch(uid, ['RFC822', 'INTERNALDATE']).first]
-        end.
-        map do |uid_meta|
-          self.new(
-            uid_meta.first,
-            uid_meta.last.attr['RFC822'],
-            uid_meta.last.attr["INTERNALDATE"]
-          )
-        end
+      imap.uid_search(['ALL']).map do |uid|
+        self.new(imap, uid)
+      end
     end
 
-    attr_reader :uid, :meta, :message
+    attr_reader :imap, :uid
 
-    def initialize(uid, rfc822, internal_date)
+    def initialize(imap, uid, attrs={})
+      @imap = imap
       @uid = uid
-      @meta = {
-        'RFC822' => rfc822,
-        'INTERNALDATE' => internal_date
-      }
-      @message = ::Mail.new(rfc822)
+      @rfc822 = attrs[:rfc822]
+      @internal_date = attrs[:internal_date]
+      @message = attrs[:message]
     end
 
     def name
-      "[#{@uid}] #{@message.from}: #{@message.subject.inspect} (#{time_s(@message.date)})"
+      @name ||= "[#{self.uid}] #{self.message.from}: #{self.message.subject.inspect} (#{time_s(self.message.date)})"
+    end
+
+    def meta
+      @meta ||= @imap.uid_fetch(self.uid, ['RFC822', 'INTERNALDATE']).first
+    end
+
+    def rfc822
+      @rfc822 ||= self.meta.attr['RFC822']
+    end
+
+    def rfc822=(value)
+      @rfc822 = value
+    end
+
+    def internal_date
+      @internal_date ||= self.meta.attr['INTERNALDATE']
+    end
+
+    def internal_date=(value)
+      @internal_date = value
+    end
+
+    def message
+      @message ||= ::Mail.new(self.rfc822)
+    end
+
+    def message=(value)
+      @message = value
     end
 
     # Returns a stripped down version of the mail item
@@ -40,15 +59,11 @@ module InboxSync
     # This implies that stripped down mail items have no attachments.
 
     def stripped
-      @stripped ||= strip_down(MailItem.new(
-        self.uid,
-        self.meta['RFC822'],
-        self.meta["INTERNALDATE"]
-      ))
+      @stripped ||= strip_down(copy_mail_item(self))
     end
 
     def inspect
-      "#<#{self.class}:#{'0x%x' % (self.object_id << 1)}: @uid=#{@uid.inspect}, from=#{@message.from.inspect}, subject=#{@message.subject.inspect}, 'INTERNALDATE'=#{@meta['INTERNALDATE'].inspect}>"
+      "#<#{self.class}:#{'0x%x' % (self.object_id << 1)}: @uid=#{self.uid.inspect}, from=#{self.message.from.inspect}, subject=#{self.message.subject.inspect}, 'INTERNALDATE'=#{self.internal_date.inspect}>"
     end
 
     private
@@ -57,6 +72,14 @@ module InboxSync
       datetime.strftime("%a %b %-d %Y, %I:%M %p")
     end
 
+    def copy_mail_item(item)
+      MailItem.new(item.imap, item.uid, {
+        :rfc822 => item.rfc822,
+        :internal_date => item.internal_date,
+        :message => item.message
+      })
+    end
+
     def strip_down(mail_item)
       message = mail_item.message
       if message.multipart?
@@ -64,7 +87,8 @@ module InboxSync
           !part.content_type.match(/text\/plain/)
         end
         message.parts.first.body = strip_down_body_s(message.parts.first.body)
-        mail_item.meta['RFC822'] = message.to_s
+        mail_item.message = message
+        mail_item.rfc822 = message.to_s
       end
       mail_item
     end

data/lib/inbox-sync/runner.rb

@@ -18,67 +18,94 @@ module InboxSync
       @shutdown = false
       @running_syncs_thread = nil
 
-      Signal.trap('SIGINT', lambda{ self.stop })
-      Signal.trap('SIGQUIT', lambda{ self.stop })
+      Signal.trap('SIGINT',  lambda{ raise Interrupt, 'SIGINT'  })
+      Signal.trap('SIGQUIT', lambda{ raise Interrupt, 'SIGQUIT' })
+      Signal.trap('TERM',    lambda{ raise Interrupt, 'TERM'    })
     end
 
     def start
-      startup
+      startup!
       loop do
-        break if @shutdown
         loop_run
+        break if shutdown?
       end
-      shutdown
+      shutdown!
     end
 
     def stop
-      main_log "Stop signal - waiting for any running syncs to finish."
-      @shutdown = true
+      if @shutdown != true
+        main_log "Stop signal - waiting for any running syncs to finish."
+        @shutdown = true
+      end
+    end
+
+    def shutdown?
+      !!@shutdown
     end
 
     protected
 
-    def startup
+    def startup!
       main_log "Starting up the runner."
+      if @interval < 0
+        main_log "run-once interval - signaling stop"
+        stop
+        @interval = 0
+      end
     end
 
-    def shutdown
+    def shutdown!
       main_log "Shutting down the runner"
     end
 
     def loop_run
-      main_log "Starting syncs in fresh thread."
-
-      @running_syncs_thread = Thread.new do
-        thread_log "starting syncs..."
-
-        begin
-          run_syncs
-        rescue Exception => err
-          thread_log_error(err, :error)
+      begin
+        main_log "Starting syncs in fresh thread."
+        @running_syncs_thread = Thread.new { run_syncs_thread }
+
+        if @interval > 0
+          main_log "Sleeping for #{@interval} second interval."
+          sleep(@interval)
+          main_log "Woke from sleep"
         end
-
-        thread_log "...syncs finished"
+      rescue Interrupt => err
+        stop
+      ensure
+        join_syncs_thread
       end
+    end
 
-      if @interval < 0
-        main_log "run-once interval - signaling stop"
+    def join_syncs_thread
+      begin
+        if @running_syncs_thread
+          main_log "Waiting for running syncs thread to join..."
+          @running_syncs_thread.join
+          main_log "... running syncs thread has joined."
+        end
+        @running_syncs_thread = nil
+      rescue Interrupt => err
         stop
-        @interval = 0
+        join_syncs_thread
+      end
+    end
+
+    def run_syncs_thread
+      thread_log "starting syncs..."
+
+      begin
+        run_syncs
+      rescue Exception => err
+        thread_log_error(err, :error)
       end
 
-      main_log "Sleeping for #{@interval} seconds."
-      sleep(@interval)
-      main_log "Woke from sleep - waiting for running syncs thread to join..."
-      @running_syncs_thread.join
-      main_log "... running sycs thread joined."
+      thread_log "...syncs finished"
     end
 
     def run_syncs
       @syncs.each do |sync|
         begin
           sync.setup
-          sync.run
+          sync.run(self)
         rescue Exception => err
           run_sync_handle_error(sync, err)
         end

data/lib/inbox-sync/sync.rb

@@ -52,8 +52,9 @@ module InboxSync
       logger.info "=== #{config_log_detail(@config.source)} sync finished. ==="
     end
 
-    def run
-      each_source_mail_item do |mail_item|
+    def run(runner=nil)
+      return if runner && runner.shutdown?
+      each_source_mail_item(runner) do |mail_item|
         begin
           response = send_to_dest(mail_item)
           dest_uid = parse_append_response_uid(response)
@@ -95,11 +96,16 @@ module InboxSync
       true
     end
 
-    def each_source_mail_item
+    def each_source_mail_item(runner=nil)
+      logger.info "* find: #{config_log_detail(@config.source)}, #{@config.source.inbox.inspect}..."
       items = MailItem.find(@source_imap)
-      logger.info "* found #{items.size} mails"
+      logger.info "* ...found #{items.size} mail items"
 
       items.each do |mail_item|
+        if runner && runner.shutdown?
+          logger.info "* the runner has been shutdown - aborting the sync"
+          break
+        end
         logger.debug "** #{mail_item.inspect}"
         yield mail_item
       end
@@ -128,9 +134,9 @@ module InboxSync
       logger.info "** Appending #{desc}#{mail_item.uid} to dest #{@config.dest.inbox}..."
 
       inbox  = @config.dest.inbox
-      mail_s = mail_item.meta['RFC822']
+      mail_s = mail_item.rfc822
       flags  = []
-      date   = mail_item.meta['INTERNALDATE']
+      date   = mail_item.internal_date
 
       using_dest_imap do |imap|
         imap.append(inbox, mail_s, flags, date)

data/lib/inbox-sync/version.rb

@@ -1,3 +1,3 @@
 module InboxSync
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/helper.rb

@@ -41,7 +41,10 @@ class Assert::Context
   }
 
   def test_mail_item
-    InboxSync::MailItem.new('12345', TEST_MAIL_DATA['RFC822'], TEST_MAIL_DATA['INTERNALDATE'])
+    InboxSync::MailItem.new('dummy_imap', '12345', {
+      :rfc822 => TEST_MAIL_DATA['RFC822'],
+      :internal_date => TEST_MAIL_DATA['INTERNALDATE']
+    })
   end
 
   def setup_sync_mail_item
@@ -64,9 +67,9 @@ class Assert::Context
 
     # append the test mail on the source imap
     inbox  = sync.config.source.inbox
-    mail_s = test_mail_item.meta['RFC822']
+    mail_s = test_mail_item.rfc822
     flags  = []
-    date   = test_mail_item.meta['INTERNALDATE']
+    date   = test_mail_item.internal_date
 
     sync.source_imap.append(inbox, mail_s, flags, date)
   end

data/test/mail_item_test.rb

@@ -11,20 +11,20 @@ module InboxSync
     end
     subject { @item }
 
-    should have_readers :uid, :meta, :message
+    should have_readers :imap, :uid
     should have_class_method :find
-    should have_instance_method :name, :stripped
+    should have_instance_methods :name, :meta, :stripped
+    should have_instance_methods :rfc822, :rfc822=
+    should have_instance_methods :internal_date, :internal_date=
+    should have_instance_methods :message, :message=
 
     should "build a Mail Message from the raw IMAP attr data" do
       assert_kind_of ::Mail::Message, subject.message
     end
 
-    should "provide the raw IMAP attrs in the meta hash" do
-      assert_includes 'RFC822', subject.meta
-      assert_includes 'INTERNALDATE', subject.meta
-
-      assert_equal TEST_MAIL_DATA['RFC822'], subject.meta['RFC822']
-      assert_equal TEST_MAIL_DATA['INTERNALDATE'], subject.meta['INTERNALDATE']
+    should "provide the IMAP rfc822 and internal_date" do
+      assert_equal TEST_MAIL_DATA['RFC822'], subject.rfc822
+      assert_equal TEST_MAIL_DATA['INTERNALDATE'], subject.internal_date
     end
 
     should "be named by its uid, from, subject, and date" do
@@ -55,7 +55,7 @@ module InboxSync
     end
 
     should "set its RFC822 to the stripped message string" do
-      assert_equal subject.meta['RFC822'], subject.message.to_s
+      assert_equal subject.rfc822, subject.message.to_s
     end
   end
 

data/test/runner_test.rb

@@ -14,6 +14,7 @@ module InboxSync
     subject { @runner }
 
     should have_readers :syncs, :interval, :logger
+    should have_instance_methods :start, :stop, :shutdown?
 
     should "know its syncs" do
       assert_equal @syncs, subject.syncs

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inbox-sync
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-05 00:00:00 Z
+date: 2012-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development