Wiki2Go 1.22.0 → 1.22.1

data/lib/Wiki2Go/Install/make_site.rb

@@ -3,9 +3,12 @@
 require 'etc'
 require 'fileutils'
 require 'optparse'
-require "uri"
+require 'uri'
+require 'rbconfig.rb'
 
-WIKI2GO_VERSION = '1.22.0'
+include Config
+
+WIKI2GO_VERSION = '1.22.1'
 gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 
 require 'Wiki2Go/Web.rb'
@@ -99,19 +102,19 @@ module Wiki2Go
       if uri.scheme.nil? then
         @server = url
       else
-       @server  = uri.host
-       @subsite = uri.path
-       @port    = uri.port.to_s
-     end
-   end
-
-   private
-   def self.type_of(configuration)
-     return 'public' if configuration.kind_of?(Wiki2Go::PublicWikiConfig)
-     return 'private' if configuration.kind_of?(Wiki2Go::PrivateWikiConfig)
-     return 'readwrite' if configuration.kind_of?(Wiki2Go::ReadWriteWikiConfig)
-     return nil 
- end
+        @server  = uri.host
+        @subsite = uri.path
+        @port    = uri.port.to_s
+      end
+    end
+
+    private
+    def self.type_of(configuration)
+      return 'public' if configuration.kind_of?(Wiki2Go::PublicWikiConfig)
+      return 'private' if configuration.kind_of?(Wiki2Go::PrivateWikiConfig)
+      return 'readwrite' if configuration.kind_of?(Wiki2Go::ReadWriteWikiConfig)
+      return nil 
+    end
   end
 
   module Install
@@ -316,6 +319,8 @@ module Wiki2Go
     end
 
     def Install.copy_scripts(source,dest)
+      ruby = File.join(CONFIG['bindir'],CONFIG['ruby_install_name'])
+      executable = "#!#{ruby}"
       ensure_path_exists dest      
       Dir.glob(File.join(source,'*')).each do |filename|
         name = File.basename(filename)
@@ -326,6 +331,7 @@ module Wiki2Go
             File.open(filename) do |f|
               content = f.readlines
               content.collect! { |line| line.chomp}
+              content[0] = executable
               destname = File.join(dest,name) 
               File.open(destname,File::CREAT|File::TRUNC|File::RDWR,0775) do |d|
                 d.puts content
@@ -336,6 +342,7 @@ module Wiki2Go
       end
     end
 
+ 
     def Install.make_executable(dir)
       cd dir do 
         Dir['*.rb'].each do |file|
@@ -456,16 +463,8 @@ class CgiOptions < Wiki2Go::#{baseconfig}
   end  
 
 end
-TEMPLATE_END
+      TEMPLATE_END
 
-      dest = File.join(config.directory,'site','scripts','CgiOptions.rb')
-      if File.exists?(dest) then
-        dest += '.new'
-      end
-      File.open(dest,File::CREAT|File::TRUNC|File::RDWR,0664) do |f|
-        f.puts template
-      end
-      
       logdir = File.join(config.directory,'logs')
       mkdir_p(logdir,{ :mode => 0775}) unless File.exists?(logdir)
       
@@ -473,18 +472,30 @@ TEMPLATE_END
       if !File.exists?(logfile) then
         touch logfile
       end
+
+      cgi_options = File.join(config.directory,'site','scripts','CgiOptions.rb')
+      if File.exists?(cgi_options) then
+        cgi_options += '.new'
+      end
+      File.open(cgi_options,File::CREAT|File::TRUNC|File::RDWR,0664) do |f|
+        f.puts template
+      end
       
       securedir = File.join(config.directory,'site','scripts','secure')
       if File.exists?(securedir) then
         secure = File.join(securedir,'CgiOptions.rb')
         
         begin
-          ln_sf(dest,secure)
+          ln_sf(cgi_options,secure)
         rescue NotImplementedError
           #Symbolic links are not supported on Windows
+          if File.exists?(secure) then
+            secure += '.new'
+          end
+          cp(cgi_options,secure)
         end
       end
-      return dest
+      return cgi_options
     end
     
     def Install.install_html(config)
@@ -569,42 +580,42 @@ TEMPLATE_END
       template = <<-END_TEMPLATE
 <VirtualHost *#{config.dotted_port}>
 ServerName #{config.server}
-DocumentRoot #{config.directory}/site
+DocumentRoot "#{config.directory}/site"
 RedirectMatch ^/$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
