daemons-rails 1.1.0 → 1.1.1

data/README.markdown

@@ -5,7 +5,7 @@ To get it work just add dependency to this gem in your Gemfile.
 
 ## NOTES ##
 
-If you switching from version before 1.1 you may need to move script/daemons file to lib/daemons directory.
+**If you are switching from earlier version to 1.1 you may need to move script/daemons file to lib/daemons directory.**
 
 ## GENERATOR ##
 
@@ -29,7 +29,7 @@ Examples:
 
 App-wide control script:
   
-    ./script/daemons [start|stop|restart]
+    ./lib/daemons/daemons [start|stop|restart|status]
     rake daemons:(start|stop|status)
 
 ## MONITORING API ##
@@ -45,7 +45,7 @@ App-wide control script:
     controller.app_name # => test.rb
     controller.start # => starts daemon
     controller.stop # => stops daemon
-    controller.status # => :not_exists or :running
+    controller.status # => :not_exists or :running    
     
 ## CONFIGURATION ##
 
@@ -63,8 +63,22 @@ If you want to use directory other than default lib/daemons then you should add
 If you change your mind, you can easily move content of this directory to other place and change config. 
 Notice: this feature available only from version 1.1 and old generated daemons can't be free moved, because uses hard-coded path to lib/daemons. So, you can generate daemons with same names and then move client code to generated templates.
 
+## USING MULTIPLE DAEMON SETS ##
+
+At this moment it is not supported at generators and rake tasks levels, but you can generate daemon to default location and move to different folder (you should also copy *daemons* script to same directory). Then you will be able to operate with them using following scripts:
+
+    other/daemons/location/daemons [start|stop|restart|status]
+    other/daemons/location/<daemon_name>_ctl [start|stop|restart|status]
+    
+To access the daemons with Monitoring API you can use configured instance of *Daemons::Rails::Monitoring*:
+    
+    Daemons::Rails::Monitoring.new("other/daemons/location")
+    
+and same set of methods. Effectively, *Daemons::Rails::Monitoring* just delegates all method calls to *Daemons::Rails::Monitoring.default* initialized with configured daemons path.
+
 ## CHANGES ##
 
+* 1.1.1 - fix dependencies, clean-up specs
 * 1.1.0 - supported custom directory for daemons, support multiple daemons directories
 * 1.0.0 - changed api for Daemons::Rails::Monitoring, fixed path in template for script, improved documentation, added RSpec
 * 0.0.3 - added rake for running script without daemonization (rake daemon:\<name\>)

data/daemons-rails.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'daemons'
   gem.add_dependency 'multi_json', '~>1.0'
   gem.add_development_dependency "rake"
-  gem.add_development_dependency 'rspec', '~>2.7.0'
+  gem.add_development_dependency 'rspec', '>=2.12'
 end

data/lib/daemons/rails/config.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'erb'
+require 'pathname'
 
 require 'daemons/rails'
 

data/lib/daemons/rails/configuration.rb

@@ -1,3 +1,6 @@
+require 'pathname'
+require 'fileutils'
+
 module Daemons
   module Rails
     class Configuration

data/lib/daemons/rails/monitoring.rb

@@ -1,22 +1,24 @@
 require "daemons"
+require "pathname"
+require "forwardable"
 require "daemons/rails"
 require "daemons/rails/config"
 require "daemons/rails/controller"
-require "active_support/core_ext/module/delegation.rb"
 
 module Daemons
   module Rails
     class Monitoring
+      singleton_class.extend Forwardable
+      singleton_class.def_delegators :default, :daemons_path=, :daemons_path, :controller, :controllers, :statuses, :start, :stop
+
       def self.default
         @default ||= self.new
       end
 
-      def initialize(daemons_path = Daemons::Rails.configuration.daemons_path)
+      def initialize(daemons_path = nil)
         @daemons_path = daemons_path
       end
 
-      singleton_class.delegate :daemons_path=, :daemons_path, :controller, :controllers, :statuses, :start, :stop, :to => :default
-
       # @deprecate use Daemons::Rails::Monitoring#daemons_path=
       def self.daemons_directory=(value)
         self.daemons_path = value

data/lib/daemons/rails/version.rb

@@ -1,5 +1,5 @@
 module Daemons
   module Rails
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/lib/daemons/rails/configuration_spec.rb

@@ -10,7 +10,6 @@ describe Daemons::Rails::Configuration do
     describe "rails env" do
       its(:root) { should == Rails.root }
       its(:daemons_path) { should == Rails.root.join('lib', 'daemons') }
-      its(:daemons_path) { should == Pathname.new('lib').join('daemons') }
     end
 
     describe "no rails" do
@@ -26,7 +25,6 @@ describe Daemons::Rails::Configuration do
       end
       its(:root) { should == Rails_.root }
       its(:daemons_path) { should == Rails_.root.join('lib', 'daemons') }
-      its(:daemons_path) { should == Pathname.new('lib').join('daemons') }
     end
   end
 
@@ -42,11 +40,10 @@ describe Daemons::Rails::Configuration do
     end
 
     its(:daemons_path) { should == Rails.root.join('daemons') }
-    its(:daemons_path) { should == Pathname.new('daemons') }
 
     it "should override daemons directory" do
       Daemons::Rails::Monitoring.daemons_path.should == Rails.root.join('daemons')
       Daemons::Rails::Monitoring.controllers.map(&:app_name).should == %w(test2.rb)
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -2,10 +2,4 @@ class Rails
   def Rails.root
     @root ||= Pathname.new(File.absolute_path(File.dirname(__FILE__))).join('fixtures')
   end
-end
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemons-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,88 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
   type: :runtime
-  prerelease: false
+  name: rails
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+  name: daemons
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
   type: :runtime
-  prerelease: false
+  name: multi_json
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.12'
+    none: false
   type: :development
-  prerelease: false
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.12'
+    none: false
+  prerelease: false
 description: daemons gem support for Rails 3
 email: []
 executables: []
@@ -135,17 +135,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: -1919585855362980352
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: -1919585855362980352
       version: '0'
+      segments:
+      - 0
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -153,4 +159,3 @@ signing_key:
 specification_version: 3
 summary: daemons gem support for Rails 3
 test_files: []
-has_rdoc: