nitro 0.31.0 → 0.40.0

data/bin/nitro

@@ -1,6 +1,13 @@
 #!/usr/bin/env ruby
 
-require 'facets/more/consoleapp'
+$LOAD_PATH.unshift 'lib'
+
+require 'facets/more/command'
+
+require 'glue/configuration'
+
+# The default Nitro management script. Provides a number of
+# options for managing the lifecycle of Nitro applications.
 
 class NitroCommand < Console::Command
 
@@ -15,19 +22,57 @@ class NitroCommand < Console::Command
   # $ nitro start
   # $ nitro run
   
-  def default
+  def start
+    # Start the state server.
+    
+    if File.exist?('state.rb') and Dir['.d*.pid'].empty?
+      puts 'Starting state server'      
+      system 'ruby state.rb --daemon'      
+    end
+    
+    # Start the application servers.
+    
     if f = application_file
-      $NITRO_NO_ENVIRONMENT = true
-      load 'run.rb'
+      ARGV.delete('start')
+      exec_application(f)
+      
+      if ic = @instance_count
+        (ic.to_i-1).times do |i|
+          exec_application(f, i + 1)
+        end
+      end
     else
       puts 'No application found!'
       # FIXME: better error mesage and/or show default app!
     end
   end
-  alias run default
-  alias start default
+  alias default start
+  alias run start
+
+  # Stop all running application instances.
+  
+  def stop
+    kill_processes('.a*.pid')
+  end
+  
+  # Restart all application servers.
+  
+  def restart
+    stop()
+    start()
+  end
+  
+  # Stop all running application instances and related 
+  # servers (for example drb servers)
+  
+  def kill
+    kill_processes('.a*.pid')
+    kill_processes('.d*.pid')
+  end
 
   # Starts an IRB console attached to the web application.
+  #
+  # $ nitro console
     
   def console
     if RUBY_PLATFORM =~ /mswin32/
@@ -39,48 +84,66 @@ class NitroCommand < Console::Command
     ENV['NITRO_INVOKE'] = 'irb'
     
     if f = application_file
-      ENV['NITRO_MODE'] = $DBG ? 'debug' : 'live'
+      ENV['CONFIGURATION_MODE'] = $DBG ? 'debug' : 'live'
       exec "#{irb_name} -r #{f} -r irb/completion --noinspect"  
     end
     
     exit
   end  
 
-  # Dump the version of Nitro.
+  # Setup a cluster. The input is the size of the cluster.
+  # For example:
+  #
+  # $ nitro cluster 5
+  #
+  # starts 5 instances that listen to consecutive port numbers.
   
-  def version
-    puts "Nitro 0.31.0"
+  def __cluster(instance_count)
+    @instance_count = instance_count
+    
+    idx = ARGV.index('--cluster')
+    ARGV.delete_at(idx)
+    ARGV.delete_at(idx)
+
+    # cluster implies daemon mode.
+    
+    unless ARGV.include? '--daemon'
+      ARGV << '--daemon'
+    end
   end
+
+  def __debug
+    ARGV.delete('--debug')
+    ENV['CONFIGURATION_MODE'] = 'debug'
+  end
+  alias __devel __debug
+
+  def __stage
+    ARGV.delete('--stage')
+    ENV['CONFIGURATION_MODE'] = 'stage'
+  end
+
+  def __live
+    ARGV.delete('--live')
+    ENV['CONFIGURATION_MODE'] = 'live'
+  end
+  alias __production __live
   
-  # :section: Options
-  
-  # Enable verbose mode.
-  
-  def _v
-    $DBG = true
-    ENV['NITRO_MODE'] = 'debug'
+  def __mongrel
+    # gmosx: handled in runner.
   end
-  alias _verbose _v
   
-  # Daemonize the server. Typically used with the Webrick 
-  # adapter.
+  def __daemon
+    # gmosx: handled in runner.
+  end
 
