r72981 - in /branches/upstream/libpackage-stash-perl/current: Changes MANIFEST META.json META.yml Makefile.PL README dist.ini inc/DistMeta.pm inc/MMPackageStash.pm lib/Package/Stash.pm lib/Package/Stash/Conflicts.pm lib/Package/Stash/PP.pm t/00-compile.t

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Thu Apr 21 17:48:30 UTC 2011


Author: gregoa
Date: Thu Apr 21 17:48:16 2011
New Revision: 72981

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72981
Log:
[svn-upgrade] new version libpackage-stash-perl (0.29)

Added:
    branches/upstream/libpackage-stash-perl/current/inc/DistMeta.pm
Modified:
    branches/upstream/libpackage-stash-perl/current/Changes
    branches/upstream/libpackage-stash-perl/current/MANIFEST
    branches/upstream/libpackage-stash-perl/current/META.json
    branches/upstream/libpackage-stash-perl/current/META.yml
    branches/upstream/libpackage-stash-perl/current/Makefile.PL
    branches/upstream/libpackage-stash-perl/current/README
    branches/upstream/libpackage-stash-perl/current/dist.ini
    branches/upstream/libpackage-stash-perl/current/inc/MMPackageStash.pm
    branches/upstream/libpackage-stash-perl/current/lib/Package/Stash.pm
    branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/Conflicts.pm
    branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/PP.pm
    branches/upstream/libpackage-stash-perl/current/t/00-compile.t

Modified: branches/upstream/libpackage-stash-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/Changes?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/Changes (original)
+++ branches/upstream/libpackage-stash-perl/current/Changes Thu Apr 21 17:48:16 2011
@@ -1,4 +1,13 @@
 Revision history for Package-Stash
+
+0.29  2011-04-06
+      - no, *really* skip the package-stash-conflict script
+
+0.28  2011-03-29
+      - META.json fixes (mst)
+
+0.27  2011-03-27
+      - also skip the package-stash-conflicts script (Father Chrysostomos)
 
 0.26  2011-03-04
       - make the namespace cache lazy and weak, in case the stash is deleted

Modified: branches/upstream/libpackage-stash-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/MANIFEST?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/MANIFEST (original)
+++ branches/upstream/libpackage-stash-perl/current/MANIFEST Thu Apr 21 17:48:16 2011
@@ -7,6 +7,7 @@
 README
 bin/package-stash-conflicts
 dist.ini
+inc/DistMeta.pm
 inc/MMPackageStash.pm
 lib/Package/Stash.pm
 lib/Package/Stash/Conflicts.pm

Modified: branches/upstream/libpackage-stash-perl/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/META.json?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/META.json (original)
+++ branches/upstream/libpackage-stash-perl/current/META.json Thu Apr 21 17:48:16 2011
@@ -3,7 +3,7 @@
    "author" : [
       "Jesse Luehrs <doy at tozt dot net>"
    ],
-   "dynamic_config" : 0,
+   "dynamic_config" : "1",
    "generated_by" : "Dist::Zilla version 4.200004, CPAN::Meta::Converter version 2.110580",
    "license" : [
       "perl_5"
@@ -26,9 +26,11 @@
          }
       },
       "runtime" : {
+         "recommends" : {
+            "Package::Stash::XS" : "0.22"
+         },
          "requires" : {
             "Package::DeprecationManager" : 0,
-            "Package::Stash::XS" : "0.22",
             "Scalar::Util" : 0,
             "perl" : "v5.8.1"
          }
@@ -49,7 +51,7 @@
          "web" : "http://github.com/doy/package-stash"
       }
    },
