rservicebus2 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6390a6216fea31b5315a309af0f998af347c539a
-  data.tar.gz: 50415a26cf33df5771b1072d7d263a7ce44e4b36
+  metadata.gz: af6224237bfbbe009d831bb7b31479fdea298c2a
+  data.tar.gz: f51e1bcd024999a267dbecdafb39ecc13c41e22e
 SHA512:
-  metadata.gz: db4ba7b7a200ace966ea8edf6a6f2a00496e34096964acf35c09c0156fd4e0f7f1839669b0be42acc720ba0a763ebc99bcf511a8b61acdf12ab1145b7dace7ee
-  data.tar.gz: 0529c38bae3eaa9f024ac54d2c1c4c09a7a665d571f3dd4fef19f61175fac9acbf69e06e2b4cd5cabb32af485f3fcbc154a8bda6926a9909a41fb2afd4f52299
+  metadata.gz: 239da2f85596cf0778b3c14dd555ba7e5827bab4f162242119d426aa664274cddf2894845acbe30c9910eab3442d236d32a34adf7d533bf1bec6cada55b695fb
+  data.tar.gz: d542ad8d463be94176ad3e776d23c5253e2cced5b9afd55f29be3557f7081f9edff6ce490f2ad4ad3c3557d9eded598160bf3cf47be93eeeb2853f8af21a3e46

data/bin/return_messages_to_source_queue

@@ -4,111 +4,111 @@ require 'yaml'
 require 'beanstalk-client'
 require 'rservicebus'
 
-def returnMsg( beanstalk, job, request_nbr )
-    firstMatch = 'ruby/object:'
-
-            payload = job.body
-
-            firstIndex = payload.index( firstMatch )
-            startIndex = payload.index( firstMatch, firstIndex + 1 ) + firstMatch.length
-
-            msgName = payload.match( '(\w*)', startIndex )[1]
-
-            msg = YAML::load(payload)
-            if msg.lastErrorString.nil? then
-                puts "*** Requested msg, #{request_nbr}, does not have a sourceQueue to which it can be returned"
-                puts '*** Only errored msgs can be Returned'
-                puts '*** Generally, msgs would not be manually moved between queues'
-                puts '*** If you do need to, try'
-                puts '*** beanstalk-admin-dump <source queue name> | beanstalk-admin-load <destination queue name>'
-
-                job.release
-                return
-            end
-            queueName = msg.lastErrorSourceQueue
-            puts '#' + "#{request_nbr.to_s}: #{msgName} to #{queueName}"
-
-            beanstalk.use( queueName )
-            beanstalk.put( payload )
-            
-            job.delete
-end
+def return_msg(beanstalk, job, request_nbr)
+  first_match = 'ruby/object:'
+  payload = job.body
+
+  first_index = payload.index(first_match)
+  start_index = payload.index(first_match, first_index + 1) + first_match.length
+
+  msg_name = payload.match('(\w*)', start_index)[1]
+
+  msg = YAML.load(payload)
+  if msg.last_error_string.nil?
+    puts "*** Requested msg, #{request_nbr}, does not have a sourceQueue to
+          which it can be returned"
+    puts '*** Only errored msgs can be Returned'
+    puts '*** Generally, msgs would not be manually moved between queues'
+    puts '*** If you do need to, try'
+    puts '*** beanstalk-admin-dump <source queue name> | beanstalk-admin-load
+          <destination queue name>'
+
+    job.release
+    return
+  end
 
+  queue_name = msg.last_error_source_queue
+  puts '#' + "#{request_nbr}: #{msg_name} to #{queue_name}"
 
-index=nil
-if ARGV.length == 0 then
-        queueName = 'error'
-elsif ARGV.length == 1 then
-        queueName = ARGV[0]
-elsif ARGV.length == 2 then
-        queueName = ARGV[0]
-        index = ARGV[1].to_i
+  beanstalk.use(queue_name)
+  beanstalk.put(payload)
+
+  job.delete
+end
+
+index = nil
+if ARGV.length == 0
+  queue_name = 'error'
+elsif ARGV.length == 1
+  queue_name = ARGV[0]
+elsif ARGV.length == 2
+  queue_name = ARGV[0]
+  index = ARGV[1].to_i
 else
