r68747 - in /trunk/libdist-zilla-plugins-cjm-perl: ./ corpus/DZT/lib/DZT/ debian/ lib/Dist/Zilla/Plugin/ lib/Dist/Zilla/Plugin/ModuleBuild/ lib/Dist/Zilla/Role/ t/

ddumont-guest at users.alioth.debian.org ddumont-guest at users.alioth.debian.org
Tue Feb 15 12:04:04 UTC 2011


Author: ddumont-guest
Date: Tue Feb 15 12:03:25 2011
New Revision: 68747

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68747
Log:
new upstream release. lintian clean, cowbuilder clean. ready for review

Added:
    trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/Metadata.pm
      - copied unchanged from r67671, branches/upstream/libdist-zilla-plugins-cjm-perl/current/lib/Dist/Zilla/Plugin/Metadata.pm
    trunk/libdist-zilla-plugins-cjm-perl/t/metadata.t
      - copied unchanged from r67671, branches/upstream/libdist-zilla-plugins-cjm-perl/current/t/metadata.t
Modified:
    trunk/libdist-zilla-plugins-cjm-perl/Changes
    trunk/libdist-zilla-plugins-cjm-perl/MANIFEST
    trunk/libdist-zilla-plugins-cjm-perl/META.json
    trunk/libdist-zilla-plugins-cjm-perl/META.yml
    trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL
    trunk/libdist-zilla-plugins-cjm-perl/README
    trunk/libdist-zilla-plugins-cjm-perl/corpus/DZT/lib/DZT/Sample.pm
    trunk/libdist-zilla-plugins-cjm-perl/debian/changelog
    trunk/libdist-zilla-plugins-cjm-perl/debian/control
    trunk/libdist-zilla-plugins-cjm-perl/debian/copyright
    trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm
    trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm
    trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm
    trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm
    trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm
    trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm
    trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t
    trunk/libdist-zilla-plugins-cjm-perl/t/template.t

Modified: trunk/libdist-zilla-plugins-cjm-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/Changes?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/Changes (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/Changes Tue Feb 15 12:03:25 2011
@@ -1,4 +1,21 @@
 Revision history for Dist-Zilla-Plugins-CJM
+
+3.04   December 20, 2010
+	Dist::Zilla::Role::ModuleInfo
+	  - Use Module::Metadata instead of Module::Build::ModuleInfo
+	  - Locally reset $/ $, $\ to default values (just in case)
+
+	Dist::Zilla::Plugin::TemplateCJM
+	  - Updated docs to talk about Module::Metadata
+
+3.03   December 7, 2010
+	Dist::Zilla::Plugin::Metadata
+	  - New plugin
+
+	Dist::Zilla::Plugin::TemplateCJM
+	  - Only process comments that contain a {{ }} pair.
+	    Text::Template breaks on strings that have the closing
+	    delimiter without the opening one.
 
 3.02   November 11, 2010
 	- Fixed test prerequisites (needed Test::More 0.88)

Modified: trunk/libdist-zilla-plugins-cjm-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/MANIFEST?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/MANIFEST (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/MANIFEST Tue Feb 15 12:03:25 2011
@@ -16,6 +16,7 @@
 corpus/gitvercheck.git
 lib/Dist/Zilla/Plugin/ArchiveRelease.pm
 lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm
+lib/Dist/Zilla/Plugin/Metadata.pm
 lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm
 lib/Dist/Zilla/Plugin/TemplateCJM.pm
 lib/Dist/Zilla/Plugin/VersionFromModule.pm
@@ -24,6 +25,7 @@
 t/arcrel.t
 t/gitvercheck.t
 t/mb_custom.t
+t/metadata.t
 t/release-pod-coverage.t
 t/release-pod-syntax.t
 t/template.t

Modified: trunk/libdist-zilla-plugins-cjm-perl/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/META.json?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/META.json (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/META.json Tue Feb 15 12:03:25 2011
@@ -4,7 +4,7 @@
       "Christopher J. Madsen <perl at cjmweb.net>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.102343, CPAN::Meta::Converter version 2.102400",
+   "generated_by" : "Dist::Zilla version 4.200000, CPAN::Meta::Converter version 2.102400",
    "license" : [
       "perl_5"
    ],
@@ -35,7 +35,7 @@
             "File::HomeDir" : "0.81",
             "File::Temp" : "0.19",
             "List::Util" : 0,
-            "Module::Build::ModuleInfo" : "0.28",
+            "Module::Metadata" : 0,
             "Moose" : "0.65",
             "Moose::Autobox" : "0.09",
             "Path::Class" : 0,
@@ -49,6 +49,7 @@
             "Test::Fatal" : 0
          },
          "requires" : {
+            "Dist::Zilla::Tester" : "4.101800",
             "File::pushd" : 0,
             "Test::More" : "0.88"
          }
@@ -62,73 +63,76 @@
          "web" : "http://github.com/madsen/dist-zilla-plugins-cjm"
       }
    },
