Wiki2Go 1.15.1 → 1.16.0

data/bin/DebugWiki2GoServer.rb

@@ -0,0 +1,10 @@
+#!/usr/local/bin/ruby
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+
+require "Wiki2Go/Server"
+
+if $0 =~ /DebugWiki2GoServer\.rb/
+  server = Wiki2Go::Server.new(ARGV)
+  thread = server.start
+  thread.join
+end

data/bin/{Wiki2Go_make_repository.rb → Wiki2Go_make_cvs_repository.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require_gem "Wiki2Go"
+#require_gem "Wiki2Go"
 
 require 'fileutils'
 require 'Wiki2Go/Install/make_repository'

data/lib/Web2Go/WebrickRequest.rb

@@ -1,4 +1,4 @@
-require 'Webrick/httputils'
+require 'webrick/httputils'
 
 module Web2Go
 

data/lib/Web2Go/WebrickResponse.rb

@@ -1,5 +1,5 @@
-require 'Webrick/httputils'
-require 'Webrick/cookie'
+require 'webrick/httputils'
+require 'webrick/cookie'
 
 module Web2Go
 
@@ -34,7 +34,7 @@ module Web2Go
       cookie = WEBrick::Cookie.new(name,value)
       cookie.expires = expires unless expires.nil?
       cookie.domain  = domain unless domain.nil?
-      cookie.path    = path unless path.nil?
+      cookie.path    = path.nil? ? '/' : path
       set_cookie(cookie)
     end
 

data/lib/Wiki2Go/BlackList.rb

@@ -1,38 +1,42 @@
 
 module Wiki2Go
-  
+
   class BlackList
-    
+
     attr_reader :name
-    
+
     def initialize(name,items)
       @name   = name
+      @banned = []
       items = items.collect {|line| 
         line.strip!
         (line.empty? || line[0] == '#' ? nil : line)
       }
       @banned = items.compact
     end
-    
+
     def all
       return @banned
     end
-    
+
     def add(item)
+      if item =~ /(:\/\/[^\/:]+)/ then
+        item = $1
+      end
       item = escape_regex(item)
       @banned << item
       @banned = @banned.sort.uniq
     end
-    
+
     def length
       return @banned.length
     end
-    
+
     def contains(user)
       match = @banned.find { |ban| user =~ Regexp.new(ban,Regexp::IGNORECASE) }
       ! match.nil?
     end
-    
+
     def found_in(lines)
       lines = lines.join(' ') if lines.kind_of? Array
       @banned.each do | pattern |
@@ -41,12 +45,21 @@ module Wiki2Go
       end
       return false
     end
-    
+
     private
-    
+
     def escape_regex(item)
       item.gsub(/\./,'\.')
     end
+
+    def add_line(item)
+      if item =~ /(:\/\/[^\/:]+)/ then
+        item = $1
+      end
+      @banned << item
+      @banned = @banned.sort.uniq
+    end
+
   end
-  
+
 end

data/lib/Wiki2Go/DotGraphics.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 
 require 'English'
+require 'Wiki2Go/LineFormatter'
 
 module Wiki2Go
 
@@ -9,7 +10,7 @@ module Wiki2Go
 
   class DotGraphics
 
-    def initialize(path)
+    def initialize(path='')
       @path = path
     end
 
@@ -28,7 +29,7 @@ module Wiki2Go
     def save_if_necessary(config,web,content,force)
       image = content
       result = ''
-      if image =~ /^([^\s]*)\s/ then
+      if image =~ /^([^\s,]+)\s/ then
         filename = $1
         image = $POSTMATCH
         image = image.gsub('\n',' ').gsub('\r',' ')
@@ -46,12 +47,39 @@ module Wiki2Go
         config.log("Writing image file to #{fullname}")
         write(image,type,fullname)
       end
-      return "<img src=\"#{web.name}/graphics/#{filename}\" border=0 alt=\"#{filename}\">"
+      if image =~ /url\s*=\s*\"([^\"]+)"/i then
+        mapname = File.basename(filename,'.*')
+        maptype = 'cmapx'
+        image = rewrite_urls(config,web,image)
+        map = generate(image,maptype)
+        map = map.gsub(/id="[^"]*"/,"id=\"#{mapname}\"").gsub(/name="[^"]*"/,"name=\"#{mapname}\"")
+        return "<img src=\"#{web.name}/graphics/#{filename}\" border=0 alt=\"#{filename}\" usemap=\"##{mapname}\">" + $/ + map
+      else
+        return "<img src=\"#{web.name}/graphics/#{filename}\" border=0 alt=\"#{filename}\">"
+      end
     end
 
