narf 0.6.3 → 0.7.1

data/README

@@ -51,6 +51,8 @@ this:
 
 === Hello World
 
+    # if installed via rubygems:
+    # require 'rubygems'
     require 'web'
     Web::process do
       Web << 'Hello World'

data/bin/narftest

@@ -1,17 +1,17 @@
-#!/usr/local/bin/ruby
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'test/unit/testcase'
-
-
-$:.replace(["#{Dir.pwd}/src","#{Dir.pwd}/config"].concat($:))
-
-require 'web'
-
-$RUNNING_AS_TEST=true
-
-Dir["tests/*.rb"].each { |test|
-    require test
-}
-
-Web.set_docroot File.join(Dir.pwd,"html")
+#!/usr/local/bin/ruby
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+require 'test/unit/testcase'
+
+
+$:.replace(["#{Dir.pwd}/src","#{Dir.pwd}/config"].concat($:))
+
+require 'web'
+
+$RUNNING_AS_TEST=true
+
+Dir["tests/*.rb"].each { |test|
+    require test
+}
+
+Web.set_docroot File.join(Dir.pwd,"html")

data/build.rb

@@ -7,15 +7,14 @@ require 'ftools'
 require 'find'
 
 def temp_dir
-    (ENV["TEMP"] || "/tmp").gsub(/\\+/, "/")
+    #(ENV["TEMP"] || "/tmp").gsub(/\\+/, "/")
+    @temp_dir ||= File.join( Dir.pwd, "tmp" )
 end
 
 def make_temp( path )
   File.join( temp_dir, path)
 end
 
-
-
 def File.rm_rf( path )
   if File.exists? path
     doomed = []
@@ -136,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"
@@ -147,15 +147,16 @@ Target.new( "upload_doc", "upload doc" ) {
     end
 }
 
