META, package files and test suite updates

barbie · Mar 27, 2013 · c631b83 · c631b83
1 parent 8e59a67
commit c631b83
Show file tree

Hide file tree

Showing 9 changed files with 147 additions and 102 deletions.
diff --git a/Changes b/Changes
@@ -1,47 +1,53 @@
 Changes for the Labyrinth Core Plugins
 
-5.10	24/01/2012
-	- config settings maximagewidth & maximageheight used to set default 
-	  size (Articles).
-	- Alignment changes as per fixes in Labyrinth-5.12.
-	- base access reset to EDITOR (Articles/Site).
-
-5.09	31/12/2011
-	- added link titles
-	- fixed image href saving.
-
-5.08	19/06/2011
-	- GetImageSize now used for articles.
-	- GetImageSize now used in Users::Item.
-
-5.07	19/06/2011
-	- more documentation updates.
-	- expanded Sections functionality.
-	- update to Users to correctly reference image sizes.
-	- include gravatar references with user profiles.
-
-5.06	13/03/2011
-	- updated documentation.
-
-5.05	24/02/2011
-	- update Articles to better support limit, stop and order from plugins.
-
-5.04	04/01/2011
-	- added Articles::Site from Labyrinth-Demo.
-
-5.03	03/01/2011
-	- query added list of fields to be cleaned before displaying.
-	- update from live for saving menu options.
-	- update from live for saving user details.
-
-5.02	01/01/2011
+        - change file dates changed to meet W3CDTF standards.
+        - upgraded to Test::CPAN::Meta::JSON for tests.
+        - reworked Makefile.PL for clarity.
+        - updated test suite.
+        - updated META files.
+
+5.10	2012-01-24
+        - config settings maximagewidth & maximageheight used to set default 
+          size (Articles).
+        - Alignment changes as per fixes in Labyrinth-5.12.
+        - base access reset to EDITOR (Articles/Site).
+
+5.09	2011-12-31
+        - added link titles
+        - fixed image href saving.
+
+5.08	2011-06-19
+        - GetImageSize now used for articles.
+        - GetImageSize now used in Users::Item.
+
+5.07	2011-06-19
+        - more documentation updates.
+        - expanded Sections functionality.
+        - update to Users to correctly reference image sizes.
+        - include gravatar references with user profiles.
+
+5.06	2011-03-13
+        - updated documentation.
+
+5.05	2011-02-24
+        - update Articles to better support limit, stop and order from plugins.
+
+5.04	2011-01-04
+        - added Articles::Site from Labyrinth-Demo.
+
+5.03	2011-01-03
+        - query added list of fields to be cleaned before displaying.
+        - update from live for saving menu options.
+        - update from live for saving user details.
+
+5.02	2011-01-01
         - fix to check MASTER access.
 
-5.01	01/01/2011
-	- moved MasterCheck from plugins to core
+5.01	2011-01-01
+        - moved MasterCheck from plugins to core
 
-5.00	01/01/2011
-	- official release alongside Labyrinth Core.
+5.00	2011-01-01
+        - official release alongside Labyrinth Core.
 
-4.17	11/03/2010
-	- split from Labyrinth Core.
+4.17	2010-03-11
+        - split from Labyrinth Core.
diff --git a/META.json b/META.json
@@ -23,27 +23,27 @@
     "prereqs" : {
         "test" : {
             "requires": {
+                "IO::File": "0",
                 "Test::More": "0.70"
             },
             "recommends": {
+                "Test::CPAN::Meta": "0",
+                "Test::CPAN::Meta::JSON": "0",
                 "Test::Pod": "1.00",
-                "Test::Pod::Coverage": "0.08",
-                "Test::CPAN::Meta": "0.13",
-                "Test::JSON::Meta": "0.08"
+                "Test::Pod::Coverage": "0.08"
             }
         },
         "runtime" : {
             "requires" : {
-              "Labyrinth": "5.12",
-
-              "Clone": "0",
-              "Config::IniFiles": "0",
-              "Digest::MD5": "0",
-              "File::Copy": "0",
-              "File::Basename": "0",
-              "Image::Size": "0",
-              "Time::Local": "0",
-              "URI::Escape": "0"
+                "Clone": "0",
+                "Config::IniFiles": "0",
+                "Digest::MD5": "0",
+                "File::Copy": "0",
+                "File::Basename": "0",
+                "Image::Size": "0",
+                "Labyrinth": "5.12",
+                "Time::Local": "0",
+                "URI::Escape": "0"
             }
         }
     },
