Hello community,
here is the log from the commit of package perl-Sysadm-Install for
openSUSE:Factory checked in at 2013-06-21 13:32:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Sysadm-Install (Old)
and /work/SRC/openSUSE:Factory/.perl-Sysadm-Install.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Sysadm-Install"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Sysadm-Install/perl-Sysadm-Install.changes
2011-09-23 12:38:56.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Sysadm-Install.new/perl-Sysadm-Install.changes
2013-06-21 13:37:20.000000000 +0200
@@ -1,0 +2,21 @@
+Sat Jun 15 06:04:10 UTC 2013 - [email protected]
+
+- updated to 0.43
+ (ms) Using binmode() now for slurp/blurt for compatibility with Win32
+ systems.
+
+ (ms) No longer silently removing directories that are in the way
+ before untar().
+ (ms) Better error diagnosis on failing untar() tests
+
+ (ms) Added home_dir() function returning user's home directory.
+ (ms) tap() now supports stdout_limit and stderr_limit options to
+ limit log verbosity
+
+ (ms) Applied pull request by ks0608 to fix Cwd problem on Win32/Mac
+ (https://github.com/mschilli/sysadm-install-perl/pull/1)
+
+ (ms) Fixed bin_find, to omit directories
+ (ms) Added cdback() with reset option
+
+-------------------------------------------------------------------
Old:
----
Sysadm-Install-0.38.tar.gz
New:
----
Sysadm-Install-0.43.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Sysadm-Install.spec ++++++
--- /var/tmp/diff_new_pack.Sx2l4y/_old 2013-06-21 13:37:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Sx2l4y/_new 2013-06-21 13:37:20.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Sysadm-Install
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,38 +16,43 @@
#
-%define cpan_name Sysadm-Install
-
Name: perl-Sysadm-Install
-Version: 0.38
-Release: 1
-
-License: GPL-1.0+ or Artistic-1.0
+Version: 0.43
+Release: 0
+%define cpan_name Sysadm-Install
Summary: Typical installation tasks for system administrators
-Url: http://search.cpan.org/dist/Sysadm-Install/
+License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
+Url: http://search.cpan.org/dist/Sysadm-Install/
Source:
http://www.cpan.org/authors/id/M/MS/MSCHILLI/%{cpan_name}-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
-BuildRequires: perl(Log::Log4perl) >= 1.28
BuildRequires: perl(LWP::Simple)
+BuildRequires: perl(Log::Log4perl) >= 1.28
BuildRequires: perl(Term::ReadKey)
-Requires: perl(Log::Log4perl) >= 1.28
+#BuildRequires: perl(Archive::Tar)
+#BuildRequires: perl(Expect)
+#BuildRequires: perl(HTTP::Request)
+#BuildRequires: perl(HTTP::Status)
+#BuildRequires: perl(Log::Log4perl::Util)
+#BuildRequires: perl(LWP::UserAgent)
+#BuildRequires: perl(Sysadm::Install)
Requires: perl(LWP::Simple)
+Requires: perl(Log::Log4perl) >= 1.28
Requires: perl(Term::ReadKey)
%{perl_requires}
%description
Have you ever wished for your installation shell scripts to run
-reproducably, without much programming fuzz, and even with optional logging
+reproducibly, without much programming fuzz, and even with optional logging
enabled? Then give up shell programming, use Perl.
'Sysadm::Install' executes shell-like commands performing typical
installation tasks: Copying files, extracting tarballs, calling 'make'. It
has a 'fail once and die' policy, meticulously checking the result of every
-operation and calling 'die()' immeditatly if anything fails.
+operation and calling 'die()' immediately if anything fails.
'Sysadm::Install' also supports a _dry_run_ mode, in which it logs
everything, but suppresses any write actions. Dry run mode is enabled by
@@ -81,11 +86,8 @@
%perl_process_packlist
%perl_gen_filelist
-%clean
-%{__rm} -rf %{buildroot}
-
%files -f %{name}.files
%defattr(-,root,root,755)
-%doc Changes README
+%doc Changes MYMETA.json MYMETA.yml README
%changelog
++++++ Sysadm-Install-0.38.tar.gz -> Sysadm-Install-0.43.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/Changes
new/Sysadm-Install-0.43/Changes
--- old/Sysadm-Install-0.38/Changes 2011-07-30 21:22:10.000000000 +0200
+++ new/Sysadm-Install-0.43/Changes 2013-03-17 08:23:53.000000000 +0100
@@ -2,6 +2,28 @@
Revision history for Sysadm::Install
########################################
+0.43 (2013/03/16)
+ (ms) Using binmode() now for slurp/blurt for compatibility with Win32
+ systems.
+
+0.42 (2013/01/20)
+ (ms) No longer silently removing directories that are in the way
+ before untar().
+ (ms) Better error diagnosis on failing untar() tests
+
+0.41 (2012/12/17)
+ (ms) Added home_dir() function returning user's home directory.
+ (ms) tap() now supports stdout_limit and stderr_limit options to
+ limit log verbosity
+
+0.40 (2012/09/15)
+ (ms) Applied pull request by ks0608 to fix Cwd problem on Win32/Mac
+ (https://github.com/mschilli/sysadm-install-perl/pull/1)
+
+0.39 (2012/05/17)
+ (ms) Fixed bin_find, to omit directories
+ (ms) Added cdback() with reset option
+
0.38 (2011/07/30)
(ms) Fixed Win32 test in 012tap.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/MANIFEST
new/Sysadm-Install-0.43/MANIFEST
--- old/Sysadm-Install-0.38/MANIFEST 2011-07-30 21:22:43.000000000 +0200
+++ new/Sysadm-Install-0.43/MANIFEST 2013-03-19 04:59:27.000000000 +0100
@@ -9,6 +9,8 @@
Makefile.PL
MANIFEST This list of files
MANIFEST.SKIP
+MYMETA.json
+MYMETA.yml
README
t/001.t
t/002tar.t
@@ -26,7 +28,10 @@
t/014utf8.t
t/015caller_level.t
t/016printable.t
+t/017cdback.t
+t/018home.t
t/canned/test.tar
t/canned/testa.tar
t/canned/utf8.txt
-META.yml Module meta-data (added by MakeMaker)
+META.yml Module YAML meta-data (added by
MakeMaker)
+META.json Module JSON meta-data (added by
MakeMaker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/MANIFEST.SKIP
new/Sysadm-Install-0.43/MANIFEST.SKIP
--- old/Sysadm-Install-0.38/MANIFEST.SKIP 2010-06-26 05:33:47.000000000
+0200
+++ new/Sysadm-Install-0.43/MANIFEST.SKIP 2013-03-15 21:07:26.000000000
+0100
@@ -6,3 +6,4 @@
MANIFEST.bak
^adm
.git
+.gz$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/META.json
new/Sysadm-Install-0.43/META.json
--- old/Sysadm-Install-0.38/META.json 1970-01-01 01:00:00.000000000 +0100
+++ new/Sysadm-Install-0.43/META.json 2013-03-19 04:59:27.000000000 +0100
@@ -0,0 +1,53 @@
+{
+ "abstract" : "Typical installation tasks for system administrators",
+ "author" : [
+ "Mike Schilli <[email protected]>"
+ ],
+ "dynamic_config" : 1,
+ "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter
version 2.120630",
+ "license" : [
+ "unknown"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
+ "version" : "2"
+ },
+ "name" : "Sysadm-Install",
+ "no_index" : {
+ "directory" : [
+ "t",
+ "inc"
+ ]
+ },
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "0"
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "0"
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "Cwd" : "0",
+ "File::Basename" : "0",
+ "File::Copy" : "0",
+ "File::Path" : "0",
+ "File::Temp" : "0.16",
+ "LWP::Simple" : "0",
+ "Log::Log4perl" : "1.28",
+ "Term::ReadKey" : "0"
+ }
+ }
+ },
+ "release_status" : "stable",
+ "resources" : {
+ "repository" : {
+ "url" : "http://github.com/mschilli/sysadm-install-perl";
+ }
+ },
+ "version" : "0.43"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/META.yml
new/Sysadm-Install-0.43/META.yml
--- old/Sysadm-Install-0.38/META.yml 2011-07-30 21:22:43.000000000 +0200
+++ new/Sysadm-Install-0.43/META.yml 2013-03-19 04:59:26.000000000 +0100
@@ -1,31 +1,31 @@
---- #YAML:1.0
-name: Sysadm-Install
-version: 0.38
-abstract: Typical installation tasks for system administrators
+---
+abstract: 'Typical installation tasks for system administrators'
author:
- - Mike Schilli <[email protected]>
-license: unknown
-distribution_type: module
-configure_requires:
- ExtUtils::MakeMaker: 0
+ - 'Mike Schilli <[email protected]>'
build_requires:
- ExtUtils::MakeMaker: 0
+ ExtUtils::MakeMaker: 0
+configure_requires:
+ ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter
version 2.120630'
+license: unknown
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: Sysadm-Install
+no_index:
+ directory:
+ - t
+ - inc
requires:
- Cwd: 0
- File::Basename: 0
- File::Copy: 0
- File::Path: 0
- File::Temp: 0.16
- Log::Log4perl: 1.28
- LWP::Simple: 0
- Term::ReadKey: 0
+ Cwd: 0
+ File::Basename: 0
+ File::Copy: 0
+ File::Path: 0
+ File::Temp: 0.16
+ LWP::Simple: 0
+ Log::Log4perl: 1.28
+ Term::ReadKey: 0
resources:
- repository: http://github.com/mschilli/sysadm-install-perl
-no_index:
- directory:
- - t
- - inc
-generated_by: ExtUtils::MakeMaker version 6.55_02
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ repository: http://github.com/mschilli/sysadm-install-perl
+version: 0.43
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/MYMETA.json
new/Sysadm-Install-0.43/MYMETA.json
--- old/Sysadm-Install-0.38/MYMETA.json 1970-01-01 01:00:00.000000000 +0100
+++ new/Sysadm-Install-0.43/MYMETA.json 2013-03-19 04:59:26.000000000 +0100
@@ -0,0 +1,53 @@
+{
+ "abstract" : "Typical installation tasks for system administrators",
+ "author" : [
+ "Mike Schilli <[email protected]>"
+ ],
+ "dynamic_config" : 0,
+ "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter
version 2.120630",
+ "license" : [
+ "unknown"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
+ "version" : "2"
+ },
+ "name" : "Sysadm-Install",
+ "no_index" : {
+ "directory" : [
+ "t",
+ "inc"
+ ]
+ },
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "0"
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "0"
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "Cwd" : "0",
+ "File::Basename" : "0",
+ "File::Copy" : "0",
+ "File::Path" : "0",
+ "File::Temp" : "0.16",
+ "LWP::Simple" : "0",
+ "Log::Log4perl" : "1.28",
+ "Term::ReadKey" : "0"
+ }
+ }
+ },
+ "release_status" : "stable",
+ "resources" : {
+ "repository" : {
+ "url" : "http://github.com/mschilli/sysadm-install-perl";
+ }
+ },
+ "version" : "0.43"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/MYMETA.yml
new/Sysadm-Install-0.43/MYMETA.yml
--- old/Sysadm-Install-0.38/MYMETA.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/Sysadm-Install-0.43/MYMETA.yml 2013-03-19 04:59:26.000000000 +0100
@@ -0,0 +1,31 @@
+---
+abstract: 'Typical installation tasks for system administrators'
+author:
+ - 'Mike Schilli <[email protected]>'
+build_requires:
+ ExtUtils::MakeMaker: 0
+configure_requires:
+ ExtUtils::MakeMaker: 0
+dynamic_config: 0
+generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter
version 2.120630'
+license: unknown
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: Sysadm-Install
+no_index:
+ directory:
+ - t
+ - inc
+requires:
+ Cwd: 0
+ File::Basename: 0
+ File::Copy: 0
+ File::Path: 0
+ File::Temp: 0.16
+ LWP::Simple: 0
+ Log::Log4perl: 1.28
+ Term::ReadKey: 0
+resources:
+ repository: http://github.com/mschilli/sysadm-install-perl
+version: 0.43
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/README
new/Sysadm-Install-0.43/README
--- old/Sysadm-Install-0.38/README 2011-07-30 21:22:42.000000000 +0200
+++ new/Sysadm-Install-0.43/README 2013-03-19 04:59:25.000000000 +0100
@@ -1,5 +1,5 @@
######################################################################
- Sysadm::Install 0.38
+ Sysadm::Install 0.43
######################################################################
NAME
@@ -31,13 +31,13 @@
DESCRIPTION
Have you ever wished for your installation shell scripts to run
- reproducably, without much programming fuzz, and even with optional
+ reproducibly, without much programming fuzz, and even with optional
logging enabled? Then give up shell programming, use Perl.
"Sysadm::Install" executes shell-like commands performing typical
installation tasks: Copying files, extracting tarballs, calling "make".
It has a "fail once and die" policy, meticulously checking the result of
- every operation and calling "die()" immeditatly if anything fails.
+ every operation and calling "die()" immediately if anything fails.
"Sysadm::Install" also supports a *dry_run* mode, in which it logs
everything, but suppresses any write actions. Dry run mode is enabled by
@@ -125,7 +125,13 @@
cd($dir, {stack_update => 0});
"cdback()"
- chdir back to the last directory before a previous "cd".
+ chdir back to the last directory before a previous "cd". If the
+ option "reset" is set, it goes all the way back to the beginning of
+ the directory stack, i.e. no matter how many cd() calls were made in
+ between, it'll go back to the original directory:
+
+ # go all the way back
+ cdback( { reset => 1 } );
"make()"
Call "make" in the shell.
@@ -244,6 +250,12 @@
tap({raise_error => 1}, "ls", "doesn't exist");
+ In DEBUG mode, "tap" logs the entire stdout/stderr output, which can
+ get too verbose at times. To limit the number of bytes logged, use
+ the "stdout_limit" and "stderr_limit" options
+
+ tap({stdout_limit => 10}, "echo", "123456789101112");
+
"$quoted_string = qquote($string, [$metachars])"
Put a string in double quotes and escape all sensitive characters so
there's no unwanted interpolation. E.g., if you have something like
@@ -507,6 +519,9 @@
Check if we're using a perl with proper utf8 support, by verifying
the Encode.pm module is available for loading.
+ "home_dir()"
+ Return the path to the home directory of the current user.
+
AUTHOR
Mike Schilli, <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/lib/Sysadm/Install.pm
new/Sysadm-Install-0.43/lib/Sysadm/Install.pm
--- old/Sysadm-Install-0.38/lib/Sysadm/Install.pm 2011-07-30
21:22:10.000000000 +0200
+++ new/Sysadm-Install-0.43/lib/Sysadm/Install.pm 2013-03-17
08:26:01.000000000 +0100
@@ -6,7 +6,7 @@
use strict;
use warnings;
-our $VERSION = '0.38';
+our $VERSION = '0.43';
use File::Copy;
use File::Path;
@@ -84,7 +84,7 @@
snip password_read nice_time
def_or blurt_atomic
is_utf8_data utf8_available
-printable
+printable home_dir
);
our %EXPORTABLE = map { $_ => 1 } @EXPORTABLE;
@@ -148,13 +148,13 @@
=head1 DESCRIPTION
Have you ever wished for your installation shell scripts to run
-reproducably, without much programming fuzz, and even with optional
+reproducibly, without much programming fuzz, and even with optional
logging enabled? Then give up shell programming, use Perl.
C<Sysadm::Install> executes shell-like commands performing typical
installation tasks: Copying files, extracting tarballs, calling C<make>.
It has a C<fail once and die> policy, meticulously checking the result
-of every operation and calling C<die()> immeditatly if anything fails.
+of every operation and calling C<die()> immediately if anything fails.
C<Sysadm::Install> also supports a I<dry_run> mode, in which it
logs everything, but suppresses any write actions. Dry run mode
@@ -298,29 +298,31 @@
require Archive::Tar;
my $arch = Archive::Tar->new($_[0]);
+ my @extracted = ();
+
if($nice and $topdir eq $namedir) {
DEBUG "Nice archive, extracting to subdir $topdir";
- rmf($namedir);
- $arch->extract();
+ @extracted = $arch->extract();
} elsif($nice) {
DEBUG "Not-so-nice archive topdir=$topdir namedir=$namedir";
- rmf($namedir);
- rmf($topdir);
# extract as topdir
- $arch->extract();
+ @extracted = $arch->extract();
rename $topdir, $namedir or
LOGCROAK("Can't rename $topdir, $namedir");
} else {
LOGCROAK("no topdir") unless defined $topdir;
DEBUG "Not-so-nice archive (no topdir), extracting to subdir $topdir";
$topdir = basename $topdir;
- rmf($topdir);
mkd($topdir);
cd($topdir);
- $arch->extract();
+ @extracted = $arch->extract();
cdback();
}
+ if( !@extracted ) {
+ LOGCROAK "Archive $_[0] was empty.";
+ }
+
return $topdir;
}
@@ -550,19 +552,32 @@
=item C<cdback()>
-chdir back to the last directory before a previous C<cd>.
+chdir back to the last directory before a previous C<cd>. If the
+option C<reset> is set, it goes all the way back to the beginning of the
+directory stack, i.e. no matter how many cd() calls were made in between,
+it'll go back to the original directory:
+
+ # go all the way back
+ cdback( { reset => 1 } );
=cut
###############################################
sub cdback {
###############################################
+ my( $opts ) = @_;
+
+ $opts = {} if !defined $opts;
local $Log::Log4perl::caller_depth =
$Log::Log4perl::caller_depth + 1;
LOGCROAK("cd stack empty") unless @DIR_STACK;
+ if( $opts->{ reset } ) {
+ @DIR_STACK = ( $DIR_STACK[0] );
+ }
+
my $old_dir = pop @DIR_STACK;
LOGCROAK("Directory stack empty")
@@ -810,6 +825,7 @@
INFO "Slurping data from $file";
open FILE, "<$file" or
LOGCROAK("Cannot open $file ($!)");
+ binmode FILE; # Win32 wants that
if( exists $options->{utf8} ) {
binmode FILE, ":utf8";
}
@@ -863,6 +879,8 @@
or
LOGCROAK("Cannot open $file for writing ($!)");
+ binmode FILE; # Win32 wants that
+
if( $options->{utf8} ) {
binmode FILE, ":utf8";
}
@@ -966,6 +984,12 @@
tap({raise_error => 1}, "ls", "doesn't exist");
+In DEBUG mode, C<tap> logs the entire stdout/stderr output, which
+can get too verbose at times. To limit the number of bytes logged, use
+the C<stdout_limit> and C<stderr_limit> options
+
+ tap({stdout_limit => 10}, "echo", "123456789101112");
+
=cut
###############################################
@@ -1026,6 +1050,14 @@
my $stderr = slurp($tmpfile, $options);
+ if( $opts->{ stdout_limit } ) {
+ $stdout = snip( $stdout, $opts->{ stdout_limit } );
+ }
+
+ if( $opts->{ stderr_limit } ) {
+ $stderr = snip( $stderr, $opts->{ stderr_limit } );
+ }
+
DEBUG "tap $cmd results: rc=$exit_code stderr=[$stderr] stdout=[$stdout]";
return ($stdout, $stderr, $exit_code);
@@ -1440,7 +1472,7 @@
for my $path (split /$path_sep/, $ENV{PATH}) {
my $full = File::Spec->catfile($path, $exe);
- return $full if -x $full;
+ return $full if -x $full and ! -d $full;
}
return undef;
@@ -1777,6 +1809,20 @@
return 1;
}
+=item C<home_dir()>
+
+Return the path to the home directory of the current user.
+
+=cut
+
+###############################################
+sub home_dir {
+###############################################
+
+ my( $home ) = glob "~";
+
+ return $home;
+}
=pod
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/t/002tar.t
new/Sysadm-Install-0.43/t/002tar.t
--- old/Sysadm-Install-0.38/t/002tar.t 2010-06-26 05:33:47.000000000 +0200
+++ new/Sysadm-Install-0.43/t/002tar.t 2013-03-15 21:07:26.000000000 +0100
@@ -7,6 +7,7 @@
use Sysadm::Install qw(:all);
use File::Spec;
use File::Path;
+use Carp;
#use Log::Log4perl qw(:easy);
#Log::Log4perl->easy_init($DEBUG);
@@ -40,7 +41,7 @@
##############
sub readfile {
##############
- open FILE, "<$_[0]" or die "Cannot open $_[0]";
+ open FILE, "<$_[0]" or croak "Cannot open $_[0] ($!)";
my $data = join '', <FILE>;
close FILE;
return $data;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/t/012tap.t
new/Sysadm-Install-0.43/t/012tap.t
--- old/Sysadm-Install-0.38/t/012tap.t 2011-07-07 16:54:12.000000000 +0200
+++ new/Sysadm-Install-0.43/t/012tap.t 2013-03-15 21:07:26.000000000 +0100
@@ -2,7 +2,7 @@
# Tests for Sysadm::Install
#####################################
-use Test::More tests => 2;
+use Test::More tests => 4;
use Sysadm::Install qw(:all);
@@ -13,4 +13,15 @@
($stdout, $stderr, $rc) = tap { raise_error => 1 }, "echo";
is($rc, 0, "tap and raise");
+
+ ($stdout, $stderr, $rc) = tap { stdout_limit => 10 }, "echo",
+ "12345678910111211314"
+ ;
+ is($stdout, "(21)[12[snip=17]4.]", "limited stdout");
+
+ # tap needs to work if PATH is not set
+ my $ls = bin_find( "ls" );
+ $ENV{ PATH } = "";
+ ($stdout, $stderr, $rc) = tap $ls, "/";
+ is($rc, 0, "cmd ok");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/t/017cdback.t
new/Sysadm-Install-0.43/t/017cdback.t
--- old/Sysadm-Install-0.38/t/017cdback.t 1970-01-01 01:00:00.000000000
+0100
+++ new/Sysadm-Install-0.43/t/017cdback.t 2013-03-15 21:07:26.000000000
+0100
@@ -0,0 +1,27 @@
+use Test::More;
+
+use Sysadm::Install qw(:all);
+use Cwd qw( cwd abs_path );
+use File::Temp qw( tempdir );
+
+my $dir_a = tempdir( CLEANUP => 1 );
+my $dir_b = tempdir( CLEANUP => 1 );
+
+plan tests => 4;
+
+my $org = cwd();
+
+cd $dir_a;
+cd $dir_b;
+
+is abs_path(), abs_path($dir_b), "dir b";
+cdback;
+is abs_path(), abs_path($dir_a), "back to dir a";
+cdback;
+is abs_path(), abs_path($org), "back to dir a";
+
+cd $dir_a;
+cd $dir_b;
+
+cdback( { reset => 1 } );
+is abs_path(), abs_path($org), "reset";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Sysadm-Install-0.38/t/018home.t
new/Sysadm-Install-0.43/t/018home.t
--- old/Sysadm-Install-0.38/t/018home.t 1970-01-01 01:00:00.000000000 +0100
+++ new/Sysadm-Install-0.43/t/018home.t 2013-03-15 21:07:26.000000000 +0100
@@ -0,0 +1,8 @@
+use Test::More;
+use Sysadm::Install qw(:all);
+
+plan tests => 1;
+
+my $home = home_dir();
+
+ok length( $home ), "home dir";
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
