gitlab-mail_room 0.0.2 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ebaaed437f93cd2df69d48f6542842364fdab407bbf6620347b7a9e0d95199
-  data.tar.gz: d374aee24abf12a1cd274c3dbc9bd9e9feeb440b0eec314807487163617e9cab
+  metadata.gz: 367b6c3327d94d056144113b001df4d6255ab16c6aedcfdb400b413eadd3e07e
+  data.tar.gz: 31ca4ff3025b9fd3ee67b1bb72203d5da46c3367830623f991bcf7b064043857
 SHA512:
-  metadata.gz: c76aa09decd47a81ee95f12d9a9c0470f48caabaf1443e461784677c58f8685a394198618498ae61d663819af4a99be4a359d5397e05f6cbab456973b995a3d8
-  data.tar.gz: f9815fff30eea223d91046f15e84d2fd4f584114c3a18743ba9f54134aa831138bb8f0936747130b5bc8da8f41b30d6e953a14c8ad4b3bc997bdb62d3e5b447e
+  metadata.gz: 55b4dce8b77c87a550e088344593490190975fffd13a7c6aed28316cd4524054fd209b476eae29d235413f33bbcc0b0abba1ff6eb3b1c2ba9c008dcc611ba20e
+  data.tar.gz: d8245f80b571b7c9a6c42c9280fd5d99db4705b4b067d6baeef6cd9dd623de69b44a75d9504ddf0fab9eb5bd566e11e72caefe9674ffff33b6e673149ed8458c

data/.gitlab-ci.yml

@@ -1,9 +1,14 @@
 # Cache gems in between builds
 
+services:
+  - redis:latest
+
 .test-template: &test
   cache:
     paths:
       - vendor/ruby
+  variables:
+    REDIS_URL: redis://redis:6379
   script:
   - bundle exec rspec spec
   before_script:

data/.gitlab/issue_templates/Release.md

