djinn 0.0.7 → 0.0.8

data/README.rdoc

@@ -45,7 +45,7 @@ Assuming you didn't sleep there your script would end and the daemon would
 detach and run in the background until it dies or gets killed. You can wrap
 argument parsing around that if you want, or do it in any other way. By default 
 the daemon will look for a config YAML file in same directory as you executed it
-from, named the same as the Djinn class, so in this case _basic.yml_. It will by
+from, named the same as the Djinn class, so in this case *basic.yml*. It will by
 default create the pid and log files in the same way. You can change this by 
 putting it in the config file or supplying an options hash:
 

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/djinn.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{djinn}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Craig Paterson"]

data/lib/djinn.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 require 'djinn/base'
 
 # This is a base implementation which handles looking for config

data/lib/djinn/base.rb

@@ -31,25 +31,27 @@ module Djinn
     end
 
     # Starts the Djinn in the background
-    def start config={}
-      @config = (config.empty?) ? load_config : config.empty?
+    def start config={}, &block
+      @config = (config.empty?) ? load_config : config
       log "Starting #{name} in the background.."
       logfile = get_logfile(config)
       daemonize(logfile, get_pidfile(config)) do
+        yield if block_given?
         trap('TERM') { handle_exit }
         trap('INT')  { handle_exit }
-        perform(config)
+        perform(@config)
       end
     end
 
     # Starts the Djinn in the foreground, which is often useful for
     # testing or other noble pursuits
-    def run config={}
-      @config = (config.empty?) ? load_config : config.empty?
+    def run config={}, &block
+      @config = (config.empty?) ? load_config : config
       log "Starting #{name} in the foreground.."
       trap('TERM') { handle_exit }
       trap('INT')  { handle_exit }
-      perform(config)
+      yield if block_given?
+      perform(@config)
     end
 
     # Convenience method, really just calls *stop* and then *start* for you :P
@@ -61,7 +63,7 @@ module Djinn
     # Stops the Djinn, unless you change the location of the pid file, in 
     # which case its all about you and the *kill* command
     def stop config={}
-      @config = (config.empty?) ? load_config : config.empty?
+      @config = (config.empty?) ? load_config : config
       pidfile = get_pidfile(@config)
       log 'No such process' and exit unless pidfile.pid
       begin

data/lib/djinn/logging.rb

@@ -1,5 +1,10 @@
 module Djinn
   module Logging
+    
+    def djinn_log msg
+      puts "#{Time.now.strftime("%m/%d/%Y %H:%M:%S")}: #{msg}"
+      STDOUT.flush
+    end
   
     def log msg
       puts "#{Time.now.strftime("%m/%d/%Y %H:%M:%S")}: #{msg}"

data/lib/djinn/rails.rb

@@ -1,5 +1,6 @@
 $:.unshift(File.join(File.dirname(__FILE__)))
 
+require 'yaml'
 require 'rails/handlers'
 
 module Djinn
@@ -21,7 +22,7 @@ module Djinn
       end
             
     end
-
+    
     private
         
       def get_pidfile(config)

data/lib/djinn/rails/handlers.rb

@@ -6,8 +6,9 @@ module Djinn
       
       def go args=[]
         action = parse_args(args)
-        load_rails unless %w(stop restart).include?(action)
-        self.new.__send__(action.intern)
+        self.new.__send__(action.intern) do
+          load_rails unless %w(stop restart).include?(action)
+        end
       end
     
       private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djinn
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Craig Paterson