@@ -42,7 +42,7 @@ my %set_synonyms = ( while (my ($attribute, $type) = each %queryable_attributes) { my @gets = $attribute; - + # construct a list of aliases while (my ($alias, $aliased_attribute) = each %attribute_aliases) { push @gets, $alias if $aliased_attribute eq $attribute; @@ -53,10 +53,10 @@ while (my ($attribute, $type) = each %queryable_attributes) { for ($set_synonyms{$attribute}) { push @sets, $_ if $_; } - + my $get_clause = join "|", @gets; my $set_clause = join "|", @sets; - + push @attribute_list, $get_clause if $type =~ /get/; push @attribute_list, "$set_clause=s" if $type =~ /set/; } bin/camp-info @@ -19,7 +19,7 @@ foreach my $camp (glob "$ENV{HOME}/camp*") { my $link_name = "$ENV{HOME}/$type: $comment"; print "$link_name\n"; - + symlink($camp,$link_name); }; bin/mkcampsymlinks @@ -55,7 +55,7 @@ if (!$showpod) { if ($opt{config}) { # Run install_templates to rebuild templated config files and install them install_templates(); - $operation++; + $operation++; } if ($opt{db}) { bin/refresh-camp @@ -3,7 +3,7 @@ body, table, th, td { font-size: 11pt; } -body { +body { margin: 5%; padding: 0; background-color: #CEDBEC; htdocs/camp.css @@ -2018,7 +2018,7 @@ sub role_password_cache_pg { chomp; next if !/^$conf->{db_host}:$conf->{db_port}:/; my ($role,$pw) = (split /:/)[3,4]; - + if ($role && $pw) { $pw_cache->{$role} = $pw; } lib/Camp/Master.pm @@ -173,12 +173,12 @@ SKIP: { + 26 # checks in validate_configuration_possibilities() + 47 # checks local to this block ; - + skip( "unable to retrieve camp list: $@", $test_count, ) if $list_err; - + skip( 'Cannot find a camp with all production catalogs and proper environment configuration!', $test_count, @@ -190,7 +190,7 @@ SKIP: { $class->per_user_file_layout, 'per_user_file_layout() true', ); - + cmp_ok( $class->camp_number, '==', @@ -204,7 +204,7 @@ SKIP: { $owner, 'user() per-user layout', ); - + cmp_ok( $INC[0], 'eq', @@ -218,27 +218,27 @@ SKIP: { File::Spec->catfile($camp_user->dir, "camp$number", 'interchange/lib'), 'camp interchange base lib path second in search path', ); - + cmp_ok( $class->base_path, 'eq', File::Spec->catfile($camp_user->dir, "camp$number",), 'base_path() camp', ); - + cmp_ok( $class->ic_path, 'eq', File::Spec->catfile($camp_user->dir, "camp$number", 'interchange',), 'ic_path() camp', ); - + validate_daemon_settings(); validate_vars(); validate_configuration_possibilities('per-user layout'); - + # Verify proper parsing of things. $class->_parse_file(undef, File::Spec->catfile( $path, 'global.cfg' ),); my $catalog = $production_catalogs[0]; @@ -448,14 +448,14 @@ SKIP: { ); }; ok($@, 'unterminated heredoc throws exception'); - + my $ifdef_file = File::Spec->catfile( $path, 'ifdef.cfg' ); $class->_parse_file( undef, File::Spec->catfile( $path, 'global_identity.cfg' )); $class->_parse_file( undef, $ifdef_file ); $class->_parse_file( $catalog, File::Spec->catfile( $path, 'catalog_identity.cfg' )); $class->_parse_file( $catalog, $ifdef_file ); for my $level (undef, $catalog) { - my $suff = $level ? '-- catalog' : '-- global'; + my $suff = $level ? '-- catalog' : '-- global'; ok( $class->variable( $level, 'SIMPLE_IFDEF' ), "#ifdef simple $suff", @@ -478,7 +478,7 @@ SKIP: { "#ifdef global token $suff", ); } - + eval { $class->_parse_file( undef, File::Spec->catfile($path, 'ifdef_nested.cfg') ); }; @@ -488,7 +488,7 @@ SKIP: { $class->_parse_file( undef, File::Spec->catfile($path, 'ifdef_unterminated.cfg') ); }; ok( $@, 'unterminated #ifdef throws exception' ); - + my $newname = 'bogus'; my $c; while ($c++ < 1000 and $class->known_catalogs($newname)) { @@ -524,16 +524,16 @@ SKIP: { [ 1, 1, 1 ], 'include directive: glob include', ); - + skip('same user; no check for incorrect user', 2) if $> == $orig_euid ; - + local $SIG{__WARN__} = sub { return; }; reset_package(); $> = $orig_euid; ok(!eval("use $class (use_libs => 1);"), 'Exception thrown for incorrect user',); - + skip('ran as interch; cannot do no-environment exception check', 1) if $> == $ic_uid ; @@ -674,7 +674,7 @@ sub validate_configuration_possibilities { ); } } - + } } lib/Camp/t/0000-Config.t @@ -7,7 +7,7 @@ include include_inner.cfg #ifndef INCLUDE_TEST eq 'inner' Variable INCLUDE_TEST outer #endif - + Variable GLOB_INCLUDE_A Variable GLOB_INCLUDE_B Variable GLOB_INCLUDE_C lib/Camp/t/0000-Config/include_outer.cfg @@ -117,7 +117,7 @@ diag(sprintf('catalog(): %s $Vend::Cfg->{CatalogName}: %s', $obj->catalog, $V 'production', 'run_environment() accessor' ); - + validate_run_environment($obj, 'run_environment() consistent with boolean convenience methods'); cmp_ok( @@ -125,7 +125,7 @@ diag(sprintf('catalog(): %s $Vend::Cfg->{CatalogName}: %s', $obj->catalog, $V 'eq', File::Spec->catfile($test_dir, 'catalogs'), 'base_path()', - ); + ); diag("Exception thrown calling base_path(): $@") if $@; cmp_ok( @@ -148,7 +148,7 @@ diag(sprintf('catalog(): %s $Vend::Cfg->{CatalogName}: %s', $obj->catalog, $V 'camp_number() undefined', ); diag("Exception thrown calling camp_number(): $@") if $@; - + # Validate the various configuration options behavior # (just run_environment and related convenience methods for now) validate_configuration_possibilities($obj); @@ -307,14 +307,14 @@ diag(sprintf('catalog(): %s $Vend::Cfg->{CatalogName}: %s', $obj->catalog, $V ); }; ok($@, 'unterminated heredoc throws exception'); - + my $ifdef_file = File::Spec->catfile( $test_dir, 'ifdef.cfg' ); $obj->_parse_file( undef, File::Spec->catfile( $test_dir, 'global_identity.cfg' )); $obj->_parse_file( undef, $ifdef_file ); $obj->_parse_file( $catalog, File::Spec->catfile( $test_dir, 'catalog_identity.cfg' )); $obj->_parse_file( $catalog, $ifdef_file ); for my $level (undef, $catalog) { - my $suff = $level ? '-- catalog' : '-- global'; + my $suff = $level ? '-- catalog' : '-- global'; ok( $obj->variable( $level, 'SIMPLE_IFDEF' ), "#ifdef simple $suff", @@ -337,7 +337,7 @@ diag(sprintf('catalog(): %s $Vend::Cfg->{CatalogName}: %s', $obj->catalog, $V "#ifdef global token $suff", ); } - + eval { $obj->_parse_file( undef, File::Spec->catfile($test_dir, 'ifdef_nested.cfg') ); }; @@ -347,7 +347,7 @@ diag(sprintf('catalog(): %s $Vend::Cfg->{CatalogName}: %s', $obj->catalog, $V $obj->_parse_file( undef, File::Spec->catfile($test_dir, 'ifdef_unterminated.cfg') ); }; ok( $@, 'unterminated #ifdef throws exception' ); - + my $newname = 'bogus'; my $c; while ($c++ < 1000 and $obj->known_catalogs($newname)) { @@ -391,7 +391,7 @@ diag(sprintf('catalog(): %s $Vend::Cfg->{CatalogName}: %s', $obj->catalog, $V {}, 'full_reset() clears object', ); - + my @inc_before = @INC; use_ok($subclass, qw(use_libs 1)) or skip("Failed to import $subclass", 3); cmp_ok( lib/Camp/t/0001_Camp-Master.t @@ -7,7 +7,7 @@ include include_inner.cfg #ifndef INCLUDE_TEST eq 'inner' Variable INCLUDE_TEST outer #endif - + Variable GLOB_INCLUDE_A Variable GLOB_INCLUDE_B Variable GLOB_INCLUDE_C lib/Camp/t/0001_Camp-Master/include_outer.cfg @@ -24,7 +24,7 @@ sub adhoc_base_path { sub _validate_adhoc_user { my $invocant = shift; - return $invocant->_setting_set('user', getpwuid($>)); + return $invocant->_setting_set('user', getpwuid($>)); } 1; lib/Camp/t/0001_Camp-Master/lib/TestApp/Config.pm @@ -35,7 +35,7 @@ ft_stopword_file = '' # All interaction with mysqld must be made via Unix sockets or named pipes. # Note that using this option without enabling named pipes on Windows # (via the "enable-named-pipe" option) will render mysqld useless! -# +# #skip-networking # Replication Master Server (default) mysql/my.cnf 87cd571608135e6b72f5bb5500bfa6c375b83ced Jon Jensen jon@endpoint.com http://github.com/devcamps/camps/commit/95c3486ded27562c4ccb83e810344d7951edcfcb 95c3486ded27562c4ccb83e810344d7951edcfcb 2009-06-15T18:55:35-07:00 2009-06-15T18:55:35-07:00 Trim unwanted trailing whitespace Mostly I needed something to commit to test GitHub mirroring. 27b5387420835fae9553f979d3e17ed23b32ffdb Jon Jensen jon@endpoint.com