-ScriptAlias /scripts #{config.directory}/site/scripts
+ScriptAlias /scripts "#{config.directory}/site/scripts"
 <Directory "#{config.directory}/site/scripts/secure">
 AuthType Basic
 AuthName "#{config.server} wiki site"
-AuthUserFile #{config.directory}/config/passwords
+AuthUserFile "#{config.directory}/config/passwords"
 require valid-user
 Options ExecCGI FollowSymLinks
 </Directory>
 <Directory "#{config.directory}/site/scripts">
 Options ExecCGI FollowSymLinks
 </Directory>
-ErrorLog #{config.directory}/logs/error.log
-CustomLog #{config.directory}/logs/access.log combined
+ErrorLog  "#{config.directory}/logs/error.log"
+CustomLog "#{config.directory}/logs/access.log" combined
 
 </VirtualHost>
-END_TEMPLATE
+      END_TEMPLATE
 
       subsite_template = <<-END_TEMPLATE
 RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
-ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
+ScriptAlias #{config.subsite}/scripts "#{config.directory}/site/scripts"
 Alias #{config.subsite} #{config.directory}/site
 <Directory "#{config.directory}/site/scripts/secure">
 AuthType Basic
 AuthName "#{config.server} wiki site"
-AuthUserFile #{config.directory}/config/passwords
+AuthUserFile "#{config.directory}/config/passwords"
 require valid-user
 Options ExecCGI FollowSymLinks
 </Directory>
 <Directory "#{config.directory}/site/scripts">
 Options ExecCGI FollowSymLinks
 </Directory>
-END_TEMPLATE
+      END_TEMPLATE
 
       write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
