sandweb-commit — CVS activity

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.1,1.2

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv10615/tools

Modified Files:
	install_script.pl 
Log Message:
* installation now saves configuration after completion, so user changed
  values are kept.


Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- install_script.pl	25 Mar 2002 08:12:39 -0000	1.1
+++ install_script.pl	25 Mar 2002 23:26:05 -0000	1.2
@@ -9,5 +9,6 @@
 
 use Data::Dumper;
-print "\ncgidir   = $config::cgidir\n".
+print "\ncfgdir   = $config::cfgdir\n".
+      "cgidir   = $config::cgidir\n".
       "tmpldir  = $config::tmpldir\n".
       "cachedir = $config::cachedir\n".
@@ -15,8 +16,9 @@
 
 #print Dumper($config::cgidir, $config::tmpldir, $config::cachedir, $config::httpuser);
-my $cgidir   = $config::cgidir;#   || '/var/www/cgi-bin';
-my $tmpldir  = $config::tmpldir;#  || "$PREFIX/lib/sandweb/templates";
-my $cachedir = $config::cachedir;# || '/var/cache/sandweb';
-my $httpuser = $config::httpuser;# || 'httpd';
+my $cfgdir   = $config::cfgdir   || '/usr/local/etc';
+my $cgidir   = $config::cgidir   || '/var/www/cgi-bin';
+my $tmpldir  = $config::tmpldir  || "$PREFIX/lib/sandweb/templates";
+my $cachedir = $config::cachedir || '/var/cache/sandweb';
+my $httpuser = $config::httpuser || 'httpd';
 
 # load functions
@@ -41,2 +43,16 @@
 
 
+# save install config to install.cfg for future reference.
+print "Saving configuration...\n";
+open(CFG, ">install.cfg") or die "Unable to re-write config : $!\n";
+print CFG "# Installation configureation variables.\n";
+print CFG "package config;\n\n";
+print CFG '$cfgdir = ' . "'$cfgdir';\n";	
+print CFG '$cgidir = ' . "'$cgidir';\n";	
+print CFG '$tmpldir = ' . "'$tmpldir';\n";	
+print CFG '$cachedir = ' . "'$cachedir';\n";	
+print CFG '$httpuser = ' . "'$httpuser';\n";	
+print CFG "\n1;\n";
+close CFG;
+
+print "Installation complete!\n";

[Sandweb-commit] CVS: sandweb install.cfg,1.2,1.3

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv7633

Modified Files:
	install.cfg 
Log Message:
* added comment


Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- install.cfg	25 Mar 2002 08:13:36 -0000	1.2
+++ install.cfg	25 Mar 2002 23:15:25 -0000	1.3
@@ -1,2 +1,3 @@
+# Installation configuration variables.
 package config;
 

[Sandweb-commit] CVS: sandweb/tools instcachedir.pl,1.3,1.4

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv7137

Modified Files:
	instcachedir.pl 
Log Message:
* chown $httpuser:0 instead of $httpuser:root (some systems use different
  group name for UID 0 (FreeBSD uses 'wheel').


Index: instcachedir.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/instcachedir.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- instcachedir.pl	25 Mar 2002 08:12:39 -0000	1.3
+++ instcachedir.pl	25 Mar 2002 23:14:19 -0000	1.4
@@ -37,15 +37,15 @@
 	print("Creating SandWeb cache dir '$cachedir'...\n");
 	if (system('tools/mkdirto.pl', '755', $httpuser . 
-                   ':root', "$cachedir")) {
+                   ':0', "$cachedir")) {
 		return(0);
 	}
 	print("Creating SandWeb cache/data dir '$cachedir/data'...\n");
 	if (system('tools/mkdirto.pl', '755', $httpuser . 
-                   ':root', "$cachedir/data")) {
+                   ':0', "$cachedir/data")) {
 		return(0);
 	}
 	print("Creating SandWeb cache/users dir '$cachedir/users'...\n");
 	if (system('tools/mkdirto.pl', '755', $httpuser . 
-                   ':root', "$cachedir/users")) {
+                   ':0', "$cachedir/users")) {
 		return(0);
 	}

[Sandweb-commit] CVS: sandweb Makefile.PL,1.8,1.9 install.cfg,1.1,1.2

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv8632

Modified Files:
	Makefile.PL install.cfg 
Log Message:
* Updated Makefile.PL to call './tools/install_config.pl' instead of all
  the single scripts.
* Updated install.cfg


Index: Makefile.PL
===================================================================
RCS file: /cvsroot/sandweb/sandweb/Makefile.PL,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- Makefile.PL	22 Mar 2002 04:39:48 -0000	1.8
+++ Makefile.PL	25 Mar 2002 08:13:35 -0000	1.9
@@ -30,7 +30,5 @@
 '
 custom_install:
-	./tools/instcgi.pl
-	./tools/insttemplates.pl $(PREFIX)
-	./tools/instcachedir.pl
+	./tools/install_script.pl $(PREFIX)
 ';
 }

Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- install.cfg	24 Mar 2002 07:11:59 -0000	1.1
+++ install.cfg	25 Mar 2002 08:13:36 -0000	1.2
@@ -1,11 +1,9 @@
 package config;
 
-
 $cfgdir = '/usr/local/etc';
 $cgidir = '/var/www/cgi-bin';
-$tmpldir = 'lib/sandweb/templates';
-$cachedir = '/var/cache/sandweb';
+$tmpldir = '/usr/local/lib/sandweb/templates';
+$cachedir = '/usr/local/share/sandweb';
 $httpuser = 'www-data';
-
 
 

[Sandweb-commit] CVS: sandweb/tools install_script.pl,NONE,1.1 instcachedir.pl,1.2,1.3 instcgi.pl,1.2,1.3 insttemplates.pl,1.2,1.3

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv8488/tools

Modified Files:
	instcachedir.pl instcgi.pl insttemplates.pl 
Added Files:
	install_script.pl 
Log Message:
* converted inst*.pl's to functions which are included in the "mother"
  perl script (install_config.pl)


--- NEW FILE ---
#!/usr/bin/perl -w

use strict;
exit 1 if (!$ARGV[0]);
my $PREFIX = $ARGV[0];

print("loading install config... ");
require 'install.cfg'; # load config

use Data::Dumper;
print "\ncgidir   = $config::cgidir\n".
      "tmpldir  = $config::tmpldir\n".
      "cachedir = $config::cachedir\n".
      "httpuser = $config::httpuser\n";

