r67600 - in /trunk/libconfig-model-itself-perl: ./ data/ debian/ lib/Config/Model/ lib/Config/Model/Itself/ lib/Config/Model/models/Itself/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri Jan 21 13:24:34 UTC 2011
Author: gregoa
Date: Fri Jan 21 13:24:16 2011
New Revision: 67600
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=67600
Log:
New upstream release.
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/data/MasterModel.pl
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/MigratedValue.pl
trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/WarpableElement.pl
Modified: trunk/libconfig-model-itself-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/Build.PL?rev=67600&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/Build.PL (original)
+++ trunk/libconfig-model-itself-perl/Build.PL Fri Jan 21 13:24:16 2011
@@ -49,7 +49,7 @@
'Module::Build' => '0.3601'
},
'requires' => {
- 'Config::Model' => '1.228',
+ 'Config::Model' => '1.230',
'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=67600&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/ChangeLog (original)
+++ trunk/libconfig-model-itself-perl/ChangeLog Fri Jan 21 13:24:16 2011
@@ -1,3 +1,8 @@
+2011-01-20 Dominique Dumont <domi.dumont at free.fr> 1.222
+
+ * added migrate_keys_from, undef_is parameters
+ * Above require Config::Model 1.230
+
2011-01-09 Dominique Dumont <domi.dumont at free.fr> 1.221
* Remove unwanted test package file (oops)
Modified: trunk/libconfig-model-itself-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/META.yml?rev=67600&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/META.yml (original)
+++ trunk/libconfig-model-itself-perl/META.yml Fri Jan 21 13:24:16 2011
@@ -14,10 +14,10 @@
version: 1.4
name: Config-Model-Itself
requires:
- Config::Model: 1.228
+ Config::Model: 1.230
Config::Model::TkUI: 1.210
Log::Log4perl: 0
Pod::POM: 0
Tk: 0
YAML::Any: 0
-version: 1.221
+version: 1.222
Modified: trunk/libconfig-model-itself-perl/data/MasterModel.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/data/MasterModel.pl?rev=67600&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/data/MasterModel.pl (original)
+++ trunk/libconfig-model-itself-perl/data/MasterModel.pl Fri Jan 21 13:24:16 2011
@@ -313,6 +313,42 @@
warn_unless_match =>
{ foo => { msg => '', fix => '$_ = "foo".$_;' } },
},
+ list_with_migrate_keys_from => {
+ type => 'list',
+ cargo => {
+ type => 'leaf',
+ value_type => 'string'
+ },
+ migrate_keys_from => '- lista',
+ },
+ hash_with_migrate_keys_from => {
+ type => 'hash',
+ index_type => 'string',
+ cargo => {
+ type => 'leaf',
+ value_type => 'string'
+ },
+ migrate_keys_from => '- hash_a',
+ },
+ 'Source' => {
+ 'value_type' => 'string',
+ 'mandatory' => '1',
+ 'migrate_from' => {
+ 'use_eval' => '1',
+ 'formula' => '$old || $older ;',
+ undef_is => "''",
+ 'variables' => {
+ 'older' => '- Original-Source-Location',
+ 'old' => '- Upstream-Source'
+ }
+ },
+ 'type' => 'leaf',
+ },
+ [qw/Upstream-Source Original-Source-Location/] => {
+ 'value_type' => 'string',
+ 'status' => 'deprecated',
+ 'type' => 'leaf'
+ },
## too difficult to correctly test Augeas here
'sshd_augeas' => {
type => 'node',
Modified: trunk/libconfig-model-itself-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/debian/changelog?rev=67600&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/debian/changelog (original)
+++ trunk/libconfig-model-itself-perl/debian/changelog Fri Jan 21 13:24:16 2011
@@ -1,3 +1,9 @@
+libconfig-model-itself-perl (1.222-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org> Fri, 21 Jan 2011 14:23:26 +0100
+
libconfig-model-itself-perl (1.221-1) unstable; urgency=low
* New upstream release: config-model-edit now use same
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=67600&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/lib/Config/Model/Itself.pm (original)
+++ trunk/libconfig-model-itself-perl/lib/Config/Model/Itself.pm Fri Jan 21 13:24:16 2011
@@ -27,7 +27,7 @@
package Config::Model::Itself ;
BEGIN {
- $Config::Model::Itself::VERSION = '1.221';
+ $Config::Model::Itself::VERSION = '1.222';
}
use strict;
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=67600&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 Fri Jan 21 13:24:16 2011
@@ -27,7 +27,7 @@
package Config::Model::Itself::BackendDetector ;
BEGIN {
- $Config::Model::Itself::BackendDetector::VERSION = '1.221';
+ $Config::Model::Itself::BackendDetector::VERSION = '1.222';
}
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=67600&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 Fri Jan 21 13:24:16 2011
@@ -27,7 +27,7 @@
package Config::Model::Itself::TkEditUI ;
BEGIN {
- $Config::Model::Itself::TkEditUI::VERSION = '1.221';
+ $Config::Model::Itself::TkEditUI::VERSION = '1.222';
}
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=67600&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 Fri Jan 21 13:24:16 2011
@@ -194,11 +194,11 @@
value_type => 'integer',
level => 'hidden',
experience => 'advanced',
- description => 'minimum number of indexes',
+ description => 'minimum number of keys',
warp => {
follow => { 'type' => '?type', },
'rules' => [
- '$type eq "hash" or $type eq "list"' =>
+ '$type eq "hash"' =>
{ level => 'normal', },
]
}
@@ -213,7 +213,7 @@
warp => {
follow => { 'type' => '?type', },
'rules' => [
- '$type eq "hash" or $type eq "list"' =>
+ '$type eq "hash"' =>
{ level => 'normal', },
]
}
Modified: trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/MigratedValue.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/MigratedValue.pl?rev=67600&op=diff
==============================================================================
--- trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/MigratedValue.pl (original)
+++ trunk/libconfig-model-itself-perl/lib/Config/Model/models/Itself/MigratedValue.pl Fri Jan 21 13:24:16 2011
@@ -7,11 +7,7 @@
#
# The GNU Lesser General Public License, Version 2.1, February 1999
#
-# $Author: ddumont $
-# $Date: 2008-05-09 17:45:50 +0200 (Fri, 09 May 2008) $
-# $Revision: 655 $
-
-# Copyright (c) 2007-2008 Dominique Dumont.
+# Copyright (c) 2007-2011 Dominique Dumont.
#
# This file is part of Config-Model-Itself.
#
@@ -65,6 +61,12 @@
upstream_default => 0,
description => 'Set to 1 if you need to perform more complex operations than substition, like extraction with regular expressions. This will force an eval by Perl when computing the formula. The result of the eval will be used as the computed value.'
},
+ 'undef_is'
+ => { type => 'leaf',
+ value_type => 'uniline',
+ description => 'Specify a replacement for undefined variables. This will replace undef values in the formula before migrating values',
+ },
+
],
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=67600&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 Fri Jan 21 13:24:16 2011
@@ -7,7 +7,7 @@
#
# The GNU Lesser General Public License, Version 2.1, February 1999
#
-# Copyright (c) 2007-2008.2010 Dominique Dumont.
+# Copyright (c) 2007-2011 Dominique Dumont.
#
# This file is part of Config-Model-Itself.
#
@@ -26,162 +26,145 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
[
- [
- name => "Itself::WarpableElement",
+ [
+ name => "Itself::WarpableElement",
- include => 'Itself::CommonElement' ,
+ include => 'Itself::CommonElement',
- 'element'
- => [
+ 'element' => [
- [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' ,
- experience => 'advanced',
- warp => { follow => { 't' => '?type'},
- 'rules'
- => [ '$t eq "hash"'
- => {
- level => 'normal',
- }
- ]
- }
- },
+ [
+ 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',
+ experience => 'advanced',
+ warp => {
+ follow => { 't' => '?type' },
+ 'rules' => [ '$t eq "hash"' => { level => 'normal', } ]
+ }
+ },
- [qw/ordered/]
- => { type => 'leaf',
- level => 'hidden',
- value_type => 'boolean' ,
- warp => { follow => { 't' => '?type' },
- 'rules'
- => [ '$t eq "hash" or $t eq "check_list"'
- => {
- level => 'normal',
- }
- ]
- }
- },
+ [ qw/migrate_keys_from/ ] => {
+ type => 'leaf',
+ level => 'hidden',
+ value_type => 'uniline',
+ experience => 'advanced',
+ warp => {
+ follow => { 't' => '?type' },
+ 'rules' => [ '$t eq "hash" or $t eq "list"' => { level => 'normal', } ]
+ }
+ },
+ [qw/ordered/] => {
+ type => 'leaf',
+ level => 'hidden',
+ value_type => 'boolean',
+ warp => {
+ follow => { 't' => '?type' },
+ 'rules' => [
+ '$t eq "hash" or $t eq "check_list"' =>
+ { level => 'normal', }
+ ]
+ }
+ },
- [qw/default_keys auto_create_keys allow_keys/]
- => { type => 'list',
- level => 'hidden',
- cargo => { type => 'leaf', value_type => 'string'} ,
- experience => 'advanced',
- warp => { follow => { 't' => '?type' },
- 'rules'
- => [ '$t eq "hash"'
- => {
- level => 'normal',
- }
- ]
- }
- },
+ [qw/default_keys auto_create_keys allow_keys/] => {
+ type => 'list',
+ level => 'hidden',
+ cargo => { type => 'leaf', value_type => 'string' },
+ experience => 'advanced',
+ warp => {
+ follow => { 't' => '?type' },
+ 'rules' => [ '$t eq "hash"' => { level => 'normal', } ]
+ }
+ },
- [qw/auto_create_ids/]
- => { type => 'leaf',
- level => 'hidden',
- value_type => 'string' ,
- experience => 'advanced',
- warp => { follow => { 't' => '?type' },
- 'rules'
- => [ '$t eq "list"'
- => {
- level => 'normal',
- }
- ]
- }
- },
+ [qw/auto_create_ids/] => {
+ type => 'leaf',
+ level => 'hidden',
+ value_type => 'string',
+ experience => 'advanced',
+ warp => {
+ follow => { 't' => '?type' },
+ 'rules' => [ '$t eq "list"' => { level => 'normal', } ]
+ }
+ },
- [qw/default_with_init/]
- => { type => 'hash',
- level => 'hidden',
- index_type => 'string',
- cargo => { type => 'leaf', value_type => 'string'} ,
- warp => { follow => { 't' => '?type' },
- 'rules'
- => [ '$t eq "hash"'
- => {
- level => 'normal',
- }
- ]
- }
- },
+ [qw/default_with_init/] => {
+ type => 'hash',
+ level => 'hidden',
+ index_type => 'string',
+ cargo => { type => 'leaf', value_type => 'string' },
+ warp => {
+ follow => { 't' => '?type' },
+ 'rules' => [ '$t eq "hash"' => { level => 'normal', } ]
+ }
+ },
- 'max_nb'
- => { type => 'leaf',
- level => 'hidden',
- value_type => 'integer',
- warp => { follow => {
- 'type' => '?type',
- },
- 'rules'
- => [ '$type eq "hash"'
- => {
- level => 'normal',
- }
- ]
- }
- },
+ 'max_nb' => {
+ type => 'leaf',
+ level => 'hidden',
+ value_type => 'integer',
+ warp => {
+ follow => { 'type' => '?type', },
+ 'rules' => [ '$type eq "hash"' => { level => 'normal', } ]
+ }
+ },
+ 'replace' => {
+ type => 'hash',
+ index_type => 'string',
+ level => 'hidden',
+ experience => 'advanced',
+ warp => {
+ follow => { 't' => '?type' },
+ 'rules' => [
+ '$t eq "leaf" or $t eq "check_list"' =>
+ { level => 'normal', }
+ ]
+ },
+ # TBD this could be a reference if we restrict replace to
+ # enum value...
+ cargo => { type => 'leaf', value_type => 'string' },
+ },
- 'replace'
- => {
- type => 'hash',
- index_type => 'string',
- level => 'hidden',
- experience => 'advanced',
- warp => { follow => { 't' => '?type' },
- 'rules'
- => [ '$t eq "leaf" or $t eq "check_list"'
- => {
- level => 'normal',
- }
- ]
- },
- # TBD this could be a reference if we restrict replace to
- # enum value...
- cargo => { type => 'leaf', value_type => 'string' } ,
- },
+ help => {
+ type => 'hash',
+ index_type => 'string',
+ level => 'hidden',
+ warp => {
+ follow => { 't' => '?type' },
+ 'rules' => [
+ '$t eq "leaf" or $t eq "check_list"' =>
+ { level => 'normal', }
+ ]
+ },
- help
- => {
- type => 'hash',
- index_type => 'string',
- level => 'hidden',
- warp => { follow => { 't' => '?type' },
- 'rules'
- => [ '$t eq "leaf" or $t eq "check_list"'
- => {
- level => 'normal',
- }
- ]
- },
- # TBD this could be a reference if we restrict replace to
- # enum value...
- cargo => { type => 'leaf', value_type => 'string' } ,
- },
- ],
+ # TBD this could be a reference if we restrict replace to
+ # enum value...
+ cargo => { type => 'leaf', value_type => 'string' },
+ },
+ ],
- 'description'
- => [
- follow_keys_from => 'this hash will contain the same keys as the hash pointed by the path string',
- allow_keys_from =>'this hash will allow keys from the keys of the hash pointed by the path string',
- ordered => 'keep track of the order of the elements of this hash',
- default_keys => 'default keys hashes.',
- auto_create_keys => 'always create a set of keys specified in this list',
- auto_create_ids => 'always create the number of id specified in this integer',
- allow_keys => 'specify a set of allowed keys',
- allow_keys_matching => 'Keys must match the specified regular expression.',
- 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',
- ],
- ],
+ 'description' => [
+ follow_keys_from => 'this hash will contain the same keys as the hash pointed by the path string',
+ allow_keys_from => 'this hash will allow keys from the keys of the hash pointed by the path string',
+ ordered => 'keep track of the order of the elements of this hash',
+ default_keys => 'default keys hashes.',
+ auto_create_keys => 'always create a set of keys specified in this list',
+ auto_create_ids => 'always create the number of id specified in this integer',
+ allow_keys => 'specify a set of allowed keys',
+ allow_keys_matching => 'Keys must match the specified regular expression.',
+ 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',
+ ],
+ ],
];
More information about the Pkg-perl-cvs-commits
mailing list