+    def rewrite_urls(config,web,image)
+      formatter = Wiki2Go::LineFormatter.new(web,config.storage,config,true,false)
+
+      image = image.gsub(/url\s*=\s*\"([^\"]+)"/i) { rewrite_url(config,web,formatter,$1) }
+      image
+    end
+
+    def rewrite_url(config,web,formatter,url)
+      if url =~ /:\/\// then
+        if config.redirect_url?(web,url) then
+          url = web.base_url + formatter.redirect_url(url)
+        end
+      else
+        url = formatter.absolute_url_of_topic(url)
+      end
+      "URL=\"#{url}\""
+    end
 
     def write(graph,format,output)
-      cmdline = "#{File.join(@path,'dot')} -T#{format} -o#{output}" 
+      command = @path.empty? ? 'dot' : File.join(@path,'dot')
+      cmdline = "#{command} -T#{format} -o#{output}" 
       IO.popen(cmdline,"w+") do |f|
         f.puts graph
         f.close_write
@@ -59,9 +87,21 @@ module Wiki2Go
       end
     end
 
+    def generate(graph,format)
+      command = @path.empty? ? 'dot' : File.join(@path,'dot')
+      cmdline = "#{command} -T#{format}"
+      result ="" 
+      IO.popen(cmdline,"w+") do |f|
+        f.puts graph
+        f.close_write
+        result = f.read
+      end
+      result
+    end
+
 
     def ensure_directory_exists(path)
-      dir,filename = File.split(path)
+      dir = File.dirname(path)
       FileUtils.makedirs(dir) unless File.directory?(dir)
     end
   end

data/lib/Wiki2Go/FileStorage.rb

@@ -38,8 +38,8 @@ module Wiki2Go
     end
 
     def save_page(subwiki,page)
-      path    = text_filename(subwiki,page.title,"txt")
-      logfile = text_filename(subwiki,page.title,"log")
+      path    = text_filename(subwiki,page.filename,"txt")
+      logfile = text_filename(subwiki,page.filename,"log")
       ensure_directory_exists(path)
       append_current_text_to_logfile(path,logfile,page.author)
       File.open(path,File::CREAT|File::TRUNC|File::RDWR) do |file|
@@ -58,6 +58,12 @@ module Wiki2Go
       end
     end
 
+    def delete_spam(subwiki,page)
+      text = text_filename(subwiki,page.filename,"txt")
+      spam_path = text_filename(subwiki,page.filename,"spam")
+      FileUtils::mv text,spam,:force => true
+    end
+
     def save_html(subwiki,page, content)
       path = File.join(@html,subwiki,page + ".html")
       ensure_directory_exists(path)

data/lib/Wiki2Go/GreyList.rb

@@ -1,74 +1,82 @@
 
 module Wiki2Go
-  
+
   class GreyList
-    
+
     class Suspect
       include Comparable
-      
+
       attr_reader :url 
       attr_reader :user
-      
+
       def initialize(user,url)
         @user = user
         @url  = url
       end
-      
+
       def to_s
         @user + ' ' + @url
       end
-      
+
       def hash
         self.to_s.hash
       end
-      
+
       def <=>(other)
         return false if other.nil?
         self.to_s <=> other.to_s
       end
-      
+
       def eql?(other)
         return false if other.nil?
         self.to_s == other.to_s
       end
-      
+
     end
-    
+
     attr_reader :name
-    
+
     def initialize(name,items)
       @name   = name
       items = items.collect {|line| 
         user, url = line.strip.split
-         (user.nil? || url.nil? ? nil : Suspect.new(user,url))
+        (user.nil? || url.nil? ? nil : Suspect.new(user,url))
       }
       @banned = items.compact
     end
