[libmodern-perl-perl] 01/07: Imported Upstream version 1.20140107

gregor herrmann gregoa at debian.org
Sat Jan 11 23:00:59 UTC 2014


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libmodern-perl-perl.

commit 9dc4f107796afb798c7b92425a927253a3176af2
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jan 11 23:42:58 2014 +0100

    Imported Upstream version 1.20140107
---
 Build.PL           | 23 ++++++++++++++++++-----
 Changes            |  4 ++++
 LICENSE            |  6 +++---
 META.yml           |  6 +++---
 Makefile.PL        | 38 +++++++++++++++++++++++---------------
 dist.ini           |  4 ++--
 lib/Modern/Perl.pm | 36 ++++++++++++++++++++----------------
 t/regressions.t    |  1 +
 t/year_imports.t   | 37 ++++++++++++++++++++++++++++++++++---
 9 files changed, 108 insertions(+), 47 deletions(-)

diff --git a/Build.PL b/Build.PL
index 209b546..a3e60e9 100644
--- a/Build.PL
+++ b/Build.PL
@@ -7,8 +7,7 @@ use Module::Build 0.3601;
 
 my %module_build_args = (
   "build_requires" => {
-    "Module::Build" => "0.3601",
-    "Test::More" => "0.98"
+    "Module::Build" => "0.3601"
   },
   "configure_requires" => {
     "ExtUtils::MakeMaker" => "6.30",
@@ -19,7 +18,7 @@ my %module_build_args = (
     "chromatic"
   ],
   "dist_name" => "Modern-Perl",
-  "dist_version" => "1.20121103",
+  "dist_version" => "1.20140107",
   "license" => "perl",
   "module_name" => "Modern::Perl",
   "recommends" => {},
@@ -27,17 +26,31 @@ my %module_build_args = (
   "requires" => {
     "IO::File" => 0,
     "IO::Handle" => 0,
-    "autodie" => "2.10",
+    "autodie" => "2.22",
     "feature" => 0,
     "mro" => 0,
     "perl" => "5.010",
     "strict" => 0,
     "warnings" => 0
   },
-  "script_files" => []
+  "script_files" => [],
+  "test_requires" => {
+    "Test::More" => "0.98"
+  }
 );
 
 
+my %fallback_build_requires = (
+  "Module::Build" => "0.3601",
+  "Test::More" => "0.98"
+);
+
+
+unless ( eval { Module::Build->VERSION(0.4004) } ) {
+  delete $module_build_args{test_requires};
+  $module_build_args{build_requires} = \%fallback_build_requires;
+}
+
 my $build = Module::Build->new(%module_build_args);
 
 $build->create_build_script;
diff --git a/Changes b/Changes
index 7e7e489..6f147df 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Modern::Perl
 
+1.20140107 2014-01-07 15:35:42 America/Los_Angeles
+    - updated for 2014 release
+    - added support for 5.18
+
 1.20121103 2012-11-03 13:30:26 America/Los_Angeles
     - fixed VERSION( undef ) (Peter Vereshagin, RT #80304)
     - fixed POD encoding error (Norbert E. Grüner, RT #80468)
diff --git a/LICENSE b/LICENSE
index 85345b6..b528144 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-This software is copyright (c) 2012 by chromatic at wgz.org.
+This software is copyright (c) 2014 by chromatic at wgz.org.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
@@ -12,7 +12,7 @@ b) the "Artistic License"
 
 --- The GNU General Public License, Version 1, February 1989 ---
 
-This software is Copyright (c) 2012 by chromatic at wgz.org.
+This software is Copyright (c) 2014 by chromatic at wgz.org.
 
 This is free software, licensed under:
 
@@ -272,7 +272,7 @@ That's all there is to it!
 
 --- The Artistic License 1.0 ---
 
-This software is Copyright (c) 2012 by chromatic at wgz.org.
+This software is Copyright (c) 2014 by chromatic at wgz.org.
 
 This is free software, licensed under:
 
diff --git a/META.yml b/META.yml
index 8046e75..5eda24c 100644
--- a/META.yml
+++ b/META.yml
@@ -9,7 +9,7 @@ configure_requires:
   ExtUtils::MakeMaker: 6.30
   Module::Build: 0.3601
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.300028, CPAN::Meta::Converter version 2.120921'
+generated_by: 'Dist::Zilla version 5.006, CPAN::Meta::Converter version 2.133380'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -18,7 +18,7 @@ name: Modern-Perl
 requires:
   IO::File: 0
   IO::Handle: 0
-  autodie: 2.10
+  autodie: 2.22
   feature: 0
   mro: 0
   perl: 5.010
@@ -27,4 +27,4 @@ requires:
 resources:
   homepage: https://github.com/chromatic/Modern-Perl
   repository: https://github.com/chromatic/Modern-Perl.git
-version: 1.20121103
+version: 1.20140107
diff --git a/Makefile.PL b/Makefile.PL
index 22e831a..9f7f5b0 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,8 +12,7 @@ my %WriteMakefileArgs = (
   "ABSTRACT" => "enable all of the features of Modern Perl with one import",
   "AUTHOR" => "chromatic",
   "BUILD_REQUIRES" => {
-    "Module::Build" => "0.3601",
-    "Test::More" => "0.98"
+    "Module::Build" => "0.3601"
   },
   "CONFIGURE_REQUIRES" => {
     "ExtUtils::MakeMaker" => "6.30",
@@ -26,30 +25,39 @@ my %WriteMakefileArgs = (
   "PREREQ_PM" => {
     "IO::File" => 0,
     "IO::Handle" => 0,
-    "autodie" => "2.10",
+    "autodie" => "2.22",
     "feature" => 0,
     "mro" => 0,
     "strict" => 0,
     "warnings" => 0
   },
-  "VERSION" => "1.20121103",
+  "TEST_REQUIRES" => {
+    "Test::More" => "0.98"
+  },
+  "VERSION" => "1.20140107",
   "test" => {
     "TESTS" => "t/*.t"
   }
 );
 
 
-unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) {
-  my $br = delete $WriteMakefileArgs{BUILD_REQUIRES};
-  my $pp = $WriteMakefileArgs{PREREQ_PM};
-  for my $mod ( keys %$br ) {
-    if ( exists $pp->{$mod} ) {
-      $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
-    }
-    else {
-      $pp->{$mod} = $br->{$mod};
-    }
-  }
+my %FallbackPrereqs = (
+  "IO::File" => 0,
+  "IO::Handle" => 0,
+  "Module::Build" => "0.3601",
+  "Test::More" => "0.98",
+  "autodie" => "2.22",
+  "feature" => 0,
+  "mro" => 0,
+  "strict" => 0,
+  "warnings" => 0
+);
+
+
+unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
+  delete $WriteMakefileArgs{TEST_REQUIRES};
+  delete $WriteMakefileArgs{BUILD_REQUIRES};
+  $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
 }
 
 delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
diff --git a/dist.ini b/dist.ini
index 267b01d..e867b45 100644
--- a/dist.ini
+++ b/dist.ini
@@ -2,7 +2,7 @@ name             = Modern-Perl
 author           = chromatic
 license          = Perl_5
 copyright_holder = chromatic at wgz.org
-copyright_year   = 2012
+copyright_year   = 2014
 
 [AutoVersion]
 format = {{ cldr('1.yyyyMMdd') }}
@@ -11,7 +11,7 @@ format = {{ cldr('1.yyyyMMdd') }}
 
 [Prereqs]
 perl    = 5.010
-autodie = 2.10
+autodie = 2.22
 
 [@Filter]
 -bundle = @Basic
diff --git a/lib/Modern/Perl.pm b/lib/Modern/Perl.pm
index b71dea1..6336fb6 100644
--- a/lib/Modern/Perl.pm
+++ b/lib/Modern/Perl.pm
@@ -1,6 +1,6 @@
 package Modern::Perl;
 {
-  $Modern::Perl::VERSION = '1.20121103';
+  $Modern::Perl::VERSION = '1.20140107';
 }
 # ABSTRACT: enable all of the features of Modern Perl with one import
 
@@ -27,7 +27,7 @@ sub VERSION
     return $VERSION if             $version < 2009;
 
     $wanted_date = $version if (caller(1))[3] =~ /::BEGIN/;
-    return 2012;
+    return 2014;
 }
 
 sub import
@@ -38,8 +38,8 @@ sub import
     my $feature_tag    = validate_date( $date );
     undef $wanted_date;
 
-    warnings->import();
-    strict->import();
+    warnings->import;
+    strict->import;
     feature->import( $feature_tag );
     mro::set_mro( scalar caller(), 'c3' );
 }
@@ -58,6 +58,7 @@ my %dates =
     2011 => ':5.12',
     2012 => ':5.14',
     2013 => ':5.16',
+    2014 => ':5.18',
 );
 
 sub validate_date
@@ -84,13 +85,15 @@ __END__
 
 =pod
 
+=encoding UTF-8
+
 =head1 NAME
 
 Modern::Perl - enable all of the features of Modern Perl with one import
 
 =head1 VERSION
 
-version 1.20121103
+version 1.20140107
 
 =head1 SYNOPSIS
 
@@ -133,19 +136,20 @@ optional import tag. For example:
 
     use Modern::Perl '2012';
 
-... enables 5.14 features, and:
+... enables 5.14 features:
 
     use Modern::Perl '2013';
 
-... enables 5.16 features. Obviously you cannot use newer features on earlier
-versions. Perl will throw the appropriate exception if you try.
+... enables 5.16 features, and:
 
-In the near future--sometime around September 2012--this module may drop
-support for 5.10 and will complain (once per process) if you use a year too
-old. As of May 2012, Perl 5.12 is unsupported by the Perl 5 Porters, so please
-consider upgrading.
+    use Modern::Perl '2014';
+
+... enables 5.18 features. Obviously you cannot use newer features on earlier
+versions. Perl will throw the appropriate exception if you try.
 
-=encoding utf8
+By mid-2014, this module will drop support for 5.10 and 5.12 and will complain
+(once per process) if you use a year too old. As of January 2014, Perl 5.14 is
+unsupported by the Perl 5 Porters, so please consider upgrading.
 
 =head1 AUTHOR
 
@@ -200,10 +204,10 @@ features.
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2009-2012 chromatic, all rights reserved.
+Copyright 2009-2014 chromatic, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl 5.14 itself.
+under the same terms as Perl 5.18 itself.
 
 =head1 AUTHOR
 
@@ -211,7 +215,7 @@ chromatic
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2012 by chromatic at wgz.org.
+This software is copyright (c) 2014 by chromatic at wgz.org.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
diff --git a/t/regressions.t b/t/regressions.t
index 2506026..4eb58e5 100644
--- a/t/regressions.t
+++ b/t/regressions.t
@@ -9,6 +9,7 @@ $SIG{__WARN__} = sub
     return if $_[0] =~ /Number found where operator expected/;
     return if $_[0] =~ /Do you need to predeclare/;
     return if $_[0] =~ /future reserved word/;
+    return if $_[0] =~ /given is experimental/;
     warn shift
 };
 
