[lemonldap-ng] 02/03: Keep Mouse for tests and command-line

[Xavier Guimard]

This is an automated email from the git hooks/post-receive script.

xguimard-guest pushed a commit to branch master
in repository lemonldap-ng.

commit 667989a3d80b467ccdad2f1c2663d50ccde18c6b
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sat Nov 12 08:39:52 2016 +0100

    Keep Mouse for tests and command-line
---
 debian/patches/replace-mouse-by-moose.patch | 147 ----------------------------
 1 file changed, 147 deletions(-)

diff --git a/debian/patches/replace-mouse-by-moose.patch b/debian/patches/replace-mouse-by-moose.patch
index 2bd038d..ff68090 100644
--- a/debian/patches/replace-mouse-by-moose.patch
+++ b/debian/patches/replace-mouse-by-moose.patch
@@ -25,53 +25,6 @@ Last-Update: 2016-05-02
 +no Moose;
  
  1;
---- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Cli.pm
-+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Cli.pm
-@@ -1,27 +1,30 @@
- package Lemonldap::NG::Common::Cli;
- 
- use strict;
--use Mouse;
-+use Moose;
- use Data::Dumper;
- use Lemonldap::NG::Common::Conf;
- 
- has confAccess => (
-     is      => 'rw',
--    builder => sub {
--        my $res = Lemonldap::NG::Common::Conf->new(
--            {
--                (
--                    ref $_[0] && $_[0]->{iniFile}
--                    ? ( confFile => $_[0]->{iniFile} )
--                    : ()
--                )
--            }
--        );
--        die $Lemonldap::NG::Common::Conf::msg unless ($res);
--        return $res;
--    },
-+    builder => 'newConfAccess',
-+    lazy    => 1
- );
- 
-+sub newConfAccess {
-+    my $res = Lemonldap::NG::Common::Conf->new(
-+        {
-+            (
-+                ref $_[0] && $_[0]->{iniFile}
-+                ? ( confFile => $_[0]->{iniFile} )
-+                : ()
-+            )
-+        }
-+    );
-+    die $Lemonldap::NG::Common::Conf::msg unless ($res);
-+    return $res;
-+}
-+
- has cfgNum => (
-     is  => 'rw',
-     isa => 'Int',
 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm
 +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm
 @@ -1,7 +1,7 @@
@@ -83,17 +36,6 @@ Last-Update: 2016-05-02
  use JSON;
  use Lemonldap::NG::Common;
  use Lemonldap::NG::Common::PSGI::Constants;
---- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Cli/Lib.pm
-+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Cli/Lib.pm
-@@ -1,7 +1,7 @@
- package Lemonldap::NG::Common::PSGI::Cli::Lib;
- 
- use JSON;
--use Mouse;
-+use Moose;
- use Lemonldap::NG::Common::PSGI;
- 
- has iniFile => ( is => 'ro', isa => 'Str' );
 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm
 +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Request.pm
 @@ -1,7 +1,7 @@
@@ -222,39 +164,6 @@ Last-Update: 2016-05-02
  use Lemonldap::NG::Handler::SharedConf qw(:tsv);
  
  extends 'Lemonldap::NG::Handler::PSGI';
---- a/lemonldap-ng-handler/t/test-psgi-lib.pm
-+++ b/lemonldap-ng-handler/t/test-psgi-lib.pm
-@@ -61,14 +61,18 @@
- 
- package Lemonldap::NG::Handler::PSGI::Cli::Lib;
- 
--use Mouse;
-+use Moose;
- 
- extends 'Lemonldap::NG::Common::PSGI::Cli::Lib';
- 
- has app => (
-     is      => 'ro',
-     isa     => 'CodeRef',
--    builder => sub {
-+    builder => 'newCli',
-+    lazy    => 1
-+);
-+
-+sub newCli {
-         return $module->run(
-             {
-                 configStorage => { type => 'File', dirName => 't' },
-@@ -78,8 +82,7 @@
-                 https         => 0,
-             }
-         );
--    }
--);
-+}
- 
- sub _get {
-     my ( $self, $path, $query, $host, $cookie ) = @_;
 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
 +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
 @@ -12,7 +12,7 @@
@@ -277,62 +186,6 @@ Last-Update: 2016-05-02
  use Lemonldap::NG::Manager::Build::Attributes;
  use Lemonldap::NG::Manager::Build::Tree;
  use Lemonldap::NG::Manager::Build::CTrees;
---- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm
-+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli.pm
-@@ -1,7 +1,7 @@
- package Lemonldap::NG::Manager::Cli;
- 
- use strict;
--use Mouse;
-+use Moose;
- use Data::Dumper;
- use Lemonldap::NG::Manager::Constants;
- 
-@@ -252,7 +252,7 @@
- 
- package Lemonldap::NG::Manager::Cli::Request;
- 
--use Mouse;
-+use Moose;
- 
- has cfgNum => ( is => 'rw' );
- 
---- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli/Lib.pm
-+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Cli/Lib.pm
-@@ -1,6 +1,6 @@
- package Lemonldap::NG::Manager::Cli::Lib;
- 
--use Mouse;
-+use Moose;
- use Lemonldap::NG::Manager;
- 
- extends 'Lemonldap::NG::Common::PSGI::Cli::Lib';
-@@ -10,14 +10,17 @@
- has app => (
-     is      => 'ro',
-     isa     => 'CodeRef',
--    builder => sub {
--        my $args = { protection => 'none' };
--        $args->{configStorage} = { confFile => $_[0]->{iniFile} }
--          if ( $_[0]->{iniFile} );
--        $_[0]->{mgr} = Lemonldap::NG::Manager->new($args);
--        $_[0]->{mgr}->init($args);
--        return $_[0]->{mgr}->run();
--    }
-+    builder => 'newLib',
-+    lazy    => 1
- );
- 
-+sub newLib {
-+    my $args = { protection => 'none' };
-+    $args->{configStorage} = { confFile => $_[0]->{iniFile} }
-+      if ( $_[0]->{iniFile} );
-+    $_[0]->{mgr} = Lemonldap::NG::Manager->new($args);
-+    $_[0]->{mgr}->init($args);
-+    return $_[0]->{mgr}->run();
-+}
-+
- 1;
 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
 +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
 @@ -8,7 +8,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git