Changeset 10621
- Timestamp:
- 02/08/10 03:51:35 (7 months ago)
- Location:
- trunk/Padre
- Files:
-
- 6 modified
-
dev.pl (modified) (3 diffs)
-
lib/Padre/Constant.pm (modified) (3 diffs)
-
lib/Padre/Plugin/PopularityContest/Ping.pm (modified) (1 diff)
-
lib/Padre/Task/HTTPClient.pm (modified) (1 diff)
-
lib/Padre/Util/SVN.pm (modified) (1 diff)
-
lib/Padre/Wx/Dialog/RegexEditor.pm (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Padre/dev.pl
r10615 r10621 36 36 'debug|d' => \$DEBUG, 37 37 'trace' => sub { $ENV{PADRE_DEBUG} = 1 }, 38 'die' => sub { $ENV{PADRE_DIE} = 1 },38 'die' => sub { $ENV{PADRE_DIE} = 1 }, 39 39 'profile' => \$PROFILE, 40 40 'a' => \$PLUGINS, … … 82 82 83 83 if ($FULLTRACE) { 84 eval { 85 require Devel::Trace; 86 }; 84 eval { require Devel::Trace; }; 87 85 if ($@) { 88 86 print "Error while initilizing --fulltrace while trying to load Devel::Trace:\n" … … 115 113 push @cmd, '--help' if $USAGE; 116 114 117 if ( $DEBUG) {115 if ($DEBUG) { 118 116 print "Running " . join( ' ', @cmd ) . "\n"; 119 117 } 120 118 121 if ( $USAGE) {119 if ($USAGE) { 122 120 usage(); 123 121 } -
trunk/Padre/lib/Padre/Constant.pm
r10615 r10621 102 102 ); 103 103 104 use constant LOG_FILE => File::Spec->catfile( CONFIG_DIR, 'debug.log' );105 use constant PLUGIN_DIR => File::Spec->catdir( CONFIG_DIR, 'plugins' );106 use constant PLUGIN_LIB => File::Spec->catdir( PLUGIN_DIR, 'Padre', 'Plugin' );104 use constant LOG_FILE => File::Spec->catfile( CONFIG_DIR, 'debug.log' ); 105 use constant PLUGIN_DIR => File::Spec->catdir( CONFIG_DIR, 'plugins' ); 106 use constant PLUGIN_LIB => File::Spec->catdir( PLUGIN_DIR, 'Padre', 'Plugin' ); 107 107 use constant CONFIG_HOST => File::Spec->catfile( CONFIG_DIR, 'config.db' ); 108 108 use constant CONFIG_HUMAN => File::Spec->catfile( CONFIG_DIR, 'config.yml' ); … … 112 112 # so we can run it again later if needed. 113 113 sub init { 114 114 115 # Check and create the directories that need to exist 115 116 unless ( -e CONFIG_DIR or File::Path::mkpath(CONFIG_DIR) ) { … … 140 141 # NOTE: The only reason this is here is that it is needed both during 141 142 # main configuration, and also during Padre::Startup. 142 use constant DEFAULT_SINGLEINSTANCE => ( 143 WIN32 and not( $ENV{HARNESS_ACTIVE} or $^P ) 144 ) ? 1 : 0; 143 use constant DEFAULT_SINGLEINSTANCE => ( WIN32 and not( $ENV{HARNESS_ACTIVE} or $^P ) ) ? 1 : 0; 145 144 146 145 use constant DEFAULT_SINGLEINSTANCE_PORT => 4444; -
trunk/Padre/lib/Padre/Plugin/PopularityContest/Ping.pm
r10615 r10621 35 35 36 36 # Hand off to the parent constructor 37 return $class->SUPER::new( 38 request => HTTP::Request->new( GET => $url->as_string ) 39 ); 37 return $class->SUPER::new( request => HTTP::Request->new( GET => $url->as_string ) ); 40 38 } 41 39 -
trunk/Padre/lib/Padre/Task/HTTPClient.pm
r10615 r10621 52 52 require Padre::Util::SVN; 53 53 my $revision = Padre::Util::SVN::padre_version(); 54 $args{method} ||= 'GET';54 $args{method} ||= 'GET'; 55 55 $args{headers}->{'X-Padre'} ||= "Padre version $VERSION $revision"; 56 56 57 57 # Each module will be tested and the first working one should return 58 58 # a object, all others should return nothing (undef) 59 foreach my $driver ( @DRIVERS) {59 foreach my $driver (@DRIVERS) { 60 60 eval "require $driver;"; 61 61 next if $@; -
trunk/Padre/lib/Padre/Util/SVN.pm
r10618 r10621 15 15 # TODO: A much better variant would be a constant set by svn. 16 16 sub padre_revision { 17 unless ( $PADRE) {17 unless ($PADRE) { 18 18 if ( $0 =~ /padre$/ ) { 19 19 my $dir = $0; -
trunk/Padre/lib/Padre/Wx/Dialog/RegexEditor.pm
r10616 r10621 394 394 $str = '' unless $str; 395 395 $level = 0 unless $level; 396 my @children = $parent->isa('PPIx::Regexp::Node') ? $parent->children : ();396 my @children = $parent->isa('PPIx::Regexp::Node') ? $parent->children : (); 397 397 for my $child (@children) { 398 398 next if $child->content eq ''; … … 412 412 $position = 0 unless $position; 413 413 @array = () unless @array; 414 my @elements = $parent->isa('PPIx::Regexp::Node') ? $parent->elements : ();414 my @elements = $parent->isa('PPIx::Regexp::Node') ? $parent->elements : (); 415 415 for my $element (@elements) { 416 416 my $content = $element->content;
