rservicebus2 0.0.2 → 0.0.3

data/lib/{rservicebus → rservicebus2}/saga_storage/inmemory.rb

@@ -1,6 +1,8 @@
-module RServiceBus
+module RServiceBus2
   # Saga Storage In Memory
   class SagaStorageInMemory
+    attr_reader :hash
+
     def initialize(_uri)
     end
 
@@ -28,10 +30,11 @@ module RServiceBus
     end
 
     def delete(correlation_id)
-      @deleted << correlation_id
+      @deleted[correlation_id] = correlation_id
     end
 
     def rollback
+      @deleted = {}
     end
   end
 end

data/lib/{rservicebus → rservicebus2}/sendat_manager.rb

@@ -1,13 +1,13 @@
-require 'rservicebus/sendat_storage'
+require 'rservicebus2/sendat_storage'
 
-module RServiceBus
+module RServiceBus2
   # Send At Manager
   class SendAtManager
     def initialize(bus)
       # Check if the SendAt Dir has been specified
       # If it has, make sure it exists, and is writable
 
-      string = RServiceBus.get_value('SENDAT_URI')
+      string = RServiceBus2.get_value('SENDAT_URI')
       string = 'file:///tmp/rservicebus-sendat' if string.nil?
 
       uri = URI.parse(string)

data/lib/{rservicebus → rservicebus2}/sendat_storage.rb

@@ -1,14 +1,14 @@
 
-module RServiceBus
+module RServiceBus2
   # Send At Storage
   class SendAtStorage
     def self.get(uri)
       case uri.scheme
       when 'file'
-        require 'rservicebus/sendat_storage/file'
+        require 'rservicebus2/sendat_storage/file'
         return SendAtStorageFile.new(uri)
       when 'inmem'
-        require 'rservicebus/sendat_storage/inmemory'
+        require 'rservicebus2/sendat_storage/inmemory'
         return SendAtStorageInMemory.new(uri)
       else
         abort("Scheme, #{uri.scheme}, not recognised when configuring

data/lib/{rservicebus → rservicebus2}/sendat_storage/file.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Send at storage file
   class SendAtStorageFile
     def initialize(uri)

data/lib/{rservicebus → rservicebus2}/sendat_storage/inmemory.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
     # Send at storage in memory
     class SendAtStorageInMemory
       def initialize(_uri)

data/lib/{rservicebus → rservicebus2}/state_manager.rb

@@ -1,6 +1,6 @@
-require 'rservicebus/state_storage'
+require 'rservicebus2/state_storage'
 
-module RServiceBus
+module RServiceBus2
 
   # State Manager
   class StateManager
@@ -8,7 +8,7 @@ module RServiceBus
       # Check if the State Dir has been specified
       # If it has, make sure it exists, and is writable
 
-      string = RServiceBus.get_value('STATE_URI')
+      string = RServiceBus2.get_value('STATE_URI')
       string = 'dir:///tmp' if string.nil?
 
       uri = URI.parse(string)

data/lib/{rservicebus → rservicebus2}/state_storage.rb

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

data/lib/{rservicebus → rservicebus2}/state_storage/dir.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # State Storage on the file system
   class StateStorageDir
     def initialize(uri)

data/lib/{rservicebus → rservicebus2}/state_storage/inmemory.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # StateStorage InMemory
   class StateStorageInMemory
     def initialize(_uri)

data/lib/{rservicebus → rservicebus2}/statistic_manager.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Used to collect various run time stats for runtime reporting
   class StatisticManager
     attr_accessor :output
@@ -15,9 +15,9 @@ module RServiceBus
 
       @total_by_message_type = {}
 
-      @output = !RServiceBus.get_value('VERBOSE', nil).nil?
+      @output = !RServiceBus2.get_value('VERBOSE', nil).nil?
       @max_stat_output_countdown =
-        RServiceBus.get_value('STAT_OUTPUT_COUNTDOWN', '1').to_i
+        RServiceBus2.get_value('STAT_OUTPUT_COUNTDOWN', '1').to_i
       @stat_output_countdown = 0
     end
 

data/lib/{rservicebus → rservicebus2}/stats.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Used to collect various run time stats for runtime reporting
   class Stats
     def initialize

data/lib/{rservicebus → rservicebus2}/subscription_manager.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Subscription Manager
   class SubscriptionManager
     def initialize(subscription_storage)
@@ -10,8 +10,8 @@ module RServiceBus
     def get(event_name)
       subscriptions = @subscriptions[event_name]
       if subscriptions.nil?
-        RServiceBus.log "No subscribers for event, #{event_name}"
-        RServiceBus.log "If there should be, ensure you have the appropriate evironment variable set, eg MESSAGE_ENDPOINT_MAPPINGS=#{event_name}:<Queue Name>"
+        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>"
         return []
       end
 
@@ -19,12 +19,12 @@ module RServiceBus
     end
 
     def add(event_name, queue_name)
-      RServiceBus.log 'Adding subscription for, ' +
+      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)
+    def remove(_event_name, _queue_name)
       fail 'Method, remove, needs to be implemented for this subscription storage'
     end
   end

