r38682 - in /trunk/libconfig-model-cursesui-perl: Build.PL ChangeLog META.yml README debian/changelog debian/control lib/Config/Model/CursesUI.pm t/curses_ui.t t/test_model.pm
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Fri Jun 26 12:27:47 UTC 2009
Author: ddumont-guest
Date: Fri Jun 26 12:27:41 2009
New Revision: 38682
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=38682
Log:
ready for release
Modified:
trunk/libconfig-model-cursesui-perl/Build.PL
trunk/libconfig-model-cursesui-perl/ChangeLog
trunk/libconfig-model-cursesui-perl/META.yml
trunk/libconfig-model-cursesui-perl/README
trunk/libconfig-model-cursesui-perl/debian/changelog
trunk/libconfig-model-cursesui-perl/debian/control
trunk/libconfig-model-cursesui-perl/lib/Config/Model/CursesUI.pm
trunk/libconfig-model-cursesui-perl/t/curses_ui.t
trunk/libconfig-model-cursesui-perl/t/test_model.pm
Modified: trunk/libconfig-model-cursesui-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/Build.PL?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/Build.PL (original)
+++ trunk/libconfig-model-cursesui-perl/Build.PL Fri Jun 26 12:27:41 2009
@@ -1,8 +1,8 @@
# $Author: ddumont $
-# $Date: 2009-01-05 14:02:38 +0100 (Mon, 05 Jan 2009) $
-# $Revision: 825 $
+# $Date: 2009-06-24 12:48:54 +0200 (mer 24 jun 2009) $
+# $Revision: 987 $
-# Copyright (c) 2007-2008 Dominique Dumont.
+# Copyright (c) 2007-2009 Dominique Dumont.
#
# This file is part of Config-Model-Curses-UI.
#
@@ -23,7 +23,7 @@
use Module::Build;
-require 5.006 ;
+require 5.008 ;
my $build = Module::Build->new
(
@@ -32,11 +32,13 @@
dist_abstract => "Curses interface to edit config data through Config::Model",
dist_author => "Dominique Dumont (ddumont at cpan dot org)",
requires => {
- 'Config::Model' => '0.633',
+ 'Config::Model' => '0.637',
'Exception::Class' => 0,
'Curses::UI' => '0.9606',
- # not yet 'Log::Log4perl' => 0 ,
},
+ build_requires => {
+ 'Log::Log4perl' => 0 ,
+ },
add_to_cleanup => [qw/stderr.log wr_data/] ,
);
Modified: trunk/libconfig-model-cursesui-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/ChangeLog?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/ChangeLog (original)
+++ trunk/libconfig-model-cursesui-perl/ChangeLog Fri Jun 26 12:27:41 2009
@@ -1,3 +1,11 @@
+2009-06-24 Dominique Dumont <domi.dumont at free.fr> v1.103
+
+ * Build.PL: depends on Config::Model 0.637. Added build dependency
+ on Log::Log4perl
+
+ * lib/Config/Model/CursesUI.pm: changed built_in call to
+ upstream_default
+
2009-01-05 Dominique Dumont <dominique.dumont at hp.com> v1.102
* lib/Config/Model/CursesUI.pm (layout_string_value): use
Modified: trunk/libconfig-model-cursesui-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/META.yml?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/META.yml (original)
+++ trunk/libconfig-model-cursesui-perl/META.yml Fri Jun 26 12:27:41 2009
@@ -1,6 +1,6 @@
---
name: Config-Model-CursesUI
-version: 1.102
+version: 1.103
author:
- Dominique Dumont (ddumont at cpan dot org)
abstract: Curses interface to edit config data through Config::Model
@@ -8,14 +8,16 @@
resources:
license: http://opensource.org/licenses/lgpl-license.php
requires:
- Config::Model: 0.633
+ Config::Model: 0.637
Curses::UI: 0.9606
Exception::Class: 0
+build_requires:
+ Log::Log4perl: 0
provides:
Config::Model::CursesUI:
file: lib/Config/Model/CursesUI.pm
- version: 1.102
-generated_by: Module::Build version 0.3
+ version: 1.103
+generated_by: Module::Build version 0.33
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: trunk/libconfig-model-cursesui-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/README?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/README (original)
+++ trunk/libconfig-model-cursesui-perl/README Fri Jun 26 12:27:41 2009
@@ -1,5 +1,9 @@
-This module provides a Curses interface for all configuration
-descriptions created for Config::Model.
+This module provides a Curses interface to the configuration editor
+provided by Config::Model.
+
+For instance, with this module, Config::Model and
+Config::Model::OpenSsh, you get a curses configuration editor for
+sshd_config.
This interface is used by config-edit program provided by
Config::Model.
Modified: trunk/libconfig-model-cursesui-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/debian/changelog?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/debian/changelog (original)
+++ trunk/libconfig-model-cursesui-perl/debian/changelog Fri Jun 26 12:27:41 2009
@@ -1,8 +1,15 @@
-libconfig-model-cursesui-perl (1.102-2) UNRELEASED; urgency=low
+libconfig-model-cursesui-perl (1.103-1) unstable; urgency=low
+ [ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- Nathan Handler <nhandler at ubuntu.com> Sat, 06 Jun 2009 01:33:21 +0000
+ [ Dominique Dumont ]
+ * New upstream release
+ * control: depends on libconfig-model-perl 0.637
+ * control: build-depends on liblog-log4perl-perl 1.11
+ * control: updated to policy 3.8.2
+
+ -- Dominique Dumont <dominique.dumont at hp.com> Fri, 26 Jun 2009 14:26:55 +0200
libconfig-model-cursesui-perl (1.102-1) unstable; urgency=low
Modified: trunk/libconfig-model-cursesui-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/debian/control?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/debian/control (original)
+++ trunk/libconfig-model-cursesui-perl/debian/control Fri Jun 26 12:27:41 2009
@@ -4,13 +4,14 @@
Build-Depends: debhelper (>= 7),
perl-modules (>= 5.10) | libmodule-build-perl
Build-Depends-Indep: perl (>= 5.8.8-12),
- libconfig-model-perl (>= 0.633),
+ libconfig-model-perl (>= 0.637),
libcurses-ui-perl (>= 0.9606),
libexception-class-perl,
- libtest-pod-perl
+ libtest-pod-perl,
+ liblog-log4perl-perl (>= 1.11)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Dominique Dumont <dominique.dumont at hp.com>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
Homepage: http://search.cpan.org/dist/Config-Model-CursesUI/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libconfig-model-cursesui-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/
@@ -18,7 +19,7 @@
Package: libconfig-model-cursesui-perl
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends},
- libconfig-model-perl (>= 0.633),
+ libconfig-model-perl (>= 0.637),
libcurses-ui-perl (>= 0.9606),
libexception-class-perl,
Description: Curses interface to edit config data through Config::Model
Modified: trunk/libconfig-model-cursesui-perl/lib/Config/Model/CursesUI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/lib/Config/Model/CursesUI.pm?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/lib/Config/Model/CursesUI.pm (original)
+++ trunk/libconfig-model-cursesui-perl/lib/Config/Model/CursesUI.pm Fri Jun 26 12:27:41 2009
@@ -1,6 +1,6 @@
# $Author: ddumont $
-# $Date: 2009-01-05 14:02:38 +0100 (Mon, 05 Jan 2009) $
-# $Revision: 825 $
+# $Date: 2009-06-24 12:48:54 +0200 (mer 24 jun 2009) $
+# $Revision: 987 $
my $verb_wiz = 1 ;
@@ -26,7 +26,7 @@
) ;
use vars qw($VERSION) ;
-$VERSION = '1.102';
+$VERSION = '1.103';
my @help_settings = qw/-bg green -fg black -border 1
-titlereverse 0
@@ -1258,8 +1258,8 @@
'-x' => $x + 15, '-y' => $y++ ) ;
my @items = ();
- if (defined $leaf->built_in) {
- push @items, "built_in value: " . $leaf->built_in ;
+ if (defined $leaf->upstream_default) {
+ push @items, "upstream_default value: " . $leaf->upstream_default ;
}
elsif (defined $leaf->fetch_standard) {
push @items, "default value: " . $leaf->fetch_standard ;
Modified: trunk/libconfig-model-cursesui-perl/t/curses_ui.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/t/curses_ui.t?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/t/curses_ui.t (original)
+++ trunk/libconfig-model-cursesui-perl/t/curses_ui.t Fri Jun 26 12:27:41 2009
@@ -1,8 +1,8 @@
# -*- cperl -*-
# $Author: ddumont $
-# $Date: 2008-05-16 13:32:43 +0200 (Fri, 16 May 2008) $
+# $Date: 2009-06-24 12:39:29 +0200 (mer 24 jun 2009) $
# $Name: not supported by cvs2svn $
-# $Revision: 668 $
+# $Revision: 986 $
use warnings FATAL => qw(all);
use ExtUtils::testlib;
@@ -11,6 +11,7 @@
use Data::Dumper;
use Config::Model ;
use Config::Model::CursesUI ;
+use Log::Log4perl qw(:easy) ;
use strict ;
@@ -24,13 +25,17 @@
my $trace = $arg =~ /t/ ? 1 : 0 ;
$::verbose = 1 if $arg =~ /v/;
$::debug = 1 if $arg =~ /d/;
+
+my $log = 1 if $arg =~ /l/;
+Log::Log4perl->easy_init($log ? $TRACE: $WARN);
+
Config::Model::Exception::Any->Trace(1) if $arg =~ /e/;
warn "You can run the GUI with 'i' argument. E.g. 'perl t/curses_ui.t i'\n";
ok(1,"Config::Model::CursesUI loaded") ;
-my $model = Config::Model -> new ( legacy => 'ignore' );
+my $model = Config::Model -> new ( );
my $inst = $model->instance (root_class_name => 'Master',
model_file => 't/test_model.pm',
Modified: trunk/libconfig-model-cursesui-perl/t/test_model.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-cursesui-perl/t/test_model.pm?rev=38682&op=diff
==============================================================================
--- trunk/libconfig-model-cursesui-perl/t/test_model.pm (original)
+++ trunk/libconfig-model-cursesui-perl/t/test_model.pm Fri Jun 26 12:27:41 2009
@@ -1,8 +1,8 @@
# -*- cperl -*-
# $Author: ddumont $
-# $Date: 2009-01-05 14:02:38 +0100 (Mon, 05 Jan 2009) $
+# $Date: 2009-06-24 12:48:54 +0200 (mer 24 jun 2009) $
# $Name: not supported by cvs2svn $
-# $Revision: 825 $
+# $Revision: 987 $
# this file is used by test script
@@ -19,14 +19,13 @@
name => 'SubSlave',
element => [
[qw/aa ab ac ad/] =>
- { type => 'leaf', value_type => 'string' },
+ { type => 'leaf', value_type => 'uniline' },
sub_slave => { type => 'node' ,
config_class_name => 'SubSlave2',
}
]
],
-# rather dummy class to check inclusion
[
name => 'X_base_class2',
element => [
@@ -35,6 +34,7 @@
choice => [qw/Av Bv Cv/]
},
],
+ class_description => 'rather dummy class to check include feature',
],
[
@@ -57,6 +57,7 @@
},
],
include => 'X_base_class',
+ include_after => 'Z',
],
[
@@ -65,12 +66,19 @@
std_id => {
type => 'hash',
index_type => 'string',
- cargo_type => 'node',
- config_class_name => 'SlaveZ' ,
+ cargo => {
+ type => 'node',
+ config_class_name => 'SlaveZ'
+ } ,
},
sub_slave => { type => 'node' ,
config_class_name => 'SubSlave',
},
+ [qw/a_string a_long_string another_string/]
+ => { type => 'leaf',
+ mandatory => 1 ,
+ value_type => 'string'
+ },
warp2 => {
type => 'warped_node',
follow => '! tree_macro',
@@ -86,19 +94,15 @@
choice => [qw/Av Bv Cv/]
},
],
- include => 'X_base_class',
+ include => 'X_base_class',
],
[
name => 'Master',
-
- read_config => { backend => 'cds_file', config_dir => 'data',
- allow_empty => 1},
-
- permission => [ [qw/tree_macro warp/] => 'advanced'] ,
+ experience => [ [qw/tree_macro warp/] => 'advanced'] ,
class_description => "Master description",
- level => [ [qw/hash_a tree_macro/] => 'important' ],
+ level => [ [qw/hash_a tree_macro int_v/] => 'important' ],
element => [
a_string => { type => 'leaf',
value_type => 'string'
@@ -129,30 +133,63 @@
min => 5,
max => 15
},
- int_v_built_in => { type => 'leaf',
- value_type => 'integer',
- built_in => '5',
- min => 5,
- max => 15
- },
+ int_v_upstream_default => { type => 'leaf',
+ value_type => 'integer',
+ upstream_default => '5',
+ min => 5,
+ max => 15
+ },
std_id => { type => 'hash',
index_type => 'string',
- cargo_type => 'node',
- config_class_name => 'SlaveZ' ,
+ cargo => { type => 'node',
+ config_class_name => 'SlaveZ'
+ } ,
},
[qw/lista listb/] => { type => 'list',
- cargo_type => 'leaf',
- cargo_args => {value_type => 'string'},
+ cargo => { type => 'leaf',
+ value_type => 'uniline'
+ },
},
[qw/hash_a hash_b/] => { type => 'hash',
index_type => 'string',
- cargo_type => 'leaf',
- cargo_args => {value_type => 'string'},
- },
+ cargo => { type => 'leaf',
+ value_type => 'uniline'
+ },
+ },
+ ordered_hash => { type => 'hash',
+ index_type => 'string',
+ ordered => 1 ,
+ cargo => { type => 'leaf',
+ value_type => 'uniline'
+ },
+ },
+ ordered_hash_of_mandatory => { type => 'hash',
+ index_type => 'string',
+ ordered => 1 ,
+ cargo => { type => 'leaf',
+ value_type => 'uniline',
+ mandatory => 1,
+ },
+ },
+ 'ordered_hash_of_nodes'
+ => { type => 'hash',
+ index_type => 'string',
+ ordered => 1 ,
+ cargo => { type => 'node',
+ config_class_name => 'SlaveZ'
+ },
+ },
olist => { type => 'list',
- cargo_type => 'node',
- config_class_name => 'SlaveZ' ,
- },
+ cargo => { type => 'node',
+ config_class_name => 'SlaveZ' ,
+ },
+ },
+ enum_list => { type => 'list',
+ cargo => { type => 'leaf',
+ value_type => 'enum',
+ choice => [qw/A B C/],
+ }
+ },
tree_macro => { type => 'leaf',
value_type => 'enum',
choice => [qw/XY XZ mXY/],
@@ -161,30 +198,17 @@
mXY => 'mXY help',
}
},
- 'a_warped_node'
- => {
- type => 'warped_node',
- follow => '! tree_macro',
- config_class_name => 'SlaveY',
- morph => 1 ,
- rules => [
- #XY => { config_class_name => 'SlaveY'},
- mXY => { config_class_name => 'SlaveY'},
- XZ => { config_class_name => 'SlaveZ'}
- ]
- },
-
- 'a_warped_out_node'
- => {
- type => 'warped_node',
- follow => '! tree_macro',
- morph => 1 ,
- rules => [
- XY => { config_class_name => 'SlaveY'},
- mXY => { config_class_name => 'SlaveY'},
- XZ => { config_class_name => 'SlaveZ'}
- ]
- },
+ warp => {
+ type => 'warped_node',
+ follow => '! tree_macro',
+ config_class_name => 'SlaveY',
+ morph => 1 ,
+ rules => [
+ #XY => { config_class_name => 'SlaveY'},
+ mXY => { config_class_name => 'SlaveY'},
+ XZ => { config_class_name => 'SlaveZ'}
+ ]
+ },
'slave_y' => { type => 'node',
config_class_name => 'SlaveY' ,
More information about the Pkg-perl-cvs-commits
mailing list