-    
+
+    def suspects
+      return @banned
+    end
+
     def all
       return @banned.collect { |suspect| suspect.to_s }
     end
-    
+
     def add(user,url)
+      if url =~ /(:\/\/[^\/:]+)/ then
+        url = $1
+      end
+
       url = escape_regex(url)
       @banned << Suspect.new(user,url)
       @banned = @banned.sort.uniq
     end
-    
+
     def length
       return @banned.length
     end
-    
-    def contains_user(user)
+
+    def contains_user?(user)
       match = @banned.find { |ban| user =~ Regexp.new(ban.user,Regexp::IGNORECASE) }
       ! match.nil?
     end
 
-    def contains_url(url)
+    def contains_url?(url)
       match = @banned.find { |ban| url =~ Regexp.new(ban.url,Regexp::IGNORECASE) }
       ! match.nil?
     end
-    
+
     def url_found_in(lines)
       lines = lines.join(' ') if lines.kind_of? Array
       @banned.each do | pattern |
@@ -77,12 +85,20 @@ module Wiki2Go
       end
       return false
     end
-    
+
+    def remove(author,url)
+      if url =~ /(:\/\/[^\/:]+)/ then
+        url = $1
+      end
+      url = escape_regex(url)
+      @banned = @banned.reject { |suspect| suspect.user == author && suspect.url == url }
+    end
+
     private
-    
+
     def escape_regex(item)
       item.gsub(/\./,'\.')
     end
   end
-  
+
 end

data/lib/Wiki2Go/Install/make_repository.rb

@@ -2,9 +2,65 @@ require 'tmpdir'
 require 'fileutils'
 require 'optparse'
 require 'etc'
+require 'logger'
 
 require 'rubygems'
 require_gem 'rscm'
+require 'rscm/logging'
+require 'rscm/better'
+
+#Patch the RSCM 0.3 module
+
+module RSCM
+  class Better
+    def Better.use_logger(logger)
+      @@logger = logger
+    end
+  end
+
+  class Cvs
+    # The extra simulate parameter is not in accordance with the AbstractSCM API,
+    # but it's optional and is only being used from within this class (uptodate? method).
+    def checkout(to_identifier=nil, simulate=false)
+      checked_out_files = []
+      if(checked_out?)
+        path_regex = /^([U|P|C]) (.*)/
+        cvs(@checkout_dir, update_command(to_identifier), simulate) do |line|
+          if(line =~ path_regex)
+            event = $1
+            path = $2.chomp
+            yield event,path if block_given?
+            checked_out_files << path
+          end
+        end
+      else
+        prefix = File.basename(@checkout_dir)
+        path_regex = /^([U|P|C]) #{prefix}\/(.*)/
+        # This is a workaround for the fact that -d . doesn't work - must be an existing sub folder.
+        mkdir_p(@checkout_dir) unless File.exist?(@checkout_dir)
+        target_dir = File.basename(@checkout_dir)
+        run_checkout_command_dir = File.dirname(@checkout_dir)
+        # -D is sticky, but subsequent updates will reset stickiness with -A
+        cvs(run_checkout_command_dir, checkout_command(target_dir, to_identifier), simulate) do |line|
+          if(line =~ path_regex)
+            event = $1
+            path = $2.chomp
+            yield event,path if block_given?
+            checked_out_files << path
+          end
+        end
+      end
+      checked_out_files
+    end
+    
+#    def command_line(cmd, password=nil, simulate=false)
+#      cvs_options = simulate ? "-n" : ""
+#      dev_null = WIN32 ? "nul" : "/dev/null"
+#      "cvs -f \"-d#{root_with_password(password)}\" #{cvs_options} -q #{cmd} 2> c:\\temp\\out.log"
+#    end
+
+  end
+end
 
 module Wiki2Go
   class RepositoryMaker
@@ -12,64 +68,299 @@ module Wiki2Go
     def RepositoryMaker.create(args)
       opts = OptionParser.new
 
