djinn 0.0.2 → 0.0.3

data/lib/djinn/tonic.rb

@@ -12,7 +12,7 @@ module Djinn
       fork do
     
         puts "Daemonizing on process #{$$}" 
-        puts system("ps aux | grep #{$$}")
+        # puts system("ps aux | grep #{$$}")
     
         # trap('TERM') { do_exit }
         # trap('INT') { do_exit }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: djinn
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Craig Paterson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 +02:00
+date: 2010-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,11 +53,69 @@ files:
 - djinn.gemspec
 - example/basic.rb
 - example/em.rb
+- example/event_machine_djinn.pid
+- example/rails/demo/Rakefile
+- example/rails/demo/app/controllers/application_controller.rb
+- example/rails/demo/app/controllers/books_controller.rb
+- example/rails/demo/app/helpers/application_helper.rb
+- example/rails/demo/app/helpers/books_helper.rb
+- example/rails/demo/app/models/book.rb
+- example/rails/demo/app/views/books/_book.html.erb
+- example/rails/demo/app/views/books/index.html.erb
+- example/rails/demo/app/views/layouts/application.html.erb
+- example/rails/demo/config/boot.rb
+- example/rails/demo/config/database.yml
+- example/rails/demo/config/environment.rb
+- example/rails/demo/config/environments/development.rb
+- example/rails/demo/config/environments/production.rb
+- example/rails/demo/config/environments/test.rb
+- example/rails/demo/config/initializers/backtrace_silencers.rb
+- example/rails/demo/config/initializers/cookie_verification_secret.rb
+- example/rails/demo/config/initializers/inflections.rb
+- example/rails/demo/config/initializers/mime_types.rb
+- example/rails/demo/config/initializers/new_rails_defaults.rb
+- example/rails/demo/config/initializers/session_store.rb
+- example/rails/demo/config/locales/en.yml
+- example/rails/demo/config/routes.rb
+- example/rails/demo/db/migrate/20100726151602_create_books.rb
+- example/rails/demo/db/schema.rb
+- example/rails/demo/db/seeds.rb
+- example/rails/demo/doc/README_FOR_APP
+- example/rails/demo/lib/book_djinn.rb
+- example/rails/demo/public/404.html
+- example/rails/demo/public/422.html
+- example/rails/demo/public/500.html
+- example/rails/demo/public/favicon.ico
+- example/rails/demo/public/images/rails.png
+- example/rails/demo/public/javascripts/application.js
+- example/rails/demo/public/javascripts/controls.js
+- example/rails/demo/public/javascripts/dragdrop.js
+- example/rails/demo/public/javascripts/effects.js
+- example/rails/demo/public/javascripts/prototype.js
+- example/rails/demo/public/robots.txt
+- example/rails/demo/script/about
+- example/rails/demo/script/book_djinn
+- example/rails/demo/script/console
+- example/rails/demo/script/dbconsole
+- example/rails/demo/script/destroy
+- example/rails/demo/script/generate
+- example/rails/demo/script/performance/benchmarker
+- example/rails/demo/script/performance/profiler
+- example/rails/demo/script/plugin
+- example/rails/demo/script/runner
+- example/rails/demo/script/server
+- example/rails/demo/test/fixtures/books.yml
+- example/rails/demo/test/functional/books_controller_test.rb
+- example/rails/demo/test/performance/browsing_test.rb
+- example/rails/demo/test/test_helper.rb
+- example/rails/demo/test/unit/book_test.rb
+- example/rails/demo/test/unit/helpers/books_helper_test.rb
 - lib/djinn.rb
-- lib/djinn/logging_helpers.rb
+- lib/djinn/base.rb
+- lib/djinn/logging.rb
 - lib/djinn/pid_file.rb
-- lib/djinn/rails/boot_daemon.rb
-- lib/djinn/rails/daemon_base.rb
+- lib/djinn/rails.rb
+- lib/djinn/rails/handlers.rb
 - lib/djinn/tonic.rb
 - test/helper.rb
 - test/test_djinn.rb

data/lib/djinn/rails/boot_daemon.rb

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.dirname(__FILE__))
-
-require 'rubygems'
-require 'optparse'
-
-environment = ENV["RAILS_ENV"] || "development"
-@action = "run"
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: social_daemon [options] {start|stop|restart|run}"
-  
-  opts.on("-e", "--environment ENV", "Run in specific Rails environment") do |e|
-    environment = e
-  end
-
-  @action = opts.permute!(ARGV)
-  # (puts opts; exit(1)) unless action.size == 1
-
-  @action = @action.first || "run"
-  (puts opts; exit(1)) unless %w(start stop restart run).include?(@action)
-  
-end.parse!
-
-ENV["RAILS_ENV"] = environment
-
-require 'daemon_base'
-

data/lib/djinn/rails/daemon_base.rb

@@ -1,99 +0,0 @@
-module Djinn
-  module Rails
-    class Base
-
-      require 'yaml'
-      require 'daemon'
-      require 'pid_file'
-      require 'daemon_logging'
-
-      extend Djinn::Daemon
-      include Djinn::LoggingHelpers
-  
-      def log m
-        DaemonBase.log m
-      end
-    
-      class << self
-    
-        def log m
-          puts "#{Time.now.strftime("%m/%d/%Y %H:%M:%S")}: #{m}"
-          STDOUT.flush
-        end
-    
-        def perform config
-          raise "Not implemented"
-        end
-  
-        def start
-          log "Starting #{underscore(self.name)} in the background.."
-          config = load_config
-          logfile = get_logfile(config)
-          daemonize(config, logfile, get_pidfile(config)) do
-            load_rails
-            self.new(config).do_stuff
-          end
-        end
-  
-        def run
-          log "Starting #{underscore(self.name)} in the foreground.."
-          load_rails
-          self.new(load_config).do_stuff
-        end
-  
-        def restart
-          stop
-          start
-        end
-  
-        def stop
-          pidfile = get_pidfile(load_config)
-          log 'No such process' and exit unless pidfile.pid
-          begin
-            log "Sending TERM signal to process #{pidfile.pid}"
-            Process.kill("TERM", pidfile.pid)
-          rescue
-            log 'Could not find process'
-          ensure
-            pidfile.remove
-          end
-        end
-    
-        private
-    
-        def get_pidfile(config)
-          PidFile.new(File.join(File.dirname(__FILE__), '..', '..', 'log', config['pid_file']))
-        end
-    
-        def get_logfile(config)
-          File.join(File.dirname(__FILE__), '..', '..', 'log', config['log_file'])
-        end
-    
-        def load_rails
-          log "Loading Rails in #{ENV['RAILS_ENV']} environment"
-          require File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')
-        end
-    
-        def load_config
-          path = File.join(File.dirname(__FILE__), '..', '..', 'config', "#{underscore(self.name)}.yml")
-          unless File.exists?(path)
-            log "No config file for daemon: #{path}"
-            exit(1)
-          else
-            YAML.load_file(path)[ENV['RAILS_ENV']]
-          end
-        end
-    
-        def underscore(camel_cased_word)
-          camel_cased_word.to_s.gsub(/::/, '/').
-            gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-            gsub(/([a-z\d])([A-Z])/,'\1_\2').
-            tr("-", "_").
-            downcase
-        end
-      
-      end
-  
-    end
-  end
-end