Wiki2Go 1.16.0 → 1.16.1

data/lib/Wiki2Go/Install/make_repository.rb

@@ -3,19 +3,36 @@ require 'fileutils'
 require 'optparse'
 require 'etc'
 require 'logger'
+require 'tempfile'
 
 require 'rubygems'
-require_gem 'rscm'
+require_gem 'rscm','~>0.3.0'
 require 'rscm/logging'
 require 'rscm/better'
 
-#Patch the RSCM 0.3 module
-
 module RSCM
   class Better
     def Better.use_logger(logger)
       @@logger = logger
     end
+
+    def self.popen(cmd, mode="r", expected_exit=0, &proc)
+      @@logger.info "Executing command in '#{Dir.getwd}': '#{cmd}'" if @@logger
+      out = Tempfile.new('cvsout')
+      out.close
+      ret = IO.popen(cmd + " 2>> #{out.path}", mode) do |io|
+        proc.call(io)
+      end
+      log = IO::readlines(out.path).join($/).strip
+      if !log.nil? && log.length > 0 then
+        @@logger.warn(log) if @@logger
+      end
+      out.close!
+      exit_code = $? >> 8
+      raise "Command\n'#{cmd}'\nfailed with code #{exit_code} in\n#{Dir.pwd}\nExpected exit code: #{expected_exit}" if exit_code != expected_exit
+      ret
+    end
+
   end
 
   class Cvs
@@ -37,7 +54,7 @@ module RSCM
         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)
+        FileUtils::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
@@ -52,16 +69,17 @@ module RSCM
       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
 
+    def command_line(cmd, password=nil, simulate=false)
+      cvs_options = simulate ? "-n" : ""
+      dev_null = WIN32 ? "nul" : "/dev/null"
+      cmd = "cvs -f \"-d#{root_with_password(password)}\" #{cvs_options} -q #{cmd}"
+      cmd
+    end
   end
 end
 
+
 module Wiki2Go
   class RepositoryMaker
 
@@ -215,11 +233,6 @@ module Wiki2Go
         # 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
@@ -231,6 +244,14 @@ module Wiki2Go
         end
       end
 
+      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 
+      }
+
+
+
       added_files += add_contents_of(modulename,wikidir,'config') { |dir,name|
         checkin = ((name == 'chonqed_blacklist.txt' || (name =~ /^\./)) ? false : true)
         # output << "Add #{name} in #{dir} ? => #{checkin}"
@@ -298,7 +319,7 @@ module Wiki2Go
       end
       return added
     end
-    
+
     def dir_in_repository?(dir)
       repository = RSCM::Cvs.new
       repository.checkout_dir = dir
@@ -308,6 +329,7 @@ module Wiki2Go
 
     def add_contents_of(modulename,dir,subdir,&proc)
       return [] if !File.exists?(dir)
+      @logger.debug("add_contents of dir '#{dir}', subdir '#{subdir}'")
 
       cvs = RSCM::Cvs.new(@dir,modulename)
       cvs.checkout_dir = dir

data/test/TestRepositoryMaker.rb

@@ -3,6 +3,7 @@
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 
 require 'Wiki2Go/Install/make_repository.rb'
+require 'Wiki2Go/Install/make_site.rb'
 
 require 'test/unit'
 require 'fileutils'
@@ -79,12 +80,25 @@ class TestRepositoryMaker < Test::Unit::TestCase
     assert_equal 0,clashed.length
     puts maker.add_wiki(site,'test','Commit update')
 
-    
-   updated,clashed =  maker.update(site2,'test')
+
+    updated,clashed =  maker.update(site2,'test')
     assert_equal 0,updated.length
     assert_equal 1,clashed.length
-#    puts maker.add_wiki(site2,'test','Commit second update')
-        
+    #    puts maker.add_wiki(site2,'test','Commit second update')
+
+  end
+
+  def test_initial_commit_of_site
+    wiki_dir = work_directory('public_cvs_site')
+    args = ['-s', 'wiki2go.nayima.be' , '-w' , 'Wiki2Go' , '-t' , 'public', '-d' , wiki_dir]
+    Wiki2Go::Install.make_site(args)
+
+    repository = work_directory('repository3')
+    maker = Wiki2Go::RepositoryMaker.new(repository)
+    maker.make_empty_repository ENV['USER'],ENV['USER']
+    maker.add_module('test_commit_wiki',ENV['USER'],ENV['USER'])
+
+    maker.add_wiki(wiki_dir,'test_commit_wiki','No Comment')
   end
 
   private 

metadata

@@ -3,15 +3,17 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: Wiki2Go
 version: !ruby/object:Gem::Version 
-  version: 1.16.0
-date: 2005-09-03 00:00:00 +02:00
+  version: 1.16.1
+date: 2005-09-04 00:00:00 +02:00
 summary: Wiki2Go is a Ruby Wiki
 require_paths: 
   - lib
 email: pvc@nayima.be
 homepage: http://wiki2go.rubyforge.org
 rubyforge_project: wiki2go
-description: Wiki2Go is a Ruby Wiki
+description: "Wiki2Go is a Ruby Wiki with the usual features plus anti-wikispam tools, graph
+  drawing and ruby code formatting extensions and can optionally be backed by a
+  CVS repository"
 autorequire: Wiki2Go
 default_executable: 
 bindir: bin