rservicebus2 0.2.10 → 0.2.15

data/lib/rservicebus2/saga_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Saga Storage
   class SagaStorage
@@ -5,13 +7,12 @@ module RServiceBus2
       case uri.scheme
       when 'dir'
         require 'rservicebus2/saga_storage/dir'
-        return SagaStorageDir.new(uri)
+        SagaStorageDir.new(uri)
       when 'inmem'
         require 'rservicebus2/saga_storage/inmemory'
-        return SagaStorageInMemory.new(uri)
+        SagaStorageInMemory.new(uri)
       else
-        abort("Scheme, #{uri.scheme}, not recognised when configuring
-          SagaStorage, #{uri}")
+        abort("Scheme, #{uri.scheme}, not recognised when configuring SagaStorage, #{uri}")
       end
     end
   end

data/lib/rservicebus2/sendat_storage/file.rb

@@ -6,7 +6,6 @@ module RServiceBus2
     def initialize(uri)
       RServiceBus2.log "SendAtStorageFile configured: #{uri.path}"
       @list = load(uri.path)
-      puts "@list: #{@list.class.name}"
       @path = uri.path
     end
 

data/lib/rservicebus2/state_manager.rb

@@ -17,15 +17,15 @@ module RServiceBus2
     end
 
     def begin
-      @state_storage.begin unless @state_storage.nil?
+      @state_storage&.begin
     end
 
     def get(handler)
-      @state_storage.get(handler) unless @state_storage.nil?
+      @state_storage&.get(handler)
     end
 
     def commit
-      @state_storage.commit unless @state_storage.nil?
+      @state_storage&.commit
     end
   end
 end

data/lib/rservicebus2/state_storage.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # State Storage
   class StateStorage
     def self.get(uri)
       case uri.scheme
       when 'dir'
-        require 'rservicebus2/state_storage/dir.rb'
-        return StateStorageDir.new(uri)
+        require 'rservicebus2/state_storage/dir'
+        StateStorageDir.new(uri)
       when 'inmem'
-        require 'rservicebus2/state_storage/inmemory.rb'
-        return StateStorageInMemory.new(uri)
+        require 'rservicebus2/state_storage/inmemory'
+        StateStorageInMemory.new(uri)
       else
-        abort("Scheme, #{uri.scheme}, not recognised when configuring
-          StateStorage, #{uri}")
+        abort("Scheme, #{uri.scheme}, not recognised when configuring StateStorage, #{uri}")
       end
     end
   end

data/lib/rservicebus2/statistic_manager.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Used to collect various run time stats for runtime reporting
   class StatisticManager
     attr_accessor :output
 
+    # rubocop:disable Metrics/MethodLength
     def initialize(host)
       @host = host
       @hash = {}
@@ -20,6 +23,7 @@ module RServiceBus2
         RServiceBus2.get_value('STAT_OUTPUT_COUNTDOWN', '1').to_i
       @stat_output_countdown = 0
     end
+    # rubocop:enable Metrics/MethodLength
 
     def inc_total_processed
       @total_processed += 1
@@ -51,7 +55,7 @@ module RServiceBus2
       @total_by_message_type[class_name] += 1
     end
 
-    def get_for_reporting_2
+    def internal_formatted_reporting
       return unless @written == false
 
       @written = true
@@ -63,7 +67,7 @@ module RServiceBus2
       types
     end
 
-    def get_for_reporting_9
+    def formatted_reporting
       "T:#{@total_processed};" \
       "E:#{@total_errored};" \
       "S:#{@total_sent};" \
@@ -72,7 +76,7 @@ module RServiceBus2
     end
 
     def report
-      @host.log(get_for_reporting_9) if @output
+      @host.log(formatted_reporting) if @output
     end
 
     def tick

data/lib/rservicebus2/subscription_manager.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Subscription Manager
   class SubscriptionManager
     def initialize(subscription_storage)
       @subscription_storage = subscription_storage
-      @subscriptions = @subscription_storage.get_all
+      @subscriptions = @subscription_storage.all
     end
 
     # Get subscriptions for given eventName
@@ -11,7 +13,8 @@ module RServiceBus2
       subscriptions = @subscriptions[event_name]
       if subscriptions.nil?
         RServiceBus2.log "No subscribers for event, #{event_name}"
-        RServiceBus2.log "If there should be, ensure you have the appropriate evironment variable set, eg MESSAGE_ENDPOINT_MAPPINGS=#{event_name}:<Queue Name>"
+        RServiceBus2.log 'If there should be, ensure you have the appropriate evironment variable set, ' \
+                          "eg MESSAGE_ENDPOINT_MAPPINGS=#{event_name}:<Queue Name>"
         return []
       end
 
@@ -19,13 +22,12 @@ module RServiceBus2
     end
 
     def add(event_name, queue_name)
-      RServiceBus2.log 'Adding subscription for, ' +
-        event_name + ', to, ' + queue_name
+      RServiceBus2.log "Adding subscription for, #{event_name}, to, #{queue_name}"
       @subscriptions = @subscription_storage.add(event_name, queue_name)
     end
 
     def remove(_event_name, _queue_name)
-      fail 'Method, remove, needs to be implemented for this subscription storage'
+      raise 'Method, remove, needs to be implemented for this subscription storage'
     end
   end
 end

data/lib/rservicebus2/subscription_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module RServiceBus2
@@ -14,8 +16,8 @@ module RServiceBus2
     end
 
     # Get a list of all subscription, as an Array
-    def get_all
-      fail 'Method, get_all, needs to be implemented for SubscriptionStorage'
+    def all
+      raise 'Method, all, needs to be implemented for SubscriptionStorage'
     end
 
     # Add a new subscription
@@ -23,7 +25,7 @@ module RServiceBus2
     #  has asked for notification
     # @param [String] queue_name the queue to which the event should be sent
     def add(_event_name, _queue_name)
-      fail 'Method, add, needs to be implemented for this subscription storage'
+      raise 'Method, add, needs to be implemented for this subscription storage'
     end
 
     # Remove an existing subscription
@@ -32,8 +34,7 @@ module RServiceBus2
     #  has asked for notification
     # @param [String] queue_name the queue to which the event should be sent
     def remove(_event_name, _queue_name)
-      fail 'Method, remove, needs to be implemented for this subscription
-        storage'
+      raise 'Method, remove, needs to be implemented for this subscription storage'
     end
   end
 end

data/lib/rservicebus2/subscription_storage/file.rb

@@ -1,15 +1,9 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Implementation of Subscription Storage to Redis
   class SubscriptionStorageFile < SubscriptionStorage
-    # Constructor
-    #
-    # @param [String] app_ame Name of the application, used as a Namespace
-    # @param [String] uri resource location to attach, eg redis://127.0.0.1/foo
-    def initialize(app_name, uri)
-      super(app_name, uri)
-    end
-
-    def get_all
+    def all
       RServiceBus2.log 'Load subscriptions'
       return {} unless File.exist?(@uri.path)
 
@@ -17,13 +11,7 @@ module RServiceBus2
     end
 
     def add(event_name, queue_name)
-      # s => subscriptions
-      if File.exist?(@uri.path)
-        s = YAML.load(File.open(@uri.path))
-      else
-        s = {}
-      end
-
+      s = File.exist?(@uri.path) ? YAML.load(File.open(@uri.path)) : {}
       s[event_name] = [] if s[event_name].nil?
 
       s[event_name] << queue_name
@@ -35,8 +23,7 @@ module RServiceBus2
     end
 
     def remove(_event_name, _queue_name)
-      fail 'Method, remove, needs to be implemented for this
-            subscription storage'
+      raise 'Method, remove, needs to be implemented for this subscription storage'
     end
   end
 end

data/lib/rservicebus2/subscription_storage_configure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 module RServiceBus2
   # Configure SubscriptionStorage for an rservicebus host

data/lib/rservicebus2/transporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'beanstalk-client'
 require 'rservicebus2'
 require 'net/ssh/gateway'
@@ -8,13 +10,15 @@ module RServiceBus2
 
   # TODO: Poison Message? Can I bury with timeout in beanstalk ?
   # Needs to end up on an error queue, destination queue may be down.
+  # rubocop:disable Metrics/ClassLength
   class Transporter
     def get_value(name, default = nil)
-      value = (ENV[name].nil? || ENV[name] == '') ? default : ENV[name]
+      value = ENV[name].nil? || ENV[name] == '' ? default : ENV[name]
       RServiceBus2.log "Env value: #{name}: #{value}"
       value
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def connect_to_source_beanstalk
       source_queue_name = get_value('SOURCE_QUEUE_NAME', 'transport-out')
       source_url = get_value('SOURCE_URL', '127.0.0.1:11300')
@@ -22,7 +26,6 @@ module RServiceBus2
       @source.watch source_queue_name
 
       RServiceBus2.log "Connected to, #{source_queue_name}@#{source_url}"
-
     rescue StandardError => e
       puts 'Error connecting to Beanstalk'
       puts "Host string, #{sourceUrl}"
@@ -35,71 +38,79 @@ module RServiceBus2
       end
       abort
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     def disconnect
       RServiceBus2.log "Disconnect from,
         #{@remote_user_name}@#{@remote_host_name}/#{@remote_queue_name}"
-      @gateway.shutdown! unless @gateway.nil?
+      @gateway&.shutdown!
       @gateway = nil
       @remote_host_name = nil
 
-      @destination.close unless @destination.nil?
+      @destination&.close
       @destination = nil
 
       @remote_user_name = nil
       @remote_queue_name = nil
     end
 
+    # rubocop:disable Metrics/MethodLength
+    def connect_local
+      @local_port = get_value('LOCAL_PORT', 27_018).to_i
+      RServiceBus2.rlog "Local Port: #{@local_port}"
+
+      RServiceBus2.log "Connect SSH, #{@remote_user_name}@#{@remoteHostName}"
+      # Open port 27018 to forward to 127.0.0.11300 on the remote host
+      @gateway = Net::SSH::Gateway.new(@remote_host_name, @remote_user_name)
+      @gateway.open('127.0.0.1', 11_300, @local_port)
+      RServiceBus2.log "Connected to SSH, #{@remote_user_name}@#{@remote_host_name}"
+    rescue Errno::EADDRINUSE
+      puts "*** Local transport port in use, #{@local_port}"
+      puts "*** Change local transport port, #{@localPort}, using format, LOCAL_PORT=#{@localPort + 1}"
+      abort
+    rescue Errno::EACCES
+      puts "*** Local transport port specified, #{@local_port}, needs sudo access"
+      puts '*** Change local transport port using format, LOCAL_PORT=27018'
+      abort
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    def connect_destination
+      destination_url = "127.0.0.1:#{@local_port}"
+      RServiceBus2.rlog "Connect to Remote Beanstalk, #{destination_url}"
+      @destination = Beanstalk::Pool.new([destinationUrl])
+      RServiceBus2.rlog "Connected to Remote Beanstalk, #{destination_url}"
+    rescue StandardError => e
+      if e.message == 'Beanstalk::NotConnected'
+        puts "***Could not connect to destination, check beanstalk is running at, #{destination_url}"
+        raise CouldNotConnectToDestination
+      end
+      raise
+    end
+
+    def pull_config(remote_host_name)
+      @remote_host_name = remote_host_name
+      @remote_user_name = get_value("REMOTE_USER_#{remote_host_name.upcase}")
+      return unless @remote_user_name.nil?
+
+      RServiceBus2.log "**** Username not specified for Host, #{remoteHostName}"
+      RServiceBus2.log "**** Add an environment variable of the form, REMOTE_USER_#{remoteHostName.upcase}=[USERNAME]"
+      abort
+    end
+
     def connect(remote_host_name)
       RServiceBus2.rlog "connect called, #{remote_host_name}"
-      if @gateway.nil? || remoteHostName != @remote_host_name || @destination.nil?
-        disconnect
-      end
+      disconnect if @gateway.nil? || remoteHostName != @remote_host_name || @destination.nil?
 
-      if @gateway.nil?
-        # Get destination url from job
-        @remote_host_name = remote_host_name
-        @remote_user_name = get_value("REMOTE_USER_#{remote_host_name.upcase}")
-        if @remote_user_name.nil?
-          RServiceBus2.log "**** Username not specified for Host, #{remoteHostName}"
-          RServiceBus2.log "**** Add an environment variable of the form, REMOTE_USER_#{remoteHostName.upcase}=[USERNAME]"
-          abort
-        end
-
-        @local_port = get_value('LOCAL_PORT', 27018).to_i
-        RServiceBus2.rlog "Local Port: #{@local_port}"
-        begin
-          RServiceBus2.log "Connect SSH, #{@remote_user_name}@#{@remoteHostName}"
-          # Open port 27018 to forward to 127.0.0.11300 on the remote host
-          @gateway = Net::SSH::Gateway.new(@remote_host_name, @remote_user_name)
-          @gateway.open('127.0.0.1', 11300, @local_port)
-          RServiceBus2.log "Connected to SSH, #{@remote_user_name}@#{@remote_host_name}"
-
-        rescue Errno::EADDRINUSE
-          puts "*** Local transport port in use, #{@local_port}"
-          puts "*** Change local transport port, #{@localPort}, using format, LOCAL_PORT=#{@localPort+1}"
-          abort
-        rescue Errno::EACCES
-          puts "*** Local transport port specified, #{@local_port}, needs sudo access"
-          puts '*** Change local transport port using format, LOCAL_PORT=27018'
-          abort
-        end
-
-        begin
-          destination_url = "127.0.0.1:#{@local_port}"
-          RServiceBus2.rlog "Connect to Remote Beanstalk, #{destination_url}"
-          @destination = Beanstalk::Pool.new([destinationUrl])
-          RServiceBus2.rlog "Connected to Remote Beanstalk, #{destination_url}"
-        rescue StandardError => e
-          if e.message == 'Beanstalk::NotConnected'
-            puts "***Could not connect to destination, check beanstalk is running at, #{destination_url}"
-            raise CouldNotConnectToDestination
-          end
-          raise
-        end
-      end
+      return unless @gateway.nil?
+
+      # Get destination url from job
+      pull_config(remote_host_name)
+      connect_local
+      connect_destination
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def process
       # Get the next job from the source queue
       job = @source.reserve @timeout
@@ -129,14 +140,14 @@ module RServiceBus2
       end
       raise e
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     def run
       @timeout = get_value('TIMEOUT', 5)
       connectToSourceBeanstalk
-      while true
-        process
-      end
+      loop { process }
       disconnect_from_remote_ssh
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.15
 platform: ruby
 authors:
 - Guy Irvine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
@@ -129,6 +129,7 @@ files:
 - lib/rservicebus2/monitor.rb
 - lib/rservicebus2/monitor/awss3.rb
 - lib/rservicebus2/monitor/awssqs.rb
+- lib/rservicebus2/monitor/beanstalk.rb
 - lib/rservicebus2/monitor/dir.rb
 - lib/rservicebus2/monitor/dirnotifier.rb
 - lib/rservicebus2/monitor/message.rb
@@ -156,7 +157,6 @@ files:
 - lib/rservicebus2/state_storage/dir.rb
 - lib/rservicebus2/state_storage/inmemory.rb
 - lib/rservicebus2/statistic_manager.rb
-- lib/rservicebus2/stats.rb
 - lib/rservicebus2/subscription_manager.rb
 - lib/rservicebus2/subscription_storage.rb
 - lib/rservicebus2/subscription_storage/file.rb