[Bps-public-commit] r18520 - in Shipwright/trunk: . t t/hello t/hello/scripts
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Sun Feb 22 11:14:55 EST 2009
Author: sunnavy
Date: Sun Feb 22 11:14:55 2009
New Revision: 18520
Added:
Shipwright/trunk/t/hello/Foo-Bar-v0.01.tar.gz (contents, props changed)
Removed:
Shipwright/trunk/t/hello/Acme-Hello-0.03.tar.gz
Modified:
Shipwright/trunk/ (props changed)
Shipwright/trunk/MANIFEST
Shipwright/trunk/t/71.script_cmds.t
Shipwright/trunk/t/hello/fs.t
Shipwright/trunk/t/hello/scripts/build
Shipwright/trunk/t/hello/scripts/howdy_require.yml
Shipwright/trunk/t/hello/shipwright/order.yml
Shipwright/trunk/t/hello/svk.t
Shipwright/trunk/t/hello/svn.t
Log:
r20031 at sunnavys-mb: sunnavy | 2009-02-23 00:14:19 +0800
replace Acme-Hello to the fake Foo-Bar in tests, becase Acme-Hello fails its tests in perl510
Modified: Shipwright/trunk/MANIFEST
==============================================================================
--- Shipwright/trunk/MANIFEST (original)
+++ Shipwright/trunk/MANIFEST Sun Feb 22 11:14:55 2009
@@ -92,7 +92,7 @@
t/dists/tgz_build.tar.gz
t/dists/version1/info
t/dists/version2/info
-t/hello/Acme-Hello-0.03.tar.gz
+t/hello/Foo-Bar-v0.01.tar.gz
t/hello/fs.t
t/hello/scripts/build
t/hello/scripts/howdy_require.yml
Modified: Shipwright/trunk/t/71.script_cmds.t
==============================================================================
--- Shipwright/trunk/t/71.script_cmds.t (original)
+++ Shipwright/trunk/t/71.script_cmds.t Sun Feb 22 11:14:55 2009
@@ -116,17 +116,17 @@
],
[
- [ 'import', 'file:t/hello/Acme-Hello-0.03.tar.gz', '--no-follow' ],
+ [ 'import', 'file:t/hello/Foo-Bar-v0.01.tar.gz', '--no-follow' ],
qr/imported with success/,
'import tar.gz file',
],
- # here we has a dist named Acme-Hello
+ # here we has a dist named Foo-Bar
[
[ 'list', ],
- qr{Acme-Hello:\s+
- version:\s+vendor:\s+0\.03\s+
- from:\s+vendor:\s+\Qfile:t/hello/Acme-Hello-0.03.tar.gz\E\s+
+ qr{Foo-Bar:\s+
+ version:\s+vendor:\s+0\.01\s+
+ from:\s+vendor:\s+\Qfile:t/hello/Foo-Bar-v0.01.tar.gz\E\s+
references:\s+0\s+
}mx,
'list the repo'
@@ -134,16 +134,16 @@
# rename cmd
[
- [ 'rename', 'Acme-Hello', 'foo' ],
- qr/renamed Acme-Hello to foo with success/
+ [ 'rename', 'Foo-Bar', 'foo' ],
+ qr/renamed Foo-Bar to foo with success/
],
- # now Acme-Hello is renamed to foo
+ # now Foo-Bar is renamed to foo
[
[ 'list', ],
qr{foo:\s+
- version:\s+vendor:\s+0\.03\s+
- from:\s+vendor:\s+\Qfile:t/hello/Acme-Hello-0.03.tar.gz\E\s+
+ version:\s+vendor:\s+0\.01\s+
+ from:\s+vendor:\s+\Qfile:t/hello/Foo-Bar-v0.01.tar.gz\E\s+
references:\s+0\s+
}mx,
'list the repo'
@@ -163,7 +163,7 @@
"rename without new-name arg"
],
[
- [ 'rename', 'Acme-Hello', '@' ],
+ [ 'rename', 'Foo-Bar', '@' ],
undef,
undef,
qr/invalid new-name: @/,
Added: Shipwright/trunk/t/hello/Foo-Bar-v0.01.tar.gz
==============================================================================
Binary file. No diff available.
Modified: Shipwright/trunk/t/hello/fs.t
==============================================================================
--- Shipwright/trunk/t/hello/fs.t (original)
+++ Shipwright/trunk/t/hello/fs.t Sun Feb 22 11:14:55 2009
@@ -22,8 +22,8 @@
'ftp://example.com/hello.tar.gz' => 'FTP',
'svn:file:///home/sunnavy/svn/hello' => 'SVN',
'svk://local/hello' => 'SVK',
- 'cpan:Acme::Hello' => 'CPAN',
- 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ) => 'Compressed',
+ 'cpan:Foo::Bar' => 'CPAN',
+ 'file:' . catfile( 't', 'hello', 'Foo-Bar-v0.01.tar.gz' ) => 'Compressed',
'dir:' . catfile( 't', 'hello' ) => 'Directory',
);
@@ -39,7 +39,7 @@
my $shipwright = Shipwright->new(
repository => "fs:$repo",
- source => 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
+ source => 'file:' . catfile( 't', 'hello', 'Foo-Bar-v0.01.tar.gz' ),
follow => 0,
log_level => 'FATAL',
force => 1,
@@ -62,20 +62,20 @@
# source
my $source_dir = $shipwright->source->run();
-like( $source_dir, qr/\bAcme-Hello\b/, 'source name looks ok' );
+like( $source_dir, qr/\bFoo-Bar\b/, 'source name looks ok' );
for (qw/source backend/) {
isa_ok( $shipwright->$_->log, 'Log::Log4perl::Logger' );
}
-ok( -e catfile( $source_dir, 'lib', 'Acme', 'Hello.pm' ),
- 'lib/Acme/Hello.pm exists in the source' );
+ok( -e catfile( $source_dir, 'lib', 'Foo', 'Bar.pm' ),
+ 'lib/Foo/Bar.pm exists in the source' );
ok( -e catfile( $source_dir, 'META.yml' ), 'META.yml exists in the source' );
# import
$shipwright->backend->import( name => 'hello', source => $source_dir );
-ok( grep( {/Build\.PL/} `ls $repo/sources/Acme-Hello/vendor` ), 'imported ok' );
+ok( grep( {/Makefile\.PL/} `ls $repo/sources/Foo-Bar/vendor` ), 'imported ok' );
my $script_dir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
copy( catfile( 't', 'hello', 'scripts', 'build' ), $script_dir );
@@ -86,7 +86,7 @@
source => $source_dir,
build_script => $script_dir,
);
-ok( grep( {/Build\.PL/} `cat $repo/scripts/Acme-Hello/build` ),
+ok( grep( {/Makefile\.PL/} `cat $repo/scripts/Foo-Bar/build` ),
'build script ok' );
# import another dist
@@ -94,7 +94,7 @@
chdir $cwd;
$shipwright = Shipwright->new(
repository => "fs:$repo",
- source => 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
+ source => 'file:' . catfile( 't', 'hello', 'Foo-Bar-v0.01.tar.gz' ),
name => 'howdy',
follow => 0,
log_level => 'FATAL',
@@ -104,7 +104,7 @@
$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/} `ls $repo/sources/howdy/vendor` ), 'imported ok' );
+ok( grep( {/Makefile\.PL/} `ls $repo/sources/howdy/vendor` ), 'imported ok' );
$script_dir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
copy( catfile( 't', 'hello', 'scripts', 'build' ), $script_dir );
copy( catfile( 't', 'hello', 'scripts', 'howdy_require.yml' ),
@@ -115,7 +115,7 @@
source => $source_dir,
build_script => $script_dir,
);
-ok( grep( {/Build\.PL/} `cat $repo/scripts/howdy/build` ), 'build script ok' );
+ok( grep( {/Makefile\.PL/} `cat $repo/scripts/howdy/build` ), 'build script ok' );
my $tempdir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
dircopy(
@@ -126,21 +126,21 @@
# check to see if update_order works
like(
`cat $repo/shipwright/order.yml`,
- qr/Acme-Hello.*howdy/s,
+ qr/Foo-Bar.*howdy/s,
'original order is right'
);
system( 'cp -r ' . catfile( $tempdir, 'shipwright' ) . " $repo/" );
like(
`cat $repo/shipwright/order.yml`,
- qr/howdy.*Acme-Hello/s,
+ qr/howdy.*Foo-Bar/s,
'imported wrong order works'
);
$shipwright->backend->update_order;
like(
`cat $repo/shipwright/order.yml`,
- qr/Acme-Hello.*howdy/s,
+ qr/Foo-Bar.*howdy/s,
'updated order works'
);
@@ -152,9 +152,9 @@
for (
catfile( $build_base, 'shipwright', 'order.yml', ),
catfile( $build_base, 'etc', 'shipwright-script-wrapper' ),
- catfile( $build_base, 'sources', 'Acme-Hello', 'vendor', ),
- catfile( $build_base, 'sources', 'Acme-Hello', 'vendor', 'MANIFEST', ),
- catfile( $build_base, 'scripts', 'Acme-Hello', 'build', ),
+ catfile( $build_base, 'sources', 'Foo-Bar', 'vendor', ),
+ catfile( $build_base, 'sources', 'Foo-Bar', 'vendor', 'MANIFEST', ),
+ catfile( $build_base, 'scripts', 'Foo-Bar', 'build', ),
)
{
ok( -e $_, "$_ exists" );
@@ -165,8 +165,8 @@
for (
catfile(
$install_base, 'lib',
- 'perl5', 'Acme',
- 'Hello.pm'
+ 'perl5', 'Foo',
+ 'Bar.pm'
),
catfile(
$install_base, 'etc',
Modified: Shipwright/trunk/t/hello/scripts/build
==============================================================================
--- Shipwright/trunk/t/hello/scripts/build (original)
+++ Shipwright/trunk/t/hello/scripts/build Sun Feb 22 11:14:55 2009
@@ -1,6 +1,5 @@
-# this is a test comment
-configure: %%PERL%% Build.PL --install_base=%%INSTALL_BASE%%
-make: ./Build
-test: ./Build test
-# and another
-install: ./Build install
+configure: %%PERL%% Makefile.PL LIB=%%INSTALL_BASE%%/lib/perl5/ PREFIX=%%INSTALL_BASE%%
+make: %%MAKE%%
+test: %%MAKE%% test
+install: %%MAKE%% install
+clean: %%MAKE%% clean
Modified: Shipwright/trunk/t/hello/scripts/howdy_require.yml
==============================================================================
--- Shipwright/trunk/t/hello/scripts/howdy_require.yml (original)
+++ Shipwright/trunk/t/hello/scripts/howdy_require.yml Sun Feb 22 11:14:55 2009
@@ -1,4 +1,4 @@
---
requires:
- Acme-Hello:
+ Foo-Bar:
version: 0
Modified: Shipwright/trunk/t/hello/shipwright/order.yml
==============================================================================
--- Shipwright/trunk/t/hello/shipwright/order.yml (original)
+++ Shipwright/trunk/t/hello/shipwright/order.yml Sun Feb 22 11:14:55 2009
@@ -1,2 +1,2 @@
- howdy
-- Acme-Hello
+- Foo-Bar
Modified: Shipwright/trunk/t/hello/svk.t
==============================================================================
--- Shipwright/trunk/t/hello/svk.t (original)
+++ Shipwright/trunk/t/hello/svk.t Sun Feb 22 11:14:55 2009
@@ -25,7 +25,7 @@
my $shipwright = Shipwright->new(
repository => "svk:$repo",
- source => 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
+ source => 'file:' . catfile( 't', 'hello', 'Foo-Bar-v0.01.tar.gz' ),
follow => 0,
log_level => 'FATAL',
force => 1,
@@ -48,7 +48,7 @@
# import
$shipwright->backend->import( name => 'hello', source => $source_dir );
- ok( grep( {/Build\.PL/} `svk ls $repo/sources/Acme-Hello/vendor` ),
+ ok( grep( {/Makefile\.PL/} `svk ls $repo/sources/Foo-Bar/vendor` ),
'imported ok' );
my $script_dir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
@@ -60,7 +60,7 @@
source => $source_dir,
build_script => $script_dir,
);
- ok( grep( {/Build\.PL/} `svk cat $repo/scripts/Acme-Hello/build` ),
+ ok( grep( {/Makefile\.PL/} `svk cat $repo/scripts/Foo-Bar/build` ),
'build script ok' );
# import another dist
@@ -68,7 +68,7 @@
chdir $cwd;
$shipwright = Shipwright->new(
repository => "svk:$repo",
- source => 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
+ source => 'file:' . catfile( 't', 'hello', 'Foo-Bar-v0.01.tar.gz' ),
name => 'howdy',
follow => 0,
log_level => 'FATAL',
@@ -78,7 +78,7 @@
$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/sources/howdy/vendor` ),
+ ok( grep( {/Makefile\.PL/} `svk ls $repo/sources/howdy/vendor` ),
'imported ok' );
$script_dir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
copy( catfile( 't', 'hello', 'scripts', 'build' ), $script_dir );
@@ -90,7 +90,7 @@
source => $source_dir,
build_script => $script_dir,
);
- ok( grep( {/Build\.PL/} `svk cat $repo/scripts/howdy/build` ),
+ ok( grep( {/Makefile\.PL/} `svk cat $repo/scripts/howdy/build` ),
'build script ok' );
my $tempdir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
@@ -102,7 +102,7 @@
# check to see if update_order works
like(
`svk cat $repo/shipwright/order.yml`,
- qr/Acme-Hello.*howdy/s,
+ qr/Foo-Bar.*howdy/s,
'original order is right'
);
@@ -111,14 +111,14 @@
. " $repo/shipwright -m ''" );
like(
`svk cat $repo/shipwright/order.yml`,
- qr/howdy.*Acme-Hello/s,
+ qr/howdy.*Foo-Bar/s,
'imported wrong order works'
);
$shipwright->backend->update_order;
like(
`svk cat $repo/shipwright/order.yml`,
- qr/Acme-Hello.*howdy/s,
+ qr/Foo-Bar.*howdy/s,
'updated order works'
);
Modified: Shipwright/trunk/t/hello/svn.t
==============================================================================
--- Shipwright/trunk/t/hello/svn.t (original)
+++ Shipwright/trunk/t/hello/svn.t Sun Feb 22 11:14:55 2009
@@ -22,7 +22,7 @@
my $shipwright = Shipwright->new(
repository => "svn:$repo",
- source => 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
+ source => 'file:' . catfile( 't', 'hello', 'Foo-Bar-v0.01.tar.gz' ),
log_level => 'FATAL',
follow => 0,
force => 1,
@@ -45,7 +45,7 @@
# import
$shipwright->backend->import( name => 'hello', source => $source_dir );
- ok( grep( {/Build\.PL/} `svn ls $repo/sources/Acme-Hello/vendor` ),
+ ok( grep( {/Makefile\.PL/} `svn ls $repo/sources/Foo-Bar/vendor` ),
'imported ok' );
my $script_dir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
@@ -57,7 +57,7 @@
source => $source_dir,
build_script => $script_dir,
);
- ok( grep( {/Build\.PL/} `svn cat $repo/scripts/Acme-Hello/build` ),
+ ok( grep( {/Makefile\.PL/} `svn cat $repo/scripts/Foo-Bar/build` ),
'build script ok' );
# import another dist
@@ -65,7 +65,7 @@
chdir $cwd;
$shipwright = Shipwright->new(
repository => "svn:$repo",
- source => 'file:' . catfile( 't', 'hello', 'Acme-Hello-0.03.tar.gz' ),
+ source => 'file:' . catfile( 't', 'hello', 'Foo-Bar-v0.01.tar.gz' ),
name => 'howdy',
follow => 0,
log_level => 'FATAL',
@@ -74,7 +74,7 @@
$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/sources/howdy/vendor` ),
+ ok( grep( {/Makefile\.PL/} `svn ls $repo/sources/howdy/vendor` ),
'imported ok' );
$script_dir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
copy( catfile( 't', 'hello', 'scripts', 'build' ), $script_dir );
@@ -86,7 +86,7 @@
source => $source_dir,
build_script => $script_dir,
);
- ok( grep( {/Build\.PL/} `svn cat $repo/scripts/howdy/build` ),
+ ok( grep( {/Makefile\.PL/} `svn cat $repo/scripts/howdy/build` ),
'build script ok' );
my $tempdir = tempdir( 'shipwright_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
@@ -98,7 +98,7 @@
# check to see if update_order works
like(
`svn cat $repo/shipwright/order.yml`,
- qr/Acme-Hello.*howdy/s,
+ qr/Foo-Bar.*howdy/s,
'order is right'
);
@@ -108,14 +108,14 @@
. " $repo/shipwright -m ''" );
like(
`svn cat $repo/shipwright/order.yml`,
- qr/howdy.*Acme-Hello/s,
+ qr/howdy.*Foo-Bar/s,
'imported wrong order works'
);
$shipwright->backend->update_order;
like(
`svn cat $repo/shipwright/order.yml`,
- qr/Acme-Hello.*howdy/s,
+ qr/Foo-Bar.*howdy/s,
'updated order works'
);
}
More information about the Bps-public-commit
mailing list