r64126 - in /trunk/libconfig-model-itself-perl: ./ debian/ lib/Config/Model/ lib/Config/Model/Itself/ lib/Config/Model/models/Itself/ t/
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Thu Oct 21 13:13:47 UTC 2010
Author: ddumont-guest
Date: Thu Oct 21 13:12:31 2010
New Revision: 64126
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64126
Log:
lintian pedantic clean, cowbuilder ok. ready for review
Modified:
trunk/libconfig-model-itself-perl/Build.PL
trunk/libconfig-model-itself-perl/ChangeLog
trunk/libconfig-model-itself-perl/META.yml
trunk/libconfig-model-itself-perl/config-model-edit
trunk/libconfig-model-itself-perl/debian/changelog
trunk/libconfig-model-itself-perl/lib/Config/Model/Itself.pm
trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/BackendDetector.pm
trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/TkEditUI.pm
trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/CommonElement.pl
trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/WarpableElement.pl
trunk/libconfig-model-itself-perl/t/backend_detect.t
trunk/libconfig-model-itself-perl/t/itself-editor.t
Modified: trunk/libconfig-model-itself-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/Build.PL?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/Build.PL (original)
+++ trunk/libconfig-model-itself-perl/Build.PL Thu Oct 21 13:12:31 2010
@@ -49,7 +49,7 @@
'Module::Build' => '0.3601'
},
'requires' => {
- 'Config::Model' => '1.207',
+ 'Config::Model' => '1.212',
'Config::Model::TkUI' => '1.210',
'Log::Log4perl' => '0',
'Pod::POM' => '0',
Modified: trunk/libconfig-model-itself-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/ChangeLog?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/ChangeLog (original)
+++ trunk/libconfig-model-itself-perl/ChangeLog Thu Oct 21 13:12:31 2010
@@ -1,4 +1,10 @@
+2010-10-15 Dominique Dumont <domi.dumont at free.fr> 1.219
+
+ * removed obsolete push/pop_no_value_check calls
+ * requires Config::Model 1.212
+
2010-09-16 Dominique Dumont <domi.dumont at free.fr> 1.218
+
* Fixed missing dependencies in Build.PL (Building from hg
requires Dist::Zilla and Dist-Zilla-Plugins-CJM >= 3.01)
Modified: trunk/libconfig-model-itself-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/META.yml?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/META.yml (original)
+++ trunk/libconfig-model-itself-perl/META.yml Thu Oct 21 13:12:31 2010
@@ -7,17 +7,17 @@
configure_requires:
Module::Build: 0.3601
dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.102340, CPAN::Meta::Converter version 2.102400'
+generated_by: 'Dist::Zilla version 4.102342, CPAN::Meta::Converter version 2.102400'
license: lgpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
name: Config-Model-Itself
requires:
- Config::Model: 1.207
+ Config::Model: 1.212
Config::Model::TkUI: 1.210
Log::Log4perl: 0
Pod::POM: 0
Tk: 0
YAML::Any: 0
-version: 1.218
+version: 1.219
Modified: trunk/libconfig-model-itself-perl/config-model-edit
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/config-model-edit?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/config-model-edit (original)
+++ trunk/libconfig-model-itself-perl/config-model-edit Thu Oct 21 13:12:31 2010
@@ -143,7 +143,8 @@
=item -force_load
-Load file even if error are found in data. Bad data are discarded
+Load file even if error are found in data. Bad data are loaded, but should be cleaned up
+before saving the model. See menu C<< File -> check >> in the GUI.
=item -dot_diagram
Modified: trunk/libconfig-model-itself-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/debian/changelog?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/debian/changelog (original)
+++ trunk/libconfig-model-itself-perl/debian/changelog Thu Oct 21 13:12:31 2010
@@ -1,3 +1,9 @@
+libconfig-model-itself-perl (1.219-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Dominique Dumont <dominique.dumont at hp.com> Thu, 21 Oct 2010 13:03:02 +0200
+
libconfig-model-itself-perl (1.218-1) unstable; urgency=low
[ Dominique Dumont ]
Modified: trunk/libconfig-model-itself-perl/lib/Config/Model/Itself.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/lib/Config/Model/Itself.pm?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/lib/Config/Model/Itself.pm (original)
+++ trunk/libconfig-model-itself-perl/lib/Config/Model/Itself.pm Thu Oct 21 13:12:31 2010
@@ -27,7 +27,7 @@
package Config::Model::Itself ;
BEGIN {
- $Config::Model::Itself::VERSION = '1.218';
+ $Config::Model::Itself::VERSION = '1.219';
}
use strict;
@@ -234,13 +234,10 @@
#print Dumper \@read_models ;
#require Tk::ObjScanner; Tk::ObjScanner::scan_object(\%read_models) ;
- $model_obj->instance->push_no_value_check(qw/store fetch type/) if $force_load;
$logger->info("loading all extracted data in Config::Model::Itself");
# load with a array ref to avoid warnings about missing order
- $model_obj->load_data( {class => [ %read_models ] } ) ;
-
- $model_obj->instance->pop_no_value_check() if $force_load;
+ $model_obj->load_data( {class => [ %read_models ] }, undef, $force_load ? 'no' : 'yes' ) ;
return $self->{map} = \%class_file_map ;
}
Modified: trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/BackendDetector.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/BackendDetector.pm?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/BackendDetector.pm (original)
+++ trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/BackendDetector.pm Thu Oct 21 13:12:31 2010
@@ -27,7 +27,7 @@
package Config::Model::Itself::BackendDetector ;
BEGIN {
- $Config::Model::Itself::BackendDetector::VERSION = '1.218';
+ $Config::Model::Itself::BackendDetector::VERSION = '1.219';
}
use Pod::POM ;
Modified: trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/TkEditUI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/TkEditUI.pm?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/TkEditUI.pm (original)
+++ trunk/libconfig-model-itself-perl/lib/Config/Model/Itself/TkEditUI.pm Thu Oct 21 13:12:31 2010
@@ -27,7 +27,7 @@
package Config::Model::Itself::TkEditUI ;
BEGIN {
- $Config::Model::Itself::TkEditUI::VERSION = '1.218';
+ $Config::Model::Itself::TkEditUI::VERSION = '1.219';
}
use strict;
Modified: trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/CommonElement.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/CommonElement.pl?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/CommonElement.pl (original)
+++ trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/CommonElement.pl Thu Oct 21 13:12:31 2010
@@ -8,9 +8,6 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
# $Author: ddumont $
-# $Date: 2008-04-11 18:20:21 +0200 (ven, 11 avr 2008) $
-# $Revision: 600 $
-
# Copyright (c) 2007-2010 Dominique Dumont.
#
# This file is part of Config-Model-Itself.
@@ -28,6 +25,25 @@
# You should have received a copy of the GNU Lesser Public License
# along with Config-Model-Itself; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+
+my @warp_in_uniline_or_string =
+ (
+ warp => { follow => { 'type' => '?type',
+ 'vtype' => '?value_type' ,
+ },
+ 'rules'
+ => [ ' $type eq "leaf"
+ and ( $vtype eq "uniline"
+ or $vtype eq "string"
+ )
+ '
+ => {
+ level => 'normal',
+ }
+ ]
+ },
+
+ ) ;
[
[
@@ -229,19 +245,35 @@
level => 'hidden',
experience => 'advanced',
description => 'Perl regular expression to assert the validity of the value.',
- warp => { follow => { 'type' => '?type',
- 'vtype' => '?value_type' ,
- },
- 'rules'
- => [ ' $type eq "leaf"
- and ( $vtype eq "uniline"
- or $vtype eq "string"
- )
- '
- => {
- level => 'normal',
- }
- ]
+ @warp_in_uniline_or_string,
+ },
+
+ 'warn_if_match'
+ => { type => 'leaf',
+ value_type => 'uniline',
+ level => 'hidden',
+ experience => 'advanced',
+ description => 'Warn user if value matches the regular expression',
+ @warp_in_uniline_or_string,
+ },
+
+ 'warn_unless_match'
+ => { type => 'leaf',
+ value_type => 'uniline',
+ level => 'hidden',
+ experience => 'advanced',
+ description => 'Warn user if value does not match the regular expression',
+ @warp_in_uniline_or_string,
+ },
+
+ 'warn'
+ => { type => 'leaf',
+ value_type => 'uniline',
+ level => 'hidden',
+ experience => 'advanced',
+ description => 'Unconditionaly issue a warning with this string when this paramater is used. This should be used mostly with "accept"',
+ warp => { follow => { t => '?type' },
+ 'rules' => [ '$t eq "leaf"' => { level => 'normal', } , ]
},
},
@@ -251,20 +283,7 @@
level => 'hidden',
experience => 'advanced',
description => "Feed this grammar to Parse::RecDescent to perform validation",
- warp => { follow => { 'type' => '?type',
- 'vtype' => '?value_type' ,
- },
- 'rules'
- => [ ' $type eq "leaf"
- and ( $vtype eq "uniline"
- or $vtype eq "string"
- )
- '
- => {
- level => 'normal',
- }
- ]
- },
+ @warp_in_uniline_or_string,
},
Modified: trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/WarpableElement.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/WarpableElement.pl?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/WarpableElement.pl (original)
+++ trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/WarpableElement.pl Thu Oct 21 13:12:31 2010
@@ -34,7 +34,8 @@
'element'
=> [
- [qw/allow_keys_from allow_keys_matching follow_keys_from/]
+ [qw/allow_keys_from allow_keys_matching follow_keys_from
+ warn_if_key_match warn_unless_key_match/]
=> { type => 'leaf',
level => 'hidden',
value_type => 'uniline' ,
@@ -178,6 +179,8 @@
default_with_init => 'specify a set of keys to create and initialization on some elements . E.g. \' foo => "X=Av Y=Bv", bar => "Y=Av Z=Cz"\' ',
help => 'Specify help string specific to possible values. E.g for "light" value, you could write " red => \'stop\', green => \'walk\' ',
replace => 'Used for enum to substitute one value with another. This parameter must be used to enable user to upgrade a configuration with obsolete values. The old value is the key of the hash, the new one is the value of the hash',
+ warn_if_key_match => 'Warn user if a key is created matching this regular expression',
+ warn_unless_key_match => 'Warn user if a key is created not matching this regular expression',
],
],
Modified: trunk/libconfig-model-itself-perl/t/backend_detect.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/t/backend_detect.t?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/t/backend_detect.t (original)
+++ trunk/libconfig-model-itself-perl/t/backend_detect.t Thu Oct 21 13:12:31 2010
@@ -51,16 +51,16 @@
my @choices = $backend->get_choice ;
ok( (scalar grep { $_ eq 'Yaml'} @choices), "Yaml plugin backend was found") ;
-ok( (scalar grep { $_ eq 'Debian::Dep5'} @choices), "Debian::Dep5 plugin backend was found") ;
+ok( (scalar grep { $_ eq 'Debian::Dpkg::Copyright'} @choices), "Debian::Dpkg::Copyright plugin backend was found") ;
my $help = $backend->get_help('Yaml') ;
like($help,qr/provided by Config::Model::Backend::Yaml/,
"Found Yaml NAME section from pod") ;
-$help = $backend->get_help('Debian::Dep5') ;
-like($help,qr/provided by Config::Model::Backend::Debian::Dep5/,
- "Found Debian::Dep5 NAME section from pod") ;
+$help = $backend->get_help('Debian::Dpkg::Copyright') ;
+like($help,qr/provided by Config::Model::Backend::Debian::Dpkg::Copyright/,
+ "Found Debian::Dpkg::Copyright NAME section from pod") ;
$help = $backend->get_help('cds_file') ;
is($help,"file ...", "cds_file help was kept") ;
Modified: trunk/libconfig-model-itself-perl/t/itself-editor.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/t/itself-editor.t?rev=64126&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/t/itself-editor.t (original)
+++ trunk/libconfig-model-itself-perl/t/itself-editor.t Thu Oct 21 13:12:31 2010
@@ -55,7 +55,7 @@
plan tests => 14 ; # avoid double print of plan when exec is run
-Log::Log4perl->easy_init($log ? $DEBUG: $ERROR);
+Log::Log4perl->easy_init($log ? $TRACE: $ERROR);
my $meta_model = Config::Model -> new ( ) ;
More information about the Pkg-perl-cvs-commits
mailing list