#print Dumper($config::cgidir, $config::tmpldir, $config::cachedir, $config::httpuser);
my $cgidir   = $config::cgidir;#   || '/var/www/cgi-bin';
my $tmpldir  = $config::tmpldir;#  || "$PREFIX/lib/sandweb/templates";
my $cachedir = $config::cachedir;# || '/var/cache/sandweb';
my $httpuser = $config::httpuser;# || 'httpd';

# load functions
require 'tools/instcgi.pl';
require 'tools/insttemplates.pl';
require 'tools/instcachedir.pl';

# CGI
$cgidir = instcgi($cgidir);
exit(2) if (!$cgidir);

# Templates
$tmpldir = insttemplates($tmpldir);
exit(3) if (!$tmpldir);

# Cache directory
my @return = instcachedir($cachedir, $httpuser);
if (@return) {
	($cachedir, $httpuser) = @return;
} else { exit(4); }




Index: instcachedir.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/instcachedir.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- instcachedir.pl	22 Mar 2002 05:06:52 -0000	1.2
+++ instcachedir.pl	25 Mar 2002 08:12:39 -0000	1.3
@@ -4,24 +4,14 @@
 #
 
-use strict;
-require 'install-config';
+sub instcachedir($$) {
+	return(0) if ((!$_[0]) && (!$_[1]));
+	my ($cachedir, $httpuser) = @_;
+	my $verified = 0;
 
-my $cachedir;
-
-if (!$config::cachedir) {
-	$cachedir = "/var/cache/sandweb";
-} else {
-	$cachedir = "$config::cachedir";
-}
-
-my $verified = 0;
-my $httpuser = 'httpd';
-if ($config::httpuser) {
-	$httpuser = $config::httpuser;
 	# try to find http user in passwd file
 	open(PWD, "</etc/passwd");
 	my @output = <PWD>;
 	close PWD;
-
+	
 	foreach my $line (@output) {
 		if ($line =~ /^$httpuser\:/) {
@@ -29,34 +19,36 @@
 		}
 	}
-}
+		
+	if (!$verified) {
+		# confirm
+		print("-----------------------------\n");
+		print("Discovering Webserver user...\n");
+		print("The user '$httpuser' does not seem to exist, the webserver must\n");
+		print("have read/write access to the '$cachedir' directory. Please\n");
+		print("enter the username the webserver runs as (some common users are:\n");
+		print("httpd, apache, www-data, or even root). [default: $httpuser]: ");
+		my $tmp = '';
+		chomp($tmp = <STDIN>);
+		if ($tmp) {
+			$httpuser = $tmp;
+		}
+	}
 	
-
-if (!$verified) {
-	# confirm
-	print("-----------------------------\n");
-	print("Discovering Webserver user...\n");
-	print("The user '$httpuser' does not seem to exist, the webserver must\n");
-	print("have read/write access to the '$cachedir' directory. Please\n");
-	print("enter the username the webserver runs as (some common users are:\n");
-	print("httpd, apache, www-data, or even root). [default: $httpuser]: ");
-	my $tmp = '';
-	chomp($tmp = <STDIN>);
-	if ($tmp) {
-		$httpuser = $tmp;
+	print("Creating SandWeb cache dir '$cachedir'...\n");
+	if (system('tools/mkdirto.pl', '755', $httpuser . 
+                   ':root', "$cachedir")) {
+		return(0);
 	}
+	print("Creating SandWeb cache/data dir '$cachedir/data'...\n");
+	if (system('tools/mkdirto.pl', '755', $httpuser . 
+                   ':root', "$cachedir/data")) {
+		return(0);
+	}
+	print("Creating SandWeb cache/users dir '$cachedir/users'...\n");
+	if (system('tools/mkdirto.pl', '755', $httpuser . 
+                   ':root', "$cachedir/users")) {
+		return(0);
+	}
+	return($cachedir, $httpuser);
 }
-
-print("Creating SandWeb cache dir '$cachedir'...\n");
-if (system('tools/mkdirto.pl', '755', $httpuser . ':root', "$cachedir")) {
-	exit(1);
-}
-print("Creating SandWeb cache/data dir '$cachedir/data'...\n");
-if (system('tools/mkdirto.pl', '755', $httpuser . ':root', "$cachedir/data")) {
-	exit(1);
-}
-print("Creating SandWeb cache/users dir '$cachedir/users'...\n");
-if (system('tools/mkdirto.pl', '755', $httpuser . ':root', "$cachedir/users")) {
-	exit(1);
-}
-exit(0);
-
+1;

Index: instcgi.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/instcgi.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- instcgi.pl	16 Mar 2002 01:55:05 -0000	1.2
+++ instcgi.pl	25 Mar 2002 08:12:39 -0000	1.3
@@ -4,38 +4,40 @@
 #
 
-use strict;
+sub instcgi($) {
+	return(0) if (!$_[0]);
+	my $cgidir = $_[0];
+
+	print("-------------------------\n");
+	print("Installing sandweb.cgi...\n\n");
+	print("Specify the location you wish to install the CGI script.\n");
+	print("This is commonly in your webservers 'cgi-bin' directory.\n");
+	print("Enter the full path [default: $cgidir] : ");
 
-my $cgidir = '/var/www/cgi-bin';
-
-print("-------------------------\n");
-print("Installing sandweb.cgi...\n\n");
-print("Specify the location you wish to install the CGI script.\n");
-print("This is commonly in your webservers 'cgi-bin' directory.\n");
-print("Enter the full path [default: $cgidir] : ");
-
-my $tmp = '';
-chomp($tmp = <STDIN>);
-if ($tmp) {
-	$cgidir = $tmp;
-}
-
-print("Installing sandweb.cgi into $cgidir... ");
-my $create = 1;
-if (!-d $cgidir) {
-	$tmp = 'y';
-	print("That directory does not exist, do you wish to create it?(Y/n): ");
+	my $tmp = '';
 	chomp($tmp = <STDIN>);
-	if (($tmp eq 'n') || ($tmp eq 'N')) {
-		# exiting
-		exit(1);
+	if ($tmp) {
+		$cgidir = $tmp;
 	}
-	system('tools/mkdirto.pl', 755, $cgidir);
-}
 
-if (system('cp', 'bin/sandweb.cgi', "$cgidir/sandweb.cgi")) {
-	exit(1);
-} else {
-	print("done.\n");
-	exit(0);
+	print("Installing sandweb.cgi into $cgidir... ");
+	my $create = 1;
+	if (!-d $cgidir) {
+		$tmp = 'y';
+		print("That directory does not exist, do you wish to create it?(Y/n): ");
+		chomp($tmp = <STDIN>);
+		if (($tmp eq 'n') || ($tmp eq 'N')) {
+			# exiting
+			return(0);
+		}
+		system('tools/mkdirto.pl', 755, $cgidir);
+	}
+	
+	if (system('cp', 'bin/sandweb.cgi', "$cgidir/sandweb.cgi")) {
+		return(0);
+	} else {
+		print("done.\n");
+		return($cgidir);
+	}
 }
 
+1;

Index: insttemplates.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/insttemplates.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- insttemplates.pl	16 Mar 2002 06:08:33 -0000	1.2
+++ insttemplates.pl	25 Mar 2002 08:12:39 -0000	1.3
@@ -4,48 +4,41 @@
 #
 
-use strict;
-require 'install-config';
-
-my $prefix = $ARGV[0] || '/usr/local';
-my $tmpldir;
-
-if (!$config::tmpldir) {
-	$tmpldir = "$prefix/lib/sandweb/templates";
-} else {
-	$tmpldir = "$prefix/$config::tmpldir";
-}
-
-if (!$tmpldir) {
-	print("-------------------------------\n");
-	print("Installing SandWeb templates...\n\n");
-	print("Specify the location you wish to install the SandWeb templates.\n");
-	print("Enter the full path [default: $tmpldir] : ");
-
-	my $tmp = '';
-	chomp($tmp = <STDIN>);
-	if ($tmp) {
-		$tmpldir = $tmp;
+sub insttemplates($) {
+	return(0) if (!$_[0]);
+	my $tmpldir = $_[0];
+
+	if (!$tmpldir) {
+		print("-------------------------------\n");
+		print("Installing SandWeb templates...\n\n");
+		print("Specify the location you wish to install the SandWeb templates.\n");
+		print("Enter the full path [default: $tmpldir] : ");
+	
+		my $tmp = '';
+		chomp($tmp = <STDIN>);
+		if ($tmp) {
+			$tmpldir = $tmp;
+		}
 	}
-}
-
-if (system('tools/mkdirto.pl', '755', "$tmpldir")) {
-	exit(1);
-}
-
-print("Installing SandWeb templates into $tmpldir... ");
-
-opendir(DIR, "templates/");
-my @files = readdir(DIR);
-closedir(DIR);
-
-foreach my $filename (@files) {
-	next if (($filename !~ /\.html$/) && ($filename !~ /\.js$/));
-	if (system('cp', "templates/$filename", "$tmpldir/")) {
-		print("working directory: ", `pwd`);
-		exit(1);
+	
+	if (system('tools/mkdirto.pl', '755', "$tmpldir")) {
+		return(0);
 	}
-}
-
-print("done.\n");
-exit(0);
-
+	
+	print("Installing SandWeb templates into $tmpldir... ");
+	
+	opendir(DIR, "templates/");
+	my @files = readdir(DIR);
+	closedir(DIR);
+	
+	foreach my $filename (@files) {
+		next if (($filename !~ /\.html$/) && ($filename !~ /\.js$/));
+		if (system('cp', "templates/$filename", "$tmpldir/")) {
+			print("working directory: ", `pwd`);
+			return(0);
+		}
+	}
+	
+	print("done.\n");
+	return($tmpldir);
+}	
+1;

[Sandweb-commit] CVS: sandweb/t/repository/CVSROOT history,1.2,NONE

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t/repository/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv13230/t/repository/CVSROOT

Removed Files:
	history 
Log Message:
* this shouldn't be checked in


--- history DELETED ---

[Sandweb-commit] CVS: sandweb/t repository.t,1.4,1.5

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv13045/t

Modified Files:
	repository.t 
Log Message:
* repository test now cleans up after itself.

  it actually checks to see if the files it's going to remove
  exist before trying to remove them ( and thus causing a false
  test failure ).

  one example of where this is useful is the "history" file in
  the t/repository, we obviously do not want to keep this, but
  it may or may not exist depending on which tests we run in the
  future.


Index: repository.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/repository.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- repository.t	23 Mar 2002 20:51:24 -0000	1.4
+++ repository.t	24 Mar 2002 09:21:27 -0000	1.5
@@ -1,5 +1,5 @@
 use Test;
 use Cwd;
-BEGIN { plan tests => 11, todo => [0] }
+BEGIN { plan tests => 17, todo => [0] }
 
 # test 1
@@ -73,2 +73,58 @@
 );
 ok( $test{'errorlevel'} );
+
+# cleanup section
+
+# test 12
+
+my $file = "t/sandbox/CVS/Entries";
+if ( -f "$file") {
+	ok( unlink("$file") );
+} else {
+	ok(1);
+}
+
+# test 13
+
+$file = "t/sandbox/CVS/Repository";
+if ( -f "$file") {
+	ok( unlink("$file") );
+} else {
+	ok(1);
+}
+
+# test 14
+
+$file = "t/sandbox/CVS/Root";
+if ( -f "$file") {
+	ok( unlink("$file") );
+} else {
+	ok(1);
+}
+
+# test 15
+
+$file = "t/sandbox/CVS";
+if ( -d "$file") {
+	ok( rmdir("$file") );
+} else {
+	ok(1);
+}
+
+# test 16
+
+$file = "t/sandbox";
+if ( -d "$file") {
+	ok( rmdir("$file") );
+} else {
+	ok(1);
+}
+
+# test 17
+
+$file = "t/repository/CVSROOT/history";
+if ( -f "$file") {
+	ok( unlink("$file") );
+} else {
+	ok(1);
+}

[Sandweb-commit] CVS: sandweb MANIFEST,1.4,1.5

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv10797

Modified Files:
	MANIFEST 
Log Message:
* changed "install-config" to install.cfg and removed modconfig from
  MANIFEST


Index: MANIFEST
===================================================================
RCS file: /cvsroot/sandweb/sandweb/MANIFEST,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- MANIFEST	23 Mar 2002 09:56:18 -0000	1.4
+++ MANIFEST	24 Mar 2002 09:04:39 -0000	1.5
@@ -3,5 +3,5 @@
 COPYING
 Makefile.PL
-install-config
+install.cfg
 
 bin/sandweb.cgi
@@ -68,5 +68,4 @@
 tools/instcachedir.pl
 tools/checkfiles.pl
-tools/modconfig.pl
 
 

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.277,1.278

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv9364

Modified Files:
	sandweb.cgi 
Log Message:
* rename wasn't checking to see if file was null, weird behaviour happens
  if this is not caught. 

* root problem was that alot of CGI params were not being set to '' if
  they were null. fixed all that I could find in the sandweb CGI


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.277
retrieving revision 1.278
diff -U2 -r1.277 -r1.278
--- sandweb.cgi	19 Mar 2002 06:29:56 -0000	1.277
+++ sandweb.cgi	24 Mar 2002 08:59:13 -0000	1.278
@@ -22,6 +22,6 @@
 #
 
+use lib '../';
 use strict;
-use lib '../lib';
 
 # SandWeb Distribution Modules
@@ -223,5 +223,5 @@
 				vcs_commit(
 					ck_auth => $ck_auth,
-					vcs_command => CGI::param('vcs_command'),
+					vcs_command => CGI::param('vcs_command') || '',
 					module_name => $module_name,
 					repo_name => $repo_name,
@@ -234,5 +234,5 @@
 				view_file_menu( 
 					ck_auth => $ck_auth,
-					filename => CGI::param('filename'),
+					filename => CGI::param('filename') || '',
 					module_name => $module_name,
 					repo_name => $repo_name,
@@ -245,5 +245,5 @@
 					edit_file_commit(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename'),
+						filename => CGI::param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -253,5 +253,5 @@
 					edit_file_menu( 
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename'),
+						filename => CGI::param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -262,5 +262,5 @@
 			elsif ( $action eq 'delete' ) {
 				# called file deleter
-				my @filename = CGI::param('filename');
+				my @filename = CGI::param('filename') || '';
 				delete_commit( 
 					ck_auth => $ck_auth,
@@ -276,6 +276,6 @@
 					rename_commit( 
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename'),
-						tofile => CGI::param('tofile'),
+						filename => CGI::param('filename') || '',
+						tofile => CGI::param('tofile') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -285,5 +285,5 @@
 					rename_menu(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename'),
+						filename => CGI::param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -297,5 +297,5 @@
 					create_file_commit(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename'),
+						filename => CGI::param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -316,5 +316,5 @@
 					create_folder_commit(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename'),
+						filename => CGI::param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -335,5 +335,5 @@
 					upload_commit(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename'),
+						filename => CGI::param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -354,5 +354,5 @@
 				download_file_commit( 
 					ck_auth => $ck_auth,
-					filename => CGI::param('filename'),
+					filename => CGI::param('filename') || '',
 					module_name => $module_name,
 					repo_name => $repo_name,
@@ -394,5 +394,5 @@
 				# load current menu (instead of going to new one)
 				#no strict 'refs';
-				#my $curr_menu = CGI::param('curr_menu');
+				#my $curr_menu = CGI::param('curr_menu') || '';
 				#&$curr_menu( ck_auth => $ck_auth);
 				debug_menu( 
@@ -1226,24 +1226,47 @@
 	);
 
-	my $content = $ui->get_menu( 
-		MENU => 'rename',
-		PROGNAME => $progname,
-		MODULE_NAME => $module_name,
-		REPO_NAME => $repo_name,
-		LOCATION => $location,
-		FILENAME => $filename,
-	);
+	unless ( $filename || $filename eq '.' ) {
+		$log->debug("no file was selected for rename");
+		my $content = $ui->get_menu(
+			MENU => 'output',
+			LOCATION => $location,
+			FILENAME => '',
+			PROGNAME => $progname,
+			OUTPUT => "Please select file or folders to rename",
+			ERROR => "No files selected",
+		);
 
-	print CGI::header( -cookie => $ck_auth );
-	$ui->print_popup(
-		TITLE=> 'SandWeb : rename file',
-		MENU_TITLE => 'SandWeb',
-		SUBMENU_TITLE => 'rename file',
-		FILENAME => $filename,
-		LOCATION => $location,
-		FOOTER => '',
-		CONTENT => $content,
-		MESSAGE => $message, 
-	);
+		print CGI::header( -cookie => $ck_auth );
+		$ui->print_popup(
+			TITLE=> "SandWeb : renamefile",
+			MENU_TITLE => 'SandWeb',
+			SUBMENU_TITLE => "rename file",
+			FOOTER => '',
+			CONTENT => $content,
+			MESSAGE => $message,
+		);
+	} else {
+
+		my $content = $ui->get_menu( 
+			MENU => 'rename',
+			PROGNAME => $progname,
+			MODULE_NAME => $module_name,
+			REPO_NAME => $repo_name,
+			LOCATION => $location,
+			FILENAME => $filename,
+		);
+
+		print CGI::header( -cookie => $ck_auth );
+		$ui->print_popup(
+			TITLE=> 'SandWeb : rename file',
+			MENU_TITLE => 'SandWeb',
+			SUBMENU_TITLE => 'rename file',
+			FILENAME => $filename,
+			LOCATION => $location,
+			FOOTER => '',
+			CONTENT => $content,
+			MESSAGE => $message, 
+		);
+	}
 }
 
@@ -1584,4 +1607,5 @@
 		'location' => "$users_dir/$username/$repo_name/$module_name$location",
 	);
+
 
 	my $error = $file->rename( tofile => $tofile ); 

[Sandweb-commit] CVS: sandweb install.cfg,NONE,1.1 install-config,1.1,NONE

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv26549

Added Files:
	install.cfg 
Removed Files:
	install-config 
Log Message:
* changed from install-config to install.cfg


--- NEW FILE ---
package config;


$cfgdir = '/usr/local/etc';
$cgidir = '/var/www/cgi-bin';
$tmpldir = 'lib/sandweb/templates';
$cachedir = '/var/cache/sandweb';
$httpuser = 'www-data';



1;

--- install-config DELETED ---

[Sandweb-commit] CVS: sandweb/bin sandweb-admin,1.11,1.12

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv25112/bin

Modified Files:
	sandweb-admin 
Log Message:
* sandweb-admin now uses SandWeb object to get data from config file.


Index: sandweb-admin
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-admin,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- sandweb-admin	11 Mar 2002 19:43:39 -0000	1.11
+++ sandweb-admin	24 Mar 2002 07:03:59 -0000	1.12
@@ -36,9 +36,37 @@
 
 use strict;
+use lib '../lib';
+
+use SandWeb;
 use Digest::MD5 qw(md5_hex);
 
-my $passwd_file = '../var/data/passwd';
-my $data_dir = '../var/data';
-my $users_dir = '../var/users';
+# changeable global vars
+my $config_file = 'sandweb.cfg';
+my $config_dir = '../etc';
+
+# name program is called by
+my $progname = $0;
+$progname =~ s:^.*/::;
+
+# object creation, all objects global throughout CGI
+my $return = SandWeb::->start_up( 
+        config_dir => $config_dir, 
+        config_file => $config_file,
+        progname => $progname,
+);
+if (!$return->{'errlev'}) {
+        # error loading config file
+        print("unable to open config file: $config_file in dir '$config_dir'");
+        print("return data: <pre>" . Dumper($return) . "</pre>");
+        exit(0);        
+}
+
+my $config = $return->{'data'}->{'config'};
+my $auth = $return->{'data'}->{'auth'};
+undef $return; # no need for this anymore
+
+my $users_dir = $config->{'paths'}->{'users_dir'};
+my $data_dir = $config->{'paths'}->{'data_dir'};
+my $passwd_file = $data_dir . '/passwd';
 
 sub main {

[Sandweb-commit] CVS: sandweb/tools modconfig.pl,1.1,NONE

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv25054/tools

Removed Files:
	modconfig.pl 
Log Message:
* removed modconfig.pl


--- modconfig.pl DELETED ---

[Sandweb-commit] CVS: sandweb/t/repository/CVSROOT history,1.1,1.2

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/t/repository/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv25054/t/repository/CVSROOT

Modified Files:
	history 
Log Message:
* removed modconfig.pl


Index: history
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/repository/CVSROOT/history,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- history	23 Mar 2002 09:19:00 -0000	1.1
+++ history	23 Mar 2002 22:17:46 -0000	1.2
@@ -54,2 +54,5 @@
 A3c9c47f2|rhelmer|~/src/sandweb/t|sandbox|1.25|testfile.c
 R3c9c47f3|rhelmer|~/src/sandweb/t|sandbox|1.26|testfile.c
+O3c9cf153|nick|~/dev/sandweb/t/*0|sandbox||sandbox
+A3c9cf153|nick|~/dev/sandweb/t|sandbox|1.1|testfile.c
+R3c9cf154|nick|~/dev/sandweb/t|sandbox|1.2|testfile.c

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.3,1.4

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv5988/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
* repository.t now uses Cwd::cwd to get current working dir, which works
  properly

* worked on providing better errorlevels from cvs class, the whole 
  "0 is successful for UNIX, 1 is successful for Perl" thing is annoying :P


Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- cvs.pm	23 Mar 2002 09:49:23 -0000	1.3
+++ cvs.pm	23 Mar 2002 20:51:24 -0000	1.4
@@ -63,4 +63,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -86,4 +90,8 @@
 	if ($type == "text") { push @param, " -kkv -MMERGE" };
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -114,4 +122,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -142,4 +154,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -180,4 +196,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -214,4 +234,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my $diff = SandWeb::Diff->new( 
 		diff => "$raw_output",
@@ -246,4 +270,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -270,4 +298,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -291,4 +323,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -312,4 +348,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = (
 		output => $output,
@@ -334,4 +374,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -362,4 +406,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -380,4 +428,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = (
 		output => $output,
@@ -404,4 +456,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -431,4 +487,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -457,4 +517,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -491,4 +555,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = (
 		output => $output,
@@ -515,4 +583,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = (
 		output => $output,
@@ -554,4 +626,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	foreach my $line (@raw_output) {
 		if ($line =~ /^M/) {
@@ -605,4 +681,8 @@
 	my $errorlevel = $?;
 
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
+
 	my %return = ( 
 		output => $output,
@@ -628,4 +708,8 @@
 	my $output = `cd \"$sandbox\" && cvs -d $root @param \"$file\" 2>&1`;
 	my $errorlevel = $?;
+
+	if ( $errorlevel == 0 ) {
+		$errorlevel = 1;
+	}
 
 	my %return = ( 

[Sandweb-commit] CVS: sandweb/t repository.t,1.3,1.4

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv5988/t

Modified Files:
	repository.t 
Log Message:
* repository.t now uses Cwd::cwd to get current working dir, which works
  properly

* worked on providing better errorlevels from cvs class, the whole 
  "0 is successful for UNIX, 1 is successful for Perl" thing is annoying :P


Index: repository.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/repository.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- repository.t	23 Mar 2002 09:23:43 -0000	1.3
+++ repository.t	23 Mar 2002 20:51:24 -0000	1.4
@@ -1,3 +1,4 @@
 use Test;
+use Cwd;
 BEGIN { plan tests => 11, todo => [0] }
 
@@ -16,5 +17,5 @@
 # test 3
 
-my $path = system("pwd");
+my $path = cwd;
 
 ok(my $repository = SandWeb::Repository->new(

[Sandweb-commit] CVS: sandweb/t file.t,NONE,1.1

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv25588/t

Added Files:
	file.t 
Log Message:
* added test for File class. Creates folder, creates file in folder,
  recursively deletes folder.


--- NEW FILE ---
use Test;
BEGIN { plan tests => 8, todo => [0] }

# test 1

eval { require SandWeb; return 1; };
ok($@, '');
croak() if $@; 

# test 2

eval { require SandWeb::File; return 1; };
ok($@, '');
croak() if $@;

# prepare
my $config_file = 'basics.cfg';
my $config_dir = 't';

# object creation, all objects global throughout CGI
my $return = SandWeb::->start_up( 
        config_dir => $config_dir, 
        config_file => $config_file,
);

# test 3

ok($return->{'errlev'});

my $config = $return->{'data'}->{'config'};
my $log = $return->{'data'}->{'log'};

# test 4

ok(my $folder = SandWeb::File->new(
	'config_obj' => $config,
	'log_obj' => $log,
	'filename' => 'testfolder',
	'location' => "t/",
));

# test 5

ok( $folder->create_folder() );

# test 6

ok(my $file = SandWeb::File->new(
	'config_obj' => $config,
	'log_obj' => $log,
	'filename' => 'testfile.c',
	'location' => "t/testfolder",
));

# test 7

ok( $file->create_file( contents => 'test' ) );

# test 8

ok( $folder->delete_folder( recurse => 'yes' ) );

[Sandweb-commit] CVS: sandweb/lib/SandWeb File.pm,1.56,1.57

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv25451/lib/SandWeb

Modified Files:
	File.pm 
Log Message:
* test harness pointed out an unused variable. fixed.


Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.56
retrieving revision 1.57
diff -U2 -r1.56 -r1.57
--- File.pm	19 Mar 2002 06:07:44 -0000	1.56
+++ File.pm	23 Mar 2002 19:47:11 -0000	1.57
@@ -275,5 +275,4 @@
 			'location' => "$location",
 			'filename' => "$filename",
-			'contents' => "$contents",
 			'log_obj' => "$log",
 		);
@@ -458,5 +457,4 @@
 					'location' => "$location/$filename",
 					'filename' => "$file",
-					'contents' => "$contents",
 					'log_obj' => "$log",
 				);

[Sandweb-commit] CVS: sandweb MANIFEST,1.3,1.4

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv29397

Modified Files:
	MANIFEST 
Log Message:
should be "cvs.pm" not "CVS.pm"


Index: MANIFEST
===================================================================
RCS file: /cvsroot/sandweb/sandweb/MANIFEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- MANIFEST	19 Mar 2002 07:55:54 -0000	1.3
+++ MANIFEST	23 Mar 2002 09:56:18 -0000	1.4
@@ -57,5 +57,5 @@
 
 doc/dependencies.list
-doc/API/CVS.txt
+doc/API/cvs.txt
 doc/API/File.txt
 doc/API/Repository.txt

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.2,1.3

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv28128/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
test harness noticed a problem where non-numeric variables were
being checked with "==" instead of "eq". fixed.


Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- cvs.pm	22 Mar 2002 04:21:49 -0000	1.2
+++ cvs.pm	23 Mar 2002 09:49:23 -0000	1.3
@@ -54,6 +54,8 @@
 	my @param = 'add';
 
-	if ($type == "binary") { push @param, " -kb" };
-	if ($type == "text") { push @param, " -kkv" };
+	if ($type) {
+		if ($type eq "binary") { push @param, " -kb" };
+		if ($type eq "text") { push @param, " -kkv" };
+	}
 	if ($message) { push @param, " -m $message" };
 

[Sandweb-commit] CVS: sandweb/t repository.t,1.2,1.3

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv22343/t

Modified Files:
	repository.t 
Log Message:
actually checks errorlevel of VCS commands now


Index: repository.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/repository.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- repository.t	23 Mar 2002 09:20:51 -0000	1.2
+++ repository.t	23 Mar 2002 09:23:43 -0000	1.3
@@ -18,5 +18,5 @@
 my $path = system("pwd");
 
-ok (my $repository = SandWeb::Repository->new(
+ok(my $repository = SandWeb::Repository->new(
 	'root' => "$path/t/repository",
 	'connection' => 'local',
@@ -29,5 +29,6 @@
 # test 4
 
-ok ($repository->checkout( file => 'sandbox' ));
+my %test = $repository->checkout( file => 'sandbox' );
+ok( $test{'errorlevel'} );
 
 # test 5
@@ -45,24 +46,28 @@
 # test 8
 
-ok ($repository->add( file => 'sandbox/testfile.c' ));
+%test = $repository->add( file => 'sandbox/testfile.c' );
+ok( $test{'errorlevel'} );
 
 # test 9
 
-ok ($repository->commit( 
+%test = $repository->commit( 
 	file => 'sandbox/testfile.c',
 	message => 'test add',
-));
+);
+ok( $test{'errorlevel'} );
 
 # test 10
 
-ok ($repository->remove( 
+%test = $repository->remove( 
 	file => 'sandbox/testfile.c',
 	force => 'yes',
-));
+);
+ok( $test{'errorlevel'} );
 
 # test 11
 
-ok ($repository->commit( 
+%test = $repository->commit( 
 	file => 'sandbox/testfile.c',
 	message => 'test remove',
-));
+);
+ok( $test{'errorlevel'} );

[Sandweb-commit] CVS: sandweb/t repository.t,1.1,1.2

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv21890/t

Modified Files:
	repository.t 
Log Message:
oops, don't want my homedir in there, pwd instead


Index: repository.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/repository.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- repository.t	23 Mar 2002 09:19:00 -0000	1.1
+++ repository.t	23 Mar 2002 09:20:51 -0000	1.2
@@ -16,5 +16,5 @@
 # test 3
 
-my $path = "/export/home/rhelmer/src/sandweb";
+my $path = system("pwd");
 
 ok (my $repository = SandWeb::Repository->new(

[Sandweb-commit] CVS: sandweb/t/repository/CVSROOT checkoutlist,NONE,1.1 checkoutlist,v,NONE,1.1 commitinfo,NONE,1.1 commitinfo,v,NONE,1.1 config,NONE,1.1 config,v,NONE,1.1 cvswrappers,NONE,1.1 cvswrappers,v,NONE,1.1 editinfo,NONE,1.1 editinfo,v,NONE,1.1 history,NONE,1.1 loginfo,NONE,1.1 loginfo,v,NONE,1.1 modules,NONE,1.1 modules,v,NONE,1.1 notify,NONE,1.1 notify,v,NONE,1.1 rcsinfo,NONE,1.1 rcsinfo,v,NONE,1.1 taginfo,NONE,1.1 taginfo,v,NONE,1.1 val-tags,NONE,1.1 verifymsg,NONE,1.1 verifymsg,v,NONE,1.1

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t/repository/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv21511/repository/CVSROOT

Added Files:
	checkoutlist checkoutlist,v commitinfo commitinfo,v config 
	config,v cvswrappers cvswrappers,v editinfo editinfo,v history 
	loginfo loginfo,v modules modules,v notify notify,v rcsinfo 
	rcsinfo,v taginfo taginfo,v val-tags verifymsg verifymsg,v 
Log Message:
added test for repository and cvs, the following tests are performed :
* checkout a module
* add a file/commit
* remove a file/commit



--- NEW FILE ---
# The "checkoutlist" file is used to support additional version controlled
# administrative files in $CVSROOT/CVSROOT, such as template files.
#
# The first entry on a line is a filename which will be checked out from
# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
# The remainder of the line is an error message to use if the file cannot
# be checked out.
#
# File format:
#
#	[<whitespace>]<filename><whitespace><error message><end-of-line>
#
# comment lines begin with '#'

***** Bogus filespec: checkoutlist,v,NONE,1.1
--- NEW FILE ---
# The "commitinfo" file is used to control pre-commit checks.
# The filter on the right is invoked with the repository and a list 
# of files to check.  A non-zero exit of the filter program will 
# cause the commit to be aborted.
#
# The first entry on a line is a regular expression which is tested
# against the directory that the change is being committed to, relative
# to the $CVSROOT.  For the first match that is found, then the remainder
# of the line is the name of the filter to run.
#
# If the repository name does not match any of the regular expressions in this
# file, the "DEFAULT" line is used, if it is specified.
#
# If the name "ALL" appears as a regular expression it is always used
# in addition to the first matching regex or "DEFAULT".

***** Bogus filespec: commitinfo,v,NONE,1.1
--- NEW FILE ---
# Set this to "no" if pserver shouldn't check system users/passwords
#SystemAuth=no

# Put CVS lock files in this directory rather than directly in the repository.
#LockDir=/var/lock/cvs

# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
# level of the new working directory when using the `cvs checkout'
# command.
#TopLevelAdmin=no

# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the
# history file, or a subset as needed (ie `TMAR' logs all write operations)
#LogHistory=TOFEWGCMAR

***** Bogus filespec: config,v,NONE,1.1
--- NEW FILE ---
# This file affects handling of files based on their names.
#
# The -t/-f options allow one to treat directories of files
# as a single file, or to transform a file in other ways on
# its way in and out of CVS.
#
# 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'

***** Bogus filespec: cvswrappers,v,NONE,1.1
--- NEW FILE ---
# The "editinfo" file is used to allow verification of logging
# information.  It works best when a template (as specified in the
# rcsinfo file) is provided for the logging procedure.  Given a
# template with locations for, a bug-id number, a list of people who
# reviewed the code before it can be checked in, and an external
# process to catalog the differences that were code reviewed, the
# following test can be applied to the code:
#
#   Making sure that the entered bug-id number is correct.
#   Validating that the code that was reviewed is indeed the code being
#       checked in (using the bug-id number or a seperate review
#       number to identify this particular code set.).
#
# If any of the above test failed, then the commit would be aborted.
#
# Actions such as mailing a copy of the report to each reviewer are
# better handled by an entry in the loginfo file.
#
# One thing that should be noted is the the ALL keyword is not
# supported.  There can be only one entry that matches a given
# repository.

***** Bogus filespec: editinfo,v,NONE,1.1
--- NEW FILE ---
O3c9c3e07|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
O3c9c44c5|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c44c6|rhelmer|~/src/sandweb/t|sandbox|1.1|testfile.c
R3c9c44c7|rhelmer|~/src/sandweb/t|sandbox|1.2|testfile.c
O3c9c450c|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c450c|rhelmer|~/src/sandweb/t|sandbox|1.3|testfile.c
R3c9c450d|rhelmer|~/src/sandweb/t|sandbox|1.4|testfile.c
O3c9c453d|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c453d|rhelmer|~/src/sandweb/t|sandbox|1.5|testfile.c
R3c9c453e|rhelmer|~/src/sandweb/t|sandbox|1.6|testfile.c
O3c9c4547|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c4547|rhelmer|~/src/sandweb/t|sandbox|1.7|testfile.c
R3c9c4548|rhelmer|~/src/sandweb/t|sandbox|1.8|testfile.c
O3c9c454d|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c454e|rhelmer|~/src/sandweb/t|sandbox|1.9|testfile.c
R3c9c454f|rhelmer|~/src/sandweb/t|sandbox|1.10|testfile.c
O3c9c4564|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c4565|rhelmer|~/src/sandweb/t|sandbox|1.1|testfile.c
R3c9c4566|rhelmer|~/src/sandweb/t|sandbox|1.2|testfile.c
O3c9c4628|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c4629|rhelmer|~/src/sandweb/t|sandbox|1.3|testfile.c
R3c9c462a|rhelmer|~/src/sandweb/t|sandbox|1.4|testfile.c
O3c9c463f|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c463f|rhelmer|~/src/sandweb/t|sandbox|1.5|testfile.c
R3c9c4640|rhelmer|~/src/sandweb/t|sandbox|1.6|testfile.c
O3c9c4658|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c4658|rhelmer|~/src/sandweb/t|sandbox|1.7|testfile.c
R3c9c465a|rhelmer|~/src/sandweb/t|sandbox|1.8|testfile.c
O3c9c466a|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c466a|rhelmer|~/src/sandweb/t|sandbox|1.9|testfile.c
R3c9c466b|rhelmer|~/src/sandweb/t|sandbox|1.10|testfile.c
O3c9c46e6|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c46e6|rhelmer|~/src/sandweb/t|sandbox|1.11|testfile.c
R3c9c46e7|rhelmer|~/src/sandweb/t|sandbox|1.12|testfile.c
O3c9c46fa|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c46fa|rhelmer|~/src/sandweb/t|sandbox|1.13|testfile.c
R3c9c46fb|rhelmer|~/src/sandweb/t|sandbox|1.14|testfile.c
O3c9c4704|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c4705|rhelmer|~/src/sandweb/t|sandbox|1.15|testfile.c
R3c9c4706|rhelmer|~/src/sandweb/t|sandbox|1.16|testfile.c
O3c9c4726|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c4727|rhelmer|~/src/sandweb/t|sandbox|1.17|testfile.c
R3c9c4728|rhelmer|~/src/sandweb/t|sandbox|1.18|testfile.c
O3c9c4736|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c4737|rhelmer|~/src/sandweb/t|sandbox|1.19|testfile.c
R3c9c4738|rhelmer|~/src/sandweb/t|sandbox|1.20|testfile.c
O3c9c47c2|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c47c2|rhelmer|~/src/sandweb/t|sandbox|1.21|testfile.c
R3c9c47c3|rhelmer|~/src/sandweb/t|sandbox|1.22|testfile.c
O3c9c47cc|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c47cd|rhelmer|~/src/sandweb/t|sandbox|1.23|testfile.c
R3c9c47ce|rhelmer|~/src/sandweb/t|sandbox|1.24|testfile.c
O3c9c47f2|rhelmer|~/src/sandweb/t/*0|sandbox||sandbox
A3c9c47f2|rhelmer|~/src/sandweb/t|sandbox|1.25|testfile.c
R3c9c47f3|rhelmer|~/src/sandweb/t|sandbox|1.26|testfile.c

--- NEW FILE ---
# The "loginfo" file controls where "cvs commit" log information
# is sent.  The first entry on a line is a regular expression which must match
# the directory that the change is being made to, relative to the
# $CVSROOT.  If a match is found, then the remainder of the line is a filter
# program that should expect log information on its standard input.
#
# If the repository name does not match any of the regular expressions in this
# file, the "DEFAULT" line is used, if it is specified.
#
# If the name ALL appears as a regular expression it is always used
# in addition to the first matching regex or DEFAULT.
#
# You may specify a format string as part of the
# filter.  The string is composed of a `%' followed
# by a single format character, or followed by a set of format
# characters surrounded by `{' and `}' as separators.  The format
# characters are:
#
#   s = file name
#   V = old version number (pre-checkin)
#   v = new version number (post-checkin)
#
# For example:
#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog

***** Bogus filespec: loginfo,v,NONE,1.1
--- NEW FILE ---
# Three different line formats are valid:
#	key	-a    aliases...
#	key [options] directory
#	key [options] directory files...
#
# Where "options" are composed of:
#	-i prog		Run "prog" on "cvs commit" from top-level of module.
#	-o prog		Run "prog" on "cvs checkout" of module.
#	-e prog		Run "prog" on "cvs export" of module.
#	-t prog		Run "prog" on "cvs rtag" of module.
#	-u prog		Run "prog" on "cvs update" of module.
#	-d dir		Place module in directory "dir" instead of module name.
#	-l		Top-level directory only -- do not recurse.
#
# NOTE:  If you change any of the "Run" options above, you'll have to
# release and re-checkout any working directories of these modules.
#
# And "directory" is a path to a directory relative to $CVSROOT.
#
# The "-a" option specifies an alias.  An alias is interpreted as if
# everything on the right of the "-a" had been typed on the command line.
#
# You can encode a module within a module by using the special '&'
# character to interpose another module into the current module.  This
# can be useful for creating a module that consists of many directories
# spread out over the entire source repository.

***** Bogus filespec: modules,v,NONE,1.1
--- NEW FILE ---
# The "notify" file controls where notifications from watches set by
# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
# a regular expression which is tested against the directory that the
# change is being made to, relative to the $CVSROOT.  If it matches,
# then the remainder of the line is a filter program that should contain
# one occurrence of %s for the user to notify, and information on its
# standard input.
#
# "ALL" or "DEFAULT" can be used in place of the regular expression.
#
# For example:
#ALL mail %s -s "CVS notification"

***** Bogus filespec: notify,v,NONE,1.1
--- NEW FILE ---
# The "rcsinfo" file is used to control templates with which the editor
# is invoked on commit and import.
#
# The first entry on a line is a regular expression which is tested
# against the directory that the change is being made to, relative to the
# $CVSROOT.  For the first match that is found, then the remainder of the
# line is the name of the file that contains the template.
#
# If the repository name does not match any of the regular expressions in this
# file, the "DEFAULT" line is used, if it is specified.
#
# If the name "ALL" appears as a regular expression it is always used
# in addition to the first matching regex or "DEFAULT".

***** Bogus filespec: rcsinfo,v,NONE,1.1
--- NEW FILE ---
# The "taginfo" file is used to control pre-tag checks.
# The filter on the right is invoked with the following arguments:
#
# $1 -- tagname
# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
# $3 -- repository
# $4->  file revision [file revision ...]
#
# A non-zero exit of the filter program will cause the tag to be aborted.
#
# The first entry on a line is a regular expression which is tested
# against the directory that the change is being committed to, relative
# to the $CVSROOT.  For the first match that is found, then the remainder
# of the line is the name of the filter to run.
#
# If the repository name does not match any of the regular expressions in this
# file, the "DEFAULT" line is used, if it is specified.
#
# If the name "ALL" appears as a regular expression it is always used
# in addition to the first matching regex or "DEFAULT".

***** Bogus filespec: taginfo,v,NONE,1.1
--- NEW FILE ---

--- NEW FILE ---
# The "verifymsg" file is used to allow verification of logging
# information.  It works best when a template (as specified in the
# rcsinfo file) is provided for the logging procedure.  Given a
# template with locations for, a bug-id number, a list of people who
# reviewed the code before it can be checked in, and an external
# process to catalog the differences that were code reviewed, the
# following test can be applied to the code:
#
#   Making sure that the entered bug-id number is correct.
#   Validating that the code that was reviewed is indeed the code being
#       checked in (using the bug-id number or a seperate review
#       number to identify this particular code set.).
#
# If any of the above test failed, then the commit would be aborted.
#
# Actions such as mailing a copy of the report to each reviewer are
# better handled by an entry in the loginfo file.
#
# One thing that should be noted is the the ALL keyword is not
# supported.  There can be only one entry that matches a given
# repository.

***** Bogus filespec: verifymsg,v,NONE,1.1

[Sandweb-commit] CVS: sandweb/t repository.t,NONE,1.1

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv21511

Added Files:
	repository.t 
Log Message:
added test for repository and cvs, the following tests are performed :
* checkout a module
* add a file/commit
* remove a file/commit



--- NEW FILE ---
use Test;
BEGIN { plan tests => 11, todo => [0] }

# test 1

eval { require SandWeb::Repository; return 1; };
ok($@, '');
croak() if $@; 

# test 2

eval { require SandWeb::Repository::cvs; return 1; };
ok($@, '');
croak() if $@; 

# test 3

my $path = "/export/home/rhelmer/src/sandweb";

ok (my $repository = SandWeb::Repository->new(
	'root' => "$path/t/repository",
	'connection' => 'local',
	'username' => 'test',
	'server' => 'localhost',
	'repo_type' => 'CVS',
	'sandbox' => "t/",
));

# test 4

ok ($repository->checkout( file => 'sandbox' ));

# test 5

ok ( open (FILE, "> t/sandbox/testfile.c") );

# test 6

ok ( print FILE "stuff" );

# test 7

ok ( close FILE );

# test 8

ok ($repository->add( file => 'sandbox/testfile.c' ));

# test 9

ok ($repository->commit( 
	file => 'sandbox/testfile.c',
	message => 'test add',
));

# test 10

ok ($repository->remove( 
	file => 'sandbox/testfile.c',
	force => 'yes',
));

# test 11

ok ($repository->commit( 
	file => 'sandbox/testfile.c',
	message => 'test remove',
));

[Sandweb-commit] CVS: sandweb/t/repository/sandbox - New directory

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t/repository/sandbox
In directory usw-pr-cvs1:/tmp/cvs-serv21436/sandbox

Log Message:
Directory /cvsroot/sandweb/sandweb/t/repository/sandbox added to the repository

[Sandweb-commit] CVS: sandweb/t/repository/CVSROOT/Emptydir - New directory

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t/repository/CVSROOT/Emptydir
In directory usw-pr-cvs1:/tmp/cvs-serv21407/Emptydir

Log Message:
Directory /cvsroot/sandweb/sandweb/t/repository/CVSROOT/Emptydir added to the repository