[Bps-public-commit] r15001 - in Shipwright/branches/2.0: t t/hello

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Mon Aug 11 09:20:24 2008
New Revision: 15001

Modified:
   Shipwright/branches/2.0/   (props changed)
   Shipwright/branches/2.0/t/71.script_cmds.t
   Shipwright/branches/2.0/t/hello/svk.t
   Shipwright/branches/2.0/t/hello/svn.t

Log:
 r15544 at sunnavys-mb:  sunnavy | 2008-08-11 21:18:47 +0800
 updated test


Modified: Shipwright/branches/2.0/t/71.script_cmds.t
==============================================================================
--- Shipwright/branches/2.0/t/71.script_cmds.t	(original)
+++ Shipwright/branches/2.0/t/71.script_cmds.t	Mon Aug 11 09:20:24 2008
@@ -280,7 +280,7 @@
                 [ 'list', 'foo' ],
                 $update_cmd
                 ? qr/version:\s+1\s+/
-                : qr/version:\s+55\s+/m, # the magic number is from practice ;)
+                : qr/version:\s+57\s+/m, # the magic number is from practice ;)
                 'list foo, version seems ok',
             ],
             $update_cmd,    # if the source dist is svk, $update_cmd is undef
@@ -288,7 +288,7 @@
                 [ 'list', 'foo', '--with-latest-version' ],
                 $update_cmd
                 ? qr/latest_version:\s+([^1]|\d{2,})\s+/
-                : qr/latest_version:\s+(?!55)\d+\s+/,
+                : qr/latest_version:\s+(?!57)\d+\s+/,
                 'list foo, latest version seems ok',
             ],
 

Modified: Shipwright/branches/2.0/t/hello/svk.t
==============================================================================
--- Shipwright/branches/2.0/t/hello/svk.t	(original)
+++ Shipwright/branches/2.0/t/hello/svk.t	Mon Aug 11 09:20:24 2008
@@ -62,7 +62,7 @@
     chomp @dirs;
     is_deeply(
         [@dirs],
-        [ 'bin/', 'dists/', 'etc/', 'inc/', 'scripts/', 'shipwright/', 't/' ],
+        [ 'bin/', 'etc/', 'inc/', 'scripts/', 'shipwright/', 'sources/', 't/' ],
         'initialize works'
     );
 
@@ -82,7 +82,8 @@
     # import
 
     $shipwright->backend->import( name => 'hello', source => $source_dir );
-    ok( grep( {/Build\.PL/} `svk ls $repo/dists/Acme-Hello` ), 'imported ok' );
+    ok( grep( {/Build\.PL/} `svk ls $repo/sources/Acme-Hello/vendor` ),
+        'imported ok' );
 
     my $script_dir = tempdir( CLEANUP => 1 );
     copy( File::Spec->catfile( 't', 'hello', 'scripts', 'build' ),
@@ -111,12 +112,13 @@
             'shipwright-script-wrapper'
         ),
         File::Spec->catfile(
-            $shipwright->build->build_base,
-            'dists', 'Acme-Hello',
+            $shipwright->build->build_base, 'sources',
+            'Acme-Hello',                   'vendor',
         ),
         File::Spec->catfile(
-            $shipwright->build->build_base, 'dists',
-            'Acme-Hello',                   'MANIFEST',
+            $shipwright->build->build_base, 'sources',
+            'Acme-Hello',                   'vendor',
+            'MANIFEST',
         ),
         File::Spec->catfile(
             $shipwright->build->build_base, 'scripts',
@@ -144,16 +146,18 @@
     chdir $cwd;
     $shipwright = Shipwright->new(
         repository => "svk:$repo",
-        source => 'file:' . File::Spec->catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
-        name   => 'howdy',
-        follow => 0,
+        source     => 'file:'
+          . File::Spec->catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
+        name      => 'howdy',
+        follow    => 0,
         log_level => 'FATAL',
     );
 
     $source_dir = $shipwright->source->run();
     like( $source_dir, qr/\bhowdy\b/, 'source name looks ok' );
     $shipwright->backend->import( name => 'hello', source => $source_dir );
-    ok( grep( {/Build\.PL/} `svk ls $repo/dists/howdy` ), 'imported ok' );
+    ok( grep( {/Build\.PL/} `svk ls $repo/sources/howdy/vendor` ),
+        'imported ok' );
     $script_dir = tempdir( CLEANUP => 1 );
     copy( File::Spec->catfile( 't', 'hello', 'scripts', 'build' ),
         $script_dir );

Modified: Shipwright/branches/2.0/t/hello/svn.t
==============================================================================
--- Shipwright/branches/2.0/t/hello/svn.t	(original)
+++ Shipwright/branches/2.0/t/hello/svn.t	Mon Aug 11 09:20:24 2008
@@ -34,7 +34,7 @@
     chomp @dirs;
     is_deeply(
         [@dirs],
-        [ 'bin/', 'dists/', 'etc/', 'inc/', 'scripts/', 'shipwright/', 't/' ],
+        [ 'bin/', 'etc/', 'inc/', 'scripts/', 'shipwright/', 'sources/', 't/' ],
         'initialize works'
     );
 
@@ -43,7 +43,8 @@
 
     # import
     $shipwright->backend->import( name => 'hello', source => $source_dir );
-    ok( grep( {/Build\.PL/} `svn ls $repo/dists/Acme-Hello` ), 'imported ok' );
+    ok( grep( {/Build\.PL/} `svn ls $repo/sources/Acme-Hello/vendor` ),
+        'imported ok' );
 
     my $script_dir = tempdir( CLEANUP => 1 );
     copy( File::Spec->catfile( 't', 'hello', 'scripts', 'build' ),
@@ -73,12 +74,13 @@
             'shipwright-script-wrapper'
         ),
         File::Spec->catfile(
-            $shipwright->build->build_base,
-            'dists', 'Acme-Hello',
+            $shipwright->build->build_base, 'sources',
+            'Acme-Hello',                   'vendor',
         ),
         File::Spec->catfile(
-            $shipwright->build->build_base, 'dists',
-            'Acme-Hello',                   'MANIFEST',
+            $shipwright->build->build_base, 'sources',
+            'Acme-Hello',                   'vendor',
+            'MANIFEST',
         ),
         File::Spec->catfile(
             $shipwright->build->build_base, 'scripts',
@@ -116,7 +118,8 @@
     $source_dir = $shipwright->source->run();
     like( $source_dir, qr/\bhowdy\b/, 'source name looks ok' );
     $shipwright->backend->import( name => 'hello', source => $source_dir );
-    ok( grep( {/Build\.PL/} `svn ls $repo/dists/howdy` ), 'imported ok' );
+    ok( grep( {/Build\.PL/} `svn ls $repo/sources/howdy/vendor` ),
+        'imported ok' );
     $script_dir = tempdir( CLEANUP => 1 );
     copy( File::Spec->catfile( 't', 'hello', 'scripts', 'build' ),
         $script_dir );