sugoi-mail 0.1.5 → 0.3.0

data/app/models/user.rb

@@ -115,6 +115,8 @@ class User < ActiveRecord::Base
         end
         if ml.save then
             self.mailinglist=ml
+            self.password = self.password_confirmation
+            self.save
             return true
         end
     end

data/bin/maild

@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby
 
-RAILS_BASE=File.join(File.dirname(__FILE__),"..")
+RAILS_BASE=File.expand_path(File.join(File.dirname(__FILE__),".."))
 CONFIGDIR=File.join(RAILS_BASE,"config")
 TMPDIR=File.join(RAILS_BASE,"tmp")
 PIDFILE=File.join(TMPDIR, "maild.pid")
 SOCKETFILE=File.join(RAILS_BASE,"tmp","sockets","maild.socket")
 
+#-------DEBUG-----
+ENV["RAILS_ENV"] = "development"
+
 require File.join(CONFIGDIR,"boot")
 require File.join(CONFIGDIR,"environment")
 require "active_record"
@@ -58,18 +61,15 @@ class MailDaemon
             $logger.err "PID file exists--already running?"
         end
 
+        $logger.info "Ready to accept mail"
+ 
+        unless @debug
+            daemonize
+        end
         File.open(PIDFILE,"w") do |f|
             f.puts Process.pid
         end
 
-        trap("INT") do 
-            @server.close
-            File.unlink(@SOCK_PATH)
-            File.unlink(PIDFILE)
-        end
-
-        $logger.info "Ready to accept mail"
-        self
     end
 
     def read_gurgitate_rules(gurgitatefile)
@@ -97,6 +97,9 @@ class MailDaemon
 
     def process client_info
         LimitedFork.fork do
