fume 0.3.2 → 0.3.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 3
-:patch: 2
+:patch: 3
 :major: 0

data/fume.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fume}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sunteya"]
-  s.date = %q{2010-01-21}
+  s.date = %q{2010-01-25}
   s.email = %q{Sunteya@gmail.com}
   s.extra_rdoc_files = [
     "README"
@@ -62,13 +62,18 @@ Gem::Specification.new do |s|
      "generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/reset.css",
      "lib/fume.rb",
      "lib/fume/authlogic.rb",
+     "lib/fume/daemon.rb",
      "lib/fume/formtastic.rb",
+     "lib/fume/logger_support.rb",
      "lib/fume/rails_ext.rb",
      "lib/fume/searchlogic.rb",
      "lib/fume/simple_theme.rb",
      "lib/fume/smart_logger.rb",
      "rails/init.rb",
-     "spec/smart_logger_spec.rb",
+     "spec/fume/daemon_spec.rb",
+     "spec/fume/logger_support_spec.rb",
+     "spec/fume/smart_logger_spec.rb",
+     "spec/rails_stub.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -78,7 +83,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{a simple rails scaffold.}
   s.test_files = [
-    "spec/smart_logger_spec.rb",
+    "spec/fume/daemon_spec.rb",
+     "spec/fume/logger_support_spec.rb",
+     "spec/fume/smart_logger_spec.rb",
+     "spec/rails_stub.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/fume.rb

@@ -4,6 +4,8 @@ require 'fume/simple_theme'
 require 'fume/rails_ext'
 require 'fume/formtastic'
 require 'fume/smart_logger'
+require 'fume/logger_support'
+require 'fume/daemon'
 
 # module Fume
 #   def self.root

data/lib/fume/daemon.rb

@@ -0,0 +1,85 @@
+require "fileutils"
+
+module Fume
+  module Daemon
+
+    def self.included(base)
+      base.instance_eval do
+        include LoggerSupport
+        
+        include InstanceMethods
+        extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+    end
+
+    module InstanceMethods
+      attr_accessor :pid_file_path
+
+      def initialize
+        self.pid_file_path = Rails.root.join("tmp", "pids", "#{daemon_name}.pid")
+      end
+
+      def daemon_name
+        self.class.name
+      end
+
+      def register_trap
+        %w{TERM INT HUP}.each do |signal_name| 
+          Signal.trap(signal_name) do
+            self.stop
+          end
+        end
+      end
+
+      def pid_file_path
+        ENV["PID_FILE"] || @pid_file_path
+      end
+      
+      def write_pid_file(pid)
+        if self.pid_file_path
+          File.open(self.pid_file_path, "w") { |f| f << pid }
+        end
+      end
+
+      def remove_pid_file
+        FileUtils.rm(pid_file_path, :force => true) if self.pid_file_path && File.exists?(self.pid_file_path)
+      end
+      
+      def already_running?
+        if self.pid_file_path && File.exists?(self.pid_file_path)
+          pid = File.read(self.pid_file_path)
+          return Process.kill(0, pid.to_i) == 1 if pid # test running
+        end
+        return false
+      rescue Errno::ESRCH #  NOT running or zombied
+        return false
+      end
+
+      def start
+        return if already_running?
+        
+        register_trap
+        write_pid_file(Process.pid)
+        logger.info { "Daemon: #{daemon_name} starting ... PID: #{Process.pid}" }
+        
+        @run = true
+
+        while @run
+          self.execute
+        end
+        logger.info { "Daemon: #{daemon_name} stoped ..." }
+      rescue Exception => e
+        logger.error(e)
+      ensure
+        remove_pid_file
+      end
+
+      def stop
+        @run = false
+      end
+    end
+  end
+end

data/lib/fume/logger_support.rb

@@ -0,0 +1,22 @@
+module Fume
+  module LoggerSupport
+    def self.included(base)
+      base.instance_eval do
+        extend ClassMethods
+        include InstanceMethods
+      end
+    end
+    
+    module ClassMethods
+      def logger
+        @logger ||= Rails.logger || Logger.new(STDOUT)
+      end
+    end
+    
+    module InstanceMethods
+      def logger
+        @logger ||= self.class.logger
+      end
+    end
+  end
+end

data/lib/fume/searchlogic.rb

@@ -4,12 +4,18 @@ module Fume
     def self.try_enable
       if defined? ::Searchlogic
         ActionController::Base.send :helper, RailsHelpers
-        ::Searchlogic::Search.send :include, SearchExtensions::InstanceMethods
-        ::Searchlogic::Search.send :extend, SearchExtensions::ClassMethods
+        ::Searchlogic::Search.send :include, SearchExtensions
       end
     end
 
     module SearchExtensions
+      def self.included(base)
+        base.instance_eval do
+          include InstanceMethods
+          extend ClassMethods
+        end
+      end
+      
       module ClassMethods
         def human_name
           "Search"

data/lib/fume/smart_logger.rb

@@ -7,11 +7,11 @@ module Fume
       when "STDOUT"
         Logger.new(STDOUT)
       when /(\w+)/
-        Logger.new("log/#{$1}.log")
+        Logger.new(Rails.root.join("log", "#{$1}.log"))
       when /(\w+\.\w+)/
-        Logger.new("log/#{$1}")
+        Logger.new(Rails.root.join("log", $1))
       else
-        Logger.new("log/#{Rails.env}.log")
+        Logger.new(Rails.root.join("log", "#{Rails.env}.log"))
       end
     end
   end

data/spec/fume/daemon_spec.rb

@@ -0,0 +1,88 @@
+require "spec_helper"
+
+describe Fume::Daemon do
+  class TestDaemon
+    include Fume::Daemon
+    
+    attr_writer :callback
+    
+    def callback(&block)
+      if block
+        @callback = block
+      else
+        @callback
+      end
+    end
+    
+    def execute
+      callback.call if callback
+      sleep 0.05
+    end
+  end
+  
+  before(:each) do
+    ENV["PID_FILE"] = nil
+    @pid_path = Rails.root.join("tmp", "pids", "test.pid").to_s
+  end
+  
+  it "should be create pid file by path" do
+    build_and_start_test_daemon do |d|
+      d.callback { File.exists?(@pid_path).should be_true }
+      d.pid_file_path = @pid_path 
+    end
+    File.exists?(@pid_path).should be_false
+  end
+  
+  it "should be create pid file by ENV" do
+    ENV["PID_FILE"] = @pid_path
+    build_and_start_test_daemon do |d|
+      d.callback { File.exists?(@pid_path).should be_true }
+    end
+    File.exists?(@pid_path).should be_false
+  end
+  
+  it "should be create pid file by default" do
+    build_and_start_test_daemon do |d|
+      d.pid_file_path.should_not be_nil
+      d.callback { File.exists?(d.pid_file_path).should be_true }
+    end
+  end
+  
+  it "should be not create pid file" do
+    build_and_start_test_daemon do |d|
+      pid_path = d.pid_file_path
+      d.pid_file_path = nil
+      d.callback { File.exists?(pid_path).should be_false }
+    end
+  end
+  
+  it "should be catch exception" do
+    daemon = build_and_start_test_daemon do |d|
+      d.callback { raise "exception" }
+    end
+    
+    File.exists?(daemon.pid_file_path).should be_false
+  end
+  
+  it "should be exit if pid file exists" do
+    build_and_start_test_daemon do |d|
+      d.pid_file_path = @pid_path
+      d.write_pid_file(Process.pid)
+      d.callback { fail("MUST exit at start") }
+    end
+  end
+  
+  def build_and_start_test_daemon
+    Thread.new do 
+      sleep 0.5
+      Process.kill("INT", $$)
+    end
+    
+    daemon = TestDaemon.new
+    daemon.logger.level = Logger::FATAL
+    yield(daemon) if block_given?
+    
+    daemon.start
+    daemon
+  end
+end

data/spec/fume/logger_support_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe Fume::LoggerSupport do
+  class TestLog
+    include Fume::LoggerSupport
+  end
+
+  it "should be return rails logger" do
+    Rails.logger = "Test"
+    TestLog.logger.should be_eql "Test"
+  end
+  
+  
+  it "should be return STDOUT logger" do
+    Rails.logger = nil
+    TestLog.logger.should_not be_nil
+  end
+end

data/spec/{smart_logger_spec.rb → fume/smart_logger_spec.rb}

@@ -1,11 +1,5 @@
 require "spec_helper"
 
-module Rails
-  class << self
-    attr_accessor :env
-  end
-end
-
 describe Fume::SmartLogger do
   before(:each) do
     @logger = Logger.new(STDOUT)
@@ -17,17 +11,17 @@ describe Fume::SmartLogger do
   end
   
   it "should be create log file logger" do
-    Logger.should_receive(:new).with("log/file.log").and_return(@logger)
+    Logger.should_receive(:new).with(Rails.root.join("log", "file.log")).and_return(@logger)
     SmartLogger.create("file").should be_eql @logger
   end
   
   it "should be create log file logger with ext" do
-    Logger.should_receive(:new).with("log/file.log").and_return(@logger)
+    Logger.should_receive(:new).with(Rails.root.join("log", "file.log")).and_return(@logger)
     SmartLogger.create("file.log").should be_eql @logger
   end
   
   it "should be create log file by Rails env" do
-    Logger.should_receive(:new).with("log/development.log").and_return(@logger)
+    Logger.should_receive(:new).with(Rails.root.join("log", "development.log")).and_return(@logger)
     Rails.env = "development"
     SmartLogger.create(nil).should be_eql @logger
   end

data/spec/rails_stub.rb

@@ -0,0 +1,9 @@
+module Rails
+  class << self
+    attr_accessor :env, :logger
+    
+    def root
+      @root ||= Pathname.new(File.dirname(__FILE__)).join("..")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,8 +2,7 @@
 # require 'spec'
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'fume')
-
-
+require "rails_stub"
 
 include Fume
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fume
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Sunteya
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 +08:00
+date: 2010-01-25 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -69,13 +69,18 @@ files:
 - generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/reset.css
 - lib/fume.rb
 - lib/fume/authlogic.rb
+- lib/fume/daemon.rb
 - lib/fume/formtastic.rb
+- lib/fume/logger_support.rb
 - lib/fume/rails_ext.rb
 - lib/fume/searchlogic.rb
 - lib/fume/simple_theme.rb
 - lib/fume/smart_logger.rb
 - rails/init.rb
-- spec/smart_logger_spec.rb
+- spec/fume/daemon_spec.rb
+- spec/fume/logger_support_spec.rb
+- spec/fume/smart_logger_spec.rb
+- spec/rails_stub.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -107,5 +112,8 @@ signing_key:
 specification_version: 3
 summary: a simple rails scaffold.
 test_files: 
-- spec/smart_logger_spec.rb
+- spec/fume/daemon_spec.rb
+- spec/fume/logger_support_spec.rb
+- spec/fume/smart_logger_spec.rb
+- spec/rails_stub.rb
 - spec/spec_helper.rb