-   "version" : "0.26",
+   "version" : "0.29",
    "x_Dist_Zilla" : {
       "plugins" : [
          {
@@ -176,7 +178,7 @@
          {
             "class" : "Dist::Zilla::Plugin::CompileTests",
             "name" : "@DOY/CompileTests",
-            "version" : "1.103030"
+            "version" : "1.110930"
          },
          {
             "class" : "Dist::Zilla::Plugin::Repository",
@@ -209,6 +211,11 @@
             "version" : "4.200004"
          },
          {
+            "class" : "inc::DistMeta",
+            "name" : "=inc::DistMeta",
+            "version" : null
+         },
+         {
             "class" : "Dist::Zilla::Plugin::Prereqs",
             "config" : {
                "Dist::Zilla::Plugin::Prereqs" : {
@@ -217,6 +224,17 @@
                }
             },
             "name" : "Prereqs",
+            "version" : "4.200004"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs",
+            "config" : {
+               "Dist::Zilla::Plugin::Prereqs" : {
+                  "phase" : "runtime",
+                  "type" : "recommends"
+               }
+            },
+            "name" : "RuntimeRecommends",
             "version" : "4.200004"
          },
          {

Modified: branches/upstream/libpackage-stash-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/META.yml?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/META.yml (original)
+++ branches/upstream/libpackage-stash-perl/current/META.yml Thu Apr 21 17:48:16 2011
@@ -9,21 +9,22 @@
 configure_requires:
   Dist::CheckConflicts: 0.02
   ExtUtils::MakeMaker: 6.31
-dynamic_config: 0
+dynamic_config: 1
 generated_by: 'Dist::Zilla version 4.200004, CPAN::Meta::Converter version 2.110580'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
   version: 1.4
 name: Package-Stash
+recommends:
+  Package::Stash::XS: 0.22
 requires:
   Package::DeprecationManager: 0
-  Package::Stash::XS: 0.22
   Scalar::Util: 0
   perl: 5.8.1
 resources:
   repository: git://github.com/doy/package-stash.git
-version: 0.26
+version: 0.29
 x_Dist_Zilla:
   plugins:
     -
@@ -125,7 +126,7 @@
     -
       class: Dist::Zilla::Plugin::CompileTests
       name: '@DOY/CompileTests'
-      version: 1.103030
+      version: 1.110930
     -
       class: Dist::Zilla::Plugin::Repository
       name: '@DOY/Repository'
@@ -151,12 +152,24 @@
       name: '@DOY/UploadToCPAN'
       version: 4.200004
     -
+      class: inc::DistMeta
+      name: '=inc::DistMeta'
+      version: ~
+    -
       class: Dist::Zilla::Plugin::Prereqs
       config:
         Dist::Zilla::Plugin::Prereqs:
           phase: runtime
           type: requires
       name: Prereqs
+      version: 4.200004
+    -
+      class: Dist::Zilla::Plugin::Prereqs
+      config:
+        Dist::Zilla::Plugin::Prereqs:
+          phase: runtime
+          type: recommends
+      name: RuntimeRecommends
       version: 4.200004
     -
       class: Dist::Zilla::Plugin::Prereqs

Modified: branches/upstream/libpackage-stash-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/Makefile.PL?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/Makefile.PL (original)
+++ branches/upstream/libpackage-stash-perl/current/Makefile.PL Thu Apr 21 17:48:16 2011
@@ -26,10 +26,9 @@
   'NAME' => 'Package::Stash',
   'PREREQ_PM' => {
     'Package::DeprecationManager' => '0',
-    'Package::Stash::XS' => '0.22',
     'Scalar::Util' => '0'
   },
-  'VERSION' => '0.26',
+  'VERSION' => '0.29',
   'test' => {
     'TESTS' => 't/*.t t/impl-selection/*.t'
   }
@@ -52,8 +51,8 @@
 delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
 
-delete $WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'}
-  unless can_cc();
+$WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'} = 0.22
+  if can_cc();
 
 WriteMakefile(%WriteMakefileArgs);
 

Modified: branches/upstream/libpackage-stash-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/README?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/README (original)
+++ branches/upstream/libpackage-stash-perl/current/README Thu Apr 21 17:48:16 2011
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution Package-Stash,
-version 0.26:
+version 0.29:
 
   routines for manipulating stashes
 

Modified: branches/upstream/libpackage-stash-perl/current/dist.ini
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/dist.ini?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/dist.ini (original)
+++ branches/upstream/libpackage-stash-perl/current/dist.ini Thu Apr 21 17:48:16 2011
@@ -7,13 +7,18 @@
 :version = 0.05
 dist = Package-Stash
 awesome = =inc::MMPackageStash
-CompileTests_skip = Conflicts$
+CompileTests_skip = [Cc]onflicts$
+
+[=inc::DistMeta]
+dynamic_config = 1
 
 [Prereqs]
 perl = 5.8.1
 Package::DeprecationManager = 0
+Scalar::Util = 0
+
+[Prereqs / RuntimeRecommends]
 Package::Stash::XS = 0.22
-Scalar::Util = 0
 
 [Prereqs / TestRequires]
 Test::Fatal = 0

Added: branches/upstream/libpackage-stash-perl/current/inc/DistMeta.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/inc/DistMeta.pm?rev=72981&op=file
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/inc/DistMeta.pm (added)
+++ branches/upstream/libpackage-stash-perl/current/inc/DistMeta.pm Thu Apr 21 17:48:16 2011
@@ -1,0 +1,31 @@
+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;

Modified: branches/upstream/libpackage-stash-perl/current/inc/MMPackageStash.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/inc/MMPackageStash.pm?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/inc/MMPackageStash.pm (original)
+++ branches/upstream/libpackage-stash-perl/current/inc/MMPackageStash.pm Thu Apr 21 17:48:16 2011
@@ -44,7 +44,9 @@
 
     my $template = $self->$orig(@_);
 
-    $template =~ s/(WriteMakefile\()/delete \$WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'}\n  unless can_cc();\n\n$1/;
+    my $xs_version = $self->zilla->prereqs->requirements_for('runtime', 'recommends')->as_string_hash->{'Package::Stash::XS'};
+
+    $template =~ s/(WriteMakefile\()/\$WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'} = $xs_version\n  if can_cc();\n\n$1/;
 
     return $template . $can_cc;
 };

Modified: branches/upstream/libpackage-stash-perl/current/lib/Package/Stash.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/lib/Package/Stash.pm?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/lib/Package/Stash.pm (original)
+++ branches/upstream/libpackage-stash-perl/current/lib/Package/Stash.pm Thu Apr 21 17:48:16 2011
@@ -1,6 +1,6 @@
 package Package::Stash;
 BEGIN {
-  $Package::Stash::VERSION = '0.26';
+  $Package::Stash::VERSION = '0.29';
 }
 use strict;
 use warnings;
@@ -102,7 +102,7 @@
 
 =head1 VERSION
 
-version 0.26
+version 0.29
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/Conflicts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/Conflicts.pm?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/Conflicts.pm (original)
+++ branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/Conflicts.pm Thu Apr 21 17:48:16 2011
@@ -13,7 +13,6 @@
     },
     -also => [ qw(
         Package::DeprecationManager
-        Package::Stash::XS
         Scalar::Util
     ) ],
 

Modified: branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/PP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/PP.pm?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/PP.pm (original)
+++ branches/upstream/libpackage-stash-perl/current/lib/Package/Stash/PP.pm Thu Apr 21 17:48:16 2011
@@ -1,6 +1,6 @@
 package Package::Stash::PP;
 BEGIN {
-  $Package::Stash::PP::VERSION = '0.26';
+  $Package::Stash::PP::VERSION = '0.29';
 }
 use strict;
 use warnings;
@@ -345,7 +345,7 @@
 
 =head1 VERSION
 
-version 0.26
+version 0.29
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libpackage-stash-perl/current/t/00-compile.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpackage-stash-perl/current/t/00-compile.t?rev=72981&op=diff
==============================================================================
--- branches/upstream/libpackage-stash-perl/current/t/00-compile.t (original)
+++ branches/upstream/libpackage-stash-perl/current/t/00-compile.t Thu Apr 21 17:48:16 2011
@@ -18,13 +18,24 @@
     $found =~ s{^lib/}{};
     $found =~ s{[/\\]}{::}g;
     $found =~ s/\.pm$//;
-    return if $found =~ /Conflicts$/;
+    return if $found =~ /[Cc]onflicts$/;
     push @modules, $found;
   },
   'lib',
 );
 
-my @scripts = glob "bin/*";
+my @scripts;
+if ( -d 'bin' ) {
+    find(
+      sub {
+        return unless -f;
+        my $found = $File::Find::name;
+        return if $found =~ /[Cc]onflicts$/;
+        push @scripts, $found;
+      },
+      'bin',
+    );
+}
 
 my $plan = scalar(@modules) + scalar(@scripts);
 $plan ? (plan tests => $plan) : (plan skip_all => "no tests to run");




More information about the Pkg-perl-cvs-commits mailing list