@@ -0,0 +1,7 @@
+# GitLab mail_room release checklist
+
+- [ ] create tag in https://gitlab.com/gitlab-org/gitlab-mail_room/
+- [ ] publish gem from this tag to rubygems.org
+- [ ] update https://gitlab.com/gitlab-org/gitlab/-/blob/master/Gemfile to use the new gem version
+- [ ] update gitlab-org/build/CNG to build container images from the new gem (example: https://gitlab.com/gitlab-org/build/CNG/-/merge_requests/451/diffs)
+- [ ] to deploy the new version to gitlab.com, update gitlab-com/gl-infra/k8s-workloads/gitlab-com to pin the new mailroom container image version and assign it the [release managers](https://about.gitlab.com/community/release-managers/) (example: https://gitlab.com/gitlab-com/gl-infra/k8s-workloads/gitlab-com/-/merge_requests/236/diffs)

data/.ruby-version

@@ -1 +1 @@
-2.6.0
+2.7.2

data/README.md

@@ -2,7 +2,21 @@
 
 ## Fork notice
 
-mail_room contains some merged functionality that GitLab requires, so this mirror fork is to help us release custom functionality.
+`mail_room` contains some merged functionality that GitLab requires, so this mirror fork is to help us release custom functionality.
+
+It needs to be more or less kept up to date with the original, so please feel free to incorporate changes to the upstream repo if you see them.
+
+### Rationale
+
+This fork is required to reduce dependency on the upstream releases.
+
+The [original JSON structured logging PR](https://github.com/tpitale/mail_room/pull/88) was [released](https://github.com/tpitale/mail_room/commit/deb8fe63bab21c5c3003346961a815d137ff6d2d) and we [bumped the version](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3719) to incorporate it into [omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab).
+It turned out that when Mailroom crashed out (which it's designed to do), the crash log [wasn't being pulled into elastic in a very useful way](https://github.com/tpitale/mail_room/commits/master) (that is, every line of the stack trace was a new event) so [another PR](https://github.com/tpitale/mail_room/pull/103) was raised.
+
+Rather than wait for the author (or bugging him more than once), we [opted for bias for action](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19186#note_290758986) and made a fork of the gem.
+Here it is [in omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3960).
+
+The fork is useful as we can post quick fixes to our own fork and release fixes quickly, and still contribute those fixes upstream to help others.
 
 ## README
 

data/lib/mail_room/cli.rb

@@ -26,7 +26,9 @@ module MailRoom
         end
 
         parser.on('--log-exit-as') do |format|
-          options[:exit_error_format] = 'json' unless format.nil?
+          # accepts 'json' and 'plain'
+          # 'plain' is equivalent to no format given
+          options[:exit_error_format] = format unless format.nil?
         end
 
         # parser.on("-l", "--log FILE") do |path|
@@ -55,7 +57,7 @@ module MailRoom
 
       coordinator.run
     rescue Exception => e # not just Errors, but includes lower-level Exceptions
-      CrashHandler.new(error: e, format: @options[:exit_error_format]).handle
+      CrashHandler.new.handle(e, @options[:exit_error_format])
       exit
     end
   end

data/lib/mail_room/connection.rb

@@ -27,7 +27,7 @@ module MailRoom
     # is the imap connection closed?
     # @return [Boolean]
     def disconnected?
-      @imap.disconnected?
+      imap.disconnected?
     end
 
     # is the connection ready to idle?
@@ -49,8 +49,8 @@ module MailRoom
         idle
 
         process_mailbox
-      rescue Net::IMAP::Error, IOError
-        @mailbox.logger.warn({ context: @mailbox.context, action: "Disconnected. Resetting..." })
+      rescue Net::IMAP::Error, IOError => e
+        @mailbox.logger.warn({ context: @mailbox.context, action: "Disconnected. Resetting...", error: e.message })
         reset
         setup
       end
@@ -174,10 +174,12 @@ module MailRoom
     # @return [Array<Integer>] message ids
     def new_message_ids
       # uid_search still leaves messages UNSEEN
-      all_unread = @imap.uid_search(@mailbox.search_command)
+      all_unread = imap.uid_search(@mailbox.search_command)
+
+      all_unread = all_unread.slice(0, @mailbox.limit_max_unread) unless @mailbox.limit_max_unread.nil? || @mailbox.limit_max_unread == 0
 
       to_deliver = all_unread.select { |uid| @mailbox.deliver?(uid) }
-      @mailbox.logger.info({ context: @mailbox.context, action: "Getting new messages", unread: {count: all_unread.count, ids: all_unread}, to_be_delivered: { count: to_deliver.count, ids: all_unread } })
+      @mailbox.logger.info({ context: @mailbox.context, action: "Getting new messages", unread: {count: all_unread.count, ids: all_unread}, to_be_delivered: { count: to_deliver.count, ids: to_deliver } })
       to_deliver
     end
 

data/lib/mail_room/crash_handler.rb

@@ -2,18 +2,15 @@
 module MailRoom
   class CrashHandler
 
-    attr_reader :error, :format
-
     SUPPORTED_FORMATS = %w[json none]
 
-    def initialize(error:, format:)
-      @error = error
-      @format = format
+    def initialize(stream=STDOUT)
+      @stream = stream
     end
 
-    def handle
+    def handle(error, format)
       if format == 'json'
-        puts json
+        @stream.puts json(error)
         return
       end
 
@@ -22,7 +19,7 @@ module MailRoom
 
     private
 
-    def json
+    def json(error)
       { time: Time.now, severity: :fatal, message: error.message, backtrace: error.backtrace }.to_json
     end
   end

data/lib/mail_room/mailbox.rb

@@ -10,6 +10,7 @@ module MailRoom
     :port,
     :ssl,
     :start_tls,
+    :limit_max_unread, #to avoid 'Error in IMAP command UID FETCH: Too long argument'
     :idle_timeout,
     :search_command,
     :name,
@@ -50,6 +51,7 @@ module MailRoom
       :port => 993,
       :ssl => true,
       :start_tls => false,
+      :limit_max_unread => 0,
       :idle_timeout => IMAP_IDLE_TIMEOUT,
       :delete_after_delivery => false,
       :expunge_deleted => false,
@@ -106,7 +108,7 @@ module MailRoom
       body = message.attr['RFC822']
       return true unless body
 
-      logger.info({context: context, uid: message.attr['UID'], action: "sending to deliverer", deliverer: delivery.class.name, byte_size: message.attr['RFC822.SIZE']})
+      logger.info({context: context, uid: message.attr['UID'], action: "sending to deliverer", deliverer: delivery.class.name, byte_size: body.bytesize})
       delivery.deliver(body)
     end
 

data/lib/mail_room/mailbox_watcher.rb

@@ -49,9 +49,14 @@ module MailRoom
         @connection = nil
       end
 
+      @mailbox.logger.info({ context: @mailbox.context, action: "Terminating watching thread..." })
+
       if self.watching_thread
-        self.watching_thread.join
+        thr = self.watching_thread.join(60)
+        @mailbox.logger.info({ context: @mailbox.context, action: "Timeout waiting for watching thread" }) unless thr
       end
+
+      @mailbox.logger.info({ context: @mailbox.context, action: "Done with thread cleanup" })
     end
 
     private

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
-  # Current version of MailRoom gem
-  VERSION = "0.0.2"
+  # Current version of gitlab-mail_room gem
+  VERSION = "0.0.8"
 end

data/mail_room.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "mocha"
-  gem.add_development_dependency "bourne"
+  gem.add_development_dependency "rspec", "~> 3.9"
+  gem.add_development_dependency "mocha", "~> 1.11"
   gem.add_development_dependency "simplecov"
 
   # for testing delivery methods

data/spec/lib/arbitration/redis_spec.rb

@@ -5,7 +5,8 @@ describe MailRoom::Arbitration::Redis do
   let(:mailbox) {
     build_mailbox(
       arbitration_options: {
-        namespace: "mail_room"
+        namespace: "mail_room",
+        redis_url: ENV['REDIS_URL']
       }
     )
   }
@@ -78,7 +79,7 @@ describe MailRoom::Arbitration::Redis do
 
   context 'redis client connection params' do
     context 'when only url is present' do
-      let(:redis_url) { "redis://localhost:6379" }
+      let(:redis_url) { ENV.fetch('REDIS_URL', 'redis://localhost:6379') }
       let(:mailbox) {
         build_mailbox(
           arbitration_options: {

data/spec/lib/cli_spec.rb

@@ -4,23 +4,35 @@ describe MailRoom::CLI do
   let(:config_path) {File.expand_path('../fixtures/test_config.yml', File.dirname(__FILE__))}
   let!(:configuration) {MailRoom::Configuration.new({:config_path => config_path})}
   let(:coordinator) {stub(:run => true, :quit => true)}
+  let(:configuration_args) { anything }
+  let(:coordinator_args) { anything }
 
   describe '.new' do
     let(:args) {["-c", "a path"]}
 
     before :each do
-      MailRoom::Configuration.stubs(:new).returns(configuration)
-      MailRoom::Coordinator.stubs(:new).returns(coordinator)
+      MailRoom::Configuration.expects(:new).with(configuration_args).returns(configuration)
+      MailRoom::Coordinator.stubs(:new).with(coordinator_args).returns(coordinator)
     end
 
-    it 'parses arguments into configuration' do
-      expect(MailRoom::CLI.new(args).configuration).to eq(configuration)
-      expect(MailRoom::Configuration).to have_received(:new).with({:config_path => 'a path'})
+    context 'with configuration args' do
+      let(:configuration_args) do
+        {:config_path => 'a path'}
+      end
+
+      it 'parses arguments into configuration' do
+        expect(MailRoom::CLI.new(args).configuration).to eq configuration
+      end
     end
 
-    it 'creates a new coordinator with configuration' do
-      expect(MailRoom::CLI.new(args).coordinator).to eq(coordinator)
-      expect(MailRoom::Coordinator).to have_received(:new).with(configuration.mailboxes)
+    context 'with coordinator args' do
+      let(:coordinator_args) do
+        configuration.mailboxes
+      end
+
+      it 'creates a new coordinator with configuration' do
+        expect(MailRoom::CLI.new(args).coordinator).to eq(coordinator)
+      end
     end
   end
 
@@ -30,30 +42,33 @@ describe MailRoom::CLI do
     before :each do
       cli.configuration = configuration
       cli.coordinator = coordinator
+      cli.stubs(:exit)
     end
 
     it 'starts running the coordinator' do
-      cli.start
+      coordinator.expects(:run)
 
-      expect(coordinator).to have_received(:run)
+      cli.start
     end
 
     context 'on error' do
-      let(:error_message) { "oh noes!" }
-      let(:coordinator) { OpenStruct.new(run: true, quit: true) }
+      let(:error) { RuntimeError.new("oh noes!") }
+      let(:coordinator) { stub(run: true, quit: true) }
+      let(:crash_handler) { stub(handle: nil) }
 
       before do
         cli.instance_variable_set(:@options, {exit_error_format: error_format})
-        coordinator.stubs(:run).raises(RuntimeError, error_message)
+        coordinator.stubs(:run).raises(error)
+        MailRoom::CrashHandler.stubs(:new).returns(crash_handler)
       end
 
       context 'json format provided' do
         let(:error_format) { 'json' }
 
         it 'passes onto CrashHandler' do
-          cli.start
+          crash_handler.expects(:handle).with(error, error_format)
 
-          expect(MailRoom::CrashHandler).to have_received(:new).with a_hash_including({format: error_format})
+          cli.start
         end
       end
     end

data/spec/lib/configuration_spec.rb

@@ -19,10 +19,9 @@ describe MailRoom::Configuration do
 
       it 'sets mailboxes to an empty set' do
         MailRoom::Mailbox.stubs(:new)
+        MailRoom::Mailbox.expects(:new).never
 
         expect(configuration.mailboxes).to eq([])
-
-        expect(MailRoom::Mailbox).to have_received(:new).never
       end
     end
   end

data/spec/lib/connection_spec.rb

@@ -44,22 +44,14 @@ describe MailRoom::Connection do
         true
       end
 
-      mailbox.stubs(:deliver?).returns(true)
-
-      imap.stubs(:idle)
-      imap.stubs(:uid_search).returns([]).then.returns([1])
-      imap.stubs(:uid_fetch).returns([new_message])
-      imap.stubs(:store)
-      imap.stubs(:expunge)
+      imap.expects(:idle)
+      imap.stubs(:uid_search).with(mailbox.search_command).returns([], [1])
+      imap.expects(:uid_fetch).with([1], "RFC822").returns([new_message])
+      mailbox.expects(:deliver?).with(1).returns(true)
+      imap.expects(:store).with(8, "+FLAGS", [Net::IMAP::DELETED])
+      imap.expects(:expunge).once
 
       connection.wait
-
-      expect(imap).to have_received(:idle)
-      expect(imap).to have_received(:uid_search).with(mailbox.search_command).twice
-      expect(imap).to have_received(:uid_fetch).with([1], "RFC822")
-      expect(mailbox).to have_received(:deliver?).with(1)
-      expect(imap).to have_received(:store).with(8, "+FLAGS", [Net::IMAP::DELETED])
-      expect(imap).to have_received(:expunge).once
     end
   end
 end

data/spec/lib/coordinator_spec.rb

@@ -3,14 +3,12 @@ require 'spec_helper'
 describe MailRoom::Coordinator do
   describe '#initialize' do
     it 'builds a watcher for each mailbox' do
-      MailRoom::MailboxWatcher.stubs(:new).returns('watcher1', 'watcher2')
+      MailRoom::MailboxWatcher.expects(:new).with('mailbox1').returns('watcher1')
+      MailRoom::MailboxWatcher.expects(:new).with('mailbox2').returns('watcher2')
 
       coordinator = MailRoom::Coordinator.new(['mailbox1', 'mailbox2'])
 
       expect(coordinator.watchers).to eq(['watcher1', 'watcher2'])
-
-      expect(MailRoom::MailboxWatcher).to have_received(:new).with('mailbox1')
-      expect(MailRoom::MailboxWatcher).to have_received(:new).with('mailbox2')
     end
 
     it 'makes no watchers when mailboxes is empty' do
@@ -27,24 +25,27 @@ describe MailRoom::Coordinator do
       MailRoom::MailboxWatcher.stubs(:new).returns(watcher)
       coordinator = MailRoom::Coordinator.new(['mailbox1'])
       coordinator.stubs(:sleep_while_running)
+      watcher.expects(:run)
+      watcher.expects(:quit)
+
       coordinator.run
-      expect(watcher).to have_received(:run)
-      expect(watcher).to have_received(:quit)
     end
     
     it 'should go to sleep after running watchers' do
       coordinator = MailRoom::Coordinator.new([])
       coordinator.stubs(:running=)
       coordinator.stubs(:running?).returns(false)
+      coordinator.expects(:running=).with(true)
+      coordinator.expects(:running?)
+
       coordinator.run
-      expect(coordinator).to have_received(:running=).with(true)
-      expect(coordinator).to have_received(:running?)
     end
 
     it 'should set attribute running to true' do
       coordinator = MailRoom::Coordinator.new([])
       coordinator.stubs(:sleep_while_running)
       coordinator.run
+
       expect(coordinator.running).to eq(true)
     end
   end
@@ -54,8 +55,9 @@ describe MailRoom::Coordinator do
       watcher = stub(:quit)
       MailRoom::MailboxWatcher.stubs(:new).returns(watcher)
       coordinator = MailRoom::Coordinator.new(['mailbox1'])
+      watcher.expects(:quit)
+
       coordinator.quit
-      expect(watcher).to have_received(:quit)
     end
   end
 end

data/spec/lib/crash_handler_spec.rb

@@ -4,21 +4,22 @@ describe MailRoom::CrashHandler do
 
   let(:error_message) { "oh noes!" }
   let(:error) { RuntimeError.new(error_message) }
+  let(:stdout) { StringIO.new }
 
   describe '#handle' do
 
-    subject{ described_class.new(error: error, format: format) }
+    subject{ described_class.new(stdout).handle(error, format) }
 
     context 'when given a json format' do
       let(:format) { 'json' }
-      let(:fake_json) do
-        { message: error_message }.to_json
-      end
 
-      it 'outputs the result of json to stdout' do
-        subject.stubs(:json).returns(fake_json)
+      it 'writes a json message to stdout' do
+        subject
+        stdout.rewind
+        output = stdout.read
 
-        expect{ subject.handle }.to output(/\"message\":\"#{error_message}\"/).to_stdout
+        expect(output).to end_with("\n")
+        expect(JSON.parse(output)['message']).to eq(error_message)
       end
     end
 
@@ -26,7 +27,7 @@ describe MailRoom::CrashHandler do
       let(:format) { "" }
 
       it 'raises an error as designed' do
-        expect{ subject.handle }.to raise_error(error.class, error_message)
+        expect{ subject }.to raise_error(error.class, error_message)
       end
     end
 
@@ -34,7 +35,7 @@ describe MailRoom::CrashHandler do
       let(:format) { "nonsense" }
 
       it 'raises an error as designed' do
-        expect{ subject.handle }.to raise_error(error.class, error_message)
+        expect{ subject }.to raise_error(error.class, error_message)
       end
     end
   end

data/spec/lib/delivery/letter_opener_spec.rb

@@ -10,20 +10,24 @@ describe MailRoom::Delivery::LetterOpener do
     before :each do
       Mail.stubs(:read_from_string).returns(mail)
       ::LetterOpener::DeliveryMethod.stubs(:new).returns(delivery_method)
-
-      MailRoom::Delivery::LetterOpener.new(mailbox).deliver('a message')
     end
 
     it 'creates a new LetterOpener::DeliveryMethod' do
-      expect(::LetterOpener::DeliveryMethod).to have_received(:new).with(:location => '/tmp/somewhere')
+      ::LetterOpener::DeliveryMethod.expects(:new).with(:location => '/tmp/somewhere').returns(delivery_method)
+
+      MailRoom::Delivery::LetterOpener.new(mailbox).deliver('a message')
     end
 
     it 'parses the message string with Mail' do
-      expect(::Mail).to have_received(:read_from_string).with('a message')
+      ::Mail.expects(:read_from_string).with('a message')
+
+      MailRoom::Delivery::LetterOpener.new(mailbox).deliver('a message')
     end
 
     it 'delivers the mail message' do
-      expect(delivery_method).to have_received(:deliver!).with(mail)
+      delivery_method.expects(:deliver!).with(mail)
+
+      MailRoom::Delivery::LetterOpener.new(mailbox).deliver('a message')
     end
   end
 end

data/spec/lib/delivery/logger_spec.rb

@@ -9,9 +9,9 @@ describe MailRoom::Delivery::Logger do
       it 'creates a new ruby logger' do
         ::Logger.stubs(:new)
 
-        MailRoom::Delivery::Logger.new(mailbox)
+        ::Logger.expects(:new).with(STDOUT)
 
-        expect(::Logger).to have_received(:new).with(STDOUT)
+        MailRoom::Delivery::Logger.new(mailbox)
       end
     end
 
@@ -19,14 +19,12 @@ describe MailRoom::Delivery::Logger do
       let(:mailbox) {build_mailbox(:log_path => '/var/log/mail-room.log')}
 
       it 'creates a new file to append to' do
-        ::Logger.stubs(:new)
         file = stub(:sync=)
-        ::File.stubs(:open).returns(file)
 
-        MailRoom::Delivery::Logger.new(mailbox)
+        File.expects(:open).with('/var/log/mail-room.log', 'a').returns(file)
+        ::Logger.stubs(:new).with(file)
 
-        expect(File).to have_received(:open).with('/var/log/mail-room.log', 'a')
-        expect(::Logger).to have_received(:new).with(file)
+        MailRoom::Delivery::Logger.new(mailbox)
       end
     end
   end
@@ -38,9 +36,9 @@ describe MailRoom::Delivery::Logger do
       logger = stub(:info)
       ::Logger.stubs(:new).returns(logger)
 
-      MailRoom::Delivery::Logger.new(mailbox).deliver('a message')
+      logger.expects(:info).with('a message')
 
-      expect(logger).to have_received(:info).with('a message')
+      MailRoom::Delivery::Logger.new(mailbox).deliver('a message')
     end
   end
 end

data/spec/lib/delivery/postback_spec.rb

@@ -18,19 +18,13 @@ describe MailRoom::Delivery::Postback do
         request = stub
         Faraday.stubs(:new).returns(connection)
 
-        connection.stubs(:token_auth)
-        connection.stubs(:post).yields(request)
+        connection.expects(:token_auth).with('abcdefg')
+        connection.expects(:post).yields(request)
 
-        request.stubs(:url)
-        request.stubs(:body=)
+        request.expects(:url).with('http://localhost/inbox')
+        request.expects(:body=).with('a message')
 
         MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
-
-        expect(connection).to have_received(:token_auth).with('abcdefg')
-        expect(connection).to have_received(:post)
-
-        expect(request).to have_received(:url).with('http://localhost/inbox')
-        expect(request).to have_received(:body=).with('a message')
       end
     end
 
@@ -52,19 +46,13 @@ describe MailRoom::Delivery::Postback do
         request = stub
         Faraday.stubs(:new).returns(connection)
 
-        connection.stubs(:basic_auth)
-        connection.stubs(:post).yields(request)
+        connection.expects(:basic_auth).with('user1', 'password123abc')
+        connection.expects(:post).yields(request)
 
-        request.stubs(:url)
-        request.stubs(:body=)
+        request.expects(:url).with('http://localhost/inbox')
+        request.expects(:body=).with('a message')
 
         MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
-
-        expect(connection).to have_received(:basic_auth).with('user1', 'password123abc')
-        expect(connection).to have_received(:post)
-
-        expect(request).to have_received(:url).with('http://localhost/inbox')
-        expect(request).to have_received(:body=).with('a message')
       end
 
       context 'with content type in the delivery options' do
@@ -86,18 +74,14 @@ describe MailRoom::Delivery::Postback do
           connection = stub
           request = stub
           Faraday.stubs(:new).returns(connection)
-  
-          connection.stubs(:basic_auth)
-          connection.stubs(:post).yields(request)
-  
+
+          connection.expects(:post).yields(request)
           request.stubs(:url)
           request.stubs(:body=)
           request.stubs(:headers).returns({})
+          connection.expects(:basic_auth).with('user1', 'password123abc')
 
           MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
-  
-          expect(connection).to have_received(:basic_auth).with('user1', 'password123abc')
-          expect(connection).to have_received(:post)
           
           expect(request.headers['Content-Type']).to eq('text/plain')
         end

data/spec/lib/delivery/que_spec.rb

@@ -18,20 +18,15 @@ describe MailRoom::Delivery::Que do
     let(:options) {MailRoom::Delivery::Que::Options.new(mailbox)}
 
     it 'stores the message in que_jobs table' do
-      PG.stubs(:connect).returns(connection)
-      connection.stubs(:exec)
-
-      MailRoom::Delivery::Que.new(options).deliver('email')
-
-      expect(PG).to have_received(:connect).with({
+      PG.expects(:connect).with({
         host: 'localhost',
         port: 5432,
         dbname: 'delivery_test',
         user: 'postgres',
         password: ''
-      })
+      }).returns(connection)
 
-      expect(connection).to have_received(:exec).with(
+      connection.expects(:exec).with(
         "INSERT INTO que_jobs (priority, job_class, queue, args) VALUES ($1, $2, $3, $4)",
         [
           5,
@@ -40,6 +35,8 @@ describe MailRoom::Delivery::Que do
           JSON.dump(['email'])
         ]
       )
+
+      MailRoom::Delivery::Que.new(options).deliver('email')
     end
   end
 end

data/spec/lib/mailbox_spec.rb

@@ -12,9 +12,9 @@ describe MailRoom::Mailbox do
 
         uid = 123
 
-        mailbox.deliver?(uid)
+        noop.expects(:deliver?).with(uid)
 
-        expect(noop).to have_received(:deliver?).with(uid)
+        mailbox.deliver?(uid)
       end
     end
 
@@ -23,12 +23,10 @@ describe MailRoom::Mailbox do
         mailbox = build_mailbox({:arbitration_method => 'redis'})
         redis = stub(:deliver?)
         MailRoom::Arbitration['redis'].stubs(:new => redis)
-
         uid = 123
+        redis.expects(:deliver?).with(uid)
 
         mailbox.deliver?(uid)
-
-        expect(redis).to have_received(:deliver?).with(uid)
       end
     end
 
@@ -38,9 +36,9 @@ describe MailRoom::Mailbox do
         noop = stub(:deliver)
         MailRoom::Delivery['noop'].stubs(:new => noop)
 
-        mailbox.deliver(stub(:attr => sample_message))
+        noop.expects(:deliver).with('a message')
 
-        expect(noop).to have_received(:deliver).with('a message')
+        mailbox.deliver(stub(:attr => sample_message))
       end
     end
 
@@ -50,9 +48,9 @@ describe MailRoom::Mailbox do
         logger = stub(:deliver)
         MailRoom::Delivery['logger'].stubs(:new => logger)
 
-        mailbox.deliver(stub(:attr => sample_message))
+        logger.expects(:deliver).with('a message')
 
-        expect(logger).to have_received(:deliver).with('a message')
+        mailbox.deliver(stub(:attr => sample_message))
       end
     end
 
@@ -62,9 +60,9 @@ describe MailRoom::Mailbox do
         postback = stub(:deliver)
         MailRoom::Delivery['postback'].stubs(:new => postback)
 
-        mailbox.deliver(stub(:attr => sample_message))
+        postback.expects(:deliver).with('a message')
 
-        expect(postback).to have_received(:deliver).with('a message')
+        mailbox.deliver(stub(:attr => sample_message))
       end
     end
 
@@ -74,9 +72,9 @@ describe MailRoom::Mailbox do
         letter_opener = stub(:deliver)
         MailRoom::Delivery['letter_opener'].stubs(:new => letter_opener)
 
-        mailbox.deliver(stub(:attr => sample_message))
+        letter_opener.expects(:deliver).with('a message')
 
-        expect(letter_opener).to have_received(:deliver).with('a message')
+        mailbox.deliver(stub(:attr => sample_message))
       end
     end
 
@@ -85,10 +83,9 @@ describe MailRoom::Mailbox do
         mailbox = build_mailbox({ name: "magic mailbox", delivery_method: 'noop' })
         noop = stub(:deliver)
         MailRoom::Delivery['noop'].stubs(:new => noop)
+        noop.expects(:deliver).never
 
         mailbox.deliver(stub(:attr => {'FLAGS' => [:Seen, :Recent]}))
-
-        expect(noop).to have_received(:deliver).never
       end
     end
 

data/spec/lib/mailbox_watcher_spec.rb

@@ -20,19 +20,15 @@ describe MailRoom::MailboxWatcher do
 
     it 'loops over wait while running' do
       connection = MailRoom::Connection.new(mailbox)
-      connection.stubs(:on_new_message)
-      connection.stubs(:wait)
 
       MailRoom::Connection.stubs(:new).returns(connection)
 
-      watcher.stubs(:running?).returns(true).then.returns(false)
+      watcher.expects(:running?).twice.returns(true, false)
+      connection.expects(:wait).once
+      connection.expects(:on_new_message).once
 
       watcher.run
       watcher.watching_thread.join # wait for finishing run
-
-      expect(watcher).to have_received(:running?).times(2)
-      expect(connection).to have_received(:wait).once
-      expect(connection).to have_received(:on_new_message).once
     end
   end
 
@@ -55,9 +51,10 @@ describe MailRoom::MailboxWatcher do
 
       expect(watcher.running?).to eq(true)
 
+      connection.expects(:quit)
+
       watcher.quit
 
-      expect(connection).to have_received(:quit)
       expect(watcher.running?).to eq(false)
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'bundler/setup'
 
 require 'rspec'
 require 'mocha/api'
-require 'bourne'
 
 require File.expand_path('../../lib/mail_room', __FILE__)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.8
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,44 +28,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bourne
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +174,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".gitlab/issue_templates/Release.md"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -253,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: mail_room will proxy email (gmail) from IMAP to a callback URL, logger, or