Commit 714d816f authored by Florian Schlichting's avatar Florian Schlichting

Imported Upstream version 0.36

parent 42100f52
Revision history for Package-Stash
0.36 2013-09-03
- support building with PUREPERL_ONLY
0.35 2013-07-09
- remove old deprecated api
......
......@@ -7,7 +7,6 @@ Makefile.PL
README
bin/package-stash-conflicts
dist.ini
inc/DistMeta.pm
inc/MMPackageStash.pm
lib/Package/Stash.pm
lib/Package/Stash/Conflicts.pm
......@@ -38,6 +37,7 @@ t/paamayim_nekdotayim.t
t/scalar-values.t
t/stash-deletion.t
t/synopsis.t
t/warnings.t
xt/author/leaks-debug.t
xt/author/leaks.t
xt/release/eol.t
......
......@@ -3,8 +3,8 @@
"author" : [
"Jesse Luehrs <doy@tozt.net>"
],
"dynamic_config" : "1",
"generated_by" : "Dist::Zilla version 4.300034, CPAN::Meta::Converter version 2.120921",
"dynamic_config" : 1,
"generated_by" : "Dist::Zilla version 4.300035, CPAN::Meta::Converter version 2.132140",
"license" : [
"perl_5"
],
......@@ -16,8 +16,11 @@
"prereqs" : {
"configure" : {
"requires" : {
"Config" : "0",
"Dist::CheckConflicts" : "0.02",
"ExtUtils::MakeMaker" : "6.30"
"ExtUtils::MakeMaker" : "6.30",
"File::Spec" : "0",
"Text::ParseWords" : "0"
}
},
"develop" : {
......@@ -53,10 +56,21 @@
"Test::Fatal" : "0",
"Test::More" : "0.88",
"Test::Requires" : "0",
"base" : "0"
"base" : "0",
"lib" : "0"
}
}
},
"provides" : {
"Package::Stash" : {
"file" : "lib/Package/Stash.pm",
"version" : "0.36"
},
"Package::Stash::PP" : {
"file" : "lib/Package/Stash/PP.pm",
"version" : "0.36"
}
},
"release_status" : "stable",
"resources" : {
"bugtracker" : {
......@@ -69,10 +83,10 @@
"web" : "https://github.com/doy/package-stash"
}
},
"version" : "0.35",
"version" : "0.36",
"x_Dist_Zilla" : {
"perl" : {
"version" : "5.018000"
"version" : "5.018001"
},
"plugins" : [
{
......@@ -84,37 +98,37 @@
}
},
"name" : "@DOY/TestMoreDoneTesting",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::GatherDir",
"name" : "@DOY/GatherDir",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::PruneCruft",
"name" : "@DOY/PruneCruft",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::ManifestSkip",
"name" : "@DOY/ManifestSkip",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::MetaYAML",
"name" : "@DOY/MetaYAML",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::License",
"name" : "@DOY/License",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::Readme",
"name" : "@DOY/Readme",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::RunExtraTests",
......@@ -124,12 +138,12 @@
{
"class" : "Dist::Zilla::Plugin::ExecDir",
"name" : "@DOY/ExecDir",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::ShareDir",
"name" : "@DOY/ShareDir",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "inc::MMPackageStash",
......@@ -139,32 +153,32 @@
{
"class" : "Dist::Zilla::Plugin::Manifest",
"name" : "@DOY/Manifest",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::TestRelease",
"name" : "@DOY/TestRelease",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::ConfirmRelease",
"name" : "@DOY/ConfirmRelease",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::MetaConfig",
"name" : "@DOY/MetaConfig",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::MetaJSON",
"name" : "@DOY/MetaJSON",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::NextRelease",
"name" : "@DOY/NextRelease",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::CheckChangesHasContent",
......@@ -174,7 +188,7 @@
{
"class" : "Dist::Zilla::Plugin::PkgVersion",
"name" : "@DOY/PkgVersion",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::Authority",
......@@ -184,12 +198,12 @@
{
"class" : "Dist::Zilla::Plugin::PodCoverageTests",
"name" : "@DOY/PodCoverageTests",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::PodSyntaxTests",
"name" : "@DOY/PodSyntaxTests",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::NoTabsTests",
......@@ -214,7 +228,7 @@
{
"class" : "Dist::Zilla::Plugin::MetaResources",
"name" : "@DOY/MetaResources",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::Git::Check",
......@@ -236,6 +250,16 @@
"name" : "@DOY/Git::NextVersion",
"version" : "2.013"
},
{
"class" : "Dist::Zilla::Plugin::ContributorsFromGit",
"name" : "@DOY/ContributorsFromGit",
"version" : "0.006"
},
{
"class" : "Dist::Zilla::Plugin::MetaProvides::Package",
"name" : "@DOY/MetaProvides::Package",
"version" : "1.14000002"
},
{
"class" : "Dist::Zilla::Plugin::PodWeaver",
"name" : "@DOY/PodWeaver",
......@@ -244,17 +268,12 @@
{
"class" : "Dist::Zilla::Plugin::UploadToCPAN",
"name" : "@DOY/UploadToCPAN",
"version" : "4.300034"
},
{
"class" : "inc::DistMeta",
"name" : "=inc::DistMeta",
"version" : null
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::AutoPrereqs",
"name" : "AutoPrereqs",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::Prereqs",
......@@ -265,7 +284,7 @@
}
},
"name" : "RuntimeRecommends",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::Prereqs",
......@@ -276,47 +295,42 @@
}
},
"name" : "DevelopRequires",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::Conflicts",
"name" : "Conflicts",
"version" : "0.10"
},
{
"class" : "Dist::Zilla::Plugin::ContributorsFromGit",
"name" : "ContributorsFromGit",
"version" : "0.006"
},
{
"class" : "Dist::Zilla::Plugin::FinderCode",
"name" : ":InstallModules",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::FinderCode",
"name" : ":IncModules",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::FinderCode",
"name" : ":TestFiles",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::FinderCode",
"name" : ":ExecFiles",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::FinderCode",
"name" : ":ShareFiles",
"version" : "4.300034"
"version" : "4.300035"
},
{
"class" : "Dist::Zilla::Plugin::FinderCode",
"name" : ":MainModule",
"version" : "4.300034"
"version" : "4.300035"
}
],
"zilla" : {
......@@ -324,7 +338,7 @@
"config" : {
"is_trial" : "0"
},
"version" : "4.300034"
"version" : "4.300035"
}
},
"x_authority" : "cpan:DOY",
......@@ -339,6 +353,7 @@
"Christian Walde <walde.christian@googlemail.com>",
"Dave Rolsky <autarch@urth.org>",
"Justin Hunter <justin.d.hunter@gmail.com>",
"Kent Fredric <kentfredric@gmail.com>",
"Tim Bunce <Tim.Bunce@pobox.com>"
]
}
......
......@@ -9,16 +9,27 @@ build_requires:
Test::More: 0.88
Test::Requires: 0
base: 0
lib: 0
configure_requires:
Config: 0
Dist::CheckConflicts: 0.02
ExtUtils::MakeMaker: 6.30
File::Spec: 0
Text::ParseWords: 0
dynamic_config: 1
generated_by: 'Dist::Zilla version 4.300034, CPAN::Meta::Converter version 2.120921'
generated_by: 'Dist::Zilla version 4.300035, CPAN::Meta::Converter version 2.132140'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
name: Package-Stash
provides:
Package::Stash:
file: lib/Package/Stash.pm
version: 0.36
Package::Stash::PP:
file: lib/Package/Stash/PP.pm
version: 0.36
recommends:
Package::Stash::XS: 0.26
requires:
......@@ -37,10 +48,10 @@ resources:
bugtracker: https://github.com/doy/package-stash/issues
homepage: http://metacpan.org/release/Package-Stash
repository: git://github.com/doy/package-stash.git
version: 0.35
version: 0.36
x_Dist_Zilla:
perl:
version: 5.018000
version: 5.018001
plugins:
-
class: Dist::Zilla::Plugin::Prereqs
......@@ -49,31 +60,31 @@ x_Dist_Zilla:
phase: test
type: requires
name: '@DOY/TestMoreDoneTesting'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::GatherDir
name: '@DOY/GatherDir'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::PruneCruft
name: '@DOY/PruneCruft'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::ManifestSkip
name: '@DOY/ManifestSkip'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::MetaYAML
name: '@DOY/MetaYAML'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::License
name: '@DOY/License'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::Readme
name: '@DOY/Readme'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::RunExtraTests
name: '@DOY/RunExtraTests'
......@@ -81,11 +92,11 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::ExecDir
name: '@DOY/ExecDir'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::ShareDir
name: '@DOY/ShareDir'
version: 4.300034
version: 4.300035
-
class: inc::MMPackageStash
name: '@DOY/=inc::MMPackageStash'
......@@ -93,27 +104,27 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::Manifest
name: '@DOY/Manifest'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::TestRelease
name: '@DOY/TestRelease'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::ConfirmRelease
name: '@DOY/ConfirmRelease'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::MetaConfig
name: '@DOY/MetaConfig'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::MetaJSON
name: '@DOY/MetaJSON'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::NextRelease
name: '@DOY/NextRelease'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::CheckChangesHasContent
name: '@DOY/CheckChangesHasContent'
......@@ -121,7 +132,7 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::PkgVersion
name: '@DOY/PkgVersion'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::Authority
name: '@DOY/Authority'
......@@ -129,11 +140,11 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::PodCoverageTests
name: '@DOY/PodCoverageTests'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::PodSyntaxTests
name: '@DOY/PodSyntaxTests'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::NoTabsTests
name: '@DOY/NoTabsTests'
......@@ -153,7 +164,7 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::MetaResources
name: '@DOY/MetaResources'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::Git::Check
name: '@DOY/Git::Check'
......@@ -170,6 +181,14 @@ x_Dist_Zilla:
class: Dist::Zilla::Plugin::Git::NextVersion
name: '@DOY/Git::NextVersion'
version: 2.013
-
class: Dist::Zilla::Plugin::ContributorsFromGit
name: '@DOY/ContributorsFromGit'
version: 0.006
-
class: Dist::Zilla::Plugin::MetaProvides::Package
name: '@DOY/MetaProvides::Package'
version: 1.14000002
-
class: Dist::Zilla::Plugin::PodWeaver
name: '@DOY/PodWeaver'
......@@ -177,15 +196,11 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::UploadToCPAN
name: '@DOY/UploadToCPAN'
version: 4.300034
-
class: inc::DistMeta
name: '=inc::DistMeta'
version: ~
version: 4.300035
-
class: Dist::Zilla::Plugin::AutoPrereqs
name: AutoPrereqs
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::Prereqs
config:
......@@ -193,7 +208,7 @@ x_Dist_Zilla:
phase: runtime
type: recommends
name: RuntimeRecommends
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::Prereqs
config:
......@@ -201,44 +216,40 @@ x_Dist_Zilla:
phase: develop
type: requires
name: DevelopRequires
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::Conflicts
name: Conflicts
version: 0.10
-
class: Dist::Zilla::Plugin::ContributorsFromGit
name: ContributorsFromGit
version: 0.006
-
class: Dist::Zilla::Plugin::FinderCode
name: ':InstallModules'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::FinderCode
name: ':IncModules'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::FinderCode
name: ':TestFiles'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::FinderCode
name: ':ExecFiles'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::FinderCode
name: ':ShareFiles'
version: 4.300034
version: 4.300035
-
class: Dist::Zilla::Plugin::FinderCode
name: ':MainModule'
version: 4.300034
version: 4.300035
zilla:
class: Dist::Zilla::Dist::Builder
config:
is_trial: 0
version: 4.300034
version: 4.300035
x_authority: cpan:DOY
x_breaks:
Class::MOP: 1.08
......@@ -250,4 +261,5 @@ x_contributors:
- 'Christian Walde <walde.christian@googlemail.com>'
- 'Dave Rolsky <autarch@urth.org>'
- 'Justin Hunter <justin.d.hunter@gmail.com>'
- 'Kent Fredric <kentfredric@gmail.com>'
- 'Tim Bunce <Tim.Bunce@pobox.com>'
......@@ -15,11 +15,15 @@ my %WriteMakefileArgs = (
'Test::Fatal' => '0',
'Test::More' => '0.88',
'Test::Requires' => '0',
'base' => '0'
'base' => '0',
'lib' => '0'
},
'CONFIGURE_REQUIRES' => {
'Config' => '0',
'Dist::CheckConflicts' => '0.02',
'ExtUtils::MakeMaker' => '6.30'
'ExtUtils::MakeMaker' => '6.30',
'File::Spec' => '0',
'Text::ParseWords' => '0'
},
'DISTNAME' => 'Package-Stash',
'EXE_FILES' => [
......@@ -39,7 +43,7 @@ my %WriteMakefileArgs = (
'strict' => '0',
'warnings' => '0'
},
'VERSION' => '0.35',
'VERSION' => '0.36',
'test' => {
'TESTS' => 't/*.t t/impl-selection/*.t'
}
......@@ -63,12 +67,13 @@ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
$WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'} = 0.26
if can_cc();
if !parse_args()->{PUREPERL_ONLY} && can_cc();
WriteMakefile(%WriteMakefileArgs);
use Config ();
use File::Spec ();
use Text::ParseWords ();
# check if we can run some command
sub can_run {
......@@ -98,6 +103,18 @@ sub can_cc {
return;
}
# XXX this is gross, but apparently it's the least gross option?
sub parse_args {
my $tmp = {};
# copied from EUMM
ExtUtils::MakeMaker::parse_args(
$tmp,
Text::ParseWords::shellwords($ENV{PERL_MM_OPT} || ''),
@ARGV,
);
return $tmp->{ARGS} || {};
}
sub check_conflicts {
if ( eval { require 'lib/Package/Stash/Conflicts.pm'; 1; } ) {
if ( eval { Package::Stash::Conflicts->check_conflicts; 1 } ) {
......
This archive contains the distribution Package-Stash,
version 0.35:
version 0.36:
routines for manipulating stashes
......
......@@ -29,7 +29,7 @@ package-stash-conflicts
=head1 VERSION
version 0.35
version 0.36
=head1 AUTHOR
......
......@@ -4,18 +4,15 @@ license = Perl_5
copyright_holder = Jesse Luehrs
[@DOY]
:version = 0.11
:version = 0.14
dist = Package-Stash
repository = github
bugtracker_web = https://github.com/doy/package-stash/issues
bugtracker_mailto =
awesome = =inc::MMPackageStash
CompileTests_skip = [Cc]onflicts$
[=inc::DistMeta]
dynamic_config = 1
CompileTests_skip = [Cc]onflicts$
[AutoPrereqs]
skip = Variable::Magic
[Prereqs / RuntimeRecommends]
Package::Stash::XS = 0.26
......@@ -29,5 +26,3 @@ Class::MOP = 1.08
MooseX::Role::WithOverloading = 0.08
namespace::clean = 0.18
MooseX::Method::Signatures = 0.36
[ContributorsFromGit]
package inc::DistMeta;
use Moose;
has metadata => (
is => 'ro',
isa => 'HashRef',
required => 1,
);
with 'Dist::Zilla::Role::MetaProvider';
around BUILDARGS => sub {
my $orig = shift;
my $self = shift;
my $params = $self->$orig(@_);
my $zilla = delete $params->{zilla};
my $plugin_name = delete $params->{plugin_name};
return {
zilla => $zilla,
plugin_name => $plugin_name,
metadata => $params,
};
};
__PACKAGE__->meta->make_immutable;
no Moose;
1;
......@@ -8,10 +8,13 @@ around _build_MakeFile_PL_template => sub {
my $orig = shift;
my $self = shift;
# copied from M::I
my $can_cc = <<'CAN_CC';
my $xs_version = $self->zilla->prereqs->requirements_for('runtime', 'recommends')->as_string_hash->{'Package::Stash::XS'};
# can_run and can_cc copied from M::I
my $helpers = <<'HELPERS';
use Config ();
use File::Spec ();
use Text::ParseWords ();
# check if we can run some command
sub can_run {
......@@ -40,15 +43,40 @@ sub can_cc {
return;
}
CAN_CC
my $template = $self->$orig(@_);
# XXX this is gross, but apparently it's the least gross option?
sub parse_args {
my $tmp = {};
# copied from EUMM
ExtUtils::MakeMaker::parse_args(
$tmp,
Text::ParseWords::shellwords($ENV{PERL_MM_OPT} || ''),
@ARGV,
);
return $tmp->{ARGS} || {};
}
HELPERS
my $xs_version = $self->zilla->prereqs->requirements_for('runtime', 'recommends')->as_string_hash->{'Package::Stash::XS'};
my $fixup_prereqs = <<PREREQS;
\$WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'} = $xs_version
if !parse_args()->{PUREPERL_ONLY} && can_cc();
PREREQS
$template =~ s/(WriteMakefile\()/\$WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'} = $xs_version\n if can_cc();\n\n$1/;
<