euston-daemons 1.2.6-java → 1.2.7-java

data/Gemfile

@@ -1,3 +1,8 @@
+if RUBY_VERSION =~ /1.9/
+  Encoding.default_external = Encoding::UTF_8
+  Encoding.default_internal = Encoding::UTF_8
+end
+
 source :rubygems
 gemspec
 

data/euston-daemons.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-daemons'
-  s.version     = '1.2.6'
+  s.version     = '1.2.7'
   s.platform    = RUBY_PLATFORM.to_s == 'java' ? 'java' : Gem::Platform::RUBY
   s.authors     = ['Lee Henson', 'Guy Boertje']
   s.email       = ['lee.m.henson@gmail.com', 'guyboertje@gmail.com']
@@ -62,13 +62,13 @@ Gem::Specification.new do |s|
   s.add_dependency              'activemodel',        '>= 3.0.10'
   s.add_dependency              'activesupport',      '>= 3.0.10'
   s.add_dependency              'erb-yaml',           '~> 1.0.0'
-  s.add_dependency              'euston',             '~> 1.2.0'
-  s.add_dependency              'euston-eventstore',  '~> 1.2.0'
-  s.add_dependency              'euston-rabbitmq',    '~> 1.2.0'
+  s.add_dependency              'euston',             '~> 1.2.4'
+  s.add_dependency              'euston-eventstore',  '~> 1.2.3'
+  s.add_dependency              'euston-rabbitmq',    '~> 1.2.2'
   s.add_dependency              'hollywood',          '~> 1.0.0'
   s.add_dependency              'i18n',               '>= 0.5.0'
-  s.add_dependency              'macaddr',            '~> 1.4.0'
   s.add_dependency              'safely',             '~> 0.3.0'
+  s.add_dependency              'uuidtools',          '~> 2.1.2'
 
   if RUBY_PLATFORM.to_s == 'java'
     s.add_dependency            'hot_bunnies',        '~> 1.3.0.pre1'
@@ -80,5 +80,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'ffaker',             '~> 1.8.0'
   s.add_development_dependency  'fuubar',             '~> 0.0.0'
   s.add_development_dependency  'rabbitmqadmin-cli',  '~> 1.0.2'
+  s.add_development_dependency  'rake',               '~> 0.9.2'
   s.add_development_dependency  'rspec',              '~> 2.6.0'
 end

data/lib/euston-daemons/pipeline/config/environment.rb

@@ -1,6 +1,6 @@
 require 'i18n'
 require 'hot_bunnies'
-require 'macaddr'
+require 'uuidtools'
 require 'euston-rabbitmq'
 
 require 'euston-daemons/pipeline/lib/command_processor/failed_message'
@@ -40,7 +40,9 @@ module Euston
         def initialize data
           @logger             = data[:logger]
           @daemon_config      = data[:daemon_config]
-          @i18n_locales_path  = @daemon_config[:i18n_locales_path]
+          if data.has_key?(:app_root) && @daemon_config.has_key?(:i18n_locales_path)
+            @i18n_locales_path  = File.join(data[:app_root], @daemon_config[:i18n_locales_path], "*")
+          end
 
           @amqp_config  = ErbYaml.read data[:amqp_config_path],   data[:environment]
           @mongo_config = ErbYaml.read data[:mongo_config_path],  data[:environment]
@@ -68,7 +70,7 @@ module Euston
           setup_mongo @mongo_config
           setup_euston @mongo_config[:event_store_database]
 
-          I18n.load_path += Dir[@i18n_locales_path] unless @i18n_locales_path.nil?
+          I18n.load_path += Dir.glob(@i18n_locales_path) unless @i18n_locales_path.nil?
 
           self.class
         end

data/lib/euston-daemons/pipeline/lib/daemon.rb

@@ -49,13 +49,13 @@ module Euston
           end
 
           (1..env.event_store_dispatchers).each do |i|
-            component = EventStoreDispatcher::Component.new env.amqp_connection.create_channel, "#{Mac.addr.to_s} #{i}", @log
+            component = EventStoreDispatcher::Component.new env.amqp_connection.create_channel, "#{UUIDTools::UUID.mac_address} #{i}", @log
             component = register_component "event_store_dispatcher_#{i}", component
             component.wait_time = env.event_store_dispatcher_wait_time
           end
 
           (1..env.message_buffers).each do |i|
-            component = MessageBuffer::Component.new env.amqp_connection.create_channel, "#{Mac.addr.to_s} #{i}", @log
+            component = MessageBuffer::Component.new env.amqp_connection.create_channel, "#{UUIDTools::UUID.mac_address} #{i}", @log
             component = register_component "message_buffer_#{i}", component
             component.wait_time = env.message_buffer_wait_time
           end

data/lib/euston-daemons/pipeline/rake_task.rb

@@ -5,7 +5,8 @@ module Euston
                   :daemon_config_path,
                   :event_handler_namespaces,
                   :mongo_config_path,
-                  :user_defined_components
+                  :user_defined_components,
+                  :app_root
 
     def initialize environment
       super(environment, :pipeline_daemon)
@@ -37,6 +38,9 @@ module Euston
 
       @logger.debug "User-defined components: #{@user_defined_components.count}"
       @data[:user_defined_components] = @user_defined_components.to_a.flatten
+
+      @logger.debug "App root: #{@app_root}"
+      @data[:app_root] = @app_root
     end
 
     def load_environment

data/lib/euston-daemons/version.rb

@@ -1,5 +1,5 @@
 module Euston
   module Daemons
-    VERSION = "1.2.6"
+    VERSION = "1.2.7"
   end
 end

data/spec/daemons/event_processor_spec.rb

@@ -3,7 +3,7 @@ describe 'event handler client', :purge_event_store, :purge_rabbitmq do
 
   let(:logger)            { Euston::NullLogger.instance }
   let(:subscription)      { StubRetryingSubscription.new }
-  let(:client)            { Euston::Daemons::Pipeline::EventProcessor::Component.new @channel, reference, 1, logger }
+  let(:client)            { Euston::Daemons::Pipeline::EventProcessor::Component.new @channel, [reference], 1, logger }
   let(:aggregate)         { Euston::Daemons::SampleModel::Counter2.new }
   let(:saved_aggregates)  { [] }
 
@@ -21,7 +21,7 @@ describe 'event handler client', :purge_event_store, :purge_rabbitmq do
                               :type => :external_thing_happened,
                               :timestamp => Time.now.to_f,
                               :version => 1 },
-                :body => {} }
+                :body => { :id => Uuid.generate } }
 
       subscription.stub_message_receipt event
     end

data/spec/daemons/message_buffer_spec.rb

@@ -21,7 +21,7 @@ describe 'message buffer component', :purge_event_store do
 
   before do
     Euston::DaemonEnvironment.event_store_mongodb = @event_store_database
-    channel.stub(:topic) { exchange }
+    channel.stub(:exchange) { exchange }
     exchange.stub(:name) { 'commands' }
     exchange.stub(:publish) { |json, options| published << { :json => json, :options => options } }
   end
@@ -43,7 +43,6 @@ describe 'message buffer component', :purge_event_store do
   end
 
   context 'there is a due command' do
-
     before do
       buffer.enqueue :commands, command
     end

data/spec/spec_helper.rb

@@ -75,6 +75,8 @@ RSpec.configure do |config|
   end
 
   config.before(:all, :purge_rabbitmq) do
+    initialize_rabbitmq amqp_config
+
     @amqp_connection = HotBunnies.connect amqp_config
 
     initialize_amqp @amqp_connection

data/spec/support/stub_retrying_subscription.rb

@@ -1,6 +1,7 @@
 class StubRetryingSubscription
   include Hollywood
 
+  def get; end
   def subscribe; end
 
   def stub_message_receipt message

metadata

@@ -2,7 +2,7 @@
 name: euston-daemons
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.2.6
+  version: 1.2.7
 platform: java
 authors:
 - Lee Henson
@@ -10,205 +10,215 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000 +00:00
-default_executable:
+date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  version_requirements: &2258 !ruby/object:Gem::Requirement
+  version_requirements: &2058 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
     none: false
-  requirement: *2258
+  requirement: *2058
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &2276 !ruby/object:Gem::Requirement
+  version_requirements: &2076 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
     none: false
