rservicebus2 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6224237bfbbe009d831bb7b31479fdea298c2a
-  data.tar.gz: f51e1bcd024999a267dbecdafb39ecc13c41e22e
+  metadata.gz: 4263471148f747aa3b457b906c57ec1db20d229b
+  data.tar.gz: 40d77269e8ed10bc478319443773beabfa2aac1d
 SHA512:
-  metadata.gz: 239da2f85596cf0778b3c14dd555ba7e5827bab4f162242119d426aa664274cddf2894845acbe30c9910eab3442d236d32a34adf7d533bf1bec6cada55b695fb
-  data.tar.gz: d542ad8d463be94176ad3e776d23c5253e2cced5b9afd55f29be3557f7081f9edff6ce490f2ad4ad3c3557d9eded598160bf3cf47be93eeeb2853f8af21a3e46
+  metadata.gz: 3695eda330c3692bdeb9c1832887407d98b82690866f272d430de46e2b145919e9bb48e48fad26c3dd3c3743f6222f48e806d6fc8f6059059cc04036e173ef96
+  data.tar.gz: adf53536976e6c77bca157312a5408b4728c1f67c77a654de55674ec1916587288619794277bc40c3f909e2b3a50bbcf6f26f5d77ddec6a42c53fb65dcc1f2c3

data/bin/return_messages_to_source_queue

@@ -2,7 +2,7 @@
 
 require 'yaml'
 require 'beanstalk-client'
-require 'rservicebus'
+require 'rservicebus2'
 
 def return_msg(beanstalk, job, request_nbr)
   first_match = 'ruby/object:'
@@ -68,7 +68,7 @@ begin
       1.upto(number_of_messages) do |request_nbr|
         job = beanstalk.reserve 1
 
-        return_msg( beanstalk, job, request_nbr )
+        return_msg(beanstalk, job, request_nbr)
       end
     rescue StandardError => e
       if e.message == 'TIMED_OUT'
@@ -92,7 +92,7 @@ begin
     begin
       beanstalk.watch(queue_name)
       job_list = []
-      1.upto(index-1) do |request_nbr|
+      1.upto(index - 1) do |request_nbr|
         job = beanstalk.reserve 1
         job_list << job
       end

data/bin/rsb_ctl

@@ -5,7 +5,7 @@
 #
 
 require 'rubygems'
-require 'rservicebus'
+require 'rservicebus2'
 require 'rservicebus/Agent'
 
 

data/bin/rservicebus2

@@ -5,10 +5,10 @@
 #
 
 require 'rubygems'
-require 'rservicebus'
+require 'rservicebus2'
 
-def run_rservicebus()
-	RServiceBus::Host.new().run()
+def run_rservicebus
+  RServiceBus2::Host.new.run
 end
 
 run_rservicebus

data/bin/rservicebus2-transport

@@ -5,12 +5,11 @@
 #
 
 require 'rubygems'
-require 'rservicebus'
-require 'rservicebus/Transporter'
+require 'rservicebus2'
+require 'rservicebus2/Transporter'
 
-def run_rservicebus_transport()
-	RServiceBus::Transporter.new().Run()
+def run_rservicebus2_transport
+  RServiceBus2::Transporter.new.Run
 end
 
 run_rservicebus_transport
-

data/bin/send_empty_message

@@ -1,15 +1,14 @@
 #!/usr/bin/env ruby
 
-require 'rservicebus'
-require 'rservicebus/Agent'
+require 'rservicebus2'
+require 'rservicebus2/Agent'
 
-
-abort( "Usage: #{File.basename($0)} <Msg Name> <Queue Name> [Response Queue Name] [Beanstalk Host]" ) unless ARGV.length >=2 && ARGV.length <=4
+abort "Usage: #{File.basename($0)} <Msg Name> <Queue Name> [Response Queue Name] [Beanstalk Host]" unless ARGV.length >=2 && ARGV.length <=4
 msg_name = ARGV[0]
 queue_name = ARGV[1]
 response_queue_name = "#{queue_name}Response" if ARGV.length >= 3
-beanstalkHost = 'beanstalk://localhost' if ARGV.length <= 4
+beanstalk_host = 'beanstalk://localhost' if ARGV.length <= 4
 
-agent = RServiceBus::Agent.new.getAgent( URI.parse( beanstalkHost) )
-msg = RServiceBus.createAnonymousClass( msg_name )
+agent = RServiceBus2::Agent.new.getAgent(URI.parse(beanstalk_host))
+msg = RServiceBus2.createAnonymousClass(msg_name)
 agent.sendMsg(msg, queue_name, response_queue_name)

data/lib/rservicebus2.rb

@@ -0,0 +1,59 @@
+# Add the currently running directory to the start of the load path
+# $:.unshift File.dirname(__FILE__) + '/../../lib'
+
+# Don't buffer stdout
+$stdout.sync = true
+
+require 'rubygems'
+require 'yaml'
+require 'uuidtools'
+require 'json'
+require 'uri'
+
+require 'rservicebus2/helper_functions'
+require 'rservicebus2/errormessage'
+require 'rservicebus2/handler_loader'
+require 'rservicebus2/handler_manager'
+require 'rservicebus2/appresource_configure'
+require 'rservicebus2/mq'
+require 'rservicebus2/host'
+require 'rservicebus2/config'
+require 'rservicebus2/endpointmapping'
+require 'rservicebus2/stats'
+require 'rservicebus2/statistic_manager'
+require 'rservicebus2/audit'
+
+require 'rservicebus2/message'
+require 'rservicebus2/message/subscription'
+require 'rservicebus2/message/statisticoutput'
+require 'rservicebus2/message/verboseoutput'
+
+require 'rservicebus2/usermessage/withpayload'
+
+require 'rservicebus2/state_manager'
+require 'rservicebus2/cron_manager'
+require 'rservicebus2/circuitbreaker'
+
+require 'rservicebus2/appresource'
+require 'rservicebus2/resource_manager'
+
+require 'rservicebus2/subscription_manager'
+require 'rservicebus2/subscription_storage'
+require 'rservicebus2/subscription_storage_configure'
+
+require 'rservicebus2/monitor_configure'
+
+require 'rservicebus2/agent'
+
+require 'rservicebus2/saga_loader.rb'
+require 'rservicebus2/saga/manager.rb'
+require 'rservicebus2/saga/data.rb'
+require 'rservicebus2/saga/base.rb'
+
+require 'rservicebus2/saga_storage'
+
+require 'rservicebus2/sendat_manager'
+
+# Initial definition of the namespace
+module RServiceBus
+end

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   class QueueNotFoundForMsg < StandardError
   end
 
@@ -8,7 +8,7 @@ module RServiceBus
     def get_agent(uri)
       ENV['RSBMQ'] = uri.to_s
 
-      RServiceBus.rlog '*** Agent.getAgent has been deprecated. Set the
+      RServiceBus2.rlog '*** Agent.getAgent has been deprecated. Set the
                       environment variable, RSBMQ, and simply create the class'
       Agent.new
     end

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

@@ -1,6 +1,6 @@
 require 'uri'
 
-module RServiceBus
+module RServiceBus2
   # Wrapper base class for resources used by applications, allowing rservicebus
   # to configure the resource - dependency injection.
   class AppResource
@@ -13,7 +13,7 @@ module RServiceBus
 
     def _connect
       @connection = connect(@uri)
-      RServiceBus.rlog "#{self.class.name}. Connected to, #{@uri}"
+      RServiceBus2.rlog "#{self.class.name}. Connected to, #{@uri}"
     end
 
     def get_resource

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # AppResourceDir
   class AppResourceDir < AppResource
     def connect(uri)

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # App Resource File
   class AppResourceFile < AppResource
     def connect(uri)

data/lib/{rservicebus → rservicebus2}/appresource/fluiddb.rb

@@ -1,5 +1,5 @@
 require 'FluidDb/Db'
-module RServiceBus
+module RServiceBus2
   # Implementation of an AppResource - FluidDb
   class AppResourceFluidDb < AppResource
     def connect(uri)

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

@@ -1,6 +1,6 @@
 require 'uri'
 
-module RServiceBus
+module RServiceBus2
   # Configure AppResources for an rservicebus host
   class ConfigureAppResource
     def get_resources(env, host, state_manager, saga_storage)
@@ -9,16 +9,16 @@ module RServiceBus
       env.each do |k, v|
         if v.is_a?(String) && k.start_with?('RSBFDB_')
           uri = URI.parse(v)
-          require 'rservicebus/appresource/fluiddb'
+          require 'rservicebus2/appresource/fluiddb'
           rm.add k.sub('RSBFDB_', ''), AppResourceFluidDb.new(host, uri)
         elsif v.is_a?(String) && k.start_with?('RSB_')
           uri = URI.parse(v)
           case uri.scheme
           when 'dir'
-            require 'rservicebus/appresource/dir'
+            require 'rservicebus2/appresource/dir'
             rm.add k.sub('RSB_', ''), AppResourceDir.new(host, uri)
           when 'file'
-            require 'rservicebus/appresource/file'
+            require 'rservicebus2/appresource/file'
             rm.add k.sub('RSB_', ''), AppResourceFile.new(host, uri)
           else
             abort("Scheme, #{uri.scheme}, not recognised when configuring

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Audit Class
   class Audit
     def initialize(mq)

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   class MessageArrivedWhileCricuitBroken < StandardError
   end
 
@@ -16,10 +16,10 @@ module RServiceBus
 
     def initialize(host)
       @host = host
-      @maxnumber_of_failures = RServiceBus.get_value('RSBCB_MAX', 5)
-      @seconds_to_break = RServiceBus.get_value('RSBCB_SECONDS_TO_BREAK', 60).to_i
-      @seconds_to_reset = RServiceBus.get_value('RSBCB_SECONDS_TO_RESET', 60).to_i
-      @reset_on_success = RServiceBus.get_value('RSBCB_RESET_ON_SUCCESS', false)
+      @maxnumber_of_failures = RServiceBus2.get_value('RSBCB_MAX', 5)
+      @seconds_to_break = RServiceBus2.get_value('RSBCB_SECONDS_TO_BREAK', 60).to_i
+      @seconds_to_reset = RServiceBus2.get_value('RSBCB_SECONDS_TO_RESET', 60).to_i
+      @reset_on_success = RServiceBus2.get_value('RSBCB_RESET_ON_SUCCESS', false)
 
       reset
     end

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Marshals configuration information for an rservicebus host
   class Config
     attr_reader :app_name, :message_endpoint_mappings, :handler_path_list,
@@ -88,7 +88,6 @@ module RServiceBus
       # This is a guard clause in case no Contracts have been specified
       # If any guard clauses have been specified, then execution should drop
       #   to the second block
-      puts "Config.load_contracts, #{@contract_list}"
       return self if get_value('CONTRACTS').nil?
 
       get_value('CONTRACTS', './Contract').split(';').each do |path|

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

@@ -1,6 +1,6 @@
 require 'parse-cron'
 
-module RServiceBus
+module RServiceBus2
   # Globber
   class Globber
     def self.parse_to_regex(str)
@@ -48,7 +48,7 @@ module RServiceBus
       @bus = host
       @msg_names = msg_names
 
-      RServiceBus.rlog 'Load Cron'
+      RServiceBus2.rlog 'Load Cron'
       @list = []
       ENV.each do |k, vs|
         if k.start_with?('RSBCRON_')
@@ -67,8 +67,8 @@ module RServiceBus
       @list.each_with_index do |v, idx|
         next if now <= v['next']
 
-        RServiceBus.rlog "CronManager.Send, #{v['name']}"
-        @bus.send(RServiceBus.create_anonymous_class(v['name']))
+        RServiceBus2.rlog "CronManager.Send, #{v['name']}"
+        @bus.send(RServiceBus2.create_anonymous_class(v['name']))
         @list[idx]['next'] = v['cron'].next(now)
       end
     end

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

@@ -1,13 +1,13 @@
-module RServiceBus
+module RServiceBus2
   # Marshals data for message end points
   # Expected format: <msg mame 1>:<end point 1>;<msg mame 2>:<end point 2>
   class EndpointMapping
     def get_value(name)
-      RServiceBus.get_value(name)
+      RServiceBus2.get_value(name)
     end
 
     def log(string, _ver = false)
-      RServiceBus.log(string)
+      RServiceBus2.log(string)
     end
 
     def configure_mapping(mapping)
@@ -19,7 +19,7 @@ module RServiceBus
         exit
       end
 
-      RServiceBus.rlog "EndpointMapping.configureMapping: #{match[1]}, #{match[2]}"
+      RServiceBus2.rlog "EndpointMapping.configureMapping: #{match[1]}, #{match[2]}"
       @endpoints[match[1]] = match[2]
 
       @queue_name_list.each do |q|

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
 
   # Error Message
   class ErrorMessage

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Given a directory, this class is responsible for finding
   #  msgnames,
   #  handlernames, and

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   # Given a directory, this class is responsible for finding
   #  msgnames,
   #  handlernames, and

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   def self.convert_dto_to_hash(obj)
     hash = {}
     obj.instance_variables.each do |var|
@@ -41,13 +41,13 @@ module RServiceBus
   end
 
   def self.send_msg(msg, response_queue = 'agent')
-    require 'rservicebus/endpointmapping'
+    require 'rservicebus2/endpointmapping'
     endpoint_mapping = EndpointMapping.new
     endpoint_mapping.configure
     queue_name = endpoint_mapping.get(msg.class.name)
 
     ENV['RSBMQ'] = 'beanstalk://localhost' if ENV['RSBMQ'].nil?
-    agent = RServiceBus::Agent.new
+    agent = RServiceBus2::Agent.new
     Audit.new(agent).audit_to_queue(msg)
     agent.send_msg(msg, queue_name, response_queue)
 
@@ -62,7 +62,7 @@ module RServiceBus
 
   def self.check_for_reply(queue_name)
     ENV['RSBMQ'] = 'beanstalk://localhost' if ENV['RSBMQ'].nil?
-    agent = RServiceBus::Agent.new
+    agent = RServiceBus2::Agent.new
     msg = agent.check_for_reply(queue_name)
     Audit.new(agent).audit_incoming(msg)
 

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

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   class NoHandlerFound < StandardError
   end
   class ClassNotFoundForMsg < StandardError
@@ -10,13 +10,13 @@ module RServiceBus
 
   # Host process for rservicebus
   class Host
-    attr_accessor :sagaData
+    attr_accessor :saga_data
 
     # Provides a thin logging veneer
     # @param [String] string Log entry
     # @param [Boolean] ver Indicator for a verbose log entry
     def log(string, ver = false)
-      RServiceBus.log(string, ver)
+      RServiceBus2.log(string, ver)
     end
 
     # Thin veneer for Configuring external resources
@@ -149,7 +149,7 @@ module RServiceBus
     end
 
     def initialize
-      RServiceBus.rlog "Current directory: #{Dir.pwd}"
+      RServiceBus2.rlog "Current directory: #{Dir.pwd}"
       @config = ConfigFromEnv.new.load_host_section
                                   .load_contracts
                                   .load_handler_path_list

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

@@ -2,7 +2,7 @@ require 'zlib'
 require 'yaml'
 require 'uuidtools'
 
-module RServiceBus
+module RServiceBus2
   # This is the top level message that is passed around the bus
   class Message
     attr_reader :return_address, :msg_id, :remote_queue_name, :remote_host_name,
@@ -15,7 +15,7 @@ module RServiceBus
     # @param [Object] returnAddress A queue to which the destination message
     #  handler can send replies
     def initialize(msg, return_address, correlation_id = nil)
-      if RServiceBus.check_environment_variable('RSBMSG_COMPRESS')
+      if RServiceBus2.check_environment_variable('RSBMSG_COMPRESS')
         @compressed = true
         @_msg = Zlib::Deflate.deflate(YAML.dump(msg))
       else

data/lib/{rservicebus → rservicebus2}/message/statisticoutput.rb

@@ -1,4 +1,4 @@
-module RServiceBus
+module RServiceBus2
   class MessageStatisticOutputOn
   end