daemons-rails 1.1.0.alpha → 1.1.0

data/README.markdown

@@ -3,6 +3,10 @@ Daemons Rails support (based on http://github.com/dougal/daemon_generator)
 
 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.
+
 ## GENERATOR ##
 
     rails generate daemon <name>
@@ -61,6 +65,6 @@ Notice: this feature available only from version 1.1 and old generated daemons c
 
 ## CHANGES ##
 
-* 1.1.0 - supported custom directory for daemons
+* 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/lib/daemons/rails/config.rb

@@ -1,6 +1,8 @@
 require 'yaml'
 require 'erb'
 
+require 'daemons/rails'
+
 module Daemons
   module Rails
     class Config
@@ -14,6 +16,10 @@ module Daemons
         @options[:script] ||= File.join(root_path, daemons_dir, "#{app_name}.rb")
       end
 
+      def self.for_controller(controller_path, root = Daemons::Rails.configuration.root)
+        new(File.basename(controller_path, '_ctl'), root, Pathname.new(controller_path).parent.relative_path_from(root))
+      end
+
       def [](key)
         @options[key]
       end

data/lib/daemons/rails/monitoring.rb

@@ -2,35 +2,56 @@ require "daemons"
 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
+      def self.default
+        @default ||= self.new
+      end
+
+      def initialize(daemons_path = Daemons::Rails.configuration.daemons_path)
+        @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)
-        @daemons_directory = value
+        self.daemons_path = value
       end
 
+      # @deprecate use Daemons::Rails::Monitoring#daemons_path
       def self.daemons_directory
-        @daemons_directory || Daemons::Rails.configuration.daemons_path
+        self.daemons_path
+      end
+
+      def daemons_path=(value)
+        @daemons_path = value
+      end
+
+      def daemons_path
+        @daemons_path || Daemons::Rails.configuration.daemons_path
       end
 
-      def self.controller(app_name)
+      def controller(app_name)
         controllers.find { |controller| controller.app_name == app_name }
       end
 
-      def self.controllers
-        Pathname.glob(daemons_directory.join('*_ctl')).map { |path| Daemons::Rails::Controller.new(path) }
+      def controllers
+        Pathname.glob(daemons_path.join('*_ctl')).map { |path| Daemons::Rails::Controller.new(path) }
       end
 
-      def self.statuses
+      def statuses
         controllers.each_with_object({}) { |controller, statuses| statuses[controller.app_name] = controller.status }
       end
 
-      def self.start(app_name)
+      def start(app_name)
         controller(app_name).start
       end
 
-      def self.stop(app_name)
+      def stop(app_name)
         controller(app_name).stop
       end
     end

data/lib/daemons/rails/version.rb

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

data/lib/generators/templates/script_ctl

@@ -2,8 +2,6 @@
 require 'rubygems'
 require "daemons"
 require "daemons/rails/config"
-require "daemons/rails"
 
-config = Daemons::Rails::Config.new("<%= file_name %>", Daemons::Rails.configuration.root, Daemons::Rails.configuration.daemons_directory)
-
-Daemons.run File.dirname(__FILE__) + "/<%= file_name %>.rb", config.to_hash
+config = Daemons::Rails::Config.for_controller(File.expand_path(__FILE__))
+Daemons.run config[:script], config.to_hash

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

@@ -0,0 +1,12 @@
+require "spec_helper"
+require "daemons/rails/config"
+
+describe Daemons::Rails::Config do
+  describe "daemon controller config" do
+    subject { Daemons::Rails::Config.for_controller(Rails.root.join('app', 'daemons', 'test_ctl').to_s) }
+
+    it "should init options" do
+      subject[:script].should == Rails.root.join('app', 'daemons', 'test.rb').to_s
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ 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_directory) { should == Pathname.new('lib').join('daemons') }
+      its(:daemons_path) { should == Pathname.new('lib').join('daemons') }
     end
 
     describe "no rails" do
@@ -26,7 +26,7 @@ describe Daemons::Rails::Configuration do
       end
       its(:root) { should == Rails_.root }
       its(:daemons_path) { should == Rails_.root.join('lib', 'daemons') }
-      its(:daemons_directory) { should == Pathname.new('lib').join('daemons') }
+      its(:daemons_path) { should == Pathname.new('lib').join('daemons') }
     end
   end
 
@@ -42,10 +42,10 @@ describe Daemons::Rails::Configuration do
     end
 
     its(:daemons_path) { should == Rails.root.join('daemons') }
-    its(:daemons_directory) { should == Pathname.new('daemons') }
+    its(:daemons_path) { should == Pathname.new('daemons') }
 
     it "should override daemons directory" do
-      Daemons::Rails::Monitoring.daemons_directory.should == Rails.root.join('daemons')
+      Daemons::Rails::Monitoring.daemons_path.should == Rails.root.join('daemons')
       Daemons::Rails::Monitoring.controllers.map(&:app_name).should == %w(test2.rb)
     end
   end

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

@@ -3,35 +3,39 @@ require "daemons/rails/monitoring"
 require "ostruct"
 
 describe Daemons::Rails::Monitoring do
-  subject { Daemons::Rails::Monitoring }
+  [Daemons::Rails::Monitoring, Daemons::Rails::Monitoring.new(Rails.root.join('lib', 'daemons'))].each do |subject|
+    it "should get list of controllers" do
+      controllers = subject.controllers
+      controllers.should have(1).item
+      controller = controllers[0]
+      controller.path.should == Rails.root.join('lib', 'daemons', 'test_ctl')
+      controller.app_name.should == 'test.rb'
+    end
 
-  it "should get list of controllers" do
-    controllers = subject.controllers
-    controllers.should have(1).item
-    controller = controllers[0]
-    controller.path.should == Rails.root.join('lib', 'daemons', 'test_ctl')
-    controller.app_name.should == 'test.rb'
-  end
+    describe "using controllers" do
+      before :each do
+        @controller = Daemons::Rails::Controller.new(Rails.root.join('lib', 'daemons', 'test_ctl'))
+        Daemons::Rails::Monitoring.any_instance.stub(:controllers).and_return([@controller])
+      end
 
-  describe "using controllers" do
-    before :each do
-      @controller = Daemons::Rails::Controller.new(Rails.root.join('lib', 'daemons', 'test_ctl'))
-      subject.stub(:controllers).and_return([@controller])
-    end
+      it "should return status for all controllers" do
+        @controller.should_receive(:run).with('status').and_return('test.rb: running [pid 10880]')
+        subject.statuses.should == {'test.rb' => :running}
+      end
 
-    it "should return status for all controllers" do
-      @controller.should_receive(:run).with('status').and_return('test.rb: running [pid 10880]')
-      subject.statuses.should == {'test.rb' => :running}
-    end
+      it "should start controller by name" do
+        @controller.should_receive(:run).with('start')
+        subject.start('test.rb')
+      end
 
-    it "should start controller by name" do
-      @controller.should_receive(:run).with('start')
-      subject.start('test.rb')
+      it "should stop controller by name" do
+        @controller.should_receive(:run).with('stop')
+        subject.stop('test.rb')
+      end
     end
+  end
 
-    it "should stop controller by name" do
-      @controller.should_receive(:run).with('stop')
-      subject.stop('test.rb')
-    end
+  it "should monitor daemons in other than default directory" do
+    Daemons::Rails::Monitoring.new(Rails.root.join('daemons')).controllers.map(&:app_name).should == %w(test2.rb)
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: daemons-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha
-  prerelease: 6
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - mirasrael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,6 +124,7 @@ files:
 - spec/fixtures/daemons/test2_ctl
 - spec/fixtures/lib/daemons/test.rb
 - spec/fixtures/lib/daemons/test_ctl
+- spec/lib/daemons/rails/config_spec.rb
 - spec/lib/daemons/rails/configuration_spec.rb
 - spec/lib/daemons/rails/monitoring_spec.rb
 - spec/spec_helper.rb
@@ -142,9 +143,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24