-  requirement: *2276
+  requirement: *2076
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: erb-yaml
-  version_requirements: &2292 !ruby/object:Gem::Requirement
+  version_requirements: &2092 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2292
+  requirement: *2092
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston
-  version_requirements: &2308 !ruby/object:Gem::Requirement
+  version_requirements: &2108 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.4
     none: false
-  requirement: *2308
+  requirement: *2108
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston-eventstore
-  version_requirements: &2324 !ruby/object:Gem::Requirement
+  version_requirements: &2124 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.3
     none: false
-  requirement: *2324
+  requirement: *2124
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston-rabbitmq
-  version_requirements: &2340 !ruby/object:Gem::Requirement
+  version_requirements: &2140 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
     none: false
-  requirement: *2340
+  requirement: *2140
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hollywood
-  version_requirements: &2356 !ruby/object:Gem::Requirement
+  version_requirements: &2156 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2356
+  requirement: *2156
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &2372 !ruby/object:Gem::Requirement
+  version_requirements: &2172 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
     none: false
-  requirement: *2372
+  requirement: *2172
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: macaddr
-  version_requirements: &2388 !ruby/object:Gem::Requirement
+  name: safely
+  version_requirements: &2188 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.3.0
     none: false
-  requirement: *2388
+  requirement: *2188
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: safely
-  version_requirements: &2404 !ruby/object:Gem::Requirement
+  name: uuidtools
+  version_requirements: &2204 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 2.1.2
     none: false
-  requirement: *2404
+  requirement: *2204
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hot_bunnies
-  version_requirements: &2420 !ruby/object:Gem::Requirement
+  version_requirements: &2220 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0.pre1
     none: false
-  requirement: *2420
+  requirement: *2220
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jmongo
-  version_requirements: &2436 !ruby/object:Gem::Requirement
+  version_requirements: &2236 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
     none: false
-  requirement: *2436
+  requirement: *2236
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  version_requirements: &2452 !ruby/object:Gem::Requirement
+  version_requirements: &2252 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
     none: false
-  requirement: *2452
+  requirement: *2252
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: cranky
-  version_requirements: &2470 !ruby/object:Gem::Requirement
+  version_requirements: &2270 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
     none: false
-  requirement: *2470
+  requirement: *2270
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: ffaker
-  version_requirements: &2486 !ruby/object:Gem::Requirement
+  version_requirements: &2286 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
     none: false
-  requirement: *2486
+  requirement: *2286
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: fuubar
-  version_requirements: &2502 !ruby/object:Gem::Requirement
+  version_requirements: &2302 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.0
     none: false
-  requirement: *2502
+  requirement: *2302
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rabbitmqadmin-cli
-  version_requirements: &2518 !ruby/object:Gem::Requirement
+  version_requirements: &2318 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
     none: false
-  requirement: *2518
+  requirement: *2318
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: &2334 !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+    none: false
+  requirement: *2334
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2534 !ruby/object:Gem::Requirement
+  version_requirements: &2350 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
     none: false
-  requirement: *2534
+  requirement: *2350
   prerelease: false
   type: :development
 description: ''
@@ -262,7 +272,6 @@ files:
 - spec/support/sample_model/counter.rb
 - spec/support/sample_model/counter2.rb
 - spec/support/stub_retrying_subscription.rb
-has_rdoc: true
 homepage: http://github.com/leemhenson/euston-daemons
 licenses: []
 post_install_message:
@@ -283,9 +292,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key:
 specification_version: 3
 summary: Message buffer, command processor and event processor daemons for Euston-RabbitMq
-test_files: []
+test_files:
+- spec/daemons/command_processor_spec.rb
+- spec/daemons/event_processor_spec.rb
+- spec/daemons/message_buffer_spec.rb
+- spec/daemons/snapshotter_spec.rb
+- spec/spec_helper.rb
+- spec/support/factories/commands.rb
+- spec/support/factories/commit.rb
+- spec/support/factories/event_message.rb
+- spec/support/factories/events.rb
+- spec/support/filters.rb
+- spec/support/sample_model/commands.rb
+- spec/support/sample_model/counter.rb
+- spec/support/sample_model/counter2.rb
+- spec/support/stub_retrying_subscription.rb
 ...