r46255 - in /branches/upstream/libconfig-model-approx-perl/current: ChangeLog META.yml lib/Config/Model/Approx.pm t/approx_config.t

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Fri Oct 23 14:43:53 2009
New Revision: 46255

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46255
Log:
[svn-upgrade] Integrating new upstream version, libconfig-model-approx-perl (1.003)

Modified:
    branches/upstream/libconfig-model-approx-perl/current/ChangeLog
    branches/upstream/libconfig-model-approx-perl/current/META.yml
    branches/upstream/libconfig-model-approx-perl/current/lib/Config/Model/Approx.pm
    branches/upstream/libconfig-model-approx-perl/current/t/approx_config.t

Modified: branches/upstream/libconfig-model-approx-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-approx-perl/current/ChangeLog?rev=46255&op=diff
==============================================================================
--- branches/upstream/libconfig-model-approx-perl/current/ChangeLog (original)
+++ branches/upstream/libconfig-model-approx-perl/current/ChangeLog Fri Oct 23 14:43:53 2009
@@ -1,3 +1,10 @@
+2009-10-22  Dominique Dumont  <domi.dumont at free.fr> 1.003
+
+	* lib/Config/Model/Approx.pm (read): Convert old style
+	parameters ( without leading '$' - approx < 2.9.0) to new
+	style (with '$'). I.e. 'verbose 1' will be converted to
+	'$verbose 1'
+
 2009-09-27  Dominique Dumont  <domi.dumont at free.fr> 1.002
 
 	* README : updated license
@@ -6,5 +13,5 @@
 
 2009-09-24  Dominique Dumont  <domi.dumont at free.fr> 1.001
 
-	* Initial release 
+	* Initial release
 

Modified: branches/upstream/libconfig-model-approx-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-approx-perl/current/META.yml?rev=46255&op=diff
==============================================================================
--- branches/upstream/libconfig-model-approx-perl/current/META.yml (original)
+++ branches/upstream/libconfig-model-approx-perl/current/META.yml Fri Oct 23 14:43:53 2009
@@ -1,6 +1,6 @@
 ---
 name: Config-Model-Approx
-version: 1.002
+version: 1.003
 author:
   - Dominique Dumont (ddumont at cpan dot org)
 abstract: Approx configuration files editor
@@ -21,7 +21,7 @@
 provides:
   Config::Model::Approx:
     file: lib/Config/Model/Approx.pm
-    version: 1.002
+    version: 1.003
 generated_by: Module::Build version 0.35
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html

Modified: branches/upstream/libconfig-model-approx-perl/current/lib/Config/Model/Approx.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-approx-perl/current/lib/Config/Model/Approx.pm?rev=46255&op=diff
==============================================================================
--- branches/upstream/libconfig-model-approx-perl/current/lib/Config/Model/Approx.pm (original)
+++ branches/upstream/libconfig-model-approx-perl/current/lib/Config/Model/Approx.pm Fri Oct 23 14:43:53 2009
@@ -1,6 +1,6 @@
 # $Author: ddumont $
-# $Date: 2009-09-27 16:02:38 +0200 (dim 27 sep 2009) $
-# $Revision: 1036 $
+# $Date: 2009-10-22 11:54:11 +0200 (jeu. 22 oct. 2009) $
+# $Revision: 1037 $
 
 #    Copyright (c) 2009 Dominique Dumont.
 #
@@ -32,7 +32,7 @@
 
 use vars qw($VERSION)  ;
 
-$VERSION = '1.002' ;
+$VERSION = '1.003' ;
 
 my $logger = Log::Log4perl::get_logger(__PACKAGE__);
 
@@ -47,7 +47,9 @@
 	s/#.*//;
 	s/\s+/=/; # translate file in string loadable by C::M::Loader
 	next unless $_;
-	my $load = s/^\$// ? $_ : "distributions:".$_;
+	my $load = s/^\$// ? $_ 
+                 : m!://!  ? "distributions:".$_
+                 :           $_ ; # old style parameter
 	$args{object}->load($load) ;
     }
 
@@ -63,7 +65,7 @@
 
     $ioh->print("# This file was written by Config::Model with Approx model\n");
     $ioh->print("# You may modify the content of this file. Configuration \n");
-    $ioh->print("# modification will be preserved. Modification in the comments\n");
+    $ioh->print("# modifications will be preserved. Modifications in the comments\n");
     $ioh->print("# will be discarded\n\n");
 
     # Using Config::Model::ObjTreeScanner would be overkill

Modified: branches/upstream/libconfig-model-approx-perl/current/t/approx_config.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-model-approx-perl/current/t/approx_config.t?rev=46255&op=diff
==============================================================================
--- branches/upstream/libconfig-model-approx-perl/current/t/approx_config.t (original)
+++ branches/upstream/libconfig-model-approx-perl/current/t/approx_config.t Fri Oct 23 14:43:53 2009
@@ -4,7 +4,7 @@
 # $Revision: 608 $
 
 use ExtUtils::testlib;
-use Test::More tests => 4;
+use Test::More tests => 5;
 use Config::Model ;
 use Log::Log4perl qw(:easy) ;
 use File::Path ;
@@ -64,6 +64,7 @@
 my $expect = 'max_rate=100K
 verbose=1
 distributions:debian=http://ftp.debian.org/debian
+distributions:local=file:///my/local/repo
 distributions:security=http://security.debian.org/debian-security -
 ';
 
@@ -78,12 +79,16 @@
 close APPROX;
 
 like($approxlines,qr/200K/,"checked written approx file") ;
+like($approxlines,qr/\$verbose/,"new approx file contains new style param") ;
 
 __END__
 
 
 $max_rate 100K
-$verbose  1
+
+# old style parameter (before approx 2.9.0)
+verbose  1
 
 debian          http://ftp.debian.org/debian
 security        http://security.debian.org/debian-security
+local           file:///my/local/repo