data/lib/{rservicebus → rservicebus2}/subscription_storage.rb

@@ -1,6 +1,6 @@
 require 'uri'
 
-module RServiceBus
+module RServiceBus2
   # Base class for subscription storage
   class SubscriptionStorage
     # Constructor

data/lib/{rservicebus → rservicebus2}/subscription_storage/file.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Implementation of Subscription Storage to Redis
   class SubscriptionStorageFile < SubscriptionStorage
     # Constructor

data/lib/{rservicebus → rservicebus2}/subscription_storage_configure.rb

@@ -1,5 +1,5 @@
 require 'uri'
-module RServiceBus
+module RServiceBus2
   # Configure SubscriptionStorage for an rservicebus host
   class ConfigureSubscriptionStorage
     def get(app_name, uri_string)
@@ -7,7 +7,7 @@ module RServiceBus
 
       case uri.scheme
       when 'file'
-        require 'rservicebus/subscription_storage/file'
+        require 'rservicebus2/subscription_storage/file'
         s = SubscriptionStorageFile.new(app_name, uri)
       else
         abort("Scheme, #{uri.scheme}, not recognised when configuring

data/lib/rservicebus2/test.rb

@@ -0,0 +1 @@
+require 'rservicebus2/test/bus'

data/lib/{rservicebus → rservicebus2}/test/bus.rb

@@ -1,7 +1,7 @@
-module RServiceBus
+module RServiceBus2
   # Test Bus
   class TestBus
-    attr_accessor :publish_list, :send_list, :reply_list, :log_list, :sagaData
+    attr_accessor :publish_list, :send_list, :reply_list, :log_list, :saga_data
 
     def initialize
       @publish_list = []

data/lib/{rservicebus → rservicebus2}/transporter.rb

@@ -1,5 +1,5 @@
 require 'beanstalk-client'
-require 'rservicebus'
+require 'rservicebus2'
 require 'net/ssh/gateway'
 
 module RServiceBus
@@ -11,7 +11,7 @@ module RServiceBus
   class Transporter
     def get_value(name, default = nil)
       value = (ENV[name].nil? || ENV[name] == '') ? default : ENV[name]
-      RServiceBus.log "Env value: #{name}: #{value}"
+      RServiceBus2.log "Env value: #{name}: #{value}"
       value
     end
 
@@ -21,7 +21,7 @@ module RServiceBus
       @source = Beanstalk::Pool.new([source_url])
       @source.watch source_queue_name
 
-      RServiceBus.log "Connected to, #{source_queue_name}@#{source_url}"
+      RServiceBus2.log "Connected to, #{source_queue_name}@#{source_url}"
 
     rescue StandardError => e
       puts 'Error connecting to Beanstalk'
@@ -37,7 +37,7 @@ module RServiceBus
     end
 
     def disconnect
-      RServiceBus.log "Disconnect from,
+      RServiceBus2.log "Disconnect from,
         #{@remote_user_name}@#{@remote_host_name}/#{@remote_queue_name}"
       @gateway.shutdown! unless @gateway.nil?
       @gateway = nil
@@ -51,7 +51,7 @@ module RServiceBus
     end
 
     def connect(remote_host_name)
-      RServiceBus.rlog "connect called, #{remote_host_name}"
+      RServiceBus2.rlog "connect called, #{remote_host_name}"
       if @gateway.nil? || remoteHostName != @remote_host_name || @destination.nil?
         disconnect
       end
@@ -61,19 +61,19 @@ module RServiceBus
         @remote_host_name = remote_host_name
         @remote_user_name = get_value("REMOTE_USER_#{remote_host_name.upcase}")
         if @remote_user_name.nil?
-          RServiceBus.log "**** Username not specified for Host, #{remoteHostName}"
-          RServiceBus.log "**** Add an environment variable of the form, REMOTE_USER_#{remoteHostName.upcase}=[USERNAME]"
+          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
-        RServiceBus.rlog "Local Port: #{@local_port}"
+        RServiceBus2.rlog "Local Port: #{@local_port}"
         begin
-          RServiceBus.log "Connect SSH, #{@remote_user_name}@#{@remoteHostName}"
+          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)
-          RServiceBus.log "Connected to SSH, #{@remote_user_name}@#{@remote_host_name}"
+          RServiceBus2.log "Connected to SSH, #{@remote_user_name}@#{@remote_host_name}"
 
         rescue Errno::EADDRINUSE
           puts "*** Local transport port in use, #{@local_port}"