@@ -665,7 +676,7 @@ auth.require = (
 
 # Include standard mime types
 include "mime.types.conf"
-END_OF_TEMPLATE
+      END_OF_TEMPLATE
 
       write_lighttpd_config(config,template)
     end
@@ -674,42 +685,42 @@ END_OF_TEMPLATE
       template = <<-END_TEMPLATE
 <VirtualHost *#{config.dotted_port}>
 ServerName #{config.server}
-DocumentRoot #{config.directory}/site
+DocumentRoot "#{config.directory}/site"
 RedirectMatch ^/$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
-ScriptAlias /scripts #{config.directory}/site/scripts
+ScriptAlias /scripts "#{config.directory}/site/scripts"
 <Directory "#{config.directory}/site/scripts/secure">
 AuthType Basic
 AuthName "#{config.server} wiki site"
-AuthUserFile #{config.directory}/config/passwords
+AuthUserFile "#{config.directory}/config/passwords"
 require valid-user
 Options ExecCGI FollowSymLinks
 </Directory>
 <Directory "#{config.directory}/site/scripts">
 Options ExecCGI FollowSymLinks
 </Directory>
-ErrorLog #{config.directory}/logs/error.log
-CustomLog #{config.directory}/logs/access.log combined
+ErrorLog  "#{config.directory}/logs/error.log"
+CustomLog "#{config.directory}/logs/access.log" combined
 
 </VirtualHost>
-END_TEMPLATE
+      END_TEMPLATE
 
       subsite_template = <<-END_TEMPLATE
 RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
-ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
+ScriptAlias #{config.subsite}/scripts "#{config.directory}/site/scripts"
 Alias #{config.subsite} #{config.directory}/site
 <Directory "#{config.directory}/site/scripts/secure">
 AuthType Basic
 AuthName "#{config.server} wiki site"
-AuthUserFile #{config.directory}/config/passwords
+AuthUserFile "#{config.directory}/config/passwords"
 require valid-user
 Options ExecCGI FollowSymLinks
 </Directory>
 <Directory "#{config.directory}/site/scripts">
 Options ExecCGI FollowSymLinks
 </Directory>
-END_TEMPLATE
+      END_TEMPLATE
 
       write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
@@ -770,7 +781,7 @@ auth.require = (
 
 # Include standard mime types
 include "mime.types.conf"
-END_OF_TEMPLATE
+      END_OF_TEMPLATE
 
       write_lighttpd_config(config,template)
     end
@@ -779,104 +790,104 @@ END_OF_TEMPLATE
       template = <<-END_TEMPLATE
 <VirtualHost *#{config.dotted_port}>
 ServerName #{config.server}
-DocumentRoot #{config.directory}/site
+DocumentRoot "#{config.directory}/site"
 RedirectMatch ^/$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
 ScriptAlias /scripts #{config.directory}/site/scripts
 <Directory "#{config.directory}/site/">
 AuthType Basic
 AuthName "#{config.server} wiki site"
-AuthUserFile #{config.directory}/config/passwords
+AuthUserFile "#{config.directory}/config/passwords"
 require valid-user
 Options ExecCGI FollowSymLinks
 </Directory>
 <Directory "#{config.directory}/site/scripts/">
 Options ExecCGI FollowSymLinks
 </Directory>
-ErrorLog #{config.directory}/logs/error.log
-CustomLog #{config.directory}/logs/access.log combined
+ErrorLog  "#{config.directory}/logs/error.log"
+CustomLog "#{config.directory}/logs/access.log" combined
 
 </VirtualHost>
-END_TEMPLATE
+      END_TEMPLATE
 
       subsite_template = <<-END_TEMPLATE
 RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
-ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
-Alias #{config.subsite} #{config.directory}/site
-<Directory "#{config.directory}/site/">
-AuthType Basic
-AuthName "#{config.server} wiki site"
-AuthUserFile #{config.directory}/config/passwords
-require valid-user
-Options ExecCGI FollowSymLinks
-</Directory>
-<Directory "#{config.directory}/site/scripts/">
-Options ExecCGI FollowSymLinks
-</Directory>
-
-END_TEMPLATE
+            ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
+            Alias #{config.subsite} "#{config.directory}/site"
+            <Directory "#{config.directory}/site/">
+            AuthType Basic
+            AuthName "#{config.server} wiki site"
+            AuthUserFile #{config.directory}/config/passwords
+            require valid-user
+            Options ExecCGI FollowSymLinks
+            </Directory>
+            <Directory "#{config.directory}/site/scripts/">
+            Options ExecCGI FollowSymLinks
+            </Directory>
+
+      END_TEMPLATE
 
       write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
     
     def Install.make_private_lighttpd_config( config)
       template = <<-END_OF_TEMPLATE
-# Configuration generated by Wiki2Go
+            # Configuration generated by Wiki2Go
       
-# selecting modules
-server.modules          = ( "mod_rewrite",
-                            "mod_redirect",
-                            "mod_alias",
-                            "mod_access",
-                            "mod_auth",
-                            "mod_status",
-                            "mod_fastcgi",
-                            "mod_cgi",
-                            "mod_compress",
-                            "mod_expire",
-                            "mod_accesslog" )
-
-server.port = #{config.port}
+            # selecting modules
+            server.modules          = ( "mod_rewrite",
+            "mod_redirect",
+            "mod_alias",
+            "mod_access",
+            "mod_auth",
+            "mod_status",
+            "mod_fastcgi",
+            "mod_cgi",
+            "mod_compress",
+            "mod_expire",
+            "mod_accesslog" )
+
+            server.port = #{config.port}
                             
-server.document-root = "#{config.directory}/site"
-server.errorlog      = "#{config.directory}/logs/lighttpd.error.log"
-accesslog.filename   = "#{config.directory}/logs/lighttpd.access.log"
-
-server.follow-symlink= "enable"
-debug.log-request-header= "enable"
-debug.log-response-header= "enable"
-debug.log-file-not-found= "enable"
-
-server.indexfiles    = ( "index.html", "FrontPage.html" ) 
-
-# Execute .rb as Ruby 
-cgi.assign = ( ".rb"  => "/usr/local/bin/ruby"  )
-
-# Redirect all scripts without extension to .rb equivalent
-url.rewrite-once = (
-                     "^/scripts/secure/([^\.\/]*)/(.*)$"    => "/scripts/secure/$1.rb/$2",
-                     "^/scripts/secure/([^\.\/]*)$"         => "/scripts/secure/$1.rb"  ,
-                     "^/scripts/(?!secure)([^\.\/]*)/(.*)$" => "/scripts/$1.rb/$2" ,
-                     "^/scripts/(?!secure)([^\.\/]*)$"      => "/scripts/$1.rb"   
-                     )
-
-auth.debug                 = 2
-auth.backend               = "htpasswd"
-auth.backend.htpasswd.userfile = "#{config.directory}/config/passwords"
-auth.require = (
-                 "/" =>
-                 (
-                   "method"  => "basic",
-                   "realm"   => "lighty wiki",
-                   "require" => "valid-user"
-                 )
-               )
-
-
-# Include standard mime types
-include "mime.types.conf"
-END_OF_TEMPLATE
+            server.document-root = "#{config.directory}/site"
+            server.errorlog      = "#{config.directory}/logs/lighttpd.error.log"
+            accesslog.filename   = "#{config.directory}/logs/lighttpd.access.log"
+
+            server.follow-symlink= "enable"
+            debug.log-request-header= "enable"
+            debug.log-response-header= "enable"
+            debug.log-file-not-found= "enable"
+
+            server.indexfiles    = ( "index.html", "FrontPage.html" ) 
+
+            # Execute .rb as Ruby 
+            cgi.assign = ( ".rb"  => "/usr/local/bin/ruby"  )
+
+            # Redirect all scripts without extension to .rb equivalent
+            url.rewrite-once = (
+            "^/scripts/secure/([^\.\/]*)/(.*)$"    => "/scripts/secure/$1.rb/$2",
+            "^/scripts/secure/([^\.\/]*)$"         => "/scripts/secure/$1.rb"  ,
+            "^/scripts/(?!secure)([^\.\/]*)/(.*)$" => "/scripts/$1.rb/$2" ,
+            "^/scripts/(?!secure)([^\.\/]*)$"      => "/scripts/$1.rb"   
+            )
+
+            auth.debug                 = 2
+            auth.backend               = "htpasswd"
+            auth.backend.htpasswd.userfile = "#{config.directory}/config/passwords"
+            auth.require = (
+            "/" =>
+            (
+            "method"  => "basic",
+            "realm"   => "lighty wiki",
+            "require" => "valid-user"
+            )
+            )
+
+
+            # Include standard mime types
+            include "mime.types.conf"
+      END_OF_TEMPLATE
 
       write_lighttpd_config(config,template)
     end

data/test/TestInstall.rb

@@ -125,8 +125,8 @@ class TestInstall <  Test::Unit::TestCase
     changed = files.updated_files
     really_changed = changed.reject {|name| name =~ /\.new$/  || name =~/\.rb$/ }
     assert_equal 0,really_changed.length,"Update should NOT change files but updated : #{really_changed.join(' and ')}"
-    assert !changed.find {|name| name =~ /CgiOptions\.rb$/ }
-    assert changed.find {|name| name =~ /CgiOptions\.rb\.new$/ }
+    assert !changed.find {|name| name =~ /CgiOptions\.rb$/ },"CgiOptions.rb should not be updated"
+    assert changed.find {|name| name =~ /CgiOptions\.rb\.new$/ },"A new CgiOptions should be created"
 
     assert_wiki_structure_exists(wiki_dir,'Wiki2Go')
   end
@@ -153,6 +153,8 @@ class TestInstall <  Test::Unit::TestCase
     assert(File.exists?(File.join(wiki_dir,'logs')))
     assert(File.exists?(File.join(wiki_dir,'texts',wiki_name)))
     assert(File.exists?(File.join(wiki_dir,'templates',wiki_name)))    
+    assert(File.exists?(File.join(wiki_dir,'site','scripts','CgiOptions.rb')))
+    assert(File.exists?(File.join(wiki_dir,'site','scripts','secure','CgiOptions.rb')))
   end
   
   def assert_exists(wiki_dir,*dirs)

data/test/testdata/logs/wiki.log

@@ -650,3 +650,7 @@ I, [2008-07-27 14:32:11#3304]  INFO -- : >> perform_view(Bugs,FrontPage) {}
 I, [2008-07-27 14:32:12#3304]  INFO -- : << perform_view 0.563 sec elapsed {}
 I, [2008-07-27 14:33:06#744]  INFO -- : >> perform_view(Bugs,FrontPage) {}
 I, [2008-07-27 14:33:06#744]  INFO -- : << perform_view 0.563 sec elapsed {}
+I, [2008-08-23 19:35:13#1908]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2008-08-23 19:35:14#1908]  INFO -- : << perform_view 0.578 sec elapsed {}
+I, [2008-08-23 21:30:08#756]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2008-08-23 21:30:08#756]  INFO -- : << perform_view 0.578 sec elapsed {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Wiki2Go
 version: !ruby/object:Gem::Version 
-  version: 1.22.0
+  version: 1.22.1
 platform: ruby
 authors: 
 - Pascal Van Cauwenberghe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 +02:00
+date: 2008-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -234,7 +234,7 @@ files:
 - test/UnitTestFiles.rb
 - test/Wiki2GoConfigForTest.rb
 has_rdoc: false
-homepage: http://wiki2go.rubyforge.org
+homepage: http://wiki2go.nayima.be
 post_install_message: 
 rdoc_options: []