Skip to content

Commit

Permalink
Add vim modeline and retab
Browse files Browse the repository at this point in the history
  • Loading branch information
rwstauner committed Jul 13, 2011
1 parent 6c6c2fa commit c0dfe32
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 27 deletions.
38 changes: 20 additions & 18 deletions lib/Dist/Zilla/Plugin/Git/DescribeVersion.pm
@@ -1,3 +1,4 @@
# vim: set ts=2 sts=2 sw=2 expandtab smarttab:
use strict;
use warnings;

Expand All @@ -16,32 +17,33 @@ with 'Dist::Zilla::Role::VersionProvider';

# -- attributes

while( my ($name, $default) = each %Git::DescribeVersion::Defaults ){
has $name => ( is => 'ro', isa=>'Str', default => $default );
}
while( my ($name, $default) = each %Git::DescribeVersion::Defaults ){
has $name => ( is => 'ro', isa=>'Str', default => $default );
}

# -- role implementation

sub provide_version {
my ($self) = @_;
my ($self) = @_;

# override (or maybe needed to initialize)
return $ENV{V} if exists $ENV{V};
# override (or maybe needed to initialize)
return $ENV{V} if exists $ENV{V};

# less overhead to use %Defaults than MOP meta API
my $opts = { map { $_ => $self->$_() }
keys %Git::DescribeVersion::Defaults };
# less overhead to use %Defaults than MOP meta API
my $opts = { map { $_ => $self->$_() }
keys %Git::DescribeVersion::Defaults };

my $new_ver = eval {
Git::DescribeVersion->new($opts)->version;
};
# TODO: Version::Next::next_version($tag) if $ENV{DZIL_RELEASING}?
my $new_ver = eval {
Git::DescribeVersion->new($opts)->version;
};

$self->log_fatal("Could not determine version from tags: $@")
unless defined $new_ver;
$self->log_fatal("Could not determine version from tags: $@")
unless defined $new_ver;

$self->log("Git described version as $new_ver");
$self->log("Git described version as $new_ver");

$self->zilla->version("$new_ver");
$self->zilla->version("$new_ver");
}

__PACKAGE__->meta->make_immutable;
Expand All @@ -57,8 +59,8 @@ no Moose;
In your F<dist.ini>:
[Git::DescribeVersion]
match_pattern = v[0-9]* ; this is the default
[Git::DescribeVersion]
match_pattern = v[0-9]* ; this is the default
=head1 DESCRIPTION
Expand Down
19 changes: 10 additions & 9 deletions t/provide_version.t
@@ -1,3 +1,4 @@
# vim: set ts=2 sts=2 sw=2 expandtab smarttab:
use strict;
use warnings;
use Test::More 0.96;
Expand Down Expand Up @@ -35,11 +36,11 @@ is($plug->provide_version(), $version, 'expected version');
like($log, qr/described version as \Q$version\E/, 'version logged expectedly');

{
# test %ENV override
local $ENV{V} = 'reindeer';
is($plug->provide_version(), $ENV{V}, '$ENV{V} overrides');
delete $ENV{V};
is($plug->provide_version(), $version, '$ENV{V} unset, returns version');
# test %ENV override
local $ENV{V} = 'reindeer';
is($plug->provide_version(), $ENV{V}, '$ENV{V} overrides');
delete $ENV{V};
is($plug->provide_version(), $version, '$ENV{V} unset, returns version');
}

# test no version received from Git::DescribeVersion
Expand All @@ -51,10 +52,10 @@ like($fatal, qr/could not determine version/i, 'expected warning logged');
# test argument passing to Git::DescribeVersion
$expversion = $version;
foreach my $opt ( $Git::DescribeVersion::Defaults{cookie}, qw(bark woof) ){
$plug->mock(cookie => sub { $opt });
$plug->provide_version();
is($gdv->{cookie}, $opt, 'argument passed to gdv');
is($gdv->{no}, 'change', 'attribute at default');
$plug->mock(cookie => sub { $opt });
$plug->provide_version();
is($gdv->{cookie}, $opt, 'argument passed to gdv');
is($gdv->{no}, 'change', 'attribute at default');
}

# it's better than nothing
Expand Down

0 comments on commit c0dfe32

Please sign in to comment.