r38563 - in /branches/upstream/libenv-ps1-perl/current: Changes MANIFEST MANIFEST.SKIP META.yml Makefile.PL example.pl lib/Env/PS1.pm

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Wed Jun 24 05:56:56 UTC 2009


Author: ryan52-guest
Date: Wed Jun 24 05:56:51 2009
New Revision: 38563

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=38563
Log:
[svn-upgrade] Integrating new upstream version, libenv-ps1-perl (0.06)

Added:
    branches/upstream/libenv-ps1-perl/current/MANIFEST.SKIP
Modified:
    branches/upstream/libenv-ps1-perl/current/Changes
    branches/upstream/libenv-ps1-perl/current/MANIFEST
    branches/upstream/libenv-ps1-perl/current/META.yml
    branches/upstream/libenv-ps1-perl/current/Makefile.PL
    branches/upstream/libenv-ps1-perl/current/example.pl
    branches/upstream/libenv-ps1-perl/current/lib/Env/PS1.pm

Modified: branches/upstream/libenv-ps1-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libenv-ps1-perl/current/Changes?rev=38563&op=diff
==============================================================================
--- branches/upstream/libenv-ps1-perl/current/Changes (original)
+++ branches/upstream/libenv-ps1-perl/current/Changes Wed Jun 24 05:56:51 2009
@@ -1,5 +1,14 @@
  Revision history for Env-PS1 - prompt string formatter
 ========================================================
