Merge lp:~emaadmanzoor/mvhub/move-out-update-cpan-libs into lp:mvhub

[Emaad Ahmed Manzoor]

moved cpan lib fetching to a separate module
added the Foo::Bar::Baz::Roo test case to lib-mvhub/t/01-load.t

* Moved update_cpan_libs(), _get_cpan_libs and _get_cpan_install_fails from Setup.pm to Setup/CPANLibs.pm.
* added the Foo::Bar::Baz::Roo test case to lib-mvhub/t/01-load.t

[Dan MacNeil (omacneil)]

Looks pretty good (love the POD!)

Before merging, the various mv_update_* scripts need to be modified.

review: Needs Fixing

[lp:~emaadmanzoor/mvhub/move-out-update-cpan-libs]

591. By Emaad Ahmed Manzoor on 2011-08-15

updated mv_* scripts to use Setup::CPANLibs

[Emaad Ahmed Manzoor (emaadmanzoor)]

Done

[Dan MacNeil (omacneil)]

Need also to update mv_update_staging and mv_update_production

when these are done, ok to merge w/o further review.

review: Needs Fixing

[lp:~emaadmanzoor/mvhub/move-out-update-cpan-libs]

592. By Emaad Ahmed Manzoor on 2011-09-02

merged from trunk

593. By Emaad Ahmed Manzoor on 2011-09-03

modified test to recognize modules 4 directories deep

594. By Emaad Ahmed Manzoor on 2011-09-03

fixed my mistake

595. By Emaad Ahmed Manzoor on 2011-09-03

perltidy fix

=== modified file 'app-mvhub/project-tools/bin/mv_update_development'
--- app-mvhub/project-tools/bin/mv_update_development	2011-08-11 03:24:54 +0000
+++ app-mvhub/project-tools/bin/mv_update_development	2011-09-03 14:01:26 +0000
@@ -122,7 +122,7 @@
 
         $prompt = "Update CPAN libraries? (Y/N):";
         if ( !($interactive) || IO::Prompt::prompt( $prompt, -YN ) ) {
-            MVHub::Utils::Setup::update_cpan_libs();
+            MVHub::Utils::Setup::CPANLibs::update_cpan_libs();
         }
     }
 }

=== modified file 'app-mvhub/project-tools/bin/mv_update_production'
--- app-mvhub/project-tools/bin/mv_update_production	2010-11-28 02:03:11 +0000
+++ app-mvhub/project-tools/bin/mv_update_production	2011-09-03 14:01:26 +0000
@@ -79,7 +79,7 @@
     }
     $prompt = "Update CPAN libraries? (Y/N):";
     if ( !($interactive) || IO::Prompt::prompt( $prompt, -YN ) ) {
-        MVHub::Utils::Setup::update_cpan_libs();
+        MVHub::Utils::Setup::CPANLibs::update_cpan_libs();
     }
 
 }

=== modified file 'app-mvhub/project-tools/bin/mv_update_staging'
--- app-mvhub/project-tools/bin/mv_update_staging	2010-11-28 02:03:11 +0000
+++ app-mvhub/project-tools/bin/mv_update_staging	2011-09-03 14:01:26 +0000
@@ -94,7 +94,7 @@
 
     $prompt = "Update CPAN libraries? (Y/N):";
     if ( !($interactive) || IO::Prompt::prompt( $prompt, -YN ) ) {
-        MVHub::Utils::Setup::update_cpan_libs();
+        MVHub::Utils::Setup::CPANLibs::update_cpan_libs();
     }
 
 }

=== added directory 'lib-mvhub/lib/MVHub/Utils/Setup'
=== modified file 'lib-mvhub/lib/MVHub/Utils/Setup.pm'
--- lib-mvhub/lib/MVHub/Utils/Setup.pm	2011-08-13 13:02:47 +0000
+++ lib-mvhub/lib/MVHub/Utils/Setup.pm	2011-09-03 14:01:26 +0000
@@ -5,7 +5,6 @@
 
 use Carp;
 use DateTime;
-use CPANPLUS::Backend;
 use DBI;
 use IO::File;
 use IO::Prompt;
@@ -42,7 +41,6 @@
     remove_cron_jobs
     restart_services
     update_etc_files
-    update_cpan_libs
 );
 
 our @SITE_CODES = qw/ mvh nsp /;
@@ -919,51 +917,3 @@
     my $cmd = "cp -vur $etc_path /";
     ( system($cmd) == 0 ) or die "Failed to copy etc files\n";
 }
