daemons-rails 0.0.3 → 1.0.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/README

@@ -11,6 +11,7 @@ Then insert your code in the lib/daemons/<name>.rb stub. All pids and logs will
 
 == CHANGES ==
 
+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>)
 
 == CONTROL ==
@@ -19,6 +20,27 @@ Individual control script:
 > ./lib/daemons/<name>_ctl [start|stop|restart|status]
 > rake daemon:<name>[:(start|stop|status)]
 
+Examples:
+rake daemon:test - runs lib/daemons/test.rb not daemonized
+rake daemon:test:start - start daemon using lib/daemons/test_ctl start
+rake daemon:test:stop - stop daemon using lib/daemons/test_ctl stop
+rake daemon:test:status - show running status for daemon using lib/daemons/test_ctl status
+
 App-wide control script:
 > ./script/daemons [start|stop|restart]
-> rake daemons:(start|stop|status)
+> rake daemons:(start|stop|status)
+
+== MONITORING API ==
+
+Daemons::Rails::Monitoring.statuses - hash with all daemons and corresponding statuses
+Daemons::Rails::Monitoring.start("test.rb") - start daemon using lib/daemons/test_ctl start
+Daemons::Rails::Monitoring.stop("test.rb") - start daemon using lib/daemons/test_ctl stop
+Daemons::Rails::Monitoring.controllers - list of controllers
+Daemons::Rails::Monitoring.controller("test.rb") - controller for test.rb application
+
+controller = Daemons::Rails::Monitoring.controller("test.rb")
+controller.path # => lib/daemons/test_ctl
+controller.app_name # => test.rb
+controller.start # => starts daemon
+controller.stop # => stops daemon
+controller.status # => :not_exists or :running

data/daemons-rails.gemspec

@@ -19,4 +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'
 end

data/lib/daemons/rails/controller.rb

@@ -0,0 +1,28 @@
+module Daemons
+  module Rails
+    class Controller
+      attr_reader :path, :app_name
+
+      def initialize(controller_path)
+        @path = controller_path
+        @app_name = "#{controller_path.basename.to_s[0..-'_ctrl'.length]}.rb"
+      end
+
+      def run(command)
+        `#{path} #{command}`
+      end
+
+      def start
+        run('start')
+      end
+
+      def stop
+        run('stop')
+      end
+
+      def status
+        run('status').to_s.split("\n").last =~ /: running \[pid \d+\]$/ ? :running : :not_exists
+      end
+    end
+  end
+end

data/lib/daemons/rails/monitoring.rb

@@ -1,4 +1,6 @@
 require "daemons"
+require "daemons/rails/config"
+require "daemons/rails/controller"
 
 module Daemons
   module Rails
@@ -11,33 +13,24 @@ module Daemons
         @daemons_directory ||= ::Rails.root.join('lib', 'daemons')
       end
 
-      def self.application(app_name)
-        group(app_name).applications.first
+      def self.controller(app_name)
+        controllers.find { |controller| controller.app_name == app_name }
       end
 
-      # We do not cache group to be sure we have actual information about running applications
-      def self.group(app_name)
-        app_config = Daemons::Rails::Config.new(app_name, ::Rails.root)
-        group = Daemons::ApplicationGroup.new("#{app_name}.rb", app_config.to_hash)
-        group.setup
-        group
+      def self.controllers
+        Pathname.glob(daemons_directory.join('*_ctl')).map { |path| Daemons::Rails::Controller.new(path) }
       end
 
-      def self.groups
-        groups = []
-        daemons_directory.each_entry do |file|
-          if !file.directory? && file.basename.to_s =~ /(\w+)_ctl/
-            groups << group($1)
-          end
-        end
-        groups
+      def self.statuses
+        controllers.each_with_object({}) { |controller, statuses| statuses[controller.app_name] = controller.status }
       end
 
-      def self.status
-        groups.each_with_object({}) do |group, statuses|
-          app = group.applications.first
-          statuses[group.app_name.sub(/\.rb$/, "")] = app && app.running? ? :running : :not_exists
-        end
+      def self.start(app_name)
+        controller(app_name).start
+      end
+
+      def self.stop(app_name)
+        controller(app_name).stop
       end
     end
   end

data/lib/daemons/rails/version.rb

@@ -1,5 +1,5 @@
 module Daemons
   module Rails
-    VERSION = "0.0.3"
+    VERSION = "1.0.0"
   end
 end

data/lib/generators/templates/script.rb

@@ -3,7 +3,7 @@
 # You might want to change this
 ENV["RAILS_ENV"] ||= "production"
 
-require File.dirname(__FILE__) + "/../../config/environment"
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", "environment"))
 
 $running = true
 Signal.trap("TERM") do 

data/spec/fixtures/config/daemons.yml

@@ -0,0 +1,6 @@
+dir_mode: script
+dir: "../../log"
+multiple: false
+backtrace: true
+monitor: false
+ontop: false

data/spec/fixtures/lib/daemons/test.rb

@@ -0,0 +1 @@
+#Test script

data/spec/fixtures/lib/daemons/test_ctl

@@ -0,0 +1 @@
+# Test controller

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

@@ -0,0 +1,37 @@
+require "spec_helper"
+require "daemons/rails/monitoring"
+require "ostruct"
+
+describe Daemons::Rails::Monitoring do
+  subject { Daemons::Rails::Monitoring }
+
+  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'))
+      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 start controller by name" do
+      @controller.should_receive(:run).with('start')
+      subject.start('test.rb')
+    end
+
+    it "should stop controller by name" do
+      @controller.should_receive(:run).with('stop')
+      subject.stop('test.rb')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemons-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2012-01-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &7575200 !ruby/object:Gem::Requirement
+  requirement: &14263920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7575200
+  version_requirements: *14263920
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &7574340 !ruby/object:Gem::Requirement
+  requirement: &14260740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7574340
+  version_requirements: *14260740
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &7572640 !ruby/object:Gem::Requirement
+  requirement: &14257180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7572640
+  version_requirements: *14257180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7572060 !ruby/object:Gem::Requirement
+  requirement: &14233540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7572060
+  version_requirements: *14233540
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &14228840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :development
+  prerelease: false
+  version_requirements: *14228840
 description: daemons gem support for Rails 3
 email: []
 executables: []
@@ -62,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - README
 - Rakefile
@@ -69,6 +81,7 @@ files:
 - install.rb
 - lib/daemons-rails.rb
 - lib/daemons/rails/config.rb
+- lib/daemons/rails/controller.rb
 - lib/daemons/rails/monitoring.rb
 - lib/daemons/rails/version.rb
 - lib/generators/USAGE
@@ -78,6 +91,11 @@ files:
 - lib/generators/templates/script.rb
 - lib/generators/templates/script_ctl
 - lib/tasks/daemons.rake
+- spec/fixtures/config/daemons.yml
+- spec/fixtures/lib/daemons/test.rb
+- spec/fixtures/lib/daemons/test_ctl
+- spec/lib/daemons/rails/monitoring_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -92,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1511355952573857073
+      hash: -1263531604415930102
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1511355952573857073
+      hash: -1263531604415930102
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10