jaigouk-merb_daemon 0.0.1.5 → 0.0.1.7

data/README.textile

@@ -1,3 +1,5 @@
+h1. Still working on the codes.
+
 h1. merb_daemon_gen
 
 A plugin for creating psuedo-scheduled jobs in merb. This merb plugin is based on dougal / daemon_generator
@@ -12,17 +14,14 @@ h2. Usage
 To get yourself rolling:
 
   $ sudo gem install daemons
-  $ merb-gen daemon <name>
+  $ merb-gen daemon name
 
-Then insert your code in the lib/daemons/<name>.rb stub. All pid's and logs will live in the normal log/ folder.  This helps to make things Capistrano friendly.
+Then insert your code in the lib/daemons/name.rb stub. All pid's and logs will live in the normal log/ folder.  This helps to make things Capistrano friendly.
 
 Individual control script:
 
-  $ ./lib/daemons/<name>_ctl [start|stop|restart]
-
-App-wide control script (I add this to my capistrano recipe's after_restart task):
+  $ ./lib/daemons/name_ctl [start|stop|restart]
 
-  $ ./script/daemons [start|stop|restart]
 
 h2. Notes
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_daemon"
-GEM_VERSION = "0.0.1.5"
+GEM_VERSION = "0.0.1.7"
 AUTHOR = "Jai-Gouk Kim"
 EMAIL = "jaigouk@gmail.com"
 HOMEPAGE = "http://jaigouk.blogspot.com/"

data/lib/generators/{daemon_generater.rb → daemon_generator.rb}

@@ -3,23 +3,23 @@ module Merb::Generators
   class DaemonGenerator < Generator
     
     def self.source_root
-      File.join(File.dirname(__FILE__), 'daemons', 'templates')
+      File.join(File.dirname(__FILE__),  'templates', 'daemon_generator')
     end
     
     desc <<-DESC
     Generates custum daemons 
     DESC
     
-    first_argument :name, :required => true
+    first_argument :name, :required => true, :desc => "daemon name"
  
     template(:daemon_rb, :after => :chmod) do |t|
-      t.source('script.rb')
-      t.destination("lib/daemons/#{name}.rb")
+      t.source('%file_name%_script.rb') #script file
+      t.destination("lib/daemons/#{file_name}.rb")
     end
     
     template(:daemon_ctl, :after => :chmod) do |t|
-      t.source('script_ctl')
-      t.destination("lib/daemons/#{name}_ctl")
+      t.source('%file_name%_script_ctl')
+      t.destination("lib/daemons/#{file_name}_ctl")
     end
     
     template(:daemon, :after => :chmod) do |t|
@@ -28,7 +28,7 @@ module Merb::Generators
     end
 
     template :daemon_yml do |t|
-      t.source(File.dirname(__FILE__) / 'templates' / 'daemons.yml')
+      t.source( 'daemons.yml')
       t.destination("config/daemons.yml")
     end
 

data/lib/merb_daemon.rb

@@ -12,7 +12,7 @@ if defined?(Merb::Plugins)
   end
   
   Merb::BootLoader.after_app_loads do
-    # code that can be required after the application loads
+ 
   end
   
   Merb::Plugins.add_rakefiles "merb_daemon/merbtasks"

data/lib/merb_daemon/merbtasks.rb

@@ -4,3 +4,4 @@ namespace :merb_daemon do
     puts "merb_daemon_gen doesn't do anything"
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jaigouk-merb_daemon
 version: !ruby/object:Gem::Version 
-  version: 0.0.1.5
+  version: 0.0.1.7
 platform: ruby
 authors: 
 - Jai-Gouk Kim
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-14 00:00:00 -08:00
+date: 2009-01-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.10
     version: 
-description: Merb plugin that provides daemons
+description: Merb plugin that generates daemons
 email: jaigouk@gmail.com
 executables: []
 
@@ -46,14 +46,12 @@ files:
 - Rakefile
 - TODO
 - lib/generators
-- lib/generators/daemons
-- lib/generators/daemons/templates
-- lib/generators/daemons/templates/daemons
-- lib/generators/daemons/templates/daemons.yml
-- lib/generators/daemons/templates/script_ctl
-- lib/generators/daemons/templates/script.rb
-- lib/generators/daemons/daemon_generater.rb
-- lib/generators/daemon_generater.rb
+- lib/generators/templates
+- lib/generators/templates/daemons
+- lib/generators/templates/daemons.yml
+- lib/generators/templates/%file_name%_script.rb
+- lib/generators/templates/%file_name%_script_ctl
+- lib/generators/daemon_generator.rb
 - lib/merb_daemon
 - lib/merb_daemon/merbtasks.rb
 - lib/merb_daemon.rb
@@ -84,6 +82,6 @@ rubyforge_project: merb
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Merb plugin that provides daemons
+summary: Merb plugin that generates daemons
 test_files: []
 

data/lib/generators/daemons/daemon_generater.rb

@@ -1,46 +0,0 @@
-# links that I referenced to write  this plugin
-#http://wiki.merbivore.com/plugindev/generator
-#http://yehudakatz.com/2007/09/19/merb-plugins-oh-yeah-theyre-pretty-frickin-cool-too/
-    
-module Merb::Generators
- 
-  class DaemonGenerator < NamespacedGenerator
-    
-    def self.source_root
-      File.join(File.dirname(__FILE__),  'templates')
-    end
-    
-    desc <<-DESC
-    Generator that build custum daemon 
-    DESC
-    
-    first_argument :name, :required => true, :desc => "file name"
- 
-    template :daemon_rb do |t|
-      t.source(File.dirname(__FILE__) / 'templates' / '%file_name%.rb')
-      t.destination("lib/daemons/#{file_name}.rb")
-    end
-    
-    template :daemon_control do |t|
-      t.source(File.dirname(__FILE__) / 'templates' / 'script_ctl')
-      t.destination("lib/daemons/#{file_name}_ctl")
-    end
-    
-    template :daemon do |t|
-      t.source(File.dirname(__FILE__) / 'templates' / 'daemons')
-      t.destination("lib/daemons")
-    end
-
-    template :daemon_yml do |t|
-      t.source(File.dirname(__FILE__) / 'templates' / 'daemons.yml')
-      t.destination("config/daemons.yml")
-    end
-
-    def chmod(action)
-      File.chmod(0755, action.destination)
-    end
-    
-  end
- 
-  add :daemon, DaemonGenerator 
-end

data/lib/generators/daemons/templates/daemons

@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-Dir[File.dirname(__FILE__) + "/../lib/daemons/*_ctl"].each {|f| `#{f} #{ARGV.first}`}

data/lib/generators/daemons/templates/daemons.yml

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

data/lib/generators/daemons/templates/script.rb

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
- 
-# You might want to change this
-ENV["MERB_ENV"] ||= "production"
- 
-require File.dirname(__FILE__) + "/../../config/environments"
- 
-$running = true
-Signal.trap("TERM") do
-  $running = false
-end
- 
-while($running) do
-  
-  # Replace this with your code
-  Merb.logger.info("This daemon is still running at #{Time.now}.\n")
-  sleep 10
-end

data/lib/generators/daemons/templates/script_ctl

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require "daemons"
-require 'yaml'
-require 'erb'
- 
-if(File.exists?(file_name))
-  require file_name
-else
-
-#merb_version = Merb::VERSION
-# 
-#gem 'activesupport',merb_version
-#require 'active_support'
-end
- 
-options = YAML.load(
-  ERB.new(
-  IO.read(
-  File.dirname(__FILE__) + "/../../config/daemons.yml"
-  )).result).with_indifferent_access
-options[:dir_mode] = options[:dir_mode].to_sym
- 
-Daemons.run File.dirname(__FILE__) + '/<%=file_name%>.rb', options