rservicebus2 0.2.15 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69007cfc230952eb00fdc713bc27b4d596eb7e59502331d7f30d22d52792c317
-  data.tar.gz: b48dab985640e9a8daf6a311f70a028031b69bdf0762013a10b83bffff29dda9
+  metadata.gz: 920ff69a3fdd0f96882ed1c8bc12dd82d78ed789fa92c664f1b80f1484365058
+  data.tar.gz: c41fa4a4284bfba83865cc6bac87e54312c26b556a6605f6e73022b8716c921c
 SHA512:
-  metadata.gz: 6e9eed975d128ba3a8c664b246e1494d9f0dfbf6b5a38bcf7c5794e38949d264c54ecbcbabee7cdb707dc272a0476675da06c0451b23392a86fbf23481269492
-  data.tar.gz: 4934bf11567524616a8357d6d3f8d222b1b5a5b22a72021a3468b1c3a69c860f1f1ce7c58262f2c30a813c19b10ac0b60cb49d7b98107bc934d2d27274d48a4b
+  metadata.gz: e68d15cc10acdb2565ab02d6d8cfd3dc8b1a871becfe9a6b66f319d763526c16df8977456aadec9b5c2cc66595082bfde320a02458e384b2753b7be68cc01726
+  data.tar.gz: f1c1c5ea85bf0920206067b92b58544068084b0e631c29ce6fdb00783114f87e507d59d3f2c237d1b307a9b3df7430deaf8ef74bf020ca6874c029801bfe99b0

data/lib/rservicebus2/host.rb

@@ -252,18 +252,30 @@ module RServiceBus2
           message_loop = false
         rescue NoMsgToProcess => e
           # This exception is just saying there are no messages to process
-          @queue_for_msgs_to_be_sent_on_complete = []
-          @monitors.each(&:look)
-          send_queued_msgs
-          @queue_for_msgs_to_be_sent_on_complete = nil
-
-          @queue_for_msgs_to_be_sent_on_complete = []
-          @cron_manager.run
-          send_queued_msgs
-          @queue_for_msgs_to_be_sent_on_complete = nil
-
-          @send_at_manager.process
-          @circuit_breaker.success
+          begin
+            @queue_for_msgs_to_be_sent_on_complete = []
+            @monitors.each(&:look)
+            send_queued_msgs
+            @queue_for_msgs_to_be_sent_on_complete = nil
+
+            @queue_for_msgs_to_be_sent_on_complete = []
+            @cron_manager.run
+            send_queued_msgs
+            @queue_for_msgs_to_be_sent_on_complete = nil
+
+            @send_at_manager.process
+            @circuit_breaker.success
+          rescue StandardError => e
+            if e.message == 'SIGTERM' || e.message == 'SIGINT'
+              puts 'Exiting on request ...'
+              message_loop = false
+            else
+              puts '*** This is really unexpected.'
+              message_loop = false
+              puts "Message: #{e.message}"
+              puts e.backtrace
+            end
+          end
         rescue StandardError => e
           if e.message == 'SIGTERM' || e.message == 'SIGINT'
             puts 'Exiting on request ...'

data/lib/rservicebus2/monitor/beanstalk.rb

@@ -12,7 +12,7 @@ module RServiceBus2
       CGI.parse(u.query)['timeout1']&.first || 5
     end
 
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
     def connect(uri)
       @uri = uri
       @timeout = deduce_timeout(uri)
@@ -36,7 +36,7 @@ module RServiceBus2
       puts e.message
       puts e.backtrace
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
 
     def look
       job = @beanstalk.reserve @timeout

data/lib/rservicebus2/monitor/dir.rb

@@ -28,6 +28,7 @@ module RServiceBus2
       abort
     end
 
+    # rubocop:disable Metrics/MethodLength
     def connect(uri)
       @path = input_dir(uri).path
       @input_filter = []
@@ -54,16 +55,14 @@ module RServiceBus2
         abort
       end
 
-      if parts['input_filter'][0] == 'ZIP'
-      elsif parts['input_filter'][0] == 'GZ'
-      elsif parts['input_filter'][0] == 'TAR'
-      else
+      unless %w[ZIP GZ TAR].include?(parts['input_filter'][0]).nil?
         puts 'Invalid input_filter specified.'
         puts '*** ZIP, or GZ are the only valid input_filters.'
         abort
       end
       @input_filter << parts['input_filter'][0]
     end
+    # rubocop:enable Metrics/MethodLength
 
     def process_content(content)
       content
@@ -86,13 +85,14 @@ module RServiceBus2
     # rubocop:disable Metrics/MethodLength
     def read_content_from_file(file_path)
       content = ''
-      if @input_filter.length > 0
-        if @input_filter[0] == 'ZIP'
+      if @input_filter.positive?
+        case @input_filter[0]
+        when 'ZIP'
           content = read_content_from_zip_file(file_path)
-        elsif @input_filter[0] == 'GZ'
+        when 'GZ'
           content = read_content_from_gz_file(file_path)
-        elsif @input_filter[0] == 'TAR'
-          fail 'TAR reader not implemented'
+        when 'TAR'
+          raise 'TAR reader not implemented'
         end
 
       else
@@ -101,15 +101,27 @@ module RServiceBus2
 
       content
     end
+    # rubocop:enable Metrics/MethodLength
 
     def process_path(file_path)
       content = read_content_from_file(file_path)
       payload = process_content(content)
 
-      send(payload, URI.parse(URI.encode("file://#{file_path}")))
+      send(payload, URI.parse(CGI.escape("file://#{file_path}")))
       content
     end
 
+    def archive_file(file_path, content)
+      basename = File.basename(file_path)
+      new_file_path = "#{@archivedir}/#{basename}.#{Time.now.strftime('%Y%m%d%H%M%S%L')}.zip"
+      RServiceBus2.log "Writing to archive, #{new_file_path}"
+
+      Zip::ZipOutputStream.open(new_file_path) do |zos|
+        zos.put_next_entry(basename)
+        zos.puts content
+      end
+    end
+
     def look
       file_processed = 0
       max_files_processed = 10
@@ -123,21 +135,12 @@ module RServiceBus2
         RServiceBus2.log "Ready to process, #{file_path}"
         content = process_path(file_path)
 
-        unless @archivedir.nil?
-          basename = File.basename(file_path)
-          new_file_path = "#{@archivedir}/#{basename}.#{Time.now.strftime('%Y%m%d%H%M%S%L')}.zip"
-          RServiceBus2.log "Writing to archive, #{new_file_path}"
-
-          Zip::ZipOutputStream.open(new_file_path) do |zos|
-            zos.put_next_entry(basename)
-            zos.puts content
-          end
-        end
+        archive_file(file_path, content) unless @archivedir.nil?
         File.unlink(file_path)
 
         file_processed += 1
-        RServiceBus2.log "Processed #{file_processed} of #{file_list.length}."
-        RServiceBus2.log "Allow system tick #{self.class.name}"
+        RServiceBus2.log "Processed #{file_processed} of #{file_list.length}.\nAllow system tick #{self.class.name}"
+
         break if file_processed >= max_files_processed
       end
     end

data/lib/rservicebus2/monitor/dirnotifier.rb

@@ -14,21 +14,19 @@ module RServiceBus2
       begin
         open_folder uri.path
         unless File.writable?(uri.path)
-          puts "***** Directory is not writable, #{uri.path}."
-          puts "***** Make the directory, #{uri.path}, writable and try again."
+          puts "***** Directory is not writable, #{uri.path}.\n" \
+               "***** Make the directory, #{uri.path}, writable and try again."
           abort
         end
       rescue Errno::ENOENT
-        puts "***** Directory does not exist, #{uri.path}."
-        puts "***** Create the directory, #{uri.path}, and try again."
-        puts "***** eg, mkdir #{uri.path}"
+        puts "***** Directory does not exist, #{uri.path}.\n" \
+             "***** Create the directory, #{uri.path}, and try again.\n" \
+             "***** eg, mkdir #{uri.path}"
         abort
       rescue Errno::ENOTDIR
-        puts "***** The specified path does not point to a directory,
-              #{uri.path}."
-        puts "***** Either repoint path to a directory, or remove, #{uri.path},
-              and create it as a directory."
-        puts "***** eg, rm #{uri.path} && mkdir #{uri.path}"
+        puts "***** The specified path does not point to a directory, #{uri.path}." \
+             "***** Either repoint path to a directory, or remove, #{uri.path}, and create it as a directory." \
+             "***** eg, rm #{uri.path} && mkdir #{uri.path}"
         abort
       end
 
@@ -55,19 +53,14 @@ module RServiceBus2
               abort
             end
           rescue Errno::ENOENT
-            puts "***** Processing Directory does not exist,
-                  #{processing_uri.path}."
-            puts "***** Create the directory, #{processing_uri.path}, and try
-                  again."
-            puts "***** eg, mkdir #{processing_uri.path}"
+            puts "***** Processing Directory does not exist, #{processing_uri.path}." \
+                 "***** Create the directory, #{processing_uri.path}, and try again." \
+                 "***** eg, mkdir #{processing_uri.path}"
             abort
           rescue Errno::ENOTDIR
-            puts "***** Processing Directory does not point to a directory,
-                  #{processing_uri.path}."
-            puts "***** Either repoint path to a directory, or remove,
-                  #{processing_uri.path}, and create it as a directory."
-            puts "***** eg, rm #{processing_uri.path} && mkdir
-                  #{processing_uri.path}"
+            puts "***** Processing Directory does not point to a directory, #{processing_uri.path}." \
+                 "***** Either repoint path to a directory, or remove, #{processing_uri.path}, and create it as a directory.\n" \
+                 "***** eg, rm #{processing_uri.path} && mkdir #{processing_uri.path}"
             abort
           end
 
@@ -80,7 +73,7 @@ module RServiceBus2
     end
 
     def look
-      file_list = get_files
+      file_list = files
       file_list.each do |file_path|
         new_path = move_file(file_path, @processing_folder)
         send(nil, URI.parse("file://#{new_path}"))
@@ -97,8 +90,8 @@ module RServiceBus2
       Pathname.new(dest).join(filename)
     end
 
-    def get_files
-      Dir.glob(Pathname.new("#{@Path}").join(@Filter) ).select { |f| File.file?(f) }
+    def files
+      Dir.glob(Pathname.new(@path).join(@filter)).select { |f| File.file?(f) }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.17
 platform: ruby
 authors:
 - Guy Irvine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client