maestro_common 0.0.4 → 0.0.5

data/lib/maestro_common/helpers/mq_helper.rb

@@ -3,8 +3,10 @@ require 'onstomp'
 require 'onstomp/failover'
 
 module Maestro
-
   module MQHelper
+    class MQError < StandardError
+    end
+
     @@INFINITE_RETRIES = 2**32-1
     @@stomp = nil
     @@subs = {}
@@ -102,7 +104,7 @@ module Maestro
 
     def MQHelper.reconnect
       if !@@stomp
-        raise Maestro::MQError, "Cannot reconnect, no existing MQ instance.  Call 'connect' to create initial connection, then use 'reconnect' if connection fails"
+        raise Maestro::MQHelper::MQError, "Cannot reconnect, no existing MQ instance.  Call 'connect' to create initial connection, then use 'reconnect' if connection fails"
       end
 
       if !@@stomp.connected?

data/lib/maestro_common/mq/messenger.rb

@@ -6,7 +6,7 @@ module Maestro
   end
 
   class Messenger
-    VALID_QUEUE_REGEX = "^/(?:queue|topic)/[A-Za-z0-9_]*$"
+    VALID_QUEUE_REGEX = "^/(?:queue|topic)/[A-Za-z0-9_\.-]*$"
 
     DEFAULT_SEND_OPTIONS = { :persistent => true, :content_type => 'application/json' }
     DEFAULT_SYNC_TIMEOUT = 5

data/lib/maestro_common/version.rb

@@ -1,5 +1,5 @@
 module Maestro
   module Common
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/maestro_common.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'onstomp'
   spec.add_dependency 'logging', '>= 1.8.0'
-  spec.add_dependency 'rubyzip', '>= 0.9.8'
+  spec.add_dependency 'rubyzip', '>= 0.9.8', "< 1.0.0" # 1.0 requires newer ruby/jruby
   spec.add_dependency 'json', '>= 1.4.6'
   spec.add_dependency 'eventmachine', ">=0.12.10"
 
@@ -28,5 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'jruby-openssl'
   spec.add_development_dependency 'rspec', '>= 2.13.0'
+  spec.add_development_dependency 'stompserver_ng'
+  spec.add_development_dependency "mocha", '>=0.10.0'
 
 end

data/spec/mqhelper_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+require 'tmpdir'
+
+describe Maestro::MQHelper do
+  after :each do
+    Maestro::MQHelper.disconnect
+  end
+
+  before :each do
+    Maestro::MQHelper.reset
+  end
+
+  describe 'connection' do
+
+    it 'should initially be nil' do
+      conn = Maestro::MQHelper.connection
+      conn.should be_nil
+    end
+
+    it 'should be non-nil after connect has been called' do
+      conn = Maestro::MQHelper.connect
+      conn.should_not be_nil
+    end
+  end
+
+  describe 'connect' do
+    
+    it 'should create a new connection' do
+      conn = Maestro::MQHelper.connect
+      conn.should_not be_nil
+    end
+
+    it 'should return existing connection if already connected' do
+      conn = Maestro::MQHelper.connect
+      conn2 = Maestro::MQHelper.connect
+      conn2.should == conn
+    end
+  end
+
+  describe 'reconnect' do
+    # Testing in order
+    it 'should raise an error if connect has not been called' do
+      expect { Maestro::MQHelper.reconnect }.to raise_error(Maestro::MQHelper::MQError)
+    end
+
+    it 'should reconnect and re-subscribe to previously subscribed connections' do
+      # Ensure we have a connection
+      Maestro::MQHelper.connect
+      Maestro::MQHelper.disconnect
+      conn = Maestro::MQHelper.reconnect
+      conn.should_not be_nil
+    end
+  end
+
+  describe 'disconnect' do
+    it 'should close connection, but leave object instantiated' do
+      conn = Maestro::MQHelper.connect
+      conn.connected?.should be_true
+      Maestro::MQHelper.disconnect
+      conn.connected?.should be_false
+    end
+  end
+
+  describe 'subscribe' do
+    it 'should set up a subscription' do
+      conn = Maestro::MQHelper.connect
+      sub = Maestro::MQHelper.subscribe('queue/test')
+      sub.should_not be_nil
+    end
+  end
+
+  describe 'unsubscribe' do
+    it 'should clear a subscription when unsubscribed' do
+      conn = Maestro::MQHelper.connect
+      sub_done = false
+      sub = Maestro::MQHelper.subscribe('queue/test') { |r| sub_done = true }
+      max_wait=5
+      while !sub_done && max_wait > 0 do
+        sleep 0.5
+        max_wait -= 1
+      end
+      sub.should_not be_nil
+      
+      # This requires some internals info, which I'm reluctant to put here
+      conn.subscriptions.length.should == 1
+
+      unsub_done = false
+      Maestro::MQHelper.unsubscribe('queue/test') { |r| unsub_done = true }
+      max_wait=5
+      while !unsub_done && max_wait > 0 do
+        sleep 0.5
+        max_wait -= 1
+      end
+
+      # This requires some internals info, which I'm reluctant to put here
+      conn.subscriptions.length.should == 0
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -3,11 +3,49 @@ require 'rspec'
 require 'logger'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib') unless $LOAD_PATH.include?(File.dirname(__FILE__) + '/../lib')
