rservicebus2 0.2.0 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e7e4478dcfd17cf33e195c10a8e26aa9394e6b0f
-  data.tar.gz: 5f712faee16f86b3ed2f56289ffced68781e5c94
+SHA256:
+  metadata.gz: e5cab110a6dd40b7b80824e669ac85709bbec790bc948d5bdcb954a1b29184a5
+  data.tar.gz: 1bc1c569d5af1d01e79c69c0aef99781498bdac5aac13671fd4cd47a286aa2b1
 SHA512:
-  metadata.gz: c730bfeb3dd50ceb5dc8aab7f2fcc7663c2539229fcf12a87c6da81855b8d3d626104710a83a01b13a09bca2e3d042f8f125e8f12d2bbe17738b15c3d7ef9b43
-  data.tar.gz: aeb9173b91dfeaeefa82a67fba42dbcf9401ad20d7560e559e7b12e271e391d9e2474805f1a860c2845aa2416006ad7b8f0c4f15f9dd2c42dc56069b08fc63f1
+  metadata.gz: 64d2065fbd9b061cf17eca6f9c8eea5e8aa4663a9e68a27463417d511496d9e329d2d2d227bd7dc0b677f39e1a0f62b56292394f5b22217517f80f097698b2dc
+  data.tar.gz: 5637363459b8c27057d5d2cba9bbd99f558a3a25fbf4f0d0e2971d4e249e8ab58001f123fee08e82c4ee116c38d849ae9ecafd5452c4416f319277e2c91bbabb

data/README.md

@@ -0,0 +1,50 @@
+# rservicebus2
+
+Use the examples directory as the starting point.
+
+## General Approach
+
+1. Convention over Configuration
+2. Configuration via Environment Variables
+3. Working examples provided for configuration
+
+## General Config
+
+### APPNAME
+1. Name of process
+2. Doubles as default queueName
+3. Defaults to directory name
+
+### MAX_RETRIES
+1. If an exception is generated while processing a message, the message can be
+retried. This allows the number of retries to be set.
+2. Defaults to 5
+
+### ERROR_QUEUE_NAME
+1. If an exception is generated while processing a message, the message can be
+retried. Once all retries are exhausted, the message will be put in the error queue.
+2. This allows the name of the queue to be set.
+3. Defaults to error
+
+### WORKING_DIR
+1. Where message handlers are looked for.
+2. Defaults to current directory
+
+### VERBOSE
+1. Send out more logging to track message processing
+
+### AUDIT_QUEUE_NAME
+1. When set, a copy of all messages sent and received will be add to this queue
+
+### RSBCRON_[msg name]
+1. An empty message will be created and sent based on the cron string
+
+## RSBMQ - Message queue
+1. Environment Variable Name: RSBMQ
+
+### Beanstalk
+
+### Redis
+
+### SQS
+RSBMQ=aws://[region]/[queue_name]

data/lib/rservicebus2/appresource/awsdynamodb.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'aws-sdk-dynamodb'
+
+module RServiceBus2
+  # AppResourceAWSDynamoDb
+  class AppResourceAWSDynamoDb < AppResource
+    def connect(uri)
+      region = uri.host
+
+      Aws::DynamoDB::Client.new(region: region)
+    end
+
+    def finished; end
+  end
+end

data/lib/rservicebus2/appresource/awss3.rb

@@ -0,0 +1,16 @@
+require 'aws-sdk-s3'
+
+module RServiceBus2
+  # AppResourceAWSDynamoDb
+  class AppResourceAWSS3 < AppResource
+    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def connect(uri)
+      region = uri.host
+
+      Aws::S3::Client.new(region: region)
+    end
+
+    def finished
+    end
+  end
+end

data/lib/rservicebus2/appresource/awssqs.rb

@@ -0,0 +1,25 @@
+require 'aws-sdk-sqs'
+require 'aws-sdk-sts'
+
+module RServiceBus2
+  # AppResourceAWSDynamoDb
+  class AppResourceAWSSQS < AppResource
+    def connect(uri)
+      queue_name = uri.path.sub('/', '')
+
+      region = uri.host
+
+      sts_client = Aws::STS::Client.new(region: region)
+      caller_identity_account = sts_client.get_caller_identity.account
+
+      queue_url = "https://sqs.#{region}.amazonaws.com/" \
+                  "#{caller_identity_account}/#{queue_name}"
+      {
+        client: Aws::SQS::Client.new(region: region),
+        url: queue_url
+      }
+    end
+
+    def finished; end
+  end
+end

data/lib/rservicebus2/appresource_configure.rb