diff --git a/t/year_imports.t b/t/year_imports.t
index bd2cc96..88a5e6a 100644
--- a/t/year_imports.t
+++ b/t/year_imports.t
@@ -9,6 +9,7 @@ $SIG{__WARN__} = sub
     return if $_[0] =~ /Number found where operator expected/;
     return if $_[0] =~ /Do you need to predeclare/;
     return if $_[0] =~ /future reserved word/;
+    return if $_[0] =~ /given is experimental/;
     warn shift
 };
 
@@ -22,9 +23,11 @@ is uc "\xdf", "\xdf", 'Modern::Perl () does not enable unicode_strings';
 eval 'sub { return __SUB__ }';
 is $@, '', q|use Modern::Perl '2013' does not enable current_sub|;
 my $warning = '';
-local $SIG{__WARN__} = sub { $warning = shift };
-eval 'fc("tschüß") eq fc("TSCHÜSS")';
-isnt $@, '', q|use Modern::Perl () does not enable fc|;
+{
+    local $SIG{__WARN__} = sub { $warning = shift };
+    eval 'fc("tschüß") eq fc("TSCHÜSS")';
+    isnt $@, '', q|use Modern::Perl () does not enable fc|;
+}
 
 {
     use Modern::Perl '2009';
@@ -96,6 +99,34 @@ if ($] >= 5.016)
             q|use Modern::Perl '2013' disables array_base|;
         eval 'fc("tschüß") eq fc("TSCHÜSS")';
         is $@, '', q|use Modern::Perl '2013' enables fc|;
