esp-commons 0.3.0 → 0.3.1

data/lib/esp-commons/engine.rb

@@ -4,7 +4,7 @@ module EspCommons
   class Engine < ::Rails::Engine
     isolate_namespace EspCommons
 
-    config.autoload_paths << File.expand_path('../lib/', __FILE__)
+    config.autoload_paths << File.expand_path('../libraries/', __FILE__)
 
     config.before_configuration do
       Settings.define 'appeals.url',      :env_var => 'APPEALS_URL'

data/lib/esp-commons/{lib → libraries}/subscriber.rb

@@ -2,6 +2,7 @@ require 'amqp'
 
 class Subscriber
   def start
+    logger.debug "RAILS_ENV=#{Rails.env}"
     subscribers.each do |subscriber|
       AMQP.start(Settings['amqp.url']) do |connection|
         channel = AMQP::Channel.new(connection)

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

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

@@ -1,18 +1,40 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
+options = {}
+OptionParser.new do |opts|
+  opts.on('-e', '--environment=ENVIRONMENT', 'Rails environment') do |env|
+    ENV['RAILS_ENV'] = env
+  end
+  opts.on('-p', '--pid-files-directory=DIRECTORY', "Pid files directory") do |dir|
+    options[:pid_files_dir] = dir
+  end
+  opts.on('-l', '--log-files-directory=DIRECTORY', "Log files directory") do |dir|
+    options[:log_files_dir] = dir
+  end
+end.parse!
+
 require File.expand_path('../../config/environment',  __FILE__)
 
 dir = Rails.root.to_s
 
-daemon_name = (dir.split('/')[-2..-1] << "daemon").join('-')
+dir_chunks = dir.split('/')
+
+project_name = dir_chunks[-1]
+project_group = dir_chunks[-2]
+
+daemon_name = [project_group, project_name, 'subscriber'].join('-')
 
 daemon_options = {
   :multiple   => false,
   :dir_mode   => :normal,
-  :dir        => Rails.root.join('tmp', 'pids'),
+  :dir        => options[:pid_files_dir] || Rails.root.join('tmp', 'pids'),
+  :log_dir    => options[:log_files_dir] || Rails.root.join('log'),
   :backtrace  => true
 }
 
+require 'daemons'
+
 Daemons.run_proc(daemon_name, daemon_options) do
   if ARGV.include?('--')
     ARGV.slice! 0..ARGV.index('--')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &9162020 !ruby/object:Gem::Requirement
+  requirement: &16840440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9162020
+  version_requirements: *16840440
+- !ruby/object:Gem::Dependency
+  name: amqp
+  requirement: &16867680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *16867680
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &9160100 !ruby/object:Gem::Requirement
+  requirement: &16867100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9160100
+  version_requirements: *16867100
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &9456820 !ruby/object:Gem::Requirement
+  requirement: &16866360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *16866360
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &16865340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9456820
+  version_requirements: *16865340
 - !ruby/object:Gem::Dependency
   name: openteam-commons
-  requirement: &9455460 !ruby/object:Gem::Requirement
+  requirement: &16864620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9455460
+  version_requirements: *16864620
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &9454020 !ruby/object:Gem::Requirement
+  requirement: &16864140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9454020
+  version_requirements: *16864140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &9453100 !ruby/object:Gem::Requirement
+  requirement: &16862880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9453100
+  version_requirements: *16862880
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -86,10 +108,10 @@ extra_rdoc_files: []
 files:
 - app/models/esp_commons/image.rb
 - config/locales/commons.ru.yml
+- lib/esp-commons/libraries/message_maker.rb
+- lib/esp-commons/libraries/subscriber.rb
+- lib/esp-commons/libraries/requester.rb
 - lib/esp-commons/engine.rb
-- lib/esp-commons/lib/message_maker.rb
-- lib/esp-commons/lib/requester.rb
-- lib/esp-commons/lib/subscriber.rb
 - lib/esp-commons/version.rb
 - lib/esp-commons.rb
 - lib/generators/esp_commons/install/install_generator.rb
@@ -112,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2401056414345403331
+      hash: -3357116084122121062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,10 +143,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2401056414345403331
+      hash: -3357116084122121062
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Summary of EspCommons.