-      directory = ''
-      user      = ''
-      group     = ''
-      opts.on("-d",'--directory dir',String) { |val| directory = File.expand_path(val) }
+      directory  = ''
+      user       = ''
+      group      = ''
+      modulename = ''
+      opts.on("-d",'--directory dir',String) { |val| directory = expand_cvsroot(val) }
       opts.on("-u",'--user username',String) { |val| user = val }
       opts.on("-g",'--group groupname',String) { |val| group = val }
+      opts.on("-m",'--module name ',String) { |val| modulename = val }
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts
         exit
       end
       opts.parse(args)
 
-      puts "Directory = #{directory}"
       if directory.empty? then
         puts opts
       else
         puts "Creating CVS in directory #{directory}"
+        oldmask = File.umask(02)
         cvs = RepositoryMaker.new(directory)
         cvs.make_empty_repository(user,group)
-        cvs.update_configuration
+        cvs.add_module(modulename,user,group)
+        File.umask(oldmask)
+      end
+    end
+
+    def RepositoryMaker.addwiki(args)
+      opts = OptionParser.new
+
+      directory = ''
+      wikidir   = ''
+      modulename = ''
+      comment    = 'Store wiki'
+      opts.on("-d",'--directory dir',String) { |val| directory = expand_cvsroot(val) }
+      opts.on("-w",'--wikidirectory dir',String) { |val| wikidir = File.expand_path(val) }
+      opts.on("-m",'--module name',String) { |val| modulename = val }
+      opts.on("-c",'--comment string',String) { |val| comment = val }
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+      opts.parse(args)
+
+      if directory.empty? || wikidir.empty? || modulename.empty? then
+        puts opts
+        return []
+      else
+        puts "Adding wiki #{wikidir} as module '#{modulename}' in CVS #{directory}"
+        oldmask = File.umask(02)
+        cvs = RepositoryMaker.new(directory)
+        added = cvs.add_wiki(wikidir,modulename,comment)
+        File.umask(oldmask)
+        return added
+      end
+    end
+
+    def RepositoryMaker.updatewiki(args)
+      opts = OptionParser.new
+
+      wikidir   = ''
+      directory = ''
+      modulename = ''
+      opts.on("-d",'--directory dir',String) { |val| directory = expand_cvsroot(val) }
+      opts.on("-w",'--wikidirectory dir',String) { |val| wikidir = File.expand_path(val) }
+      opts.on("-m",'--module name ',String) { |val| modulename = val }
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+      opts.parse(args)
+
+      if wikidir.empty? then
+        puts opts
+      else
+        puts "Updating wiki #{wikidir}"
+        oldmask = File.umask(02)
+        cvs = RepositoryMaker.new(directory)
+        cvs.update(wikidir,modulename)
+        File.umask(oldmask)
       end
     end
 
-    def initialize(dir)
+    def initialize(dir,logger=nil)
       @dir = dir
-      @repository = RSCM::Cvs.new(@dir)
+      @logger = logger || Logger.new(STDERR)
+      RSCM::Better.use_logger @logger
     end
 
     def make_empty_repository(user,group)
-      FileUtils::mkdir_p @dir
-      FileUtils::chmod   02775,@dir
+      if !File.exists?(File.join(@dir,'CVSROOT')) then
+        repository = RSCM::Cvs.new(@dir)
+        FileUtils::mkdir_p @dir
 
-      lockdir = File.join(@dir,'locks')
-      FileUtils::mkdir_p lockdir
-      FileUtils::chmod   02775,lockdir
+        repository.create_central
 
-      @repository.create
-      set_owner(@dir,user,group)
+        lockdir = File.join(@dir,'locks')
+        FileUtils::mkdir_p lockdir
+
+        set_owner(@dir,user,group)
+      end
+      update_configuration
+
+    end
+
+    def add_module(modulename,user,group)
+      if !modulename.nil? && !modulename.empty? then
+        moduledir = File.join(@dir,modulename)
+        FileUtils::mkdir_p moduledir
+        set_owner(moduledir,user,group)
+      end
 
     end
 
