diff --git a/ChangeLog b/ChangeLog index ef62461..a32e8e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,7 @@ * current_version_from_makefilepl() now also recognizes 'reference_module' from Module::Install::ReadmeMarkdownFromPod - + 0.52 (2008-05-10) * Added VC::Git (Yann) diff --git a/lib/ShipIt/ProjectType/AutoConf.pm b/lib/ShipIt/ProjectType/AutoConf.pm index 11c0ced..4b49bac 100644 --- a/lib/ShipIt/ProjectType/AutoConf.pm +++ b/lib/ShipIt/ProjectType/AutoConf.pm @@ -105,7 +105,7 @@ sub _build_tempdist { # $self goes out of scope, later. my $tdir = $self->{dist_tempdirobj} = tempdir_obj(); - File::Copy::move($distfile, $tdir->directory) or + File::Copy::move($distfile, $tdir->directory) or die "Failed to move dist $distfile to tempdir"; return $tdir->directory . "/$distfile"; diff --git a/lib/ShipIt/ProjectType/Perl.pm b/lib/ShipIt/ProjectType/Perl.pm index 7f6c8bb..bd941da 100644 --- a/lib/ShipIt/ProjectType/Perl.pm +++ b/lib/ShipIt/ProjectType/Perl.pm @@ -93,7 +93,7 @@ sub _versioncode_from_string { if ($string =~ / ( ( use \s* version \s* ; \s* )? - (our)? \s* \$VERSION \s* = \s* + (our)? \s* \$VERSION \s* = \s* ( ['"] [\d\.\_]+ ['"] | q{1,2}\( \s* [\d\.\_]+ \s* \) diff --git a/lib/ShipIt/Util.pm b/lib/ShipIt/Util.pm index 8f3f3bc..05b54a6 100644 --- a/lib/ShipIt/Util.pm +++ b/lib/ShipIt/Util.pm @@ -65,7 +65,7 @@ sub make_var { sub find_subclasses { # search for any other custom project type modules my $class = shift; - my @classes = (); + my @classes = (); for my $dir (@INC) { for my $file (glob("$dir/" . join("/", split(/::/, $class)) . "/*.pm")) { if($file =~ /\/(\w+)\.pm/) { diff --git a/lib/ShipIt/VC.pm b/lib/ShipIt/VC.pm index 06278d6..6512f03 100644 --- a/lib/ShipIt/VC.pm +++ b/lib/ShipIt/VC.pm @@ -41,7 +41,7 @@ sub new { return ShipIt::VC::Git->new($conf) if -e ".git"; return ShipIt::VC::Mercurial->new($conf) if -e ".hg"; return ShipIt::VC::SVK->new($conf) if $class->is_svk_co; - + # look for any custom modules with an expensive search after exhausting the known ones for my $class (grep {!/::(SVN|Git|Mercurial|SVK)$/} find_subclasses($class)) { eval "CORE::require $class"; diff --git a/lib/ShipIt/VC/Git.pm b/lib/ShipIt/VC/Git.pm index 7dd1aae..65090f6 100644 --- a/lib/ShipIt/VC/Git.pm +++ b/lib/ShipIt/VC/Git.pm @@ -108,7 +108,7 @@ sub tag_version { my $tmp_fh = File::Temp->new(UNLINK => 1, SUFFIX => '.msg'); print $tmp_fh $msg; my $tmp_fn = "$tmp_fh"; - my $tag = $self->_tag_of_version($ver); + my $tag = $self->_tag_of_version($ver); system($self->command, "tag", "-a", ($self->{sign_tag} ? "-s" : ()), "-F", $tmp_fn, $tag) and die "Tagging of version '$ver' failed.\n";