-Target.new( "test", "run narf unit tests" ) {
+Target.new( "test", "run narf unit tests" ) {
+    Dir.mkdir( 'tmp' ) unless File.exists? 'tmp'
     require 'test/unit'
     require 'test/unit/ui/console/testrunner'
 
     $:.replace(['lib'].concat($:))
 
     require 'web'
-
-    Dir["test/*.rb"].each { |test|
+
+    Dir["test/cgi/*.rb"].each { |test|
 	require test
     }
 
@@ -180,12 +181,17 @@ Target.new( "test", "run narf unit tests" ) {
     end
     
     alias :teardown_wiki :setup_wiki
-
+    
+    Dir.mkdir "tmp" unless File.exists? "tmp"
+    Dir.mkdir "tmp/test.pages" unless File.exists? "tmp/test.pages"
+    Dir.mkdir "tmp/tarpit" unless File.exists? "tmp/tarpit"
+    
     Web::Wiki::set_pref(:store_dir  => make_temp("test.pages/"),
                         :store_url  => "../test.pages/",
                         :tarpit_dir => make_temp("tarpit/"),
                         :vandals    => "vandals.test.txt",
-                        :baseurl    => "wiki.rb" )
+                        :baseurl    => "wiki.rb" )
+    
     Web.set_docroot( File.join(Dir.pwd,"examples") )
 
     # a bunch of the illustration_page functions don't work on windows
@@ -201,13 +207,37 @@ Target.new( "test", "run narf unit tests" ) {
 
 }
 
-Target.new( "testwebunit", "test web unit" ) {
-    $: << "lib"
-    ENV['URLBASE'] = ARGV[1] || "http://www.hexane.org/webtest/"
+Target.new( "testinstall", "test installation (pass URL after target)" ) {
+    $: << Dir.pwd + "/lib"
+    require 'webunit'
     
-    require 'web/unit/runtest'
+    # I don't like how webunit is appending a '/'
+    # at the end of my urls.
+    module WebUnit
+      class TestCase
+        def initialize( method, name=self.class.name )
+          case USING_FRAMEWORK
+          when 'Test::Unit'
+            super(method)
+          when 'RubyUnit'
+            super
+          else
+            super
+            # raise??
+          end
+          @urlbase = ENV['URLBASE'] ? ENV['URLBASE'] : 'http://localhost/'
+          @urlbase = orthop_url( @urlbase )
+          #@urlbase << '/' unless @urlbase =~ %r!/$!
+          $stderr.puts "URLBASE is #{@urlbase}" if $DEBUG
+        end
+      end
+    end
     
-    Web::Unit.runtest(Dir["test/webunit/test*.rb"])
+    ENV['URLBASE'] = ARGV[1] || ENV['URLBASE'] || "http://www.hexane.org/webtest/"
+    require 'webunit/runtest'
+
+    Dir.chdir( "test/installation" )
+    WebUnit.runtest(Dir["test*.rb"])
 }
 
 Target.new( "testexamples", "test narf examples" ) {
@@ -231,85 +261,19 @@ Target.new( "testexamples", "test narf examples" ) {
 }
 
 
-def install_dir
-    $:.find { |dir|
-        /site_ruby\/\d.\d\z/ =~ dir
-    } + "/"
-end
-
-FILES = [ "web",
-          "web.rb",
-          "web/action.rb",
-	  "web/assertinclude.rb",
-	  "web/buffer.rb",
-	  "web/request.rb",
-	  "web/session.rb",
-	  "web/template.rb",
-	  "web/writableio.rb",
-          "web/rhp.rb" ]
-
-OLD_FILES = [ "web",
-              "narf.rb",
-	      "narf/app.rb",
-	      "narf/assertinclude.rb",
-	      "narf/buffer.rb",
-	      "narf/request.rb",
-	      "narf/session.rb",
-	      "narf/template.rb",
-	      "narf/writableio.rb"	]
-
-Target.new( "uninstall", "delete narf files from site_ruby" ){
-
-    file_list = (FILES.reverse | OLD_FILES.reverse ).collect{|file|
-        install_dir + file
-    }
-
-    file_list.push( "/usr/bin/rhp")
-
-    file_list.each{ |file|
-	if File.exists? file
-	    if File.stat(file).directory?
-                Dir.delete file
-	    else
-                File.delete file
-            end
-	end
-    }
-}
-
-Target.new( "compile_narf_runner", "" ) {
-  Dir.mkdir "bin" unless File.exists? "bin"
-  narf_c = File.open( 'sapi/apache_cgi/src/narf.c', 'r' ) { |f|
-    f.read
-  }
-  require 'rbconfig'
-  narf_c.gsub!( /(ruby)/, Config::CONFIG["bindir"] + "/ruby" )
-  File.open( 'sapi/apache_cgi/src/narf-path_adjusted.c', 'wb') { |f|
-    f.write(narf_c)
-  }
-  `gcc sapi/apache_cgi/src/narf-path_adjusted.c -o sapi/apache_cgi/bin/narf`
-}
-
-Target.new( "install", "install narf in site ruby" ){
-
-    Target.run( "uninstall" )
-    Target.run( "compile_rhp" )
-
-    FILES.each{ |file|
-            from, to = "lib/" + file, install_dir + file
-
-            if (File.stat(from).directory?)
-	        unless File.exists? to
-		    puts "Creating #{to}"
-                    Dir.mkdir to 
-                end
-            else
-                puts "#{ from } => #{ to }...\n"
-	        File.copy( from, to )
-            end
-    }
-
-    File.copy( "rhp", "/usr/bin/rhp" )
-}
+  Target.new( "compile", "compile narf interpreter" ) do
+    Dir.mkdir "bin" unless File.exists? "bin"
+    require 'rbconfig'
+    
+    if (Config::CONFIG['sitearch'] =~ /windows/)
+      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 ")
+      `#{cmd}`
+    end
+  end
 
 Target.run( ARGV[0] ) if ($0 == __FILE__)

data/build.rb~

@@ -0,0 +1,278 @@
+#!/usr/bin/env ruby
+
+# require 'stringio'
+
+# GC.disable
+require 'ftools'
+require 'find'
+
+def temp_dir
+    #(ENV["TEMP"] || "/tmp").gsub(/\\+/, "/")
+    @temp_dir ||= File.join( Dir.pwd, "tmp" )
+end
+
+def make_temp( path )
+  File.join( temp_dir, path)
+end
+
+def File.rm_rf( path )
+  if File.exists? path
+    doomed = []
+    Find.find( path ) { |filename|
+      doomed.push filename
+    }
+    doomed.reverse.each{ |filename|
+      if File.directory? filename
+        Dir.rmdir( filename )
+      else
+      File.delete( filename )
+      end
+    }
+  end
+end
+
+module Test
+    module Unit
+	class TestCase
+	    @@subclasses = []
+	    
+	    def TestCase.inherited(sub)
+		@@subclasses.push sub
+	    end
+	    
+	    def TestCase.all_suite
+		suite = Test::Unit::TestSuite.new
+		@@subclasses.each{ |sub|
+		    suite << sub.suite # te
+		}
+		suite
+	    end
+	end
+    end
+end
+
+class Target
+    @@targets = {}
+    def Target.run(name="")
+	if (keys.include? name)
+	    @@targets[name].run
+	else
+	    help_text
+	end
+    end
+
+    def Target.keys
+        @@targets.keys.sort
+    end
+
+    def Target.first
+	keys.first
+    end
+
+    def Target.justify
+	justify = 0
+
+	keys.each { |key|
+	    justify = key.length if (key.length > justify)
+	}
+
+	justify + 1
+    end
+
+    def Target.help_text
+	text  = "Usage:   ruby build.rb [ #{ keys.join( " | ") } ]" + $/
+	text += @@targets[keys.first].help_text( "Options: ", justify )
+	keys.slice(1...keys.length).each{ |key|
+	    text += @@targets[key].help_text( "         ", justify )
+	}
+	puts text
+    end
+
+    attr_reader :name, :description
+    def initialize( name, description, &run )
+	@name = name
+	@description = description
+	@run = run || Target.method(:help_text)
+	@@targets[name] = self
+    end
+
+    def run
+	$stderr.puts "Target: " + name + " | " + description
+	@run.call
+    end
+
+    def help_text( prefix, justify )
+	prefix + name.ljust(justify) + " -- " + description + $/
+    end
+end
+
+Target.new( "upload_doc", "upload doc" ) {
+    Target.run( "rdoc" )
+    `scp -r doc/rdoc/* patsplat@ssh.narf-lib.org:~/narf-lib.org/doc`
+}
+
+  Target.new( "rdoc", "build rdoc" ) {
+    begin
+      require 'rdoc/rdoc'
+      
+      rdoc = RDoc::RDoc.new
+      rdoc.document( [  
+                       # set the output directory
+                       "-o", 
+                      "doc/rdoc/",
+                      
+                      # set the main page
+                      "--main",
+                      "README",
+                      
+                      # list the files to be excluded
+                      "--exclude",
+                      /htmltools|htmlparser|unit|writableio|tagparser|strscanparser|web\/action|assertinclude|buffer|formreader|forms|runner|simpledispatcher|traceoutput|linker|page|lib\/web\/sapi/,
+
+                      # list the files / dirs to be parsed for documentation
+                      "README",
+                      "examples/examples.rdoc",
+                      "lib/web.rb",
+                      "lib/web",
+                      "doc/apache_cgi.txt",
+                      "doc/fastcgi.txt",
+                      "doc/mod_ruby.txt",
+                      "doc/webrick.txt"
+                       
+			  ] )
+    rescue LoadError => error
+	puts "Building the rdocs will require 'rdoc/rdoc'"
+	puts "visit http://rdoc.sourceforge.net/ to obtain this library"
+    end
+}
+
+Target.new( "test", "run narf unit tests" ) {
+    Dir.mkdir( 'tmp' ) unless File.exists? 'tmp'
+    require 'test/unit'
+    require 'test/unit/ui/console/testrunner'
+
+    $:.replace(['lib'].concat($:))
+
+    require 'web'
+
+    Dir["test/cgi/*.rb"].each { |test|
+	require test
+    }
+
+    # buffered test runner is a custom made test runner
+    # that lives in the test dir
+    Test::Unit::UI::Console::TestRunner.new(Test::Unit::TestCase.all_suite
+						    ).start
+}
+  
+  Target.new( "testwiki", "test narf wiki" ) {
+    require 'test/unit'
+    require 'test/unit/ui/console/testrunner'
+
+    $:.replace( ['./lib/'].concat($:) ) 
+    
+    require 'web'
+    require 'web/wiki'
+
+    def setup_wiki
+      File.rm_rf( Web::Wiki::store_dir )
+      Web::Wiki::wipe
+    end
+    
+    alias :teardown_wiki :setup_wiki
+    
+    Dir.mkdir "tmp" unless File.exists? "tmp"
+    Dir.mkdir "tmp/test.pages" unless File.exists? "tmp/test.pages"
+    Dir.mkdir "tmp/tarpit" unless File.exists? "tmp/tarpit"
+    
+    Web::Wiki::set_pref(:store_dir  => make_temp("test.pages/"),
+                        :store_url  => "../test.pages/",
+                        :tarpit_dir => make_temp("tarpit/"),
+                        :vandals    => "vandals.test.txt",
+                        :baseurl    => "wiki.rb" )
+    
+    Web.set_docroot( File.join(Dir.pwd,"examples") )
+
+    # a bunch of the illustration_page functions don't work on windows
+    #require 'test/wiki/test.illustration_page.rb'
+    Dir["test/wiki/*.rb"].each { |test|
+      require test
+    }
+    #require 'test/wiki/test.wiki.rb'
+
+    # buffered test runner is a custom made test runner
+    # that lives in the test dir
+    Test::Unit::UI::Console::TestRunner.new(Test::Unit::TestCase.all_suite).start
+
+}
+
+Target.new( "testinstall", "test installation (pass URL after target)" ) {
+    $: << Dir.pwd + "/lib"
+    require 'webunit'
+    
+    # I don't like how webunit is appending a '/'
+    # at the end of my urls.
+    module WebUnit
+      class TestCase
+        def initialize( method, name=self.class.name )
+          case USING_FRAMEWORK
+          when 'Test::Unit'
+            super(method)
+          when 'RubyUnit'
+            super
+          else
+            super
+            # raise??
+          end
+          @urlbase = ENV['URLBASE'] ? ENV['URLBASE'] : 'http://localhost/'
+          @urlbase = orthop_url( @urlbase )
+          #@urlbase << '/' unless @urlbase =~ %r!/$!
+          $stderr.puts "URLBASE is #{@urlbase}" if $DEBUG
+        end
+      end
+    end
+    
+    ENV['URLBASE'] = ARGV[1] || ENV['URLBASE'] || "http://www.hexane.org/webtest/"
+    require 'webunit/runtest'
+
+    Dir.chdir( "test/installation" )
+    WebUnit.runtest(Dir["test*.rb"])
+}
+
+Target.new( "testexamples", "test narf examples" ) {
+    require 'test/unit'
+    require 'test/unit/ui/console/testrunner'
+
+    $:.replace(['./lib/'].concat($:)) 
+
+    require 'web'
+    require 'web/wiki'
+
+    Web.set_docroot File.join(Dir.pwd,"examples")
+
+    Dir["examples/test/*.rb"].each { |test|
+        require test
+    }
+
+    # buffered test runner is a custom made test runner
+    # that lives in the test dir
+    Test::Unit::UI::Console::TestRunner.new(Test::Unit::TestCase.all_suite ).start
+}
+
+
+  Target.new( "compile", "compile narf interpreter" ) do
+    Dir.mkdir "bin" unless File.exists? "bin"
+    require 'rbconfig'
+    
+    if (Config::CONFIG['sitearch'] =~ /windows/)
+      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 ")
+      `#{cmd}`
+    end
+  end
+
+Target.run( ARGV[0] ) if ($0 == __FILE__)