+
+0.06 Tue Jun 23 2009
+     Minor bug fix release
+
+     - New Maintainer, thanks to Jaap for all the work thus far.
+     - Fix \w and \W when the current directory is $HOME (should show a tilde)
+     - work with the PS1='$(foobar)' style of command substitution
+     - check for existance of the CLICOLOR env var before using it,
+       thanks to Phil Pennock for the patch (RT #13074)
 
 0.05 Mon Nov 22 2004
 	Maintenance release

Modified: branches/upstream/libenv-ps1-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libenv-ps1-perl/current/MANIFEST?rev=38563&op=diff
==============================================================================
--- branches/upstream/libenv-ps1-perl/current/MANIFEST (original)
+++ branches/upstream/libenv-ps1-perl/current/MANIFEST Wed Jun 24 05:56:51 2009
@@ -4,6 +4,7 @@
 lib/Env/PS1.pm
 Makefile.PL
 MANIFEST			This list of files
+MANIFEST.SKIP
 META.yml
 README
 t/00_usage.t

Added: branches/upstream/libenv-ps1-perl/current/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libenv-ps1-perl/current/MANIFEST.SKIP?rev=38563&op=file
==============================================================================
--- branches/upstream/libenv-ps1-perl/current/MANIFEST.SKIP (added)
+++ branches/upstream/libenv-ps1-perl/current/MANIFEST.SKIP Wed Jun 24 05:56:51 2009
@@ -1,0 +1,36 @@
+
+#!start included /usr/share/perl/5.10/ExtUtils/MANIFEST.SKIP
+# Avoid version control files.
+\bRCS\b
+\bCVS\b
+\bSCCS\b
+,v$
+\B\.svn\b
+\b_darcs\b
+
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib\.ts$
+\bpm_to_blib$
+\bblibdirs\.ts$         # 6.18 through 6.25 generated this
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+
+# Avoid temp and backup files.
+~$
+\.old$
+\#$
+\b\.#
+\.bak$
+
+# Avoid Devel::Cover files.
+\bcover_db\b
+#!end included /usr/share/perl/5.10/ExtUtils/MANIFEST.SKIP
+
+
+\B\.git\b

Modified: branches/upstream/libenv-ps1-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libenv-ps1-perl/current/META.yml?rev=38563&op=diff
==============================================================================
--- branches/upstream/libenv-ps1-perl/current/META.yml (original)
+++ branches/upstream/libenv-ps1-perl/current/META.yml Wed Jun 24 05:56:51 2009
@@ -1,10 +1,12 @@
---- #YAML:1.0
+---
 name: Env-PS1
-version: 0.05
+version: 0.06
 author:
-  - Jaap Karssenberg <pardus at cpan.org>
+  - 'Jaap Karssenberg <pardus at cpan.org>'
 abstract: prompt string formatter
 license: perl
+resources:
+  license: http://dev.perl.org/licenses/
 requires:
   AutoLoader: 0
   POSIX: 0
@@ -14,5 +16,8 @@
 provides:
   Env::PS1:
     file: lib/Env/PS1.pm
-    version: 0.05
-generated_by: Module::Build version 0.2604
+    version: 0.06
+generated_by: Module::Build version 0.33
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4

Modified: branches/upstream/libenv-ps1-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libenv-ps1-perl/current/Makefile.PL?rev=38563&op=diff
==============================================================================
--- branches/upstream/libenv-ps1-perl/current/Makefile.PL (original)
+++ branches/upstream/libenv-ps1-perl/current/Makefile.PL Wed Jun 24 05:56:51 2009
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
+# Note: this file was auto-generated by Module::Build::Compat version 0.33
     
     unless (eval "use Module::Build::Compat 0.02; 1" ) {
       print "This module requires Module::Build to install itself.\n";
@@ -17,15 +17,18 @@
       
       # Save this 'cause CPAN will chdir all over the place.
       my $cwd = Cwd::cwd();
-      my $makefile = File::Spec->rel2abs($0);
       
-      CPAN::Shell->install('Module::Build::Compat')
-	or die " *** Cannot install without Module::Build.  Exiting ...\n";
+      CPAN::Shell->install('Module::Build::Compat');
+      CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
+	or die "Couldn't install Module::Build, giving up.\n";
       
       chdir $cwd or die "Cannot chdir() back to $cwd: $!";
     }
     eval "use Module::Build::Compat 0.02; 1" or die $@;
-    use lib '_build/lib';
+    
     Module::Build::Compat->run_build_pl(args => \@ARGV);
+    my $build_script = 'Build';  
+    $build_script .= '.com' if $^O eq 'VMS';
+    exit(0) unless(-e $build_script); # cpantesters convention
     require Module::Build;
     Module::Build::Compat->write_makefile(build_class => 'Module::Build');

Modified: branches/upstream/libenv-ps1-perl/current/example.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libenv-ps1-perl/current/example.pl?rev=38563&op=diff
==============================================================================
--- branches/upstream/libenv-ps1-perl/current/example.pl (original)
+++ branches/upstream/libenv-ps1-perl/current/example.pl Wed Jun 24 05:56:51 2009
@@ -1,9 +1,6 @@
 #!/usr/bin/perl
 
-use lib './blib/lib/';
-
-die "Please run \"perl Build.PL && ./Build\" first\n" unless -d './blib/lib/';
-eval 'use Env::PS1 qw/$PS1/';
+use Env::PS1 qw/$PS1/;
 
 my @demo = (
 	username => '\u',

Modified: branches/upstream/libenv-ps1-perl/current/lib/Env/PS1.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libenv-ps1-perl/current/lib/Env/PS1.pm?rev=38563&op=diff
==============================================================================
--- branches/upstream/libenv-ps1-perl/current/lib/Env/PS1.pm (original)
+++ branches/upstream/libenv-ps1-perl/current/lib/Env/PS1.pm Wed Jun 24 05:56:51 2009
@@ -4,7 +4,7 @@
 use Carp;
 use AutoLoader 'AUTOLOAD';
 
-our $VERSION = 0.05;
+our $VERSION = 0.06;
 
 our $_getpwuid = eval { getpwuid($>) }; # Not supported on some platforms
 
@@ -41,11 +41,15 @@
 	$format =~ s#(\\\\)|(?<!\\)\$(?:(\w+)|\{(.*?)\})#
 		$1 ? '\\\\' : $2 ? $ENV{$2} : $ENV{$3}
 	#ge;
-	unless ($format eq $$self{format} and $ENV{CLICOLOR} eq $$self{clicolor}) {
+        unless ($format eq $$self{format} and exists $ENV{CLICOLOR}
+                and $ENV{CLICOLOR} eq $$self{clicolor}) {
 		@$self{qw/format clicolor/} = ($format, $ENV{CLICOLOR});
 		$$self{cache} = [ $self->cache($format) ];
 	}
 	my $string = join '', map { ref($_) ? $_->() : $_ } @{$$self{cache}};
+        $string =~ s#\$\((.+)\)#
+          `$1`;
+        #ge;
 	return $string;
 }
 
@@ -107,9 +111,12 @@
 sub U { $user_info[0] || $ENV{USER} || $ENV{LOGNAME} }
 
 sub W { 
-	return sub { $ENV{PWD} } if $_[1] eq 'w';
+	return sub { $ENV{PWD} eq $ENV{HOME} ? "~" : $ENV{PWD} } if $_[1] eq 'w';
 	return sub {
 		return '/' if $ENV{PWD} eq '/';
+                if($ENV{PWD} eq $ENV{HOME}) {
+                  return "~";
+                }
 		$ENV{PWD} =~ m#([^/]*)/?$#;
 		return $1;
 	};
@@ -536,7 +543,10 @@
 
 Jaap Karssenberg || Pardus [Larus] E<lt>pardus at cpan.orgE<gt>
 
+This module is currently maintained by Ryan Niebur E<lt>rsn at cpan.orgE<gt>
+
 Copyright (c) 2004 Jaap G Karssenberg. All rights reserved.
+Copyright (c) 2009 Ryan Niebur.
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 




More information about the Pkg-perl-cvs-commits mailing list