-   "version" : "3.02",
+   "version" : "3.04",
    "x_Dist_Zilla" : {
       "plugins" : [
          {
             "class" : "Dist::Zilla::Plugin::GatherDir",
             "name" : "@CJM/GatherDir",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::PruneCruft",
             "name" : "@CJM/PruneCruft",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::ManifestSkip",
             "name" : "@CJM/ManifestSkip",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaJSON",
             "name" : "@CJM/MetaJSON",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaYAML",
             "name" : "@CJM/MetaYAML",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::License",
             "name" : "@CJM/License",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
             "name" : "@CJM/PodSyntaxTests",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodCoverageTests",
             "name" : "@CJM/PodCoverageTests",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::ExtraTests",
             "name" : "@CJM/ExtraTests",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodLoom",
+            "config" : {
+               "Pod::Loom version" : "0.04"
+            },
             "name" : "@CJM/PodLoom",
-            "version" : "3.00"
+            "version" : "3.02"
          },
          {
             "class" : "Dist::Zilla::Plugin::MakeMaker",
             "name" : "@CJM/MakeMaker",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaConfig",
             "name" : "@CJM/MetaConfig",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::MatchManifest",
             "name" : "@CJM/MatchManifest",
-            "version" : "0.04"
+            "version" : "4.00"
          },
          {
             "class" : "Dist::Zilla::Plugin::GitVersionCheckCJM",
@@ -138,7 +142,7 @@
          {
             "class" : "Dist::Zilla::Plugin::TemplateCJM",
             "name" : "@CJM/TemplateCJM",
-            "version" : "3.00"
+            "version" : "3.04"
          },
          {
             "class" : "Dist::Zilla::Plugin::Repository",
@@ -148,32 +152,32 @@
          {
             "class" : "Dist::Zilla::Plugin::Git::Check",
             "name" : "@CJM/@Git/Check",
-            "version" : "1.102810"
+            "version" : "1.103520"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Commit",
             "name" : "@CJM/@Git/Commit",
-            "version" : "1.102810"
+            "version" : "1.103520"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Tag",
             "name" : "@CJM/@Git/Tag",
-            "version" : "1.102810"
+            "version" : "1.103520"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Push",
             "name" : "@CJM/@Git/Push",
-            "version" : "1.102810"
+            "version" : "1.103520"
          },
          {
             "class" : "Dist::Zilla::Plugin::TestRelease",
             "name" : "@CJM/TestRelease",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::UploadToCPAN",
             "name" : "@CJM/UploadToCPAN",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::ArchiveRelease",
@@ -199,7 +203,7 @@
                }
             },
             "name" : "Prereqs",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -210,7 +214,7 @@
                }
             },
             "name" : "RuntimeRecommends",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -221,7 +225,7 @@
                }
             },
             "name" : "TestRequires",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -232,27 +236,27 @@
                }
             },
             "name" : "TestRecommends",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":InstallModules",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":TestFiles",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ExecFiles",
-            "version" : "4.102343"
+            "version" : "4.200000"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ShareFiles",
-            "version" : "4.102343"
+            "version" : "4.200000"
          }
       ],
       "zilla" : {
@@ -260,7 +264,7 @@
          "config" : {
             "is_trial" : 0
          },
-         "version" : "4.102343"
+         "version" : "4.200000"
       }
    }
 }

Modified: trunk/libdist-zilla-plugins-cjm-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/META.yml?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/META.yml (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/META.yml Tue Feb 15 12:03:25 2011
@@ -3,12 +3,13 @@
 author:
   - 'Christopher J. Madsen <perl at cjmweb.net>'
 build_requires:
+  Dist::Zilla::Tester: 4.101800
   File::pushd: 0
   Test::More: 0.88
 configure_requires:
   ExtUtils::MakeMaker: 6.31
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.102343, CPAN::Meta::Converter version 2.102400'
+generated_by: 'Dist::Zilla version 4.200000, CPAN::Meta::Converter version 2.102400'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -26,7 +27,7 @@
   File::HomeDir: 0.81
   File::Temp: 0.19
   List::Util: 0
-  Module::Build::ModuleInfo: 0.28
+  Module::Metadata: 0
   Moose: 0.65
   Moose::Autobox: 0.09
   Path::Class: 0
@@ -35,61 +36,63 @@
   version: 0.77
 resources:
   repository: git://github.com/madsen/dist-zilla-plugins-cjm.git
-version: 3.02
+version: 3.04
 x_Dist_Zilla:
   plugins:
     -
       class: Dist::Zilla::Plugin::GatherDir
       name: '@CJM/GatherDir'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::PruneCruft
       name: '@CJM/PruneCruft'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::ManifestSkip
       name: '@CJM/ManifestSkip'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::MetaJSON
       name: '@CJM/MetaJSON'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::MetaYAML
       name: '@CJM/MetaYAML'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::License
       name: '@CJM/License'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::PodSyntaxTests
       name: '@CJM/PodSyntaxTests'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::PodCoverageTests
       name: '@CJM/PodCoverageTests'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::ExtraTests
       name: '@CJM/ExtraTests'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::PodLoom
+      config:
+        Pod::Loom version: 0.04
       name: '@CJM/PodLoom'
-      version: 3.00
+      version: 3.02
     -
       class: Dist::Zilla::Plugin::MakeMaker
       name: '@CJM/MakeMaker'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::MetaConfig
       name: '@CJM/MetaConfig'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::MatchManifest
       name: '@CJM/MatchManifest'
-      version: 0.04
+      version: 4.00
     -
       class: Dist::Zilla::Plugin::GitVersionCheckCJM
       name: '@CJM/GitVersionCheckCJM'
@@ -97,7 +100,7 @@
     -
       class: Dist::Zilla::Plugin::TemplateCJM
       name: '@CJM/TemplateCJM'
-      version: 3.00
+      version: 3.04
     -
       class: Dist::Zilla::Plugin::Repository
       name: '@CJM/Repository'
@@ -105,27 +108,27 @@
     -
       class: Dist::Zilla::Plugin::Git::Check
       name: '@CJM/@Git/Check'
-      version: 1.102810
+      version: 1.103520
     -
       class: Dist::Zilla::Plugin::Git::Commit
       name: '@CJM/@Git/Commit'
-      version: 1.102810
+      version: 1.103520
     -
       class: Dist::Zilla::Plugin::Git::Tag
       name: '@CJM/@Git/Tag'
-      version: 1.102810
+      version: 1.103520
     -
       class: Dist::Zilla::Plugin::Git::Push
       name: '@CJM/@Git/Push'
-      version: 1.102810
+      version: 1.103520
     -
       class: Dist::Zilla::Plugin::TestRelease
       name: '@CJM/TestRelease'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::UploadToCPAN
       name: '@CJM/UploadToCPAN'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::ArchiveRelease
       name: '@CJM/ArchiveRelease'
@@ -145,7 +148,7 @@
           phase: runtime
           type: requires
       name: Prereqs
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::Prereqs
       config:
@@ -153,7 +156,7 @@
           phase: runtime
           type: recommends
       name: RuntimeRecommends
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::Prereqs
       config:
@@ -161,7 +164,7 @@
           phase: test
           type: requires
       name: TestRequires
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::Prereqs
       config:
@@ -169,25 +172,25 @@
           phase: test
           type: recommends
       name: TestRecommends
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':InstallModules'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':TestFiles'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ExecFiles'
-      version: 4.102343
+      version: 4.200000
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ShareFiles'
-      version: 4.102343
+      version: 4.200000
   zilla:
     class: Dist::Zilla::Dist::Builder
     config:
       is_trial: 0
-    version: 4.102343
+    version: 4.200000

Modified: trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/Makefile.PL Tue Feb 15 12:03:25 2011
@@ -12,6 +12,7 @@
   'ABSTRACT' => 'CJM\'s plugins for Dist::Zilla',
   'AUTHOR' => 'Christopher J. Madsen <perl at cjmweb.net>',
   'BUILD_REQUIRES' => {
+    'Dist::Zilla::Tester' => '4.101800',
     'File::pushd' => '0',
     'Test::More' => '0.88'
   },
@@ -29,7 +30,7 @@
     'File::HomeDir' => '0.81',
     'File::Temp' => '0.19',
     'List::Util' => '0',
-    'Module::Build::ModuleInfo' => '0.28',
+    'Module::Metadata' => '0',
     'Moose' => '0.65',
     'Moose::Autobox' => '0.09',
     'Path::Class' => '0',
@@ -37,7 +38,7 @@
     'autodie' => '0',
     'version' => '0.77'
   },
