Changeset 10615

Timestamp:

02/08/10 02:23:11 (5 weeks ago)

Author:

adamk

Message:

Added support for --reset to flush and reset the configuration to defaults, because the Swarm plugin is instantly segfaulting Padre at startup and I didn't want to have to keep resetting the configuration by hand all the time.

Location:

trunk/Padre

Files:

• Changes (modified) (6 diffs)
• dev.pl (modified) (5 diffs)
• lib/Padre/Constant.pm (modified) (2 diffs)
• lib/Padre/Plugin/PopularityContest.pm (modified) (1 diff)
• lib/Padre/Plugin/PopularityContest/Ping.pm (modified) (2 diffs)
• lib/Padre/Task/HTTPClient.pm (modified) (2 diffs)
• lib/Padre/Util.pm (modified) (1 diff)
• lib/Padre/Util/SVN.pm (added)
• lib/Padre/Wx/Main.pm (modified) (4 diffs)
• script/padre (modified) (7 diffs)

trunk/Padre/Changes

@@ -25 +25 @@
       of the modules used by the Perl help provider run-time loaded (ADAMK)
     - Moved padre.exe build from bin to win32-loader folder since bin is a
-      bad location for putting the Padre win32 launcher code (SMUELLER, AZAWAWI)
+      bad path for putting the Padre win32 launcher code (SMUELLER, AZAWAWI)
     - Added "Open in File Browser" in the File and right-click menu (AZAWAWI)
-    - No need to launch a command shell to execute explorer.exe on win32 (AZAWAWI)
+    - No need to launch a command shell to execute explorer.exe on
+      win32 (AZAWAWI)
     - Added "Open with Default System Editor" in "File -> Open..." (AZAWAWI)
+    - Implemented padre --reset to flush and reset the current Padre
+      configuration in otherwise unrecoverable situations, such as now
+      when the Swarm plugin causes the slave-driver code to instantly
+      segfault at startup (ADAMK)
 
 0.56 2010.02.01
@@ -57 +62 @@
       the invoker (AZAWAWI)
     - Disable debugger menu items when there is no document (AZAWAWI)
-    - Fixed a Padre debugger crash when an unsaved document is debugged (AZAWAWI)
+    - Fixed a Padre debugger crash when unsaved document is debugged (AZAWAWI)
     - Fixed Padre no-document crash with Find Next/Find Previous functionality
       (AZAWAWI)
@@ -205 +210 @@
     - Ctrl-Tab behaviour is now configurable (SEWI)
     - Rename Padre::Debug to Padre::Logger (SZABGAB)
-    - Reuse the comment field of the menu actions and show them in the toolbar (SZABGAB)
+    - Reuse the comment field of the menu actions and show them in
+      the toolbar (SZABGAB)
     - Add comment field to all the menu items that did not have yet (SZABGAB)
     - Integrated Padre::DB into the Padre::Locker API, so that we can do
@@ -212 +218 @@
       being done in a transaction, or were doing crazy bizarre things. Startup
       is now noticably faster (ADAMK)
-    - Added Preference setting to control autocomplete when editting a script rather than
-      a Module. (PLAVEN)      
+    - Added Preference setting to control autocomplete when editting a
+      script rather than a Module. (PLAVEN)      
 
 0.52 2009.12.14
@@ -347 +353 @@
     - Fixed ticket #627: Suggestion: Make it possible to copy 'Syntax Check'
       messages (AZAWAWI)
-    - require version 0.20 of Wx::Perl::ProcessStream to fix #628 (AZAWAWI, SZABGAB)
+    - Require version 0.20 of Wx::Perl::ProcessStream to fix #628 (AZAWAWI, SZABGAB)
     - Fixed ticket #493: splash image license not suitable for Debian (AZAWAWI)
     - Fixed t/86-service.t to work again on win32 (AZAWAWI)
@@ -1198 +1204 @@
 
 0.04 2008.08.08
-    - add Devel::PerlySense as prereq
-    - stop checking for wx version for now
-    - change the create_makefile_pl to passthrough as the traditional did not do the extra work done by Build.PL
+    - Add Devel::PerlySense as prereq
+    - Stop checking for wx version for now
+    - Change the create_makefile_pl to passthrough as the traditional did
+      not do the extra work done by Build.PL
     - Mark the buffer that is unsaved with a star.
-    - stop saving the content of the loaded file and use GetModify
+    - Stop saving the content of the loaded file and use GetModify
       to find out if the file has been modifyed since last save