+        eval 'my sub foo {}';
+        isnt $@, '', q|use Modern::Perl '2013' should not enable lexical subs|;
+    };
+    is $@, '', 'this block should succeed';
+}
+
+if ($] >= 5.018)
+{
+    eval q{
+        use Modern::Perl '2014';
+        eval 'sub { given (0) {} }';
+        is $@, '', q|use Modern::Perl '2014' enables switch|;
+        eval 'sub { say 0 }';
+        is $@, '', q|use Modern::Perl '2014' enables say|;
+        eval 'state $x';
+        is $@, '', q|use Modern::Perl '2014' enables state|;
+        is uc "\xdf", "SS", '2014 enables unicode_strings';
+        eval 'sub { return __SUB__ }';
+        is $@, '', q|use Modern::Perl '2014' enables current_sub|;
+        my $warning = '';
+        local $SIG{__WARN__} = sub { $warning = shift };
+        eval '$[ = 10';
+        like $warning, qr/Use of assignment to \$\[ is deprecated/,
+            q|use Modern::Perl '2014' disables array_base|;
+        eval 'fc("tschüß") eq fc("TSCHÜSS")';
+        is $@, '', q|use Modern::Perl '2014' enables fc|;
+        eval 'my sub foo {}';
+        isnt $@, '', q|use Modern::Perl '2014' does not enable lexical subs|;
     };
     is $@, '', 'this block should succeed';
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmodern-perl-perl.git



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