-  'VERSION' => '3.02',
+  'VERSION' => '3.04',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: trunk/libdist-zilla-plugins-cjm-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/README?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/README (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/README Tue Feb 15 12:03:25 2011
@@ -1,4 +1,4 @@
-Dist-Zilla-Plugins-CJM version 3.02, released November 11, 2010
+Dist-Zilla-Plugins-CJM version 3.04, released December 20, 2010
 
 
 Dist-Zilla-Plugins-CJM is a collection of plugins I've written for
@@ -29,35 +29,34 @@
 
 DEPENDENCIES
 
-  Package                    Minimum Version
-  -------------------------- ---------------
-  CPAN::Meta::Converter       2.101550
-  Dist::Zilla                 3
-  File::Copy                  
-  File::HomeDir               0.81
-  File::Temp                  0.19
-  List::Util                  
-  Module::Build::ModuleInfo   0.28
-  Moose                       0.65
-  Moose::Autobox              0.09
-  Path::Class                 
-  Scalar::Util                
-  autodie                     
-  version                     0.77
+  Package                Minimum Version
+  ---------------------- ---------------
+  CPAN::Meta::Converter   2.101550
+  Dist::Zilla             3
+  File::Copy              
+  File::HomeDir           0.81
+  File::Temp              0.19
+  List::Util              
+  Module::Metadata        
+  Moose                   0.65
+  Moose::Autobox          0.09
+  Path::Class             
+  Scalar::Util            
+  autodie                 
+  version                 0.77
 
 
 
 CHANGES
-    Here's what's new in version 3.02 of Dist-Zilla-Plugins-CJM:
+    Here's what's new in version 3.04 of Dist-Zilla-Plugins-CJM:
     (See the file "Changes" for the full revision history.)
 
-	- Fixed test prerequisites (needed Test::More 0.88)
+	Dist::Zilla::Role::ModuleInfo
+	  - Use Module::Metadata instead of Module::Build::ModuleInfo
+	  - Locally reset $/ $, $\ to default values (just in case)
 
-	Dist::Zilla::Plugin::GitVersionCheckCJM
-	  - Use Git::Wrapper instead of Git (RT#60140)
-	  - Complain if a module's version exceeds the dist's version
-	  - Indicate when the dist's version needs to be incremented
-	  - Now has tests
+	Dist::Zilla::Plugin::TemplateCJM
+	  - Updated docs to talk about Module::Metadata
 
 
 

Modified: trunk/libdist-zilla-plugins-cjm-perl/corpus/DZT/lib/DZT/Sample.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/corpus/DZT/lib/DZT/Sample.pm?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/corpus/DZT/lib/DZT/Sample.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/corpus/DZT/lib/DZT/Sample.pm Tue Feb 15 12:03:25 2011
@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+
+# This { {comment}} should be unchanged.
 
 our $VERSION = '0.04';
 # This file is part of {{$dist}} {{$dist_version}} ({{$date}})

Modified: trunk/libdist-zilla-plugins-cjm-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/debian/changelog?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/debian/changelog (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/debian/changelog Tue Feb 15 12:03:25 2011
@@ -1,3 +1,15 @@
+libdist-zilla-plugins-cjm-perl (3.04-1) unstable; urgency=low
+
+  * New upstream release
+  * control: added libfile-pushd-perl build-indep dependency
+  * control: added libmodule-metadata-perl dependency
+  * control: added new module Dist::Zilla::Plugin::Metadata to
+    description
+  * copyright: updated format to dep5 candidate,
+  * control, copyright: changed my e-mail address
+
+ -- Dominique Dumont <domi.dumont at free.fr>  Tue, 15 Feb 2011 13:00:48 +0100
+
 libdist-zilla-plugins-cjm-perl (3.02-1) unstable; urgency=low
 
   * Initial Release. (Closes: #597613)

Modified: trunk/libdist-zilla-plugins-cjm-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/debian/control?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/debian/control (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/debian/control Tue Feb 15 12:03:25 2011
@@ -1,16 +1,18 @@
 Source: libdist-zilla-plugins-cjm-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Dominique Dumont <dominique.dumont at hp.com>
+Uploaders: Dominique Dumont <domi.dumont at free.fr>
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: libcpan-meta-perl,
-                     libdist-zilla-perl (>= 3),
+                     libdist-zilla-perl,
                      libfile-homedir-perl (>= 0.81),
+                     libfile-pushd-perl,
                      libmoose-autobox-perl,
                      libmoose-perl (>= 0.65),
                      libpath-class-perl,
-                     perl (>= 5.10.1)
+                     perl (>= 5.10.1),
+                     libmodule-metadata-perl
 Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/Dist-Zilla-Plugins-CJM/
 
@@ -19,12 +21,13 @@
 Depends: ${misc:Depends},
          ${perl:Depends},
          libcpan-meta-perl,
-         libdist-zilla-perl (>= 3),
+         libdist-zilla-perl,
          libfile-homedir-perl (>= 0.81),
          libmoose-autobox-perl,
          libmoose-perl (>= 0.65),
          libpath-class-perl,
-         perl (>= 5.10.1)
+         perl (>= 5.10.1),
+         libmodule-metadata-perl
 Description: collection of CJM's plugins for Dist::Zilla
  Collection of Dist::Zilla plugins. This package features the 
  following Perl modules:
@@ -41,4 +44,6 @@
      Get distribution version from its main_module
    * Dist::Zilla::Role::ModuleInfo
      Create Module::Build::ModuleInfo object from Dist::Zilla::File  
+   * Dist::Zilla::Plugin::Metadata
+     Add arbitrary keys to distmeta
 

Modified: trunk/libdist-zilla-plugins-cjm-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/debian/copyright?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/debian/copyright (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/debian/copyright Tue Feb 15 12:03:25 2011
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: Dist-Zilla-Plugins-CJM
-Maintainer: Christopher J. Madsen <perl at cjmweb.net>
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Dist-Zilla-Plugins-CJM
+Upstream-Contact: Christopher J. Madsen <perl at cjmweb.net>
 Source: http://search.cpan.org/dist/Dist-Zilla-Plugins-CJM/
 Copyright: 2010, Christopher J. Madsen <perl at cjmweb.net>
 
@@ -8,9 +8,11 @@
 Copyright: 2010, Christopher J. Madsen <perl at cjmweb.net>
 License: Artistic or GPL-1+
 
+
 Files: debian/*
-Copyright: 2010, Dominique Dumont <dominique.dumont at hp.com>
+Copyright: 2010-2011, Dominique Dumont <domi.dumont at free.fr>
 License: Artistic or GPL-1+
+
 
 License: Artistic
  This program is free software; you can redistribute it and/or modify

Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ArchiveRelease.pm Tue Feb 15 12:03:25 2011
@@ -19,7 +19,7 @@
 
 use 5.008;
 our $VERSION = '3.01';
-# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.04 (December 20, 2010)
 
 
 use Moose;
@@ -148,8 +148,8 @@
 =head1 VERSION
 
 This document describes version 3.01 of
-Dist::Zilla::Plugin::ArchiveRelease, released November 11, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.02.
+Dist::Zilla::Plugin::ArchiveRelease, released December 20, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.04.
 
 =head1 SYNOPSIS
 
@@ -207,7 +207,7 @@
 L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
 
 You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-git://github.com/madsen/dist-zilla-plugins-cjm.git.
+L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/GitVersionCheckCJM.pm Tue Feb 15 12:03:25 2011
@@ -18,7 +18,7 @@
 #---------------------------------------------------------------------
 
 our $VERSION = '3.02';
-# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.04 (December 20, 2010)
 
 
 use version 0.77 ();
@@ -159,8 +159,8 @@
 =head1 VERSION
 
 This document describes version 3.02 of
-Dist::Zilla::Plugin::GitVersionCheckCJM, released November 11, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.02.
+Dist::Zilla::Plugin::GitVersionCheckCJM, released December 20, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.04.
 
 =head1 SYNOPSIS
 
@@ -234,7 +234,7 @@
 L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
 
 You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-git://github.com/madsen/dist-zilla-plugins-cjm.git.
+L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/ModuleBuild/Custom.pm Tue Feb 15 12:03:25 2011
@@ -18,7 +18,7 @@
 #---------------------------------------------------------------------
 
 our $VERSION = '3.01';
-# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.04 (December 20, 2010)
 
 
 use Moose;
@@ -166,8 +166,8 @@
 =head1 VERSION
 
 This document describes version 3.01 of
-Dist::Zilla::Plugin::ModuleBuild::Custom, released November 11, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.02.
+Dist::Zilla::Plugin::ModuleBuild::Custom, released December 20, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.04.
 
 =head1 SYNOPSIS
 
@@ -299,7 +299,7 @@
 L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
 
 You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-git://github.com/madsen/dist-zilla-plugins-cjm.git.
+L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/TemplateCJM.pm Tue Feb 15 12:03:25 2011
@@ -17,8 +17,8 @@
 # ABSTRACT: Process templates, including version numbers & changes
 #---------------------------------------------------------------------
 
-our $VERSION = '3.00';
-# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
+our $VERSION = '3.04';
+# This file is part of Dist-Zilla-Plugins-CJM 3.04 (December 20, 2010)
 
 
 use Moose;
@@ -227,7 +227,10 @@
                }xgems;
 
   # And comments at BOL:
-  $content =~ s{( ^\#.+ )}
+  #   Text::Template breaks on strings that have the closing delimiter
+  #   without the opening one.  Only process comments that have at
+  #   least one matched set of delimiters.
+  $content =~ s{( ^\# .* \{\{ .* \}\} .* )}
                {
                  $self->_cur_offset($-[0]);
                  $self->fill_in_string($1, $dataRef, $parmsRef)
@@ -366,9 +369,9 @@
 
 =head1 VERSION
 
-This document describes version 3.00 of
-Dist::Zilla::Plugin::TemplateCJM, released November 11, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.02.
+This document describes version 3.04 of
+Dist::Zilla::Plugin::TemplateCJM, released December 20, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.04.
 
 =head1 SYNOPSIS
 
@@ -458,7 +461,7 @@
 
 =item C<$pm_info>
 
-A Module::Build::ModuleInfo object containing information about the
+A Module::Metadata object containing information about the
 module.  (Note that the filename in C<$pm_info> will not be correct.)
 
 =item C<$version>
@@ -601,7 +604,7 @@
 L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
 
 You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-git://github.com/madsen/dist-zilla-plugins-cjm.git.
+L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Plugin/VersionFromModule.pm Tue Feb 15 12:03:25 2011
@@ -18,7 +18,7 @@
 #---------------------------------------------------------------------
 
 our $VERSION = '0.08';
-# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
+# This file is part of Dist-Zilla-Plugins-CJM 3.04 (December 20, 2010)
 
 use Moose;
 with 'Dist::Zilla::Role::VersionProvider';
@@ -57,8 +57,8 @@
 =head1 VERSION
 
 This document describes version 0.08 of
-Dist::Zilla::Plugin::VersionFromModule, released November 11, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.02.
+Dist::Zilla::Plugin::VersionFromModule, released December 20, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.04.
 
 =head1 SYNOPSIS
 
@@ -95,7 +95,7 @@
 L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
 
 You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-git://github.com/madsen/dist-zilla-plugins-cjm.git.
+L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/lib/Dist/Zilla/Role/ModuleInfo.pm Tue Feb 15 12:03:25 2011
@@ -1,7 +1,7 @@
 #---------------------------------------------------------------------
 package Dist::Zilla::Role::ModuleInfo;
 #
-# Copyright 2009 Christopher J. Madsen
+# Copyright 2010 Christopher J. Madsen
 #
 # Author: Christopher J. Madsen <perl at cjmweb.net>
 # Created: 25 Sep 2009
@@ -14,17 +14,17 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See either the
 # GNU General Public License or the Artistic License for more details.
 #
-# ABSTRACT: Create Module::Build::ModuleInfo object from Dist::Zilla::File
+# ABSTRACT: Create Module::Metadata object from Dist::Zilla::File
 #---------------------------------------------------------------------
 
-our $VERSION = '0.08';
-# This file is part of Dist-Zilla-Plugins-CJM 3.02 (November 11, 2010)
+our $VERSION = '3.04';
+# This file is part of Dist-Zilla-Plugins-CJM 3.04 (December 20, 2010)
 
 use Moose::Role;
 
 use autodie ':io';
 use File::Temp ();
-use Module::Build::ModuleInfo ();
+use Module::Metadata ();
 use Path::Class qw(dir file);
 
 
@@ -32,23 +32,26 @@
 {
   my $self = shift;
   my $file = shift;
-  # Any additional parameters get passed to M::B::ModuleInfo->new_from_file
+  # Any additional parameters get passed to M::Metadata->new_from_file
 
-  # Module::Build::ModuleInfo doesn't have a new_from_string method,
+  # To be safe, reset the global variables controlling IO to their defaults:
+  local ($/, $,, $\) = "\n";
+
+  # Module::Metadata doesn't have a new_from_string method,
   # so we'll write the current contents to a temporary file:
 
   my $tempdirObject = File::Temp->newdir();
   my $dir     = dir("$tempdirObject");
   my $modPath = file($file->name);
 
-  # Module::Build::ModuleInfo only cares about the basename of the file:
+  # Module::Metadata only cares about the basename of the file:
   my $tempname = $dir->file($modPath->basename);
 
   open(my $temp, '>', $tempname);
   print $temp $file->content;
   close $temp;
 
-  return Module::Build::ModuleInfo->new_from_file("$tempname", @_)
+  return Module::Metadata->new_from_file("$tempname", @_)
       or die "Unable to get module info from " . $file->name . "\n";
 } # end get_module_info
 
@@ -59,18 +62,20 @@
 
 =head1 NAME
 
-Dist::Zilla::Role::ModuleInfo - Create Module::Build::ModuleInfo object from Dist::Zilla::File
+Dist::Zilla::Role::ModuleInfo - Create Module::Metadata object from Dist::Zilla::File
 
 =head1 VERSION
 
-This document describes version 0.08 of
-Dist::Zilla::Role::ModuleInfo, released November 11, 2010
-as part of Dist-Zilla-Plugins-CJM version 3.02.
+This document describes version 3.04 of
+Dist::Zilla::Role::ModuleInfo, released December 20, 2010
+as part of Dist-Zilla-Plugins-CJM version 3.04.
 
 =head1 DESCRIPTION
 
 Plugins implementing ModuleInfo may call their own C<get_module_info>
-method to construct a L<Module::Build::ModuleInfo> object.
+method to construct a L<Module::Metadata> object.  (Module::Metadata
+is the new name for Module::Build::ModuleInfo, now that it's been
+split from the Module-Build distribution.)
 
 =head1 METHODS
 
@@ -78,13 +83,17 @@
 
   my $info = $plugin->get_module_info($file);
 
-This constructs a Module::Build::ModuleInfo object from the contents
+This constructs a Module::Metadata object from the contents
 of a C<$file> object that does Dist::Zilla::Role::File.  Any additional
-arguments are passed along to C<< Module::Build::ModuleInfo->new_from_file >>.
+arguments are passed along to C<< Module::Metadata->new_from_file >>.
 
 =head1 CONFIGURATION AND ENVIRONMENT
 
 Dist::Zilla::Role::ModuleInfo requires no configuration files or environment variables.
+
+=head1 DEPENDENCIES
+
+L<Module::Metadata>.
 
 =head1 INCOMPATIBILITIES
 
@@ -104,7 +113,7 @@
 L<http://rt.cpan.org/Public/Bug/Report.html?Queue=Dist-Zilla-Plugins-CJM>
 
 You can follow or contribute to Dist-Zilla-Plugins-CJM's development at
-git://github.com/madsen/dist-zilla-plugins-cjm.git.
+L<< http://github.com/madsen/dist-zilla-plugins-cjm >>.
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/t/00-compile.t Tue Feb 15 12:03:25 2011
@@ -1,8 +1,9 @@
-use Test::More tests => 6;
+use Test::More tests => 7;
 
-diag("Testing Dist-Zilla-Plugins-CJM 3.02");
+diag("Testing Dist-Zilla-Plugins-CJM 3.04");
 
 use_ok('Dist::Zilla::Plugin::ArchiveRelease');
+use_ok('Dist::Zilla::Plugin::Metadata');
 use_ok('Dist::Zilla::Plugin::ModuleBuild::Custom');
 use_ok('Dist::Zilla::Plugin::TemplateCJM');
 use_ok('Dist::Zilla::Plugin::VersionFromModule');

Modified: trunk/libdist-zilla-plugins-cjm-perl/t/template.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdist-zilla-plugins-cjm-perl/t/template.t?rev=68747&op=diff
==============================================================================
--- trunk/libdist-zilla-plugins-cjm-perl/t/template.t (original)
+++ trunk/libdist-zilla-plugins-cjm-perl/t/template.t Tue Feb 15 12:03:25 2011
@@ -3,7 +3,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 5;
+use Test::More tests => 6;
 
 use Dist::Zilla::Tester;
 
@@ -124,6 +124,12 @@
 
   like(
     $module,
+    qr{^\Q# This { {comment}} should be unchanged.\E\n}m,
+    'unchanged comment in module',
+  );
+
+  like(
+    $module,
     make_re("DZT::Sample requires L<Bloofle> and\n".
             "L<Foo::Bar> (1.00 or later).\n"),
     'POD in module',




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