+    def update(wikidir,modulename)
+      repository = RSCM::Cvs.new(@dir,modulename)
+      repository.checkout_dir = wikidir
+      updated = []
+      clashed = []
+      begin
+        repository.checkout do |event,path|
+          updated << path if event == 'U' || event == 'P'
+          clashed << path if event == 'C'
+        end
+      rescue Exception => e
+        clashed = [ e.to_s ]
+      end
+      return updated,clashed
+    end
+
+    def add_wiki(wikidir,modulename,comment='No Comment')
+      repository = RSCM::Cvs.new(@dir,modulename)
+      repository.checkout_dir = wikidir
+      repository.checkout unless repository.checked_out?
+
+      output = []
+      added_files = []
+
+      added_files += add_contents_of(modulename,wikidir,'texts') { |dir,name|
+        checkin = ((name =~ /^\./) ? false : true)
+        # output << "Add #{name.inspect} in #{dir} ? => #{checkin}"
+        checkin 
+      }
+      added_files += add_contents_of(modulename,wikidir,'templates') { |dir,name|
+        checkin = ((name =~ /^\./) ? false : true) 
+        # output << "Add #{name} in #{dir} ? => #{checkin}"
+        checkin 
+      }
+      added_files += add_contents_of(modulename,File.join(wikidir,'site'),'html') { |dir,name|
+        checkin = ((name == 'rss.xml' || (name =~ /^\./)) ? false : true)
+        output << "Add #{name} in #{dir} ? => #{checkin}"
+        checkin 
+      }
+
+      sitedir = File.join(wikidir,'site')
+      if File.exists?(sitedir) then
+        add_directory modulename,wikidir,'site' 
+        scriptdir = File.join(sitedir,'scripts')
+        if File.exists?(scriptdir) then
+          add_directory modulename,sitedir,'scripts'
+          added_files += add_files modulename,scriptdir,[ 'CgiOptions.rb']
+        end
+      end
+
+      added_files += add_contents_of(modulename,wikidir,'config') { |dir,name|
+        checkin = ((name == 'chonqed_blacklist.txt' || (name =~ /^\./)) ? false : true)
+        # output << "Add #{name} in #{dir} ? => #{checkin}"
+        checkin 
+      }
+      begin
+        repository.commit comment do |line|
+          output << line
+        end
+      rescue Exception => e
+        output << e.to_s
+      end
+      output
+    end
+
+    def is_local?(wikidir,modulename)
+      repository = RSCM::Cvs.new(@dir,modulename)
+      repository.checkout_dir = wikidir
+      repository.can_create_central?      
+    end
+
+    private
+
+    def files_checked_in(dir)
+      files = []
+      entries = File.join(dir,'CVS','Entries')
+      pattern = Regexp.new("^/([^\/]+)/")
+      if File.exists?(entries) then
+        File.open(entries,File::RDONLY) do |f|
+          lines = f.readlines
+          lines.each do |line|
+            if line =~ pattern
+              files << $1
+            end
+          end
+        end
+      end
+      files
+    end
+
+    def not_checked_in(dir,filenames)
+      checked_in = files_checked_in(dir) 
+      new_files = filenames - checked_in
+      new_files 
+    end
+
+
+    def add_directory(modulename,dir,subdir)
+      repository = RSCM::Cvs.new(@dir,modulename)
+      repository.checkout_dir = dir
+
+      repository.add subdir unless dir_in_repository?(File.join(dir,subdir))
+    end
+
+    def add_files(modulename,dir,files)
+      added = []
+      if files.length > 0 then
+        files = not_checked_in(dir,files)
+        if files.length > 0 then
+          repository = RSCM::Cvs.new(@dir,modulename)
+          repository.checkout_dir = dir
+          repository.add files.join(' ')
+          added = files
+        end
+      end
+      return added
+    end
+    
+    def dir_in_repository?(dir)
+      repository = RSCM::Cvs.new
+      repository.checkout_dir = dir
+      result = repository.checked_out?
+      result
+    end
+
+    def add_contents_of(modulename,dir,subdir,&proc)
+      return [] if !File.exists?(dir)
+
+      cvs = RSCM::Cvs.new(@dir,modulename)
+      cvs.checkout_dir = dir
+
+      added = []
+
+      current_dir = File.join(dir,subdir)
+      if File.exists?(current_dir) then
+        do_add = (block_given? ? yield(dir,subdir) : true)
+        if do_add then
+          add_directory(modulename,dir,subdir)
+          added << subdir
+        end
+        names = []
+        Dir.entries(current_dir).each do |name|
+          if name != '.' && name != '..' && name != 'CVS' then
+            if File.directory?(File.join(current_dir,name)) then
+              added += add_contents_of(modulename,current_dir,name,&proc)
+            else
+              do_add = (block_given? ? yield(current_dir,name) : true)
+              if do_add then
+                names << name
+              end   
+            end
+          end
+        end
+        if names.length > 0 then
+          added += add_files(modulename,current_dir,names)
+        end
+      end
+      added
+    end
+
     def update_configuration
       checkout_to = File.join(Dir.tmpdir,'cvs_config')
       FileUtils::rm_r checkout_to if File.exists?(checkout_to)
       cvsroot = RSCM::Cvs.new(@dir,'CVSROOT')
