daemons-rails 1.1.2 → 1.2.0

data/README.markdown

@@ -5,7 +5,8 @@ To get it work just add dependency to this gem in your Gemfile.
 
 ## NOTES ##
 
-**If you are switching from earlier version to 1.1 you may need to move script/daemons file to lib/daemons directory.**
+- **If you switched from earlier version to 1.2 its recommended to change `Daemons.run` to `Daemons::Rails.run` in your `*_ctl` files**
+- **If you switched from earlier version to 1.1 you may need to move `script/daemons` file to `lib/daemons` directory.**
 
 ## GENERATOR ##
 
@@ -78,6 +79,7 @@ and same set of methods. Effectively, *Daemons::Rails::Monitoring* just delegate
 
 ## CHANGES ##
 
+* 1.2.0 - development dependency on Rails bumped to support Rails 4 (dmilisic). Removed direct dependency on Daemons gem from generated files (in preparation for more daemonization providers)	
 * 1.1.2 - fix script template to load environment within Rails.root directory. It takes no effect on already generated scripts.
 * 1.1.1 - fix dependencies, clean-up specs
 * 1.1.0 - supported custom directory for daemons, support multiple daemons directories

data/Rakefile

@@ -1,2 +1,5 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)

data/daemons-rails.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Daemons::Rails::VERSION
 
-  gem.add_dependency 'rails', '~>3.0'
   gem.add_dependency 'daemons'
   gem.add_dependency 'multi_json', '~>1.0'
+
+  gem.add_development_dependency 'rails', '>=3.0.0'
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'rspec', '>=2.12'
 end

data/lib/daemons-rails.rb

@@ -1,15 +1,17 @@
-require "rails"
-require "daemons/rails/config"
-require "daemons/rails/monitoring"
+require 'rails'
+require 'daemons/rails/config'
+require 'daemons/rails/monitoring'
 
 module Daemons
-  class Railtie < ::Rails::Railtie
-    generators do
-      require "generators/daemon_generator.rb"
-    end
+  module Rails
+    class Railtie < ::Rails::Railtie
+      generators do
+        require 'generators/daemon_generator.rb'
+      end
 
-    rake_tasks do
-      load "tasks/daemons.rake"
+      rake_tasks do
+        load 'tasks/daemons.rake'
+      end
     end
   end
 end

data/lib/daemons/rails.rb

@@ -1,4 +1,5 @@
-require "daemons/rails/configuration"
+require 'daemons'
+require 'daemons/rails/configuration'
 
 module Daemons
   module Rails
@@ -10,5 +11,9 @@ module Daemons
     def self.configure
       yield configuration
     end
+
+    def self.run(*args)
+      Daemons.run(*args)
+    end
   end
 end

data/lib/daemons/rails/configuration.rb

@@ -5,7 +5,9 @@ module Daemons
   module Rails
     class Configuration
       def detect_root
-        if defined?(::Rails)
+        if ENV["DAEMONS_ROOT"]
+          Pathname.new(ENV["DAEMONS_ROOT"])
+        elsif defined?(::Rails)
           ::Rails.root
         else
           root = Pathname.new(FileUtils.pwd)
@@ -37,4 +39,4 @@ module Daemons
       end
     end
   end
-end
+end

data/lib/daemons/rails/controller.rb

@@ -5,11 +5,11 @@ module Daemons
 
       def initialize(controller_path)
         @path = controller_path
-        @app_name = "#{controller_path.basename.to_s[0..-'_ctrl'.length]}.rb"
+        @app_name = "#{controller_path.basename.to_s[0...-'_ctl'.length]}.rb"
       end
 
       def run(command)
-        `#{path} #{command}`
+        `cd #{Daemons::Rails.configuration.root} && #{path} #{command}`
       end
 
       def start
@@ -25,4 +25,4 @@ module Daemons
       end
     end
   end
-end
+end

data/lib/daemons/rails/version.rb

@@ -1,5 +1,5 @@
 module Daemons
   module Rails
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
   end
 end

data/lib/generators/templates/script_ctl

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require "daemons"
-require "daemons/rails/config"
+require 'daemons/rails/config'
 
 config = Daemons::Rails::Config.for_controller(File.expand_path(__FILE__))
-Daemons.run config[:script], config.to_hash
+Daemons::Rails.run config[:script], config.to_hash

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

@@ -1,11 +1,11 @@
-require "spec_helper"
-require "daemons/rails/config"
+require 'spec_helper'
+require 'daemons/rails/config'
 
 describe Daemons::Rails::Config do
-  describe "daemon controller 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
+    it 'should init options' do
       subject[:script].should == Rails.root.join('app', 'daemons', 'test.rb').to_s
     end
   end

metadata

@@ -1,96 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: daemons-rails
 version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  version: 1.1.2
 platform: ruby
 authors:
 - mirasrael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  name: rails
-- !ruby/object:Gem::Dependency
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
   name: daemons
-- !ruby/object:Gem::Dependency
   type: :runtime
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
+  prerelease: false
   name: multi_json
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  type: :development
   requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
+    none: false
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rails
+  type: :development
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
   name: rake
-- !ruby/object:Gem::Dependency
   type: :development
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.12'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.12'
+    none: false
+  prerelease: false
   name: rspec
+  type: :development
 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: 3041252732915999327
       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: 3041252732915999327
       version: '0'
+      segments:
+      - 0
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24