+            Signal.trap("SIGTERM"){
+                exit!
+            }
             begin
                 # pp client_info
                 g=Gurgitate::Mailmessage.new(client_info[:message], 
@@ -111,31 +114,52 @@ class MailDaemon
                     $logger.warning "    from #{tr}"
                 end
             end
-            exit! # since we're a child process
+            # since we're a child process
+            exit!
         end
     end
 
     def run
-        start
-
-        begin
-            unless @debug
-                daemonize
-            end
-
-            loop do
-                client = @server.accept
+         start
+         loop do
+            begin
+                Signal.trap("SIGTERM"){
+                    $logger.info "caught SIGTERM"
+                    shutdown
+                }
+                #NOTE: A SIGTERM (kill or kill -15) or SIGINT
+                #      (ctrl+C, kill -2) will be caught and maild
+                #      will clean up after itself (call shutdown)
+
+                begin   
+                    client = @server.accept_nonblock
+                rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
+                    IO.select([@server])
+                    retry
+                end
+            
                 client_info = Marshal.load client
                 process client_info
+
+            rescue SignalException 
+                #catches SIGINT
+                shutdown
             end
-        rescue
-            @server.close
-            File.unlink(@SOCK_PATH)
-            raise
         end
     end
+
+    def shutdown
+        $logger.info "shutdown has been called.."
+
+        @server.close
+        File.unlink(@SOCK_PATH)
+        File.unlink(PIDFILE)
+        exit 0 
+    end
 end
 
+
+
 if ARGV[0] == "-d" then
     maild=MailDaemon.new :debug => true
 else
@@ -143,3 +167,7 @@ else
 end
 
 maild.run
+
+
+
+

data/bin/sugoi-admin

@@ -16,6 +16,14 @@ command = ARGV.shift.gsub(/-/,"_")
 request = ActionController::CommandlineRequest.new(command, *ARGV)
 response = ActionController::CommandlineResponse.new
 
-admin.process(request, response)
-
-puts response.body
+begin
+    admin.process(request, response)
+
+    puts response.body
+rescue UnknownAction => e
+    puts "sugoi-admin: Command error: #{e}"
+    exit 1
+rescue RuntimeError => e
+    puts "sugoi-admin: Error: #{e}"
+    exit 1
+end

data/db/migrate/017_add_mailinglist_types.rb

@@ -11,13 +11,6 @@
 # joinable:     true  -> people can subscribe to the list at will <- DEFAULT
 #               false -> only the owner can subscribe or unsubscribe people
 
-#  NOTE FOR JOSUIKAI!
-#  ******************
-#
-#  There needs to be another kind of "joinable" which says that only
-#  people who already have accounts on the system can join a mailing
-#  list.
-
 class AddMailinglistTypes < ActiveRecord::Migration
 
     class MailinglistClass < ActiveRecord::Base; end

data/lib/gurgitate-rules.rb

@@ -49,19 +49,16 @@ to.each do |to_address|
         return
     else
         matches = to_address.match(/(.*?)#(.*?)@(.*)/)
-        puts "hey, found a funky rewrite thingy"
+        $logger.debug "hey, found a funky rewrite thingy"
 
         if matches then
-            localpart, destdomain, domain = matches[1..3]
-            to_address = "#{localpart}@#{destdomain}"
-            p "from address is: #{from}"
             proxy_address=Address.proxyaddress(from)
-            p "proxy address is: #{proxy_address.inspect}"
+            $logger.debug "proxy address is: #{proxy_address.inspect}"
             if proxy_address
-                # mailinglist = Mailinglist.find_by_address(proxy_address)[0]
                 mess=Message.from_message(self)
-                p mess
-                mess.proxy_deliver proxy_address, to_address
+                
+                mess.mailinglist = Mailinglist.find_by_address(proxy_address)[0]
+                mess.deliver 
             end
         end
         # bounce, or report to postmaster, or something

data/lib/tasks/release.rake

@@ -1,6 +1,6 @@
 require 'rake/gempackagetask'
 
-PKG_VERSION = "0.1.5"
+PKG_VERSION = "0.3.0"
 PKG_NAME = "sugoi-mail"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
@@ -9,14 +9,13 @@ spec = Gem::Specification.new do |s|
     s.version = PKG_VERSION
     s.required_ruby_version = ">= 1.8.4"
     s.summary = "Powerful mailing list manager."
-    # s.description = "FIXME"
     s.has_rdoc = true
 
     s.files = Dir.glob('**/*', File::FNM_DOTMATCH).reject do |f| 
         [ /\.$/, /config\/database.yml$/, /config\/database.yml-/, 
             /database\.sqlite/,
             /\.log$/, /^pkg/, /\.svn/, /^vendor\/rails/, /\~$/, 
-            /\/\._/, /\/#/ ].any? {|regex| f =~ regex }
+            /\/\._/, /\/#/, /\/coverage\// ].any? {|regex| f =~ regex }
     end
     s.require_path = '.'
     s.author = "Dave Brown"

data/script/boot/sugoi-mail.EDIT_ME

@@ -0,0 +1,237 @@
+#! /bin/sh
+
+# Sugoi-Mail boot-up script.
+# This file should be in /etc/init.d/
+# DO NOT FORGET TO SET YOUR INSTALLPATH AND SUGOIUSER
+# please rename this file to sugoi-mail (without the .EDIT_ME)
+
+#Written by: aavdacev@invio.co.jp
+
+
+INSTALLPATH="/--SET INSTALL PATH--" #ie: '/home/sugoi-user/sugoi-mail'
+SUGOIUSER="--SET USER RUNNING SUGOIMAIL--" #ie: 'sugoi-user'
+
+RunTests(){
+    maild_socket_exists=0
+    maild_pid=''
+    maild_running=0
+    mongrel_pid=''
+    mongrel_running=0
+
+
+    if test -e $INSTALLPATH/tmp/sockets/maild.socket
+    then 
+        maild_socket_exists=1
+    fi
+
+    if test -e $INSTALLPATH/tmp/maild.pid
+    then
+        maild_pid=`cat $INSTALLPATH/tmp/maild.pid`
+    fi
+
+    if [ ! -z "$(ps -fu $SUGOIUSER | grep ruby[\ ]$INSTALLPATH/bin/maild)" ]
+    then 
+        maild_running=1
+    fi
+
+    if test -e $INSTALLPATH/log/mongrel.pid
+    then
+        mongrel_pid=`cat $INSTALLPATH/log/mongrel.pid`
+        if [ ! -z "$(ps -fu $SUGOIUSER | grep [\ ]$mongrel_pid[\ ].*mongrel_rails)" ]
+        then
+            mongrel_running=1
+        fi
+    fi
+}
+
+Status(){
+    RunTests
+    status_msg=""
+    if [ "$maild_socket_exists" -eq 1 ]; then
+        status_msg="$status_msg - 'tmp/sockets/maild.socket' exists. \n"
+    fi
+
+    if [ ! -z "$maild_pid" ]; then
+        status_msg="$status_msg - 'tmp/maild.pid' exists and reads: $maild_pid \n"
+    fi
+           
+    if [ "$maild_running" -eq 1 ]; then
+        status_msg="$status_msg - Maild belonging to $SUGOIUSER is running. \n"
+    fi 
+            
+    if [ ! -z "$mongrel_pid" ]; then 
+        status_msg="$status_msg - 'log/mongrel.pid' exists and reads $mongrel_pid \n"
+    fi
+        
+    if [ "$mongrel_running" -eq 1 ]; then
+        status_msg="$status_msg - Mongrel webserver is running"
+    fi
+     
+    if [ "$1" = "output" ]
+    then
+        echo -e "$status_msg"
+    fi
+     
+    if [ "$maild_socket_exists" -eq 1 ] &&
+    [ ! -z "$maild_pid" ] &&
+    [ "$maild_running" -eq 1 ] &&
+    [ ! -z "$mongrel_pid" ] && 
+    [ "$mongrel_running" -eq 1 ]
+    then 
+        echo "Sugoi-mail: all systems are running."
+
+    elif [ ! "$maild_socket_exists" -eq 1 ] &&
+    [ -z "$maild_pid" ] &&
+    [ ! "$maild_running" -eq 1 ] &&
+    [ -z "$mongrel_pid" ] && 
+    [ ! "$mongrel_running" -eq 1 ] 
+    then
+        echo "Sugoi-mail: all processes safely stopped."
+
+    else
+        echo "Sugoi-mail: irregular state. Failed to start or stop properly."
+        echo ">> Try 'cleanup' or consult 'help'." 
+    fi
+
+}         
+
+Menu(){
+    case $1 in
+        start)
+            if [ "$mongrel_running" -eq 1  ]; then
+                echo "ERR: Sugoi mail is already being served by mongrel. Consult 'help'"
+            elif [ "$maild_running" -eq 1 ]; then
+                echo "ERR: Maild is already running. Consult 'help'."
+            else
+                echo " - Clearing PID and socket-files.."
+                rm -f $INSTALLPATH/tmp/maild.pid
+                rm -f $INSTALLPATH/tmp/sockets/maild.socket
+
+                echo " - Starting maild Daemon.."
+                su - $SUGOIUSER -c "$INSTALLPATH/bin/maild;exit;"
+                
+                echo " - Starting Mongrel webserver.."
+                su - $SUGOIUSER -c "cd $INSTALLPATH; mongrel_rails start -d;exit;" 
+            
+                #timeout for 3 sec for mongrel to boot, ensure correct status msg
+                sleep 3s
+                Status   
+            fi
+
+        ;;
+
+        status)
+            Status "output"     
+        ;;
+   
+        cleanup)
+            echo "Sugoi-mail cleanup.. [ started ]"
+            echo "- stopping maild, mongrel, and cleaning up files.."
+            if [ "$mongrel_running" -eq 1 ]; then
+                su - $SUGOIUSER -c "cd $INSTALLPATH; mongrel_rails stop"
+            fi
+           
+            if [ "$maild_running" -eq 1 ]; then
+                kill -9 $maild_pid 
+            fi 
+
+            if [ "$maild_socket_exists" -eq 1 ]; then
+                rm -f $INSTALLPATH/tmp/sockets/maild.socket
+            fi
+
+            if [ ! -z "$maild_pid" ]; then
+                rm -f $INSTALLPATH/tmp/maild.pid
+            fi
+           
+            Status
+        ;;
+        restart)
+            if [ ! "$maild_running" -eq 1 ]; then
+                echo "CAN'T RESTART: Maild belonging to $SUGOIUSER is not running. Use 'start'"
+            elif [ ! "$mongrel_running" ]; then
+                echo "CAN'T RESTART: Sugoi-Mail is not being served by Mongrel. Try 'cleanup'"
+            else
+                if [ -z "$maild_pid" ]; then
+                    echo "ERR: no PID file exists, but maild is running. Consult 'help'"                
+                else
+                    echo "Restarting Sugoi-Mail..."
+                    Menu stop
+            
+                    echo "..Booting up again.."
+                    Menu start
+                fi           
+            fi
+                   ;;
+        stop)
+            if [ ! "$maild_running" -eq 1 ]; then
+                echo "ERR: Maild belonging to $SUGOIUSER is not running. Use 'start'"
+            elif [ ! "$mongrel_running" ]; then
+                echo "ERR: Sugoi-Mail is not being served by Mongrel. Consult 'help'"
+            else
+                if [ -z "$maild_pid" ]; then
+                    echo "ERR: no PID file exists, but maild is running. Consult 'help'"                
+                else
+                    echo " - Stopping Mongrel webservice.."
+                    su - $SUGOIUSER -c "cd $INSTALLPATH; mongrel_rails stop"
+                    echo " - Stopping maild daemon.."
+                    su - $SUGOIUSER -c "kill -2 $maild_pid"
+                    
+                    Status
+                fi           
+            fi 
+        ;;
+    
+        *)
+            echo "-- SUGOI-MAIL BOOT SCRIPT HELP --
+
+INFO:
+    This file is a boot script for Sugoi-Mail and should be located in /etc/init.d
+    Please ensure the installpath and sugoi-user have been set properly:
+     - Sugoi-mail installpath: $INSTALLPATH 
+     - Sugoi-mail user: $SUGOIUSER
+
+SYNTAX:
+    sugoi-mail [ command ]
+
+COMMANDS:
+    
+start
+    If sugoi-mail is not running, 'start' will clean up PID & socketfiles, 
+    boot maild daemon, start Mongrel webserver, and finally print sugoi-mail 
+    program status.
+
+stop
+    If sugoi-mail is running, 'stop' will stop Mongrel webservice, terminate the
+    maild daemon, and print the sugoi-mail program status.
+
+restart
+    If sugoi-mail is running, 'restart' will call 'stop', and then 'start'
+    the behaviour of 'stop' and 'start' are described above. 
+
+cleanup
+    At any point in time 'cleanup' will restore sugoi-mail to a 'stopped' state.
+    'cleanup' does not check the current program state, harshly (kill -9) stops 
+    maild daemon, cleans up the PID and socketfiles manualy, stops Mongrel 
+    webservice, and then prints a status message
+    
+help
+   Display this help message        
+
+*  All other commands default to 'help'
+
+ERROR HANDLING:
+    Most error states can be resoved with 'cleanup'. If maild is running, but the
+    PID-file does not exist, you must kill maild manually by finding its process
+    id in the 'ps -ef' listing
+
+AUTHOR:
+    aavdacev@invio.co.jp
+"
+        ;;
+
+    esac
+}
+
+RunTests
+Menu $1
+exit 0