-      cvsroot.checkout(checkout_to)
+      cvsroot.checkout_dir = checkout_to 
+      cvsroot.checkout
 
       update_cvswrappers(checkout_to)
       update_config(checkout_to)
 
-      cvsroot.commit(checkout_to,'update cvswrappers for binary files')
+      cvsroot.commit('update cvswrappers for binary files')
       FileUtils::rm_r(checkout_to)
     end
 
-    private
+    def self.expand_cvsroot(path)
+      path.include?(':') ? path : File.expand_path(path)
+    end
 
     def update_cvswrappers(dir)
-      File.open(File.join(dir,'cvswrappers'),File::APPEND|File::WRONLY) do |file|
+      File.open(File.join(dir,'cvswrappers'),File::CREAT|File::WRONLY) do |file|
         file.write cvswrappers_content
       end
     end
@@ -106,6 +397,25 @@ module Wiki2Go
 
     def cvswrappers_content
       return <<-END_CVS_WRAPPERS
+# This file affects handling of files based on their names.
+#
+# The -m option specifies whether CVS attempts to merge files.
+#
+# The -k option specifies keyword expansion (e.g. -kb for binary).
+#
+# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
+#
+#  wildcard     [option value][option value]...
+#
+#  where option is one of
+#  -f           from cvs filter         value: path to filter
+#  -t           to cvs filter           value: path to filter
+#  -m           update methodology      value: MERGE or COPY
+#  -k           expansion mode          value: b, o, kkv, &c
+#
+#  and value is a single-quote delimited value.
+# For example:
+#*.gif -k 'b'
 *.gif -k 'b'
 *.jpg -k 'b'
 *.jpeg -k 'b'
@@ -113,28 +423,33 @@ module Wiki2Go
 
 *.doc -k 'b'
 *.pdf -k 'b'
+*.xls -k 'b'
+*.ppt -k 'b'
 END_CVS_WRAPPERS
     end
 
-    def set_owner(dir,username,groupname)
-      info = Etc.getpwnam(username)
-      if !info.nil? then
-        user_id = info.uid
-        group_id = info.gid
-        if !groupname.nil? then
-          group_id = Etc.getgrnam(groupname).gid
-        end
-        File.chown(user_id,group_id,dir)
-        Dir.glob(File.join(dir,'**/*')).each do |file|
-          if file[0] != '.' then
-            mode = File.stat(file).mode | 0020
-            File.chmod(mode,file)
-            File.chown(user_id,group_id,file)
-          end
+  def set_owner(dir,username,groupname)
+    info = Etc.getpwnam(username)
+    if !info.nil? then
+      user_id = info.uid
+      group_id = info.gid
+      if !groupname.nil? then
+        group_id = Etc.getgrnam(groupname).gid
+      end
+      mode = File.stat(dir).mode | 02775
+      File.chmod(mode,dir)
+      File.chown(user_id,group_id,dir)
+      Dir.glob(File.join(dir,'**/*')).each do |file|
+        if file[0] != '.' then
+          mode = File.stat(file).mode | 02775
+          File.chmod(mode,file)
+          File.chown(user_id,group_id,file)
         end
       end
     end
-
   end
 
-end
+end
+
+end
+