Changeset 9636

Timestamp:

12/12/09 07:06:05 (2 years ago)

Author:

azawawi

Message:

Fixed Padre crash in Module Tools/Install? Locale/Module?/CPAN config.

Location:

trunk/Padre/lib/Padre

Files:

• Action/Plugins.pm (modified) (1 diff)
• Wx/Menu/Plugins.pm (modified) (1 diff)

trunk/Padre/lib/Padre/Action/Plugins.pm

@@ -171 +171 @@
 }
 
+#####################################################################
+# Module Tools
+
+sub install_file {
+    my $self = shift;
+    my $main = shift;
+
+    # Ask what we should install
+    my $dialog = Wx::FileDialog->new(
+        $main,
+        Wx::gettext("Select distribution to install"),
+        '',                                  # Default directory
+        '',                                  # Default file
+        'CPAN Packages (*.tar.gz)|*.tar.gz', # wildcard
+        Wx::wxFD_OPEN | Wx::wxFD_FILE_MUST_EXIST
+    );
+    $dialog->CentreOnParent;
+    if ( $dialog->ShowModal == Wx::wxID_CANCEL ) {
+        return;
+    }
+    my $string = $dialog->GetPath;
+    $dialog->Destroy;
+    unless ( defined $string and $string =~ /\S/ ) {
+        $main->error( Wx::gettext("Did not provide a distribution") );
+        return;
+    }
+
+    $self->install_pip( $main, $string );
+    return;
+}
+
+sub install_url {
+    my $self = shift;
+    my $main = shift;
+
+    # Ask what we should install
+    my $dialog = Wx::TextEntryDialog->new(
+        $main,
+        Wx::gettext("Enter URL to install\ne.g. http://svn.ali.as/cpan/releases/Config-Tiny-2.00.tar.gz"),
+        "pip",
+        '',
+    );
+    if ( $dialog->ShowModal == Wx::wxID_CANCEL ) {
+        return;
+    }
+    my $string = $dialog->GetValue;
+    $dialog->Destroy;
+    unless ( defined $string and $string =~ /\S/ ) {
+        $main->error( Wx::gettext("Did not provide a distribution") );
+        return;
+    }
+
+    $self->install_pip( $main, $string );
+    return;
+}
+
+sub install_pip {
+    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
+    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 );
+
+    return;
+}
+
+sub cpan_config {
+    my $self = shift;
+    my $main = shift;
+
+    # Locate the CPAN config file(s)
+    my $default_dir = '';
+    eval {
+        require CPAN;
+        $default_dir = $INC{'CPAN.pm'};
+        $default_dir =~ s/\.pm$//is; # remove .pm
+    };
+
+    # Load the main config first
+    if ( $default_dir ne '' ) {
+        my $core = File::Spec->catfile( $default_dir, 'Config.pm' );
+        if ( -e $core ) {
+            $main->setup_editors($core);
+            return;
+        }
+    }
+
+    # Fallback to a personal config
+    my $user = File::Spec->catfile(
+        File::HomeDir->my_home,
+        '.cpan', 'CPAN', 'MyConfig.pm'
+    );
+    if ( -e $user ) {
+        $main->setup_editors($user);
+        return;
+    }
+
+    $main->error( Wx::gettext("Failed to find your CPAN configuration") );
+}
+
 1;
 

trunk/Padre/lib/Padre/Wx/Menu/Plugins.pm

@@ -192 +192 @@
 
 
-#####################################################################
-# Module Tools
-
-sub install_file {
-    my $self = shift;
-    my $main = shift;
-
-    # Ask what we should install
-    my $dialog = Wx::FileDialog->new(
-        $main,
-        Wx::gettext("Select distribution to install"),
-        '',                                  # Default directory
-        '',                                  # Default file
-        'CPAN Packages (*.tar.gz)|*.tar.gz', # wildcard
-        Wx::wxFD_OPEN | Wx::wxFD_FILE_MUST_EXIST
-    );
-    $dialog->CentreOnParent;
-    if ( $dialog->ShowModal == Wx::wxID_CANCEL ) {
-        return;
-    }
-    my $string = $dialog->GetPath;
-    $dialog->Destroy;
-    unless ( defined $string and $string =~ /\S/ ) {
-        $main->error( Wx::gettext("Did not provide a distribution") );
-        return;
-    }
-
-    $self->install_pip( $main, $string );
-    return;
-}
-
-sub install_url {
-    my $self = shift;
-    my $main = shift;
-
-    # Ask what we should install
-    my $dialog = Wx::TextEntryDialog->new(
-        $main,
-        Wx::gettext("Enter URL to install\ne.g. http://svn.ali.as/cpan/releases/Config-Tiny-2.00.tar.gz"),
-        "pip",
-        '',
-    );
-    if ( $dialog->ShowModal == Wx::wxID_CANCEL ) {
-        return;
-    }
-    my $string = $dialog->GetValue;
-    $dialog->Destroy;
-    unless ( defined $string and $string =~ /\S/ ) {
-        $main->error( Wx::gettext("Did not provide a distribution") );
-        return;
-    }
-
-    $self->install_pip( $main, $string );
-    return;
-}
-
-sub install_pip {
-    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
-    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 );
-
-    return;
-}
-
-sub cpan_config {
-    my $self = shift;
-    my $main = shift;
-
-    # Locate the CPAN config file(s)
-    my $default_dir = '';
-    eval {
-        require CPAN;
-        $default_dir = $INC{'CPAN.pm'};
-        $default_dir =~ s/\.pm$//is; # remove .pm
-    };
-
-    # Load the main config first
-    if ( $default_dir ne '' ) {
-        my $core = File::Spec->catfile( $default_dir, 'Config.pm' );
-        if ( -e $core ) {
-            $main->setup_editors($core);
-            return;
-        }
-    }
-
-    # Fallback to a personal config
-    my $user = File::Spec->catfile(
-        File::HomeDir->my_home,
-        '.cpan', 'CPAN', 'MyConfig.pm'
-    );
-    if ( -e $user ) {
-        $main->setup_editors($user);
-        return;
-    }
-
-    $main->error( Wx::gettext("Failed to find your CPAN configuration") );
-}
-
 1;