@@ -87,9 +87,9 @@ module RServiceBus
 
         begin
           destination_url = "127.0.0.1:#{@local_port}"
-          RServiceBus.rlog "Connect to Remote Beanstalk, #{destination_url}"
+          RServiceBus2.rlog "Connect to Remote Beanstalk, #{destination_url}"
           @destination = Beanstalk::Pool.new([destinationUrl])
-          RServiceBus.rlog "Connected to Remote Beanstalk, #{destination_url}"
+          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}"
@@ -108,10 +108,10 @@ module RServiceBus
       connect(msg.remote_host_name)
 
       @remote_queue_name = msg.remote_queue_name
-      RServiceBus.rlog "Put msg, #{msg.remote_queue_name}"
+      RServiceBus2.rlog "Put msg, #{msg.remote_queue_name}"
       @destination.use(msg.remote_queue_name)
       @destination.put(job.body)
-      RServiceBus.log "Msg put, #{msg.remote_queue_name}"
+      RServiceBus2.log "Msg put, #{msg.remote_queue_name}"
 
       unless ENV['AUDIT_QUEUE_NAME'].nil?
         @source.use ENV['AUDIT_QUEUE_NAME']
@@ -120,11 +120,11 @@ module RServiceBus
       # remove job
       job.delete
 
-      RServiceBus.log "Job sent to, #{@remote_user_name}@#{@remote_host_name}/#{@remote_queue_name}"
+      RServiceBus2.log "Job sent to, #{@remote_user_name}@#{@remote_host_name}/#{@remote_queue_name}"
     rescue StandardError => e
       disconnect
       if e.message == 'TIMED_OUT'
-        RServiceBus.rlog 'No Msg'
+        RServiceBus2.rlog 'No Msg'
         return
       end
       raise e