@@ -31,6 +31,15 @@ module RServiceBus2
           when 'file'
             require 'rservicebus2/appresource/file'
             rm.add k.sub('RSB_', ''), AppResourceFile.new(host, uri)
+          when 'awsdynamodb'
+            require 'rservicebus2/appresource/awsdynamodb'
+            rm.add k.sub('RSB_', ''), AppResourceAWSDynamoDb.new(host, uri)
+          when 'awss3'
+            require 'rservicebus2/appresource/awss3'
+            rm.add k.sub('RSB_', ''), AppResourceAWSS3.new(host, uri)
+          when 'awssqs'
+            require 'rservicebus2/appresource/awssqs'
+            rm.add k.sub('RSB_', ''), AppResourceAWSSQS.new(host, uri)
           else
             abort("Scheme, #{uri.scheme}, not recognised when configuring
                   app resource, #{k}=#{v}")

data/lib/rservicebus2/monitor/awss3.rb

@@ -0,0 +1,51 @@
+require 'aws-sdk-s3'
+
+module RServiceBus2
+  # Monitor S3 Bucket for objects
+  class MonitorAWSS3 < Monitor
+    def connect(uri)
+      @bucket_name = uri.path
+      @bucket_name[0] = ''
+
+      @region = uri.host
+
+      @s3_client = Aws::S3::Client.new(region: @region)
+      @input_filter = []
+    end
+
+    def process_content(content)
+      content
+    end
+
+    def process_path(object_key)
+      # content = read_content_from_object(object_key)
+      resp = @s3_client.get_object(bucket: @bucket_name, key: object_key)
+
+      # call #read or #string on the response body
+      content = resp.body.read
+      payload = process_content(content)
+
+      send(payload, URI.parse(CGI.escape("s3://#{@region}/#{@bucket_name}/#{object_key}")))
+
+      @s3_client.delete_object({ bucket: @bucket_name, key: object_key })
+
+      content
+    end
+
+    def look
+      file_processed = 0
+      max_files_processed = 2
+
+      objects = @s3_client.list_objects_v2( bucket: @bucket_name, max_keys: max_files_processed).contents
+
+      objects.each do |object|
+        RServiceBus2.log "Ready to process, #{object.key}"
+        process_path(object.key)
+
+        file_processed += 1
+        RServiceBus2.log "Processed #{file_processed} of #{objects.length}."
+        RServiceBus2.log "Allow system tick #{self.class.name}"
+      end
+    end
+  end
+end

data/lib/rservicebus2/monitor/awssqs.rb

@@ -0,0 +1,32 @@
+require 'aws-sdk-sqs'
+require 'aws-sdk-sts'
+
+module RServiceBus2
+  # Monitor S3 Bucket for objects
+  class MonitorAWSSQS < Monitor
+    def connect(uri)
+      queue_name = uri.path.sub('/', '')
+
+      region = uri.host
+
+      sts_client = Aws::STS::Client.new(region: region)
+      caller_identity_account = sts_client.get_caller_identity.account
+
+      @queue_url = "https://sqs.#{region}.amazonaws.com/" +
+                   "#{caller_identity_account}/#{queue_name}"
+      @sqs_client = Aws::SQS::Client.new(region: region)
+    end
+
+    def look
+      # TODO make max available as env variable
+      response = @sqs_client.receive_message(queue_url: @queue_url, max_number_of_messages: 1)
+      response.messages.each do |message|
+        send(message.body, URI.parse(CGI.escape(@queue_url)))
+        @sqs_client.delete_message({
+          queue_url: @queue_url,
+          receipt_handle: message.receipt_handle
+        })
+      end
+    end
+  end
+end

data/lib/rservicebus2/monitor_configure.rb

@@ -48,6 +48,12 @@ module RServiceBus2
           when 'dir'
             require 'rservicebus2/monitor/dir'
             monitor = MonitorDir.new(@host, name, uri)
+          when 'awss3'
+            require 'rservicebus2/monitor/awss3'
+            monitor = MonitorAWSS3.new(@host, name, uri)
+          when 'awssqs'
+            require 'rservicebus2/monitor/awssqs'
+            monitor = MonitorAWSSQS.new(@host, name, uri)
           when 'dirnotifier'
             require 'rservicebus2/monitor/dirnotifier'
             monitor = MonitorDirNotifier.new(@host, name, uri)

data/lib/rservicebus2/mq.rb

@@ -20,10 +20,13 @@ module RServiceBus2
         mq = MQBeanstalk.new(uri)
       when 'file'
         require 'rservicebus2/mq/file'
-	mq = MQFile.new(uri)
+        mq = MQFile.new(uri)
       when 'redis'
         require 'rservicebus2/mq/redis'
-	mq = MQRedis.new(uri)
+        mq = MQRedis.new(uri)
+      when 'aws'
+        require 'rservicebus2/mq/aws'
+        mq = MQAWS.new(uri)
       else
         abort("Scheme, #{uri.scheme}, not recognised when configuring mq,
           #{string}")

data/lib/rservicebus2/mq/aws.rb

@@ -0,0 +1,85 @@
+require 'aws-sdk-sqs'
+require 'aws-sdk-sts'
+require 'rservicebus2/mq'
+
+module RServiceBus2
+  # Beanstalk client implementation.
+  class MQAWS < MQ
+    # Connect to the broker
+    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def connect(region, port)
+      begin
+        @max_job_size = 4_194_304
+        @region = region
+
+        sts_client = Aws::STS::Client.new(region: region)
+        @caller_identity_account = sts_client.get_caller_identity.account
+      rescue StandardError => e
+        puts 'Error connecting to AWS'
+        puts "Host string, #{region}"
+        puts e.message
+        puts e.backtrace
+        abort
+      end
+    end
+
+    def subscribe(queuename)
+      # For example:
+      # 'https://sqs.us-east-1.amazonaws.com/111111111111/my-queue'
+      @queue_url = 'https://sqs.' + @region + '.amazonaws.com/' +
+        @caller_identity_account + '/' + queuename
+      @sqs_client = Aws::SQS::Client.new(region: @region)
+    end
+
+    # Get next msg from queue
+    def pop
+      begin
+        response = @sqs_client.receive_message(
+          queue_url: @queue_url,
+          max_number_of_messages: 1
+        )
+
+        if response.messages.count.zero?
+          raise NoMsgToProcess
+        end
+
+        response.messages.each do |message|
+          @job = message
+        end
+      rescue StandardError => e
+        raise e
+      end
+      @job.body
+    end
+
+    def return_to_queue
+#      @job.release if @job
+      @job = nil
+    end
+
+    def ack
+      @sqs_client.delete_message({
+        queue_url: @queue_url,
+        receipt_handle: @job.receipt_handle
+      })
+      @job = nil
+    end
+
+    def send(queue_name, msg)
+      if msg.length > @max_job_size
+        puts '***Attempting to send a msg which will not fit on queue.'
+        puts "***Msg size, #{msg.length}, max msg size, #{@max_job_size}."
+        fail JobTooBigError, "Msg size, #{msg.length}, max msg size,
+              #{@max_job_size}"
+      end
+
+      queue_url = 'https://sqs.' + @region + '.amazonaws.com/' +
+        @caller_identity_account + '/' + queue_name
+
+      @sqs_client.send_message(
+        queue_url: queue_url,
+        message_body: msg
+      )
+    end
+  end
+end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.7
 platform: ruby
 authors:
 - Guy Irvine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: beanstalk-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fluiddb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
-  name: beanstalk-client
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: fluiddb
+  name: parse-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: parse-cron
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -93,6 +93,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- README.md
 - bin/return_messages_to_source_queue
 - bin/rsb_ctl
 - bin/rservicebus2
@@ -103,6 +104,9 @@ files:
 - lib/rservicebus2.rb
 - lib/rservicebus2/agent.rb
 - lib/rservicebus2/appresource.rb
+- lib/rservicebus2/appresource/awsdynamodb.rb
+- lib/rservicebus2/appresource/awss3.rb
+- lib/rservicebus2/appresource/awssqs.rb
 - lib/rservicebus2/appresource/dir.rb
 - lib/rservicebus2/appresource/file.rb
 - lib/rservicebus2/appresource/fluiddb.rb
@@ -123,12 +127,15 @@ files:
 - lib/rservicebus2/message/subscription.rb
 - lib/rservicebus2/message/verboseoutput.rb
 - lib/rservicebus2/monitor.rb
+- lib/rservicebus2/monitor/awss3.rb
+- lib/rservicebus2/monitor/awssqs.rb
 - lib/rservicebus2/monitor/dir.rb
 - lib/rservicebus2/monitor/dirnotifier.rb
 - lib/rservicebus2/monitor/message.rb
 - lib/rservicebus2/monitor/xmldir.rb
 - lib/rservicebus2/monitor_configure.rb
 - lib/rservicebus2/mq.rb
+- lib/rservicebus2/mq/aws.rb
 - lib/rservicebus2/mq/beanstalk.rb
 - lib/rservicebus2/mq/file.rb
 - lib/rservicebus2/mq/redis.rb
@@ -162,7 +169,7 @@ homepage: http://rubygems.org/gems/rservicebus2
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: RServiceBus
 test_files: []