esp-commons 0.4.2 → 0.5.0

data/lib/esp-commons/libraries/subscriber.rb

@@ -19,7 +19,6 @@ class Subscriber
           logger.debug "#{subscriber.class} receive #{method}: #{message}"
           if subscriber.respond_to?(method)
             begin
-              defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
               subscriber.send(method, *message)
               logger.debug "#{subscriber.class} successfully executed #{method}"
             rescue => e
@@ -53,6 +52,6 @@ class Subscriber
       from = subscriber.class.name.sub(/Subscriber$/, '').underscore
       to = Rails.application.class.name.sub('::Application', '').underscore
 
-      "esp.#{from}.#{to}"
+      "esp.#{from}.#{to}".gsub /_/, '-'
     end
 end

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/lib/generators/esp_commons/install/templates/script/subscriber

@@ -14,9 +14,7 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-require File.expand_path('../../config/environment',  __FILE__)
-
-dir = Rails.root.to_s
+dir = File.expand_path('../../',  __FILE__)
 
 dir_chunks = dir.split('/')
 
@@ -28,11 +26,15 @@ daemon_name = [project_group, project_name, 'subscriber'].join('-')
 daemon_options = {
   :multiple   => false,
   :dir_mode   => :normal,
-  :dir        => options[:pid_files_dir] || Rails.root.join('tmp', 'pids'),
-  :log_dir    => options[:log_files_dir] || Rails.root.join('log'),
+  :dir        => options[:pid_files_dir] || "#{dir}/tmp/pids",
+  :log_dir    => options[:log_files_dir] || "#{dir}/log",
   :backtrace  => true
 }
 
+require 'rubygems'
+ENV['BUNDLE_GEMFILE'] ||= "#{dir}/Gemfile"
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 require 'daemons'
 
 Daemons.run_proc(daemon_name, daemon_options) do
@@ -44,6 +46,8 @@ Daemons.run_proc(daemon_name, daemon_options) do
 
   Dir.chdir dir
 
+  require "#{dir}/config/environment"
+
   Subscriber.new.start
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &10696440 !ruby/object:Gem::Requirement
+  requirement: &9961200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10696440
+  version_requirements: *9961200
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &10723680 !ruby/object:Gem::Requirement
+  requirement: &9988940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10723680
+  version_requirements: *9988940
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &10723100 !ruby/object:Gem::Requirement
+  requirement: &9988360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10723100
+  version_requirements: *9988360
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &10722360 !ruby/object:Gem::Requirement
+  requirement: &9987680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10722360
+  version_requirements: *9987680
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &10721340 !ruby/object:Gem::Requirement
+  requirement: &9986660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10721340
+  version_requirements: *9986660
 - !ruby/object:Gem::Dependency
   name: openteam-commons
-  requirement: &10720620 !ruby/object:Gem::Requirement
+  requirement: &9985880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10720620
+  version_requirements: *9985880
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10720140 !ruby/object:Gem::Requirement
+  requirement: &9985400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10720140
+  version_requirements: *9985400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &10718880 !ruby/object:Gem::Requirement
+  requirement: &9984140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10718880
+  version_requirements: *9984140
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2157924660499318148
+      hash: -4045254798982168477
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2157924660499318148
+      hash: -4045254798982168477
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15