-    - replace the search_term by search_terms in the config file
-    - allow remembering of search terms
-    - replace the text dialog by a full dialog box and a Wx::ComboBox
+    - Replace the search_term by search_terms in the config file
+    - Allow remembering of search terms
+    - Replace the text dialog by a full dialog box and a Wx::ComboBox
     - Setup http://padre.perlide.org/ using trac
     - Move the repository to http://svn.perlide.org/padre/
 
 0.03_02 2008.08.03
-    - add experimental code for plugins
-    - add experimental version of Padre::Plugin::PAR
-    - fix the shortcuts of some of the menues in windows, thanks to Octavian Rasnita
-    - replace the AppendSubMenu calls by Append calls to support older version of wxWidgets
+    - Add experimental code for plugins
+    - Add experimental version of Padre::Plugin::PAR
+    - Fix the shortcuts of some of the menues in windows, thanks to Octavian Rasnita
+    - Replace the AppendSubMenu calls by Append calls to support older version of wxWidgets
 
 0.03_01 2008.07.31

trunk/Padre/dev.pl

@@ -15 +15 @@
 use Getopt::Long ();
 use vars qw{
+        $USAGE
         $DEBUG
-        $TRACE
-        $DIE
         $PROFILE
         $PLUGINS
-        $USAGE
         $FULLTRACE
         $INVISIBLE
@@ -27 +25 @@
 
 BEGIN {
+        $USAGE     = 0;
         $DEBUG     = 0;
-        $DIE       = 0;
         $PROFILE   = 0;
         $PLUGINS   = 0;
-        $USAGE     = 0;
         $FULLTRACE = 0;
         $INVISIBLE = 0;
         @INCLUDE   = ();
         Getopt::Long::GetOptions(
-                'usage|help' => \$USAGE,
-                'debug|d'    => \$DEBUG,
-                'trace'      => sub {
-                        $ENV{PADRE_DEBUG} = 1;
-                },
-                'die'         => \$DIE,
+                'usage|help'  => \$USAGE,
+                'debug|d'     => \$DEBUG,
+                'trace'       => sub { $ENV{PADRE_DEBUG} = 1 },
+                'die'         => sub { $ENV{PADRE_DIE}   = 1 },
                 'profile'     => \$PROFILE,
                 'a'           => \$PLUGINS,
@@ -50 +45 @@
 }
 
-$USAGE and usage();
-
 $ENV{PADRE_DEV}  = 1;
 $ENV{PADRE_HOME} = $FindBin::Bin;
-$ENV{PADRE_DIE}  = $DIE;
 
 use lib $FindBin::Bin, "$FindBin::Bin/lib";
@@ -90 +82 @@
 
 if ($FULLTRACE) {
-        eval { require Devel::Trace; };
+        eval {
+                require Devel::Trace;
+        };
         if ($@) {
                 print "Error while initilizing --fulltrace while trying to load Devel::Trace:\n"
                         . "$@Maybe Devel::Trace isn't installed?\n";
-                exit 1;
+                exit(1);
         }
         push @cmd, '-d:Trace';
@@ -121 +115 @@
 push @cmd, '--help' if $USAGE;
 
-$DEBUG and print "Running " . join( ' ', @cmd ) . "\n";
+if ( $DEBUG ) {
+        print "Running " . join( ' ', @cmd ) . "\n";
+}
+
+if ( $USAGE ) {
+        usage();
+}
 
 system(@cmd);
 
 sub vmsgfmt {
-        msgfmt(
-                {   in      => "$_[0]/share/locale/",
-                        verbose => 0,
-                }
-        );
+        msgfmt( { in => "$_[0]/share/locale/", verbose => 0 } );
 }
 

trunk/Padre/lib/Padre/Constant.pm

@@ -102 +102 @@
 );
 
-use constant LOG_FILE => File::Spec->catfile( CONFIG_DIR, 'debug.log' );
-use constant PLUGIN_DIR => File::Spec->catdir( CONFIG_DIR, 'plugins' );
-use constant PLUGIN_LIB => File::Spec->catdir( PLUGIN_DIR, 'Padre', 'Plugin' );
+use constant LOG_FILE       => File::Spec->catfile( CONFIG_DIR, 'debug.log' );
+use constant PLUGIN_DIR     => File::Spec->catdir( CONFIG_DIR, 'plugins' );
+use constant PLUGIN_LIB     => File::Spec->catdir( PLUGIN_DIR, 'Padre', 'Plugin' );
 use constant CONFIG_HOST    => File::Spec->catfile( CONFIG_DIR, 'config.db' );
 use constant CONFIG_HUMAN   => File::Spec->catfile( CONFIG_DIR, 'config.yml' );
 use constant CONFIG_STARTUP => File::Spec->catfile( CONFIG_DIR, 'startup.yml' );
 
-# Check and create the directories that need to exist
-unless ( -e CONFIG_DIR or File::Path::mkpath(CONFIG_DIR) ) {
-        Carp::croak( "Cannot create config directory '" . CONFIG_DIR . "': $!" );
+# Do the initialisation in a function,
+# so we can run it again later if needed.
+sub init {
+        # Check and create the directories that need to exist
+        unless ( -e CONFIG_DIR or File::Path::mkpath(CONFIG_DIR) ) {
+                Carp::croak( "Cannot create config directory '" . CONFIG_DIR . "': $!" );
+        }
+        unless ( -e PLUGIN_LIB or File::Path::mkpath(PLUGIN_LIB) ) {
+                Carp::croak( "Cannot create plug-ins directory '" . PLUGIN_LIB . "': $!" );
+        }
 }
-unless ( -e PLUGIN_LIB or File::Path::mkpath(PLUGIN_LIB) ) {
-        Carp::croak( "Cannot create plug-ins directory '" . PLUGIN_LIB . "': $!" );
+
+BEGIN {
+        init();
 }
 
@@ -132 +140 @@
 # NOTE: The only reason this is here is that it is needed both during
 # main configuration, and also during Padre::Startup.
-use constant DEFAULT_SINGLEINSTANCE => ( WIN32 and not( $ENV{HARNESS_ACTIVE} or $^P ) ) ? 1 : 0;
+use constant DEFAULT_SINGLEINSTANCE => (
+        WIN32 and not( $ENV{HARNESS_ACTIVE} or $^P )
+) ? 1 : 0;
 
 use constant DEFAULT_SINGLEINSTANCE_PORT => 4444;
-
-
-
-
-
-#####################################################################
-# Pseudo Constants
-
-my $revision;
-
-# Get the svn revision of the currently running Padre once:
-# eval 'use constant PADRE_REVISION => Padre::Util::revision;';
-# This needs to be a pseudo constant as it requires Padre::Util which
-# requires Padre::Constant (this module).
-sub PADRE_REVISION () {
-
-        # Get and keep the revision at the first call of this pseudo-constant
-        # (usually at Padre start)
-        require Padre::Util;
-        $revision ||= Padre::Util::revision();
-        return $revision;
-}
 
 1;

trunk/Padre/lib/Padre/Plugin/PopularityContest.pm

@@ -229 +229 @@
 
         # Versioning information
-        my $revision = Padre::Constant::PADRE_REVISION;
+        require Padre::Util::SVN;
+        my $revision = Padre::Util::SVN::padre_revision();
         if ( defined $revision ) {
 

trunk/Padre/lib/Padre/Plugin/PopularityContest/Ping.pm

@@ -25 +25 @@
                 my $dir = $0;
                 $dir =~ s/padre$//;
-                my $revision = Padre::Util::svn_directory_revision($dir);
-                if ( -d "$dir.svn" ) {
-                        $data{svn} = $revision;
-                }
+                require Padre::Util::SVN;
+                my $revision = Padre::Util::SVN::directory_revision($dir);
+                $data{svn} = $revision if -d "$dir.svn";
         }
 
@@ -36 +35 @@
 
         # Hand off to the parent constructor
-        return $class->SUPER::new( request => HTTP::Request->new( GET => $url->as_string ) );
+        return $class->SUPER::new(
+                request => HTTP::Request->new( GET => $url->as_string )
+        );
 }
 

trunk/Padre/lib/Padre/Task/HTTPClient.pm

@@ -4 +4 @@
 use strict;
 use warnings;
-
-use Padre::Constant;
+use Padre::Constant ();
 
 # Use all modules which may provide services for us:
 
 our $VERSION = '0.56';
+our @DRIVERS = qw{
+        Padre::Task::HTTPClient::LWP
+};
 
 =pod
@@ -41 +43 @@
 
 sub new {
-
         my $class = shift;
-
-        my %args = @_;
-
-        return if ( !defined( $args{URL} ) ) or ( $args{URL} eq '' );
+        my %args  = @_;
+        unless ( defined $args{URL} and length $args{URL} ) {
+                return;
+        }
 
         # Prepare information
-        $args{headers}->{'X-Padre'} ||= 'Padre version ' . $VERSION . ' ' . Padre::Constant::PADRE_REVISION;
-        $args{method} ||= 'GET';
-
-        my $self;
+        require Padre::Util::SVN;
+        my $revision = Padre::Util::SVN::padre_version();
+        $args{method}               ||= 'GET';
+        $args{headers}->{'X-Padre'} ||= "Padre version $VERSION $revision";
 
         # Each module will be tested and the first working one should return
         # a object, all others should return nothing (undef)
-        for ('LWP') {
-
-                #               require 'Padre/Task/HTTPClient/' . $_ . '.pm';
-                eval 'require Padre::Task::HTTPClient::' . $_;
+        foreach my $driver ( @DRIVERS ) {
+                eval "require $driver;";
                 next if $@;
-                $self = "Padre::Task::HTTPClient::$_"->new(%args);
-                next unless defined($self);
+                my $self = $driver->new(%args) or next;
                 return $self;
         }
 
         return;
-
 }
 

trunk/Padre/lib/Padre/Util.pm

@@ -535 +535 @@
 }
 
-# TODO: A much better variant would be a constant set by svn.
-sub revision {
-        if ( $0 =~ /padre$/ ) {
-                my $dir = $0;
-                $dir =~ s/padre$//;
-                my $revision = Padre::Util::svn_directory_revision($dir);
-                if ( -d "$dir.svn" ) {
-                        return 'r' . $revision;
-                }
-        }
-        return;
-}
-
 1;
 

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -1176 +1176 @@
 
 sub refresh_title {
-        my $self    = shift;
-        my $config  = $self->{config};
-        my $current = $self->current;
-
-        my %variable_data = (
+        my $self     = shift;
+        my $config   = $self->{config};
+        my $current  = $self->current;
+        my %variable = (
                 '%' => '%',
                 'v' => $Padre::VERSION,
-                'f' => '',             # Initlize space for filename
-                'b' => '',             # Initlize space for filename - basename
-                'd' => '',             # Initlize space for filename - dirname
-                'F' => '',             # Initlize space for filename relative to project dir
-                'p' => '',             # Initlize space for project name
+                'f' => '',             # Initialize space for filename
+                'b' => '',             # Initialize space for filename - basename
+                'd' => '',             # Initialize space for filename - dirname
+                'F' => '',             # Initialize space for filename relative to project dir
+                'p' => '',             # Initialize space for project name
         );
 
@@ -1198 +1197 @@
                 my $document = $current->document;
                 my $file     = $document->file;
-                $variable_data{'f'} = $file->{filename};
-                $variable_data{'b'} = $file->basename;
-                $variable_data{'d'} = $file->dirname;
-
-                $variable_data{'F'} = $file->{filename};
+                $variable{'f'} = $file->{filename};
+                $variable{'b'} = $file->basename;
+                $variable{'d'} = $file->dirname;
+                $variable{'F'} = $file->{filename};
                 my $project_dir = $document->project_dir;
                 if ( defined $project_dir ) {
                         $project_dir = quotemeta $project_dir;
-                        $variable_data{'F'} =~ s/^$project_dir//;
+                        $variable{'F'} =~ s/^$project_dir//;
                 }
         }
@@ -1215 +1213 @@
                         'where id = ?', $self->ide->{session},
                 );
-                $variable_data{'p'} = $session->name;
+                $variable{'p'} = $session->name;
         }
 
@@ -1221 +1219 @@
         $self->{title} = $config->main_title;
 
-        my $Vars = join( '', keys(%variable_data) );
-
-        $self->{title} =~ s/\%([$Vars])/$variable_data{$1}/g;
-
-        $self->{title} = 'Padre ' . $Padre::VERSION
-                if !defined( $self->{title} );
-
-        my $revision = Padre::Constant::PADRE_REVISION;
-        $self->{title} .= " SVN \@$revision (\$VERSION = $Padre::VERSION)"
-                if defined($revision);
+        my $variables = join '', keys %variable;
+        $self->{title} =~ s/\%([$variables])/$variable{$1}/g;
+        unless ( defined $self->{title} ) {
+                $self->{title} = "Padre $Padre::VERSION";
+        }
+
+        require Padre::Util::SVN;
+        my $revision = Padre::Util::SVN::padre_revision();
+        if ( defined $revision ) {
+                $self->{title} .= " SVN \@$revision (\$VERSION = $Padre::VERSION)";
+        }
 
         if ( $self->GetTitle ne $self->{title} ) {

trunk/Padre/script/padre

@@ -4 +4 @@
 use strict;
 use warnings;
-use File::Which  ();
-use Getopt::Long ();
-use Carp         ();
+use Carp ();
 
 local $| = 1;
@@ -16 +14 @@
 # Must run using wxPerl on OS X.
 if ( $^O eq 'darwin' and $^X !~ m{/wxPerl\.app/} ) {
+        require File::Which;
         my $perl = scalar File::Which::which('wxPerl');
         chomp($perl);
@@ -29 +28 @@
 # Handle special command line cases early, because options like --home
 # MUST be processed before the Padre.pm library is loaded.
-my $USAGE       = '';
-my $VERSION     = '';
-my $HOME        = undef;
-my $SESSION     = undef;
-my $PRELOAD     = undef;
-my $DESKTOP     = undef;
-my $ACTIONQUEUE = undef;
-my $getopt      = Getopt::Long::GetOptions(
+require Getopt::Long;
+my $USAGE   = '';
+my $VERSION = '';
+my $HOME    = undef;
+my $RESET   = undef;
+my $SESSION = undef;
+my $PRELOAD = undef;
+my $DESKTOP = undef;
+my $ACTIONS = undef;
+my $getopt  = Getopt::Long::GetOptions(
         'help|usage'    => \$USAGE,
         'version'       => \$VERSION,
         'home=s'        => \$HOME,
+        'reset'         => \$RESET,
         'session=s'     => \$SESSION,
         'desktop'       => \$DESKTOP,
-        'actionqueue=s' => \$ACTIONQUEUE,
-
-        # Keep this secret for now --ADAMK
-        'preload' => \$PRELOAD,
+        'actionqueue=s' => \$ACTIONS,
+        'preload'       => \$PRELOAD, # Keep this sekrit for now --ADAMK
 );
 
-if ( $USAGE or !$getopt ) {
+
+
+
+
+#####################################################################
+# Special Execution Modules
+
+# Padre command line usage
+if ( $USAGE or not $getopt ) {
         print <<"END_USAGE";
 Usage: $0 [FILENAMES]
 
---home=dir          Forces Padre's "home" directory to a specific location
 --help              Shows this help message
+--home=dir          Forces Padre "home" directory to a specific location
+--reset             Flush entire local config directory and reset to defaults
 --session=name      Open given session during Padre startup
 --version           Prints Padre version and quits
@@ -63 +72 @@
 }
 
-local $ENV{PADRE_HOME} = defined($HOME) ? $HOME : $ENV{PADRE_HOME};
-
-# Special execution modes
+# Padre version
 if ($VERSION) {
         my $msg = "Perl Application Development and Refactoring Environment $Padre::VERSION\n";
@@ -84 +91 @@
 }
 
+# Lock in the home and constants, which are needed for everything else
+local $ENV{PADRE_HOME} = defined($HOME) ? $HOME : $ENV{PADRE_HOME};
+require Padre::Constant;
+
+# Destroy and reinitialise our config directory
+if ($RESET) {
+        require File::Remove;
+        File::Remove::remove( \1, Padre::Constant::CONFIG_DIR() );
+        Padre::Constant::init();
+}
+
 if ($DESKTOP) {
         require Padre::Desktop;
         unless ( Padre::Desktop::desktop() ) {
-                warn "--desktop not implemented for " . $^O . "\n";
+                warn "--desktop not implemented for $^O\n";
         }
         exit(1);
@@ -97 +115 @@
 # local $ENV{PADRE_PAR_PATH} = $ENV{PAR_TEMP} || '';
 
-my %opts = (
-        files       => \@ARGV,
-        session     => $SESSION,
-        actionqueue => $ACTIONQUEUE,
-);
-
 # If we have an action queue then we are running for automation reasons.
 # Avoid the startup logic and continue to the main startup.
-unless ( defined $ACTIONQUEUE ) {
+unless ( defined $ACTIONS ) {
 
         # Run the Padre startup sequence before we load the main application
@@ -125 +137 @@
 
 # Build the application
-my $app = Padre->new(%opts);
-unless ($app) {
-        die "Failed to create Padre instance";
-}
+my $ide = Padre->new(
+        files       => \@ARGV,
+        session     => $SESSION,
+        actionqueue => $ACTIONS,
+) or die "Failed to create Padre instance";
 
 # Start the application
-$app->run;
+$ide->run;
 
 # Copyright 2008-2010 The Padre development team as listed in Padre.pm.