Changeset 11108

Timestamp:

03/13/10 16:23:40 (2 years ago)

Author:

adamk

Message:

Switched from pip to cpanm

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• Makefile.PL (modified) (3 diffs)
• lib/Padre/Action/Tools.pm (modified) (4 diffs)

trunk/Padre/Changes

@@ -22 +22 @@
     - When showing a toolbar panel for the first time, make sure it's lock
       state is consistent with the main_lockinterface config setting (ADAMK)
+    - Local file and remote file installation switched from pip to
+      cpanm (ADAMK)
 
 0.58 2010.03.08  **WARNING Still not stable**

trunk/Padre/Makefile.PL

@@ -46 +46 @@
 
 my $wxw = eval { use Alien::wxWidgets; 1; };
-if ( $@ || !$wxw ) {
+if ( $@ or not $wxw ) {
     print STDERR "Warning: prerequisite Alien::wxWidgets not found.\n";
     exit 0;
@@ -71 +71 @@
 requires 'perl'                  => '5.008005';
 requires 'App::Ack'              => '1.86';
+requires 'App::cpanminus'        => '0.9922';
 requires 'Class::Adapter'        => '1.05';
 requires 'Class::Unload'         => '0.03';
@@ -124 +125 @@
 requires 'Parse::ErrorString::Perl' => '0.11';
 requires 'Parse::ExuberantCTags'    => '1.00';
-requires 'pip'                      => '0.13';
 requires 'Pod::POM'                 => '0.17';
 requires 'Pod::Simple'              => '3.07';

trunk/Padre/lib/Padre/Action/Tools.pm

@@ -6 +6 @@
 use strict;
 use warnings;
+use File::Spec      ();
 use Params::Util    ();
 use Padre::Constant ();
@@ -185 +186 @@
 }
 
+
+
+
+
 #####################################################################
 # Module Tools
@@ -212 +217 @@
     }
 
-    $self->install_pip( $main, $string );
+    $self->install_cpanm( $main, $string );
     return;
 }
@@ -237 +242 @@
     }
 
-    $self->install_pip( $main, $string );
+    $self->install_cpanm( $main, $string );
     return;
 }
 
-sub install_pip {
+sub install_cpanm {
     my $self   = shift;
     my $main   = shift;
     my $module = shift;
 
-    # Find 'pip', used to install modules
-    require File::Which;
-    my $pip = scalar File::Which::which('pip');
-    unless ( -f $pip ) {
-        $main->error( Wx::gettext("pip is unexpectedly not installed") );
-        return;
-    }
-
-    $main->setup_bindings;
-
-    # Run with console Perl to prevent unexpected results under wperl
+    # Find 'cpanm', used to install modules
+    require Config;
+    my %seen  = ();
+    my @where = grep {
+        defined $_ and length $_ and not $seen{$_}++
+    } map {
+        $Config::Config{$_}
+    } qw{
+        sitescriptexp
+        sitebinexp
+        vendorscriptexp
+        vendorbinexp
+        scriptdirexp
+        binexp
+    };
+    my $cpanm = '';
+    foreach my $dir ( @where ) {
+        my $path = File::Spec->catfile( $dir, 'cpanm' );
+        if ( -f $path ) {
+            $cpanm = $path;
+            last;
+        }
+    }
+    unless ( $cpanm ) {
+        $main->error( Wx::gettext("cpanm is unexpectedly not installed") );
+        return;
+    }
+
+    # Create the command
     my $perl = Padre::Perl::cperl();
-    my $cmd  = qq{"$perl" "$pip" "$module"};
-    local $ENV{AUTOMATED_TESTING} = 1;
-    Wx::Perl::ProcessStream::Process->new->Run( $cmd, 'CPAN_mod', $main );
+    my $cmd  = qq{"$perl" "$cpanm" "$module"};
+    $main->run_command($cmd);
 
     return;