-
-sub update_cpan_libs {
-
-    my $cb = CPANPLUS::Backend->new(
-        conf => {
-            allow_build_interactivity => 'false',
-            prereqs                   => 1,
-            verbose                   => 'false',
-        }
-    );
-
-    my @modules = _get_cpan_modules();
-    my $result = $cb->install( modules => \@modules );
-
-    if ( !$result ) {
-        my $msg = "\n   FAILED to install/update following cpan modules:\n";
-        $msg .= _get_cpan_install_fails( $result->rv() );
-        warn "$msg\n";
-    }
-    else {
-        print "\nupdated cpan libs successfully\n";
-    }
-}
-
-sub _get_cpan_modules {
-    return qw /
-        Devel::NYTProf
-        DBIx::XHTML_Table
-        Search::Sitemap
-        Set::Array
-        SQL::Library
-        Test::HTML::Lint
-        Test::WWW::Mechanize
-        Text::xSV
-        WWW::Mechanize
-        /;
-}
-
-sub _get_cpan_install_fails {
-    my $modules_href = shift;
-
-    my $failed_mods;
-    foreach my $module_name ( sort keys %$modules_href ) {
-        $failed_mods .= ' ' x 10 . "$module_name\n"
-            if not $$modules_href{$module_name};
-    }
-    return $failed_mods;
-}

=== added file 'lib-mvhub/lib/MVHub/Utils/Setup/CPANLibs.pm'
--- lib-mvhub/lib/MVHub/Utils/Setup/CPANLibs.pm	1970-01-01 00:00:00 +0000
+++ lib-mvhub/lib/MVHub/Utils/Setup/CPANLibs.pm	2011-09-03 14:01:26 +0000
@@ -0,0 +1,120 @@
+package MVHub::Utils::Setup::CPANLibs;
+
+use strict;
+use warnings;
+
+use CPANPLUS::Backend;
+
+use autodie qw/ :all /;
+
+our @EXPORT = qw(
+    update_cpan_libs
+);
+
+sub update_cpan_libs {
+
+    my $cb = CPANPLUS::Backend->new(
+        conf => {
+            allow_build_interactivity => 'false',
+            prereqs                   => 1,
+            verbose                   => 'false',
+        }
+    );
+
+    my @modules = _get_cpan_modules();
+    my $result = $cb->install( modules => \@modules );
+
+    if ( !$result ) {
+        my $msg = "\n   FAILED to install/update following cpan modules:\n";
+        $msg .= _get_cpan_install_fails( $result->rv() );
+        warn "$msg\n";
+    }
+    else {
+        print "\nupdated cpan libs successfully\n";
+    }
+}
+
+sub _get_cpan_modules {
+    return qw /
+        Devel::NYTProf
+        DBIx::XHTML_Table
+        Search::Sitemap
+        Set::Array
+        SQL::Library
+        Test::HTML::Lint
+        Test::WWW::Mechanize
+        Text::xSV
+        WWW::Mechanize
+        /;
+}
+
+sub _get_cpan_install_fails {
+    my $modules_href = shift;
+
+    my $failed_mods;
+    foreach my $module_name ( sort keys %$modules_href ) {
+        $failed_mods .= ' ' x 10 . "$module_name\n"
+            if not $$modules_href{$module_name};
+    }
+    return $failed_mods;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+MVHub::Utils::Setup::CPANLibs - Downloads and installs the CPAN modules MVHub requires
+
+=head1 SYNOPSIS
+
+  use MVHub::Utils::Setup::CPANLibs;
+  MVHub::Utils::Setup::CPANLibs::update_cpan_libs()
+	or die "Could not update CPAN libraries.\n";
+
+=head1 DESCRIPTION
+
+ Downloads and installs the CPAN modules required by MVHub.
+ The modules to download are listed within the module code.
+
+=head1 SEE ALSO
+
+ MVHub::Utils::Setup
+
+=head1 SUBROUTINES
+
+=head2 _get_cpan_libs()
+
+    Private method that provides the names of the CPAN
+    modules to download and install; modify this method
+    to add/remove additional modules.
+
+=head2 update_cpan_libs()
+
+    Downloads and installs the CPAN modules retrieved
+    from _get_cpan_libs.
+    
+=head2 _get_cpan_install_fails()
+
+    Provides the error message to update_cpan_libs()
+    for failed modules.       
+
+=head1 DEPENDENCIES
+
+CPANPLUS::Backend (core module)
+
+=head1 LAST MODIFIED
+
+Last modified on $Date: 2011-08-12 12:00:00 +0530 (Sat, 12 Aug 2011) $ by $Author: emaadmanzoor $
+
+=head1 AUTHOR
+
+Community Software Lab E<lt>[e-mail]<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+The GNU Affero General Public License, version 3.0 or later
+
+Copyright (c) 2004-2008 Community Software Lab, Inc ( http://thecsl.org )
+
+=cut

=== modified file 'lib-mvhub/t/01-load.t'
--- lib-mvhub/t/01-load.t	2010-09-27 13:28:16 +0000
+++ lib-mvhub/t/01-load.t	2011-09-03 14:01:26 +0000
@@ -50,6 +50,11 @@
             $module = ( split '\.', $module )[0];
             push @modules, $module;
         }
+        elsif ( $file =~ m|lib/\w+/\w+/\w+/\w+\.pm$| ) {
+            $module = join '::', ( split '/', $file )[ -4 .. -1 ];
+            $module = ( split '\.', $module )[0];
+            push @modules, $module;
+        }
         else {
             warn "\n'$file'\n not matched \n";
         }