+unless defined?(SPEC_ROOT)
+  SPEC_ROOT = File.expand_path("../", __FILE__)
+end
 
 require File.join('maestro_common', 'common')
+Dir[File.join(SPEC_ROOT, 'support/**/*.rb')].each { |f| require(f) }
+include Maestro::Support::Stomp
+
+module Maestro
+
+  unless Maestro.const_defined?('Logging')
+
+    module Logging
+      require 'logging'
+
+      def log
+        ::Logging::Logger.new(STDOUT)
+      end
+
+    end
+  end
+
+  class << self
+    include Maestro::Logging unless Maestro.include?(Maestro::Logging)
+
+    def stomp_config
+      {
+        'url' => 'stomp://127.0.0.1:61613'
+      }
+    end
+  end
+end
 
 RSpec.configure do |config|
+  config.mock_with :mocha
+
+  config.before(:suite) do
+    start_stomp_server(File.join(File.dirname(__FILE__), "../log")) unless ENV['START_STOMP']=='false'
+  end
 
+  config.after(:suite) do
+    stop_stomp_server
+  end
 end
 
 

data/spec/support/stomp.rb

@@ -0,0 +1,56 @@
+require 'pathname'
+
+module Maestro
+  module Support
+    module Stomp
+      @@stomp = nil
+      @@pidfile = nil
+
+      def start_stomp_server(dir)
+        # No Stomp auth is configured/required.
+        require 'stomp_server_ng'
+
+        # just because Maestro.log_dir is not defined this early
+        FileUtils.mkdir_p(dir)
+        log_dir = Pathname.new(dir).realpath.to_s
+        puts "Log dir: #{log_dir}"
+
+        puts "Starting StompServer"
+
+        test = Thread.new do
+          EventMachine.run do
+            opts = StompServer::Configurator.new.opts # get default config options
+            opts[:port] = 61613
+            # Get the logs and pid file in the same log dir as Maestro
+            opts[:logdir] = log_dir
+            opts[:logfile] = File.join(opts[:logdir], File.basename(opts[:logfile]))
+            @@pidfile = File.join(opts[:logdir], File.basename(opts[:pidfile]))
+            opts[:pidfile] = @@pidfile
+            @@stomp = StompServer::Run.new(opts)
+            @@stomp.start
+            puts "StompServer running at port: #{opts[:port]}"
+            EventMachine.start_server(
+              opts[:host],
+              opts[:port],
+              StompServer::Protocols::Stomp,
+              @@stomp.auth_required, # *args: arg[0]
+              @@stomp.queue_manager, # *args: arg[1]
+              @@stomp.topic_manager, # *args: arg[2]
+              @@stomp.stompauth, # *args: arg[3]
+              opts # Options hash
+            )
+          end
+        end
+      end
+
+      def stop_stomp_server
+        puts "Stopping STOMP server"
+        if @@stomp
+          @@stomp.stop(@@pidfile)
+          puts "Stopped STOMP server"
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: maestro_common
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
   - Doug Henderson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-21 00:00:00 Z
+date: 2013-09-17 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: onstomp
@@ -42,6 +42,9 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             version: 0.9.8
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
     requirement: *id003
     prerelease: false
     type: :runtime
@@ -111,6 +114,28 @@ dependencies:
     requirement: *id009
     prerelease: false
     type: :development
+  - !ruby/object:Gem::Dependency 
+    name: stompserver_ng
+    version_requirements: &id010 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id010
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    version_requirements: &id011 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.10.0
+    requirement: *id011
+    prerelease: false
+    type: :development
 description: A bunch of utility classes that are used in multiple places
 email: 
   - dhenderson@maestrodev.com
@@ -133,8 +158,10 @@ files:
   - lib/maestro_common/utils/retryable.rb
   - lib/maestro_common/version.rb
   - maestro_common.gemspec
+  - spec/mqhelper_spec.rb
   - spec/retryable_spec.rb
   - spec/spec_helper.rb
+  - spec/support/stomp.rb
 homepage: https://github.com/maestrodev/maestro-ruby-common
 licenses: 
   - Apache 2.0
@@ -169,5 +196,7 @@ signing_key:
 specification_version: 3
 summary: Maestro common classes
 test_files: 
+  - spec/mqhelper_spec.rb
   - spec/retryable_spec.rb
   - spec/spec_helper.rb
+  - spec/support/stomp.rb