-        abort('Usage: ReturnMessagesToSourceQueue [queue name] [index]')
+  abort('Usage: ReturnMessagesToSourceQueue [queue name] [index]')
 end
 
 begin
-    host = 'localhost:11300'
-    beanstalk = Beanstalk::Pool.new([host])
-    
-    tubes = beanstalk.list_tubes[host]
-    unless tubes.include?(queueName) then
-      abort("Nothing waiting on the Beanstalk queue, #{queueName}")
+  host = 'localhost:11300'
+  beanstalk = Beanstalk::Pool.new([host])
+
+  tubes = beanstalk.list_tubes[host]
+  abort("Nothing waiting on the Beanstalk queue, #{queue_name}") unless
+    tubes.include?(queue_name)
+
+  tube_stats = beanstalk.stats_tube(queue_name)
+  number_of_messages = tube_stats['current-jobs-ready']
+  if index.nil?
+    puts
+    puts "Attempting to return #{number_of_messages} to their source queue"
+    puts
+
+    begin
+      beanstalk.watch(queue_name)
+      1.upto(number_of_messages) do |request_nbr|
+        job = beanstalk.reserve 1
+
+        return_msg( beanstalk, job, request_nbr )
+      end
+    rescue StandardError => e
+      if e.message == 'TIMED_OUT'
+      else
+        raise
+      end
     end
-    
-    tubeStats = beanstalk.stats_tube(queueName)
-    number_of_messages = tubeStats['current-jobs-ready']
-    if index.nil? then
-        puts
-        puts "Attempting to return #{number_of_messages} to their source queue"
-        puts
-    
-        begin
-            beanstalk.watch(queueName)
-            1.upto(number_of_messages) do |request_nbr|
-                job = beanstalk.reserve 1
-            
-                returnMsg( beanstalk, job, request_nbr )
-            end
-            rescue Exception => e
-            if e.message == 'TIMED_OUT' then
-                else
-                raise
-            end
-        end
-    else
-        if index > number_of_messages then
-            puts "*** Requested msg, #{index}, is greater than the number of msgs in the queue, #{number_of_messages}"
-            puts '*** Try a smaller index, or remove the index number to return all msgs'
-            abort();
-        end
-
-        puts
-        puts "Attempting to msg number, #{index} to it's source queue"
-        puts
-    
-        begin
-            beanstalk.watch(queueName)
-            jobList = Array.new
-            1.upto(index-1) do |request_nbr|
-                job = beanstalk.reserve 1
-                jobList << job
-            end
-            job = beanstalk.reserve 1
-            returnMsg( beanstalk, job, index )
-
-            jobList.each do |job|
-                job.release
-            end
-
-            rescue Exception => e
-            if e.message == 'TIMED_OUT' then
-                else
-                raise
-            end
-        end
+  else
+    if index > number_of_messages
+      puts "*** Requested msg, #{index}, is greater than the number of msgs in
+            the queue, #{number_of_messages}"
+      puts '*** Try a smaller index, or remove the index number to return all
+            msgs'
+      abort
     end
-    
-    rescue Beanstalk::NotConnected=>e
+
+    puts
+    puts "Attempting to msg number, #{index} to it's source queue"
+    puts
+
+    begin
+      beanstalk.watch(queue_name)
+      job_list = []
+      1.upto(index-1) do |request_nbr|
+        job = beanstalk.reserve 1
+        job_list << job
+      end
+      job = beanstalk.reserve 1
+      return_msg(beanstalk, job, index)
+
+      job_list.each(&:release)
+
+    rescue StandardError => e
+      if e.message == 'TIMED_OUT'
+      else
+        raise
+      end
+    end
+  end
+
+  rescue Beanstalk::NotConnected
     puts 'Beanstalk not running'
-end
+  end

data/lib/rservicebus/test.rb

@@ -1,2 +1 @@
 require 'rservicebus/test/bus'
-require 'rservicebus/test/redis'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Guy Irvine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools