narf 0.7.2 → 0.7.3

data/ChangeLog

@@ -1,4 +1,41 @@
 ------------------------------------------------------------------------
+rev 122:  patsplat | 2005-02-25 23:28:21 -0500 (Fri, 25 Feb 2005) | 2 lines
+
+tweaks for narf.c on linux ~ pat
+
+------------------------------------------------------------------------
+rev 121:  patsplat | 2005-02-19 02:32:27 -0500 (Sat, 19 Feb 2005) | 1 line
+
+made fixes so narf would compile on unix dynamically via rbconfig settings ~ patrick
+------------------------------------------------------------------------
+rev 120:  patsplat | 2005-02-15 22:58:49 -0500 (Tue, 15 Feb 2005) | 1 line
+
+tweaked compile rules ~ pat
+------------------------------------------------------------------------
+rev 119:  patsplat | 2005-02-15 22:55:52 -0500 (Tue, 15 Feb 2005) | 1 line
+
+added windows cgi documentation ~ pat
+------------------------------------------------------------------------
+rev 117:  patsplat | 2005-02-14 15:31:23 -0500 (Mon, 14 Feb 2005) | 1 line
+
+Preparing for 0.7.2 release
+------------------------------------------------------------------------
+rev 115:  patsplat | 2005-02-13 04:09:54 -0500 (Sun, 13 Feb 2005) | 1 line
+
+settling in for another release ~ pat
+------------------------------------------------------------------------
+rev 113:  patsplat | 2005-02-13 03:33:38 -0500 (Sun, 13 Feb 2005) | 1 line
+
+Preparing for 0.7.0 release
+------------------------------------------------------------------------
+rev 112:  patsplat | 2005-02-13 03:32:11 -0500 (Sun, 13 Feb 2005) | 1 line
+
+settling in for another release ~ pat
+------------------------------------------------------------------------
+rev 111:  patsplat | 2005-02-12 02:52:38 -0500 (Sat, 12 Feb 2005) | 1 line
+
+calling all platforms: work on the new narf! ~ pat
+------------------------------------------------------------------------
 rev 110:  patsplat | 2005-02-09 00:38:05 -0500 (Wed, 09 Feb 2005) | 1 line
 
 made narf runner work for rb and narf files, by extension ~ pat

data/bin/narftest

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/home1/p/patsplat/bin/ruby
 require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 require 'test/unit/testcase'

data/build.rb

@@ -7,8 +7,8 @@ require 'ftools'
 require 'find'
 
 def temp_dir
-    #(ENV["TEMP"] || "/tmp").gsub(/\\+/, "/")
-    @temp_dir ||= File.join( Dir.pwd, "tmp" )
+  #(ENV["TEMP"] || "/tmp").gsub(/\\+/, "/")
+  @temp_dir ||= File.join( Dir.pwd, "tmp" )
 end
 
 def make_temp( path )
@@ -261,7 +261,7 @@ Target.new( "testexamples", "test narf examples" ) {
 }
 
 
-  Target.new( "compile", "compile narf interpreter" ) do
+Target.new( "compile", "compile narf interpreter" ) do
     Dir.mkdir "bin" unless File.exists? "bin"
     require 'rbconfig'
     
@@ -269,11 +269,27 @@ Target.new( "testexamples", "test narf examples" ) {
       puts "cmd: copy sapi/win/narf.exe bin/narf.exe"
       File.copy 'sapi/win/narf.exe', 'bin/narf.exe'
     else
-      archdir = Config::CONFIG["archdir"]
-      puts "cmd: " +
-      (cmd = "gcc -L/usr/local -lruby -I#{archdir} -o bin/narf sapi/narf.c ")
+      c          = Config::CONFIG
+      libdir     = c['libdir']
+      archdir    = c['archdir']
+      ld         = c['CC']
+      ldflags    = c['LDFLAGS']
+      xldflags   = c["XLDFLAGS"]
+      xldflags.gsub!(/-L\./, "")
+      xldflags  += " #{c['LIBPATHFLAG'] % libdir}"
+      librubyarg = c["LIBRUBYARG"]
+      if c["RUBY_SHARED"]
+        librubyarg.gsub!(/-L\./, "")
+      end
+      
+      libs = c["LIBS"]
+      
+      #(cmd = "gcc sapi/narf.c -v -I#{archdir} -L#{libdir} #{c['libs']} #{librubyarg} -o bin/narf")
+      
+      cmd = [ ld, ldflags, xldflags, "-I#{archdir}", "sapi/narf.c", librubyarg, libs, "-o bin/narf" ].join(" ")
+      puts "cmd: " + cmd
       `#{cmd}`
     end
   end
-
+  
 Target.run( ARGV[0] ) if ($0 == __FILE__)

data/build.rb~

@@ -135,6 +135,7 @@ Target.new( "upload_doc", "upload doc" ) {
                       "lib/web.rb",
                       "lib/web",
                       "doc/apache_cgi.txt",
+                      "doc/windows_cgi.txt",
                       "doc/fastcgi.txt",
                       "doc/mod_ruby.txt",
                       "doc/webrick.txt"
@@ -260,7 +261,7 @@ Target.new( "testexamples", "test narf examples" ) {
 }
 
 
-  Target.new( "compile", "compile narf interpreter" ) do
+Target.new( "compile", "compile narf interpreter" ) do
     Dir.mkdir "bin" unless File.exists? "bin"
     require 'rbconfig'
     
@@ -268,11 +269,27 @@ Target.new( "testexamples", "test narf examples" ) {
       puts "cmd: copy sapi/win/narf.exe bin/narf.exe"
       File.copy 'sapi/win/narf.exe', 'bin/narf.exe'
     else
-      archdir = Config::CONFIG["archdir"]
-      puts "cmd: " +
-      (cmd = "gcc -L/usr/local -lruby -I#{archdir} -o bin/narf sapi/narf.c ")
+      c          = Config::CONFIG
+      libdir     = c['libdir']
+      archdir    = c['archdir']
+      ld         = c['CC']
+      ldflags    = c['LDFLAGS']
+      xldflags   = c["XLDFLAGS"]
+      xldflags.gsub!(/-L\./, "")
+      xldflags  += " #{c['LIBPATHFLAG'] % libdir}"
+      librubyarg = c["LIBRUBYARG"]
+      if c["RUBY_SHARED"]
+        librubyarg.gsub!(/-L\./, "")
+      end
+      
+      libs = c["LIBS"]
+      
+      mknarf = [ ld, ldflags, xldflags, "-I#{archdir}", "sapi/narf.c", librubyarg, libs, "-o bin/narf" ].join(" ")
+      #(cmd = "gcc sapi/narf.c -v -I#{archdir} -L#{libdir} #{c['libs']} #{librubyarg} -o bin/narf")
+      cmd = mknarf
+      puts "cmd: " + cmd
       `#{cmd}`
     end
   end
-
+  
 Target.run( ARGV[0] ) if ($0 == __FILE__)

data/lib/web/wiki.rb

@@ -331,7 +331,7 @@ module Web
       def initialize( wiki )
         @handled = false
         @wiki = wiki
-        @template = if (File.basename(Web.script_name) == "admin.rb")
+        @template = if (File.basename(Web.script_name || '') == "admin.rb")
                       "admin.html"
                     else
                       "template.html"

data/narf.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 spec = Gem::Specification.new do |s|
   #### Basic information.
   s.name = 'narf'
-  s.version = "0.7.2"
+  s.version = "0.7.3"
   s.summary = <<-EOF
 NARF is a replacement for and derivative of the Ruby CGI library. It exists to trivialize web development .
 EOF

data/narf.gemspec~

@@ -3,7 +3,7 @@ require 'rubygems'
 spec = Gem::Specification.new do |s|
   #### Basic information.
   s.name = 'narf'
-  s.version = "0.7.1"
+  s.version = "0.7.2"
   s.summary = <<-EOF
 NARF is a replacement for and derivative of the Ruby CGI library. It exists to trivialize web development .
 EOF

data/pre-setup.rb

@@ -2,4 +2,4 @@ require 'build.rb'
 
 Target.run "rdoc"
 
-Target.run "compile_narf_runner"
+Target.run "compile"

data/sapi/narf.c

@@ -8,7 +8,7 @@ int main(int argc, char *argv[])
   ruby_init_loadpath();
   ruby_script("narf");
   ruby_set_argv(argc, argv);
-  rb_eval_string_protect("require 'web/runner'; Web::load(ENV['PATH_TRANSLATED'] || ARGV[1] );", &state);
+  rb_eval_string_protect("require 'web/runner'; Web::load(if (File.exists?ENV['PATH_TRANSLATED'].to_s) then ENV['PATH_TRANSLATED']; elsif(File.exists?ENV['SCRIPT_FILENAME'].to_s) then ENV['SCRIPT_FILENAME']; else ARGV[1]; end );", &state);
   if (state) {
     rb_p( ruby_errinfo );
   }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: narf
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
-date: 2005-02-14
+  version: 0.7.3
+date: 2005-02-26
 summary: NARF is a replacement for and derivative of the Ruby CGI library. It exists to trivialize web development .
 require_paths: 
   - lib