-  def _daemon  
-    require 'daemons/daemonize'
-    
-    pwd = Dir.pwd
-    Daemonize.daemonize(File.join(pwd, 'log/app.log'))
-    
-    # Restore the original pwd (daemonize sets the 
-    # pwd to '/').
-    Dir.chdir(pwd)
-    
-    # Set the logger to a file (daemonize closes the
-    # std streams).
-    Logger.set(Logger.new('log/app.log'))
+  def _v
+    require 'nitro/version'
+    puts "Nitro #{Nitro::Version}"
+    exit
   end
-  alias _daemonize _daemon
-  
+  alias __version _v
+      
 private
   
   # Typical application main file names.
@@ -98,8 +161,43 @@ private
     
     return false
   end
+
+  # Start the application server. If a cluster is defined,
+  # multiple instances of the application server are spawned.
+  
+  def exec_application(file, port_offset = nil)
+    cmd = "ruby #{file} #{ARGV.join(' ')}"
+    
+    if port_offset
+      cmd << " --port_offset #{port_offset}"
+    end
+
+    # Mark this invocation with the application name. 
+    # Useful to identify process when  runing ps on Unix. Use
+    # for example:
+    #
+    # ps aux | grep ruby
+    
+    cmd << " --app #{File.basename(Dir.pwd)}"
+    
+    system(cmd)
+  end
+
+  # Kill processes marked by .pid files.
+
+  def kill_processes(pattern = '.*.pid')  
+    Dir[pattern].each do |f|
+      pid = f.split('.')[1].slice(1..-1)
+      begin
+        Process.kill('TERM', pid.to_i)
+      rescue 
+        # drink it!
+      ensure
+        File.unlink(f)
+      end
+    end
+  end
+
 end
 
 NitroCommand.new.execute
-
-# * George Moschovitis <gm@navel.gr>

data/doc/CHANGELOG.1

@@ -1,5 +1,5 @@
 
-10-12-2004  George Moschovitis  <gm@navel.gr>
+10-12-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/nitro/server/render.rb (#load_staticall_included): introduced. 
   
@@ -11,7 +11,7 @@
   * lib/og/backend/psql.rb: (#create_table) changed join_table code to 
   be more compatible with the mysql driver.
   
-09-12-2004  George Moschovitis  <gm@navel.gr>
+09-12-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * examples/*: included the nitro logo to both examples.
   
@@ -29,7 +29,7 @@
   
   * lib/og/backend.rb (#join_table): introduced.
   
-08-12-2004  George Moschovitis  <gm@navel.gr>
+08-12-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * improved comments to various files.
   
@@ -58,7 +58,7 @@
   
   * examples/blog/env.rb: environment injection.
   
-07-12-2004  George Moschovitis  <gm@navel.gr>
+07-12-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/og/meta.rb: implemented has_one relation.
   
@@ -76,7 +76,7 @@
   * lib/nitro/ui/pager.rb: updated to be compatible with latest code,
   (#offset): added.
 
-06-12-2004  George Moschovitis  <gm@navel.gr>
+06-12-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/nitro/filters.rb: (gen_filters_call_code): support
   for module filters.
@@ -87,7 +87,7 @@
   exists,
   (#compile_xml_method): call filter chains.
   
-05-12-2004  George Moschovitis  <gm@navel.gr>
+05-12-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * yeah, i got some simple filtering working.
   
@@ -99,16 +99,16 @@
   (#gen_filters_call_code): implemented, preevaluates filter callers,
   allow Filter.filter type of filtering.
 
-02-12-2004  George Moschovitis  <gm@navel.gr>
+02-12-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/nitro/filters.rb: introduced.
 
-29-11-2004  George Moschovitis  <gm@navel.gr>
+29-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/nitro/server/shaders.rb: yeah, added compile time ruby 
   code evaluation.
 
-28-11-2004  George Moschovitis  <gm@navel.gr>
+28-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/xsl/base.xsl: updated ob related macros,
   x:ob-write-end.
@@ -117,15 +117,15 @@
   (#ob_end): end output buffer.
   (#ob_write_end): introduced.
 
-26-11-2004  George Moschovitis  <gm@navel.gr>
+26-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/nitro/application.rb: daemonize [fixed by elathan].
 
-25-11-2004  George Moschovitis  <gm@navel.gr>
+25-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/shaders.rb: fix in RubyShader.
 
-24-11-2004  George Moschovitis  <gm@navel.gr>
+24-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/nitro/builders/table.rb: Introduced table builder.
   
@@ -134,7 +134,7 @@
   * bin/new_app.rb: implemented,
   better, just cp -R the proto dir.
 
-23-11-2004  George Moschovitis  <gm@navel.gr>
+23-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * --- VERSION 0.5.0 ---
 
@@ -161,7 +161,7 @@
   
   * lib/nitro/template.rb: scrapped.
 
-22-11-2004  George Moschovitis  <gm@navel.gr>
+22-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/xsl/base.xsl: rendering-errors.
   
@@ -169,7 +169,7 @@
   introduced rendering_errors,
   (#log_error)
   
-21-11-2004  George Moschovitis  <gm@navel.gr>
+21-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * examples/blog/root/view_entry.xml: just cool :)
   
@@ -193,7 +193,7 @@
   * lib/nitro/config.rb: $template_ext, $xml_template_ext,
   $index_template.
 
-18-11-2004  George Moschovitis  <gm@navel.gr>
+18-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/nitro/server/dispatcher.rb (#process): support for rpc.
 
@@ -214,7 +214,7 @@
   * lib/glue: introduced,
   moved many files from lib/nitro/* and lib/nitro/utils/* here.
 
-17-11-2004  George Moschovitis  <gm@navel.gr>
+17-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * README.og: introduced.
   * RELEASES.og: introduced.
@@ -224,7 +224,7 @@
   
   * Rakefile: introduced Og GemSpec.
 
-16-11-2004  George Moschovitis  <gm@navel.gr>
+16-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/og/backends/mysql.rb (#create_table): handles sql indices.
 
@@ -241,7 +241,7 @@
   cool append_features trick,
   :noindex flag!
 
-15-11-2004  George Moschovitis  <gm@navel.gr>
+15-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * --- VERSION 0.4.1 ---
 
@@ -249,13 +249,13 @@
   
   * examples/blog: better documentation.
 
-14-11-2004  George Moschovitis  <gm@navel.gr>
+14-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * improved RDoc in many files.
   
   * lib/nitro/logger.rb: show full severity string.
   
-13-11-2004  George Moschovitis  <gm@navel.gr>
+13-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * lib/nitro/parts.rb: deprecated.
   
@@ -284,13 +284,13 @@
   * examples/blog/config.rb: more comments,
   $srv_address to make more visible.
   
-12-11-2004  George Moschovitis  <gm@navel.gr>
+12-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * examples/blog/config.rb: moved from webapp.rb.
   
   * examples/blog/conf/*: removed.
 
-11-11-2004  George Moschovitis  <gm@navel.gr>
+11-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * Rakefile: use version.
   
@@ -348,7 +348,7 @@
   
   * examples/blog/root/entry-form.xhtml: yeah i got an included fragment.
 
-10-11-2004  George Moschovitis  <gm@navel.gr>
+10-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * examples/blog/root/view_entry.xhtml: introduced,
   comments.
@@ -386,7 +386,7 @@
 
   * examples/blog/root/style.css: implemented the css.
 
-09-11-2004  George Moschovitis  <gm@navel.gr>
+09-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * examples/blog/root/index.xhtml: introduced.
   
@@ -415,7 +415,7 @@
   * lib/n/og/backends/mysql.rb (#read_prop/#write_prop): rewritten to make
   more general [b.candler]
   
-08-11-2004  George Moschovitis  <gm@navel.gr>
+08-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/server/dispatcher.rb (#process): store request, response,
   (#process): more intelligent control/method decomposition.
@@ -438,7 +438,7 @@
   
   * examples/blog/root/style.css: introduced.
 
-07-11-2004  George Moschovitis  <gm@navel.gr>
+07-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/server/render.rb (#transform): first version,
   yeah, i got an xhtml with multiple code segments rendered,
@@ -455,7 +455,7 @@
   
   * test/n/utils/tc_string.rb: removed tests from obsolete methods. 
 
-06-11-2004  George Moschovitis  <gm@navel.gr>
+06-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * examples/blog/lib/blog.rb: introduced.
   
@@ -464,7 +464,7 @@
   
   * lib/n/server/dispatcher.rb (#process): moved code from w.
 
-05-11-2004  George Moschovitis  <gm@navel.gr>
+05-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/server/w.rb (do_GET): simple action synthesizer,
   yeah parameter passing works,
@@ -473,7 +473,7 @@
   
   * use .xhtml as an extension.
 
-04-11-2004  George Moschovitis  <gm@navel.gr>
+04-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/server/w.rb (do_GET): implemented.
   
@@ -486,7 +486,7 @@
   
   * examples/blog: experiments with layout.
 
-03-11-2004  George Moschovitis  <gm@navel.gr>
+03-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/server/w.rb: introduced experimental webrick server.
   (WebrickDispatcher): introduced.
@@ -509,7 +509,7 @@
   (#prop): works EXACTLY like attr now.
   (#prop): class == object by default.
 
-02-11-2004  George Moschovitis  <gm@navel.gr>
+02-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * yeah tests pass again.
   
@@ -527,7 +527,7 @@
   
   * lib/n/og.rb: $og_auto_manage_classes introduced.
 
-01-11-2004  George Moschovitis  <gm@navel.gr>
+01-11-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * --- VERSION 0.3.0 ---
   
@@ -558,7 +558,7 @@
   
   * lib/n/server/webrick.rb (#do_GET): og connection per request.
 
-31-10-2004  George Moschovitis  <gm@navel.gr>
+31-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/og/backends/mysql.rb: converted to the new refactored code.
 
@@ -574,7 +574,7 @@
   
   * no __og, just og_xxx.
 
-30-10-2004  George Moschovitis  <gm@navel.gr>
+30-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/og/backends/psql.rb (#write_prop): fixed,
   (#initialize): autocreate database if not found,
@@ -609,7 +609,7 @@
   support,
   removed all N::OgUtils.table crap.
 
-29-10-2004  George Moschovitis  <gm@navel.gr>
+29-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/og/backends/mysql.rb: introduced,
   create_table works,
@@ -649,7 +649,7 @@
   (#manage): fixed bug with create_table,
   (#enchant): YEAH, added the first enchantments :) 
 
-28-10-2004  George Moschovitis  <gm@navel.gr>
+28-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/connection.rb (#create_schema, #drop_schema): removed.
 
@@ -662,7 +662,7 @@
   * lib/n/config.rb: moved many standard configurations
   here.
 
-27-10-2004  George Moschovitis  <gm@navel.gr>
+27-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/db.rb: dont require utils and connection by default.
   
@@ -696,7 +696,7 @@
 
   * lib/n/server/RESEARCH.txt: removed
 
-26-10-2004  George Moschovitis  <gm@navel.gr>
+26-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/app/dispatcher.rb: introduced for experiments in design.
   
@@ -711,7 +711,7 @@
   * lib/n/app/handlers/page-handler.rb (#transform_script):
   support <?rb as marker [c.nasis]. 
   
-25-10-2004  George Moschovitis  <gm@navel.gr>
+25-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * --- VERSION 0.2.0 ---
 
@@ -728,7 +728,7 @@
   
   * examples/ndb/rub.rb: implemented.
 
-23-10-2004  George Moschovitis  <gm@navel.gr>
+23-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * examples/ndb/*: introduced.
   
@@ -750,7 +750,7 @@
   
   * examples/simple/README: improved.
 
-22-10-2004  George Moschovitis  <gm@navel.gr>
+22-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * README: updated.
 
@@ -778,7 +778,7 @@
 
   * improved RDoc documentation to many, many souce files.
 
-21-10-2004  George Moschovitis  <gm@navel.gr>
+21-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/db/make-release.sh: removed.
   
@@ -794,13 +794,13 @@
   
   * doc/*: moved many txt files to the gen/doc directory.
 
-21-10-2004  George Moschovitis  <gm@navel.gr>
+21-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * --- VERSION 0.1.2 ---
 
   * README: final changes before the release.
   
-20-10-2004  George Moschovitis  <gm@navel.gr>
+20-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/server/cluster.rb: removed.
   
@@ -830,7 +830,7 @@
   
   * MIT-LICENCE: added.
 
-19-10-2004  George Moschovitis  <gm@navel.gr>
+19-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/app/webrick-servler.rb (#do_GET): better error handling.
 
@@ -878,7 +878,7 @@
   
   * etc: moved from scripts.
 
-18-10-2004  George Moschovitis  <gm@navel.gr>
+18-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/n/db/connection.rb (#match): use safe query.
   
@@ -892,7 +892,7 @@
   
   * excellent, the reference app runs again.
 
-18-10-2004  George Moschovitis  <gm@navel.gr>
+18-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * lib/p: introduced
   
@@ -900,12 +900,12 @@
   
   * bin/cluster.rb: link to the cluster.
   
-18-10-2004  George Moschovitis  <gm@navel.gr>
+18-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * MAJOR CHANGE: recreated directory structure under /nitro
   to make more compatible with other ruby projects.
 
-17-10-2004  George Moschovitis  <gm@navel.gr>
+17-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * app/conf/debug-config.rb: no error_page when debugging to avoid
   loops.
@@ -951,7 +951,7 @@
   
   * p/feeds: renamed from syndication.
 
-14-10-2004  George Moschovitis  <gm@navel.gr>
+14-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * p/geoloc/entities.rb (#country_code_for_ip): introduced.
   
@@ -961,7 +961,7 @@
   (DbTools#alter_table): improved,
   after many fixes the alter table works even for non entities.
 
-13-10-2004  George Moschovitis  <gm@navel.gr>
+13-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/db/managed.rb (Module#manage): dont define update methods 
   for classes that do not define a primary key.
@@ -982,7 +982,7 @@
 
   * n/app/webrick-servlet.rb: get correct last_ip
 
-12-10-2004  George Moschovitis  <gm@navel.gr>
+12-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * p/sync: introduced.
   
@@ -990,11 +990,11 @@
   
   * p/files/part.rb: introduced.
 
-12-10-2004  George Moschovitis  <gm@navel.gr>
+12-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * p/*: some fixes to make the mixins work again.
 
-12-10-2004  George Moschovitis  <gm@navel.gr>
+12-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * p/glue/part.rb: correctly require methods.
   
@@ -1026,7 +1026,7 @@
   * scrap/geo.csv: New file. Geographical Information about IP 
   address in CSV format.
   
-11-10-2004  George Moschovitis  <gm@navel.gr>
+11-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * n/properties.rb: prop_accessor alias,
   no trailing __ in __force methods.
@@ -1035,7 +1035,7 @@
   (Versionable): introduced,
   (Schedulable): introduced.
 
-11-10-2004  George Moschovitis  <gm@navel.gr>
+11-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/db/psql.rb (#create_table): works with new sql_index.
   
@@ -1056,7 +1056,7 @@
   * n/db/psql.rb (DbUtils#read_prop): support for Object, Array,
   Hash objects.
 
-10-10-2004  George Moschovitis  <gm@navel.gr>
+10-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * gems: dir introduced.
 
@@ -1137,7 +1137,7 @@
 
   * app/root/s/simple/shader.xsl (x:footer): correct w3c.validator
 
-07-10-2004  George Moschovitis  <gm@navel.gr>
+07-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * correct :nodoc: all for test cases.
 
@@ -1149,7 +1149,7 @@
   
   * n/.tc-db.rb: tests run again.
 
-06-10-2004  George Moschovitis  <gm@navel.gr>
+06-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * more mass replaces to make older code work.
 
@@ -1157,7 +1157,7 @@
   
   * p/messages/methods.rb: introduced.
 
-06-10-2004  George Moschovitis  <gm@navel.gr>
+06-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * p/messages/part.rb: introduced.
 
@@ -1178,7 +1178,7 @@
 
   * n/DOCS/css.txt: introduced, info about centering page.
 
-05-10-2004  George Moschovitis  <gm@navel.gr>
+05-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * p/users/entities.rb (RoleOwner#add_role): fixed NASTY bug.
 
@@ -1193,7 +1193,7 @@
 
   * p/users/roles-form.ss: introduced
 
-04-10-2004  George Moschovitis  <gm@navel.gr>
+04-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/slude/conf/debug-conf.rb: log to STDERR.
 
@@ -1221,7 +1221,7 @@
   
   * n/category.rb: removed compatibility stuff.
 
-03-10-2004  George Moschovitis  <gm@navel.gr>
+03-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * p/users/methods.rb (#add_role): recoded,
   (#del_role): recoded.
@@ -1261,7 +1261,7 @@
   
   * app/.cache: introduced cache link.
 
-01-10-2004  George Moschovitis  <gm@navel.gr>
+01-10-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/mixins/permissions.rb: introduced.
   
@@ -1302,7 +1302,7 @@
   
   * n/std.rb: removed CVSXXX methods.
 
-29-09-2004  George Moschovitis  <gm@navel.gr>
+29-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/users/emails/reset-password.st: introduced.
   
@@ -1314,11 +1314,11 @@
   (#register_user): send email,
   (#reset_password): send email
 
-29-09-2004  George Moschovitis  <gm@navel.gr>
+29-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/utils/template.rb: simple templating system.
 
-29-09-2004  George Moschovitis  <gm@navel.gr>
+29-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * app/conf/apache.conf: moved from n/app.
   
@@ -1336,7 +1336,7 @@
   
   * n/app/request.rb (Request#get): works like delete now.
   
-29-09-2004  George Moschovitis  <gm@navel.gr>
+29-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/app/request-part.rb: introduced, copied functionality from
   request.
@@ -1346,7 +1346,7 @@
   * app/conf/config.rb: changed all refs to navel/,
   removed $app_base_dir.
 
-28-09-2004  George Moschovitis  <gm@navel.gr>
+28-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/db/connection.rb: include DbTools.
   
@@ -1359,7 +1359,7 @@
   * app/app.rb: moved app stuff to config, removed appsrv.
   * app/env.rb: updated
   
-27-09-2004  George Moschovitis  <gm@navel.gr>
+27-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/mixins/schedulable.rb: introduced.
   
@@ -1425,7 +1425,7 @@
   (User#banned?): introduced,
   (User#closed?): introduced
 
-23-09-2004  George Moschovitis  <gm@navel.gr>
+23-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * yeah, user icons work :)
   
@@ -1443,7 +1443,7 @@
   * n/app/script.rb: no defcode, pagecode variables,
   (#__cache_put): just pass fragment.
 
-22-09-2004  George Moschovitis  <gm@navel.gr>
+22-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/db/connection.rb (DbConnection#child): get one child!
   
@@ -1469,13 +1469,13 @@
   * scrap/user-convert.rb: New script. Convert OG users to DB users.
   * scrap/user-report.rb: New script. Find users with duplicate emails.
     
-22-09-2004  George Moschovitis  <gm@navel.gr>
+22-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/app/request.rb (Request#set_errors): only set errors unless empty.
   
   * added many missing files in svn.
 
-21-09-2004  George Moschovitis  <gm@navel.gr>
+21-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * FUCKIN MEGA, env works PERFECTLY!
   
@@ -1512,18 +1512,18 @@
   (Request#get_cookie): fixed get_cookie,
   (Request#del_cookie): implemented.
 
-20-09-2004  George Moschovitis  <gm@navel.gr>
+20-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * n/utils/cache.rb: totaly recoded algorithm,
   yeah seems to work and pass the testcases,
   extend from Hash to be more flexible, 
   ultracool touch method.
   
-20-09-2004  George Moschovitis  <gm@navel.gr>
+20-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * made all test cases hidden files!
 
-20-09-2004  George Moschovitis  <gm@navel.gr>
+20-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * n/app/response.rb: removed
   * n/server/response.rb: same
@@ -1548,7 +1548,7 @@
   * n/id.rb: removed
   * n/std.rb: renamed standard.rb
 
-20-09-2004  George Moschovitis  <gm@navel.gr>
+20-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/web/*: removed the whole directory, YEAH!
   
@@ -1569,11 +1569,11 @@
   
   * n/shaders/*: moved from web.
 
-20-09-2004  George Moschovitis  <gm@navel.gr>
+20-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * moved scrap outside n.
 
-19-09-2004  George Moschovitis  <gm@navel.gr>
+19-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
   
   * Changed tooo many files to log.
 
@@ -1636,7 +1636,7 @@
   * n/web/sync/*: removed
   * n/group.rb: removed
 
-17-09-2004  George Moschovitis  <gm@navel.gr>
+17-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * YEAH, converted all R:: to N::
   
@@ -1649,7 +1649,7 @@
   
   * app/logs: symbolic link.
 
-17-09-2004  George Moschovitis  <gm@navel.gr>
+17-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/root/p: relative link!
   
@@ -1669,7 +1669,7 @@
   
   * n/web/server/request.rb (Request#set_arg): value defaults to true
 
-16-09-2004  George Moschovitis  <gm@navel.gr>
+16-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/conf/config.rb: localhost as smtp.
   
@@ -1702,11 +1702,11 @@
   
   * p/users/signup-form.ss: introduced
   
-15-09-2004  George Moschovitis  <gm@navel.gr>
+15-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/Changelog: more tab friendly.
   
-15-09-2004  George Moschovitis  <gm@navel.gr>
+15-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/app.rb: Cleaned up!
   
@@ -1750,7 +1750,7 @@
 
   * n1/web/utils/html.rb: Do not require n2/web/utils/html.
 
-14-09-2004  George Moschovitis  <gm@navel.gr>
+14-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n1/* : changed all refs to n1.
   
@@ -1789,7 +1789,7 @@
   
   * n/db/connection.rb: Array, Hash -> bytea
 
-13-09-2004  George Moschovitis  <gm@navel.gr>
+13-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * MAJOR: $session_manager -> $sessions.
 
@@ -1819,7 +1819,7 @@
   after many fixes seems to kinda work,
   (DbUtils): boolean type, types with small cap!
 
-12-09-2004  George Moschovitis  <gm@navel.gr>
+12-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/db/connection.rb (DbConnection): fixed bug in deserialize_one,
   (DbConnection#transaction): introduced,
@@ -1833,7 +1833,7 @@
   
   * lets SLUDE!
 
-11-09-2004  George Moschovitis  <gm@navel.gr>
+11-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/root/s/deviant/style.css: buttonc.
   
@@ -1850,7 +1850,7 @@
   
   * n/root/db: introduced db part.
 
-10-09-2004  George Moschovitis  <gm@navel.gr>
+10-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/requires.rb: removed unneeded requires.
   
@@ -1872,7 +1872,7 @@
   
   * n/root/editor/js: yeah, use tinyMCE.
 
-09-09-2004  George Moschovitis  <gm@navel.gr>
+09-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * u/utils/tc-cache.rb: introduced,
   [], []=, delete, clear,
@@ -1893,7 +1893,7 @@
   * app/root/faq/index.sx: restructured to avoid db queries in init
   phase.
   
-08-09-2004  George Moschovitis  <gm@navel.gr>
+08-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/appserver/webrick: dont include Webrick module in the top scope,
   use a custom logger!
@@ -1917,12 +1917,12 @@
   * n/(various files): Transform $log.debug "" to $log.debug "" if $DEBUG.
   * n/db/connection.rb (alter_table): Implement.
 
-08-09-2004  George Moschovitis  <gm@navel.gr>
+08-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/web/server/handlers/page-handler.rb (#transform_script): call 
   __init_render for top level scripts.
 
-07-09-2004  George Moschovitis  <gm@navel.gr>
+07-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/web/server/request.rb: script_hash -> tag.
   
@@ -1946,7 +1946,7 @@
   * n/scrap/xmlize.rb: New file.
   * n/scrap/adjust-colors.rb: New file.
 
-06-09-2004  George Moschovitis  <gm@navel.gr>
+06-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n1/og/backend (#get): Set pid from row data!
   
@@ -1972,7 +1972,7 @@
   (CHash#[]=): remove dead servers,
   after A LOT of changes it now works!
 
-05-09-2004  George Moschovitis  <gm@navel.gr>
+05-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/root/faq/index.sx (#__etag): experimental etag calculation
   
@@ -1990,7 +1990,7 @@
   for cacheable pages,
   (#get_cached_fragment): fixed bug with fragment_hash.
 
-04-09-2004  George Moschovitis  <gm@navel.gr>
+04-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * YEAH i got the subscripts calculated.
   
@@ -2012,7 +2012,7 @@
   transform/compile methods dont need request,
   (#transform_script): calculate sub_scripts.
 
-03-09-2004  George Moschovitis  <gm@navel.gr>
+03-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/root/panel.ss: dump user from cookie,
   fully replaced user bar with javascript.
@@ -2029,7 +2029,7 @@
   
   * JOY.GR 1st birthday.
   
-02-09-2004  George Moschovitis  <gm@navel.gr>
+02-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/root/s/deviant/print.css: fixed ref to simple.css
   
@@ -2058,7 +2058,7 @@
   (Script#__last_modified): hook to calculate last modified for this 
   script.
 
-01-09-2004  George Moschovitis  <gm@navel.gr>
+01-09-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/root/s/deviant/shader.xsl: <x:error-log />
   
@@ -2116,7 +2116,7 @@
   prefix fromm fora names.
   * app/root/scripts/kick.rb: New script to kick out users.
 
-31-08-2004  George Moschovitis  <gm@navel.gr>
+31-08-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/db/managed.rb (Relation): pclass, tclass => Strings.
   
@@ -2158,7 +2158,7 @@
 
   * n/DOCS/pg.txt: Created a PostgreSQL Tips file.
   
-30-08-2004  George Moschovitis  <gm@navel.gr>
+30-08-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * n/fora/def.rb (ForumeMessage#__pre_insert): use thread_oid unstead
   of pid to prepare sql traverse.
@@ -2200,7 +2200,7 @@
   (PartActions#search_basesql): pass extrasql,
   (PartActions#search): search and return matching entities.
 
-29-08-2004  George Moschovitis  <gm@navel.gr>
+29-08-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * YEAH, environments mostly work!
   
@@ -2225,7 +2225,7 @@
   
   * n/ui/sitemap.rb (SitePage): keep realm for each page.
 
-28-08-2004  George Moschovitis  <gm@navel.gr>
+28-08-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * YEAH, favourites work with the new code.
 
@@ -2254,7 +2254,7 @@
   * n/root/fora/list.ss: fixed style handling
   * n/root/messages/list.ss: same
 
-27-08-2004  George Moschovitis  <gm@navel.gr>
+27-08-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * YEAH, the new db code seems to work!
   
@@ -2280,7 +2280,7 @@
   
   * created a simple util to handle faqs.
 
-27-08-2004  George Moschovitis  <gm@navel.gr>
+27-08-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/root/fora/activity.sx: use msg-list and latest code.
   * n/root/fora/activity.si: removed, use msg-list.si instead. 
@@ -2327,7 +2327,7 @@
   * n/web/server/handlers/page-handler.rb (PageHandler#transform_script):
   Make regular expressions non-greedy.
 
-26-08-2004  George Moschovitis  <gm@navel.gr>
+26-08-2004  George Moschovitis  <george.moschovitis@gmail.com>
 
   * app/root/fora/favourites.sx: fora favourites.