@@ -111,7 +111,7 @@
     },
 
     "resources": {
-        "license": "http://dev.perl.org/licenses/",
+        "license": "http://www.perlfoundation.org/artistic_license_2_0",
         "bugtracker": { "web": "http://rt.cpan.org/Public/Dist/Display.html?Name=Labyrinth-Plugin-Core" },
         "repository": {
             "url": "git://github.com/barbie/labyrinth-plugin-core.git",

diff --git a/META.yml b/META.yml
@@ -10,23 +10,23 @@ distribution_type:        module
 installdirs:              site
 
 requires:
-  Labyrinth:              5.12
-  Clone:                  0
-  Time::Local:            0
-  Image::Size:            0
-  File::Copy:             0
-  File::Basename:         0
-  Digest::MD5:            0
-  URI::Escape:            0
-  Config::IniFiles:       0
+  Clone:                        0
+  Config::IniFiles:             0
+  Digest::MD5:                  0
+  File::Copy:                   0
+  File::Basename:               0
+  Image::Size:                  0
+  Labyrinth:                    5.12
+  Time::Local:                  0
+  URI::Escape:                  0
 recommends:
-  Test::More:             0.70
-  Test::Pod:              1.00
-  Test::Pod::Coverage:    0.08
-  Test::CPAN::Meta:       0.13
-  Test::JSON::Meta:       0.08
+  Test::CPAN::Meta:             0
+  Test::CPAN::Meta::JSON:       0
+  Test::Pod:                    1.00
+  Test::Pod::Coverage:          0.08
 build_requires:
-  Test::More:             0.01
+  IO::File:                     0
+  Test::More:                   0.70
 
 provides:
   Labyrinth::Plugin::Articles:
@@ -75,10 +75,12 @@ provides:
 no_index:
   directory:
     - t
+    - examples
 
 resources:
-  license:    http://dev.perl.org/licenses/
+  license:    http://www.perlfoundation.org/artistic_license_2_0
   bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Labyrinth-Plugin-Core
+  repository: http://github.com/barbie/labyrinth-plugin-core
 
 meta-spec:
    version:   1.4

diff --git a/Makefile.PL b/Makefile.PL
@@ -1,21 +1,33 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
 use 5.006;
+
 use ExtUtils::MakeMaker;
+
 WriteMakefile(
-    NAME            => 'Labyrinth::Plugin::Core',
-    VERSION_FROM    => 'lib/Labyrinth/Plugin/Core.pm',
-    PREREQ_PM       => {
-        'Labyrinth'         => '5.12',
+    AUTHOR              => 'Barbie <barbie@cpan.org>',
+    NAME                => 'Labyrinth::Plugin::Core',
+    VERSION_FROM        => 'lib/Labyrinth/Plugin/Core.pm',
+    ABSTRACT            => 'Core Labyrinth codebase - Core Plugins',
+    NO_META             => 1,
+    PREREQ_PM           => {
+
+        # prereqs
+        'Labyrinth'             => '5.12',
+        'Clone'                 => 0,
+        'Time::Local'           => 0,
+        'Image::Size'           => 0,
+        'File::Copy'            => 0,
+        'File::Basename'        => 0,
+        'Digest::MD5'           => 0,
+        'URI::Escape'           => 0,
+        'Config::IniFiles'      => 0,
+
+        # build/test prereqs
+        'IO::File'              => '0',
+        'Test::More'            => '0.70'
 
-        'Clone'             => 0,
-        'Time::Local'       => 0,
-        'Image::Size'       => 0,
-        'File::Copy'        => 0,
-        'File::Basename'    => 0,
-        'Digest::MD5'       => 0,
-        'URI::Escape'       => 0,
-        'Config::IniFiles'  => 0,
-    },
-    NO_META     => 1,
-    ABSTRACT    => 'Core Labyrinth codebase - Core Plugins',
-    AUTHOR      => 'Barbie <barbie@cpan.org>',
+    }
 );
diff --git a/t/90podtest.t b/t/90podtest.t
@@ -1,3 +1,6 @@
+#!/usr/bin/perl -w
+use strict;
+
 use Test::More;
 
 # Skip if doing a regular install
@@ -7,4 +10,3 @@ plan skip_all => "Author tests not required for installation"
 eval "use Test::Pod 1.00";
 plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
 all_pod_files_ok();
-
diff --git a/t/91podcover.t b/t/91podcover.t
@@ -1,3 +1,6 @@
+#!/usr/bin/perl -w
+use strict;
+
 use Test::More;
 
 # Skip if doing a regular install

diff --git a/t/94metatest.t b/t/94metatest.t
@@ -1,3 +1,6 @@
+#!/usr/bin/perl -w
+use strict;
+
 use Test::More;
 
 # Skip if doing a regular install
@@ -7,7 +10,7 @@ plan skip_all => "Author tests not required for installation"
 eval "use Test::CPAN::Meta";
 plan skip_all => "Test::CPAN::Meta required for testing META.yml" if $@;
 
-plan no_plan;
+plan 'no_plan';
 
 my $meta = meta_spec_ok(undef,undef,@_);
 

diff --git a/t/95changedate.t b/t/95changedate.t
@@ -1,26 +1,40 @@
+#!/usr/bin/perl -w
+use strict;
+
 use Test::More;
 use IO::File;
-use Labyrinth::Plugin::Core;
 
 # Skip if doing a regular install
 plan skip_all => "Author tests not required for installation"
     unless ( $ENV{AUTOMATED_TESTING} );
 
-my $changes;
-$changes = 'Changes' if(-f 'Changes');
-$changes = 'CHANGES' if(-f 'CHANGES');
-
-plan skip_all => 'No Changes file found'    unless($changes);
+my $fh = IO::File->new('Changes','r')   or plan skip_all => "Cannot open Changes file";
 
-my $fh = IO::File->new($changes,'r')   or plan skip_all => "Cannot open $changes file";
+plan 'no_plan';
 
-plan no_plan;
+use Labyrinth::Plugin::Core;
+my $version = $Labyrinth::Plugin::Core::VERSION;
 
 my $latest = 0;
 while(<$fh>) {
     next        unless(m!^\d!);
-    $latest = 1 if(m!^$Labyrinth::Plugin::Core::VERSION!);
-    like($_, qr!\d[\d._]+\s+\d{2}/\d{2}/\d{4}!,'... version has a date');
+    $latest = 1 if(m!^$version!);
+
+    # 2012-08-26T01:02 or 2012-08-26T01:02:03 or 2012-08-26T01:02:03.04 or 2012-08-26T01:02+01:00
+
+    like($_, qr!^
+                \d[\d._]+\s+                # version
+                (   \d{4}-\d{2}-\d{2}       # 2012-08-26    - YYYY-MM-DD
+                    (   T\d{2}:\d{2}        # T01:02        - Thh:mm
+                        (   :\d{2}          # :02           - :ss
+                            (   \.\d+       # .2            - .ss (microseconds)
+                            )?
+                        )?
+                        (   (Z|[-+]\d+:\d+) # +01:00        - timezone
+                        )?
+                    )?
+                ) 
+                \s*$!x,'... version has a date');
 }
 
 is($latest,1,'... latest version not listed');
diff --git a/t/96metatest.t b/t/96metatest.t
@@ -1,13 +1,16 @@
+#!/usr/bin/perl -w
+use strict;
+
 use Test::More;
 
 # Skip if doing a regular install
 plan skip_all => "Author tests not required for installation"
     unless ( $ENV{AUTOMATED_TESTING} );
 
-eval "use Test::JSON::Meta 0.08";
-plan skip_all => "Test::JSON::Meta 0.08 required for testing META.json files" if $@;
+eval "use Test::CPAN::Meta::JSON";
+plan skip_all => "Test::CPAN::Meta::JSON required for testing META.json files" if $@;
 
-plan no_plan;
+plan 'no_plan';
 
 my $meta = meta_spec_ok(undef,undef,@_);