Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Actually support Dist::Zilla in some non-trivial capacity

Finish up the support for Dist::Zilla, now we have (in theory)
complete Dist::Zilla integration where you can do:

    dzil release

And we'll make a release, bump the changelog & commit it, create a
tag, and then push it to origin.

This in effect reverts commit 9269fe9
of adding a Makefile.PL.It doesn't make any sense to check this file
in, with dist.ini this'll be created with "dzil build", and to test we
should be doing "dzil test" instead of "make test".
  • Loading branch information...
commit 3f7aae3a8f980b3b54c1920686d48348512a0bd8 1 parent fcbb440
@avar avar authored
View
5 Changes
@@ -0,0 +1,5 @@
+Revision history for git-deploy
+
+{{$NEXT}}
+
+ - Initial CPAN version
View
74 Makefile.PL
@@ -1,74 +0,0 @@
-
-use strict;
-use warnings;
-
-
-
-use ExtUtils::MakeMaker 6.30;
-
-
-
-my %WriteMakefileArgs = (
- "ABSTRACT" => "automate the git steps required for a deploying code from a git repository",
- "AUTHOR" => "\306var Arnfj\366r\360 Bjarmason <avarab\@gmail.com>, Yves Orton <demerphq\@gmail.com>",
- "BUILD_REQUIRES" => {
- "File::Temp" => 0,
- "Test::More" => 0
- },
- "CONFIGURE_REQUIRES" => {
- "ExtUtils::MakeMaker" => "6.30"
- },
- "DISTNAME" => "git-deploy",
- "EXE_FILES" => [
- "bin/git-deploy"
- ],
- "LICENSE" => "perl",
- "NAME" => "git::deploy",
- "PREREQ_PM" => {
- "Carp" => 0,
- "Cwd" => 0,
- "Data::Dumper" => 0,
- "Exporter" => 0,
- "Fcntl" => 0,
- "File::Basename" => 0,
- "File::Find" => 0,
- "File::Spec::Functions" => 0,
- "FindBin" => 0,
- "Getopt::Long" => 0,
- "POSIX" => 0,
- "Pod::Usage" => 0,
- "Sys::Hostname" => 0,
- "Term::ReadLine" => 0,
- "Time::HiRes" => 0,
- "base" => 0,
- "constant" => 0,
- "strict" => 0,
- "warnings" => 0
- },
- "VERSION" => "5.00",
- "test" => {
- "TESTS" => "t/*.t"
- }
-);
-
-
-unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) {
- my $br = delete $WriteMakefileArgs{BUILD_REQUIRES};
- my $pp = $WriteMakefileArgs{PREREQ_PM};
- for my $mod ( keys %$br ) {
- if ( exists $pp->{$mod} ) {
- $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
- }
- else {
- $pp->{$mod} = $br->{$mod};
- }
- }
-}
-
-delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
- unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
-
-WriteMakefile(%WriteMakefileArgs);
-
-
-
View
4 bin/git-deploy
@@ -6,8 +6,6 @@
use strict;
use warnings;
-our $VERSION= '5.00';
-
use Getopt::Long qw(GetOptions);
use Pod::Usage qw(pod2usage);
use Cwd qw(cwd abs_path);
@@ -440,7 +438,7 @@ GetOptions(
'v|verbose+' => \( $VERBOSE= ($ENV{GIT_DEPLOY_VERBOSE} || 0) ),
'help|?' => \( my $help ),
'man' => \( my $man ),
- 'V|version' => sub { print "$0 v$VERSION\n"; exit },
+ 'V|version' => sub { print "$0 v" . ($Git::Deploy::VERSION || "Git") . "\n"; exit },
) or pod2usage(2);
pod2usage(1) if $help;
pod2usage( -exitstatus => 0, -verbose => 2 ) if $man;
View
41 dist.ini
@@ -6,26 +6,47 @@ copyright_year = 2012
main_module = bin/git-deploy
[@Filter]
--bundle = @Basic
--remove = MakeMaker
-[MakeMaker::Runner]
-[Clean]
+bundle = @Basic
+; Don't add a =head1 VERSION - https://metacpan.org/module/Dist::Zilla::Plugin::PodVersion
+remove = PodVersion
+remove = Readme
+;; For debugging "dzil release"
+;remove = UploadToCPAN
+;[FakeRelease]
+;user = AVAR
-[VersionFromModule]
[AutoPrereqs]
[MetaJSON]
[MetaResources]
+homepage = http://git-deploy.github.com
+bugtracker.web = http://github.com/git-deploy/git-deploy/issues
repository.url = https://github.com/git-deploy/git-deploy.git
repository.web = https://github.com/git-deploy/git-deploy
repository.type = git
-
-;[PodWeaver]
+license = http://dev.perl.org/licenses/
[ReadmeAnyFromPod / ReadmePodInRoot]
type = pod
filename = README.pod
-location = root
+location = build
+
+; Add $VERSION to lib/Git/Deploy.pm
+[OurPkgVersion]
+
+; Bump the Changelog version
+[NextRelease]
-;[NoTabsTests]
-;[EOLTests]
+; Get the version from git, and increment it on release
+[Git::NextVersion]
+first_version = 6.00
+
+; Commit the Changes file once we modify it on release
+[Git::Commit]
+
+; Create a tag on release and push it and any commits
+[Git::Tag]
+[Git::Push]
+
+; dzil clean after release
+[Clean]
View
3  lib/Git/Deploy.pm
@@ -14,7 +14,8 @@ use File::Spec::Functions qw(catdir);
use Git::Deploy::Timing qw(push_timings);
use Git::Deploy::Say;
-our $VERSION= "0.001";
+# VERSION: generated by DZP::OurPkgVersion
+
our @ISA= qw(Exporter);
our @EXPORT= qw(
Please sign in to comment.
Something went wrong with that request. Please try again.