data/lib/{rservicebus → rservicebus2}/usermessage/withpayload.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # User Message
   class UserMessageWithPayload
     attr_reader :payload

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Guy Irvine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -92,63 +92,62 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rservicebus/agent.rb
-- lib/rservicebus/appresource/dir.rb
-- lib/rservicebus/appresource/file.rb
-- lib/rservicebus/appresource/fluiddb.rb
-- lib/rservicebus/appresource.rb
-- lib/rservicebus/appresource_configure.rb
-- lib/rservicebus/audit.rb
-- lib/rservicebus/circuitbreaker.rb
-- lib/rservicebus/config.rb
-- lib/rservicebus/cron_manager.rb
-- lib/rservicebus/endpointmapping.rb
-- lib/rservicebus/errormessage.rb
-- lib/rservicebus/handler_loader.rb
-- lib/rservicebus/handler_manager.rb
-- lib/rservicebus/helper_functions.rb
-- lib/rservicebus/host.rb
-- lib/rservicebus/message/statisticoutput.rb
-- lib/rservicebus/message/subscription.rb
-- lib/rservicebus/message/verboseoutput.rb
-- lib/rservicebus/message.rb
-- lib/rservicebus/monitor/csvdir.rb
-- lib/rservicebus/monitor/dir.rb
-- lib/rservicebus/monitor/dirnotifier.rb
-- lib/rservicebus/monitor/message.rb
-- lib/rservicebus/monitor/xmldir.rb
-- lib/rservicebus/monitor.rb
-- lib/rservicebus/monitor_configure.rb
-- lib/rservicebus/mq/beanstalk.rb
-- lib/rservicebus/mq.rb
-- lib/rservicebus/resource_manager.rb
-- lib/rservicebus/saga/base.rb
-- lib/rservicebus/saga/data.rb
-- lib/rservicebus/saga/manager.rb
-- lib/rservicebus/saga_loader.rb
-- lib/rservicebus/saga_storage/dir.rb
-- lib/rservicebus/saga_storage/inmemory.rb
-- lib/rservicebus/saga_storage.rb
-- lib/rservicebus/sendat_manager.rb
-- lib/rservicebus/sendat_storage/file.rb
-- lib/rservicebus/sendat_storage/inmemory.rb
-- lib/rservicebus/sendat_storage.rb
-- lib/rservicebus/state_manager.rb
-- lib/rservicebus/state_storage/dir.rb
-- lib/rservicebus/state_storage/inmemory.rb
-- lib/rservicebus/state_storage.rb
-- lib/rservicebus/statistic_manager.rb
-- lib/rservicebus/stats.rb
-- lib/rservicebus/subscription_manager.rb
-- lib/rservicebus/subscription_storage/file.rb
-- lib/rservicebus/subscription_storage/redis.rb
-- lib/rservicebus/subscription_storage.rb
-- lib/rservicebus/subscription_storage_configure.rb
-- lib/rservicebus/test/bus.rb
-- lib/rservicebus/test.rb
-- lib/rservicebus/transporter.rb
-- lib/rservicebus/usermessage/withpayload.rb
-- lib/rservicebus.rb
+- lib/rservicebus2/agent.rb
+- lib/rservicebus2/appresource/dir.rb
+- lib/rservicebus2/appresource/file.rb
+- lib/rservicebus2/appresource/fluiddb.rb
+- lib/rservicebus2/appresource.rb
+- lib/rservicebus2/appresource_configure.rb
+- lib/rservicebus2/audit.rb
+- lib/rservicebus2/circuitbreaker.rb
+- lib/rservicebus2/config.rb
+- lib/rservicebus2/cron_manager.rb
+- lib/rservicebus2/endpointmapping.rb
+- lib/rservicebus2/errormessage.rb
+- lib/rservicebus2/handler_loader.rb
+- lib/rservicebus2/handler_manager.rb
+- lib/rservicebus2/helper_functions.rb
+- lib/rservicebus2/host.rb
+- lib/rservicebus2/message/statisticoutput.rb
+- lib/rservicebus2/message/subscription.rb
+- lib/rservicebus2/message/verboseoutput.rb
+- lib/rservicebus2/message.rb
+- lib/rservicebus2/monitor/csvdir.rb
+- lib/rservicebus2/monitor/dir.rb
+- lib/rservicebus2/monitor/dirnotifier.rb
+- lib/rservicebus2/monitor/message.rb
+- lib/rservicebus2/monitor/xmldir.rb
+- lib/rservicebus2/monitor.rb
+- lib/rservicebus2/monitor_configure.rb
+- lib/rservicebus2/mq/beanstalk.rb
+- lib/rservicebus2/mq.rb
+- lib/rservicebus2/resource_manager.rb
+- lib/rservicebus2/saga/base.rb
+- lib/rservicebus2/saga/data.rb
+- lib/rservicebus2/saga/manager.rb
+- lib/rservicebus2/saga_loader.rb
+- lib/rservicebus2/saga_storage/dir.rb
+- lib/rservicebus2/saga_storage/inmemory.rb
+- lib/rservicebus2/saga_storage.rb
+- lib/rservicebus2/sendat_manager.rb
+- lib/rservicebus2/sendat_storage/file.rb
+- lib/rservicebus2/sendat_storage/inmemory.rb
+- lib/rservicebus2/sendat_storage.rb
+- lib/rservicebus2/state_manager.rb
+- lib/rservicebus2/state_storage/dir.rb
+- lib/rservicebus2/state_storage/inmemory.rb
+- lib/rservicebus2/state_storage.rb
+- lib/rservicebus2/statistic_manager.rb
+- lib/rservicebus2/stats.rb
+- lib/rservicebus2/subscription_manager.rb
+- lib/rservicebus2/subscription_storage/file.rb
+- lib/rservicebus2/subscription_storage.rb
+- lib/rservicebus2/subscription_storage_configure.rb
+- lib/rservicebus2/test/bus.rb
+- lib/rservicebus2/test.rb
+- lib/rservicebus2/transporter.rb
+- lib/rservicebus2/usermessage/withpayload.rb
+- lib/rservicebus2.rb
 - bin/return_messages_to_source_queue
 - bin/rsb_ctl
 - bin/rservicebus2