Build results of 8586dac (on master)

kentnl · Jul 16, 2015 · 4c69acc · 4c69acc
1 parent da1ffc8
commit 4c69acc
Show file tree

Hide file tree

Showing 24 changed files with 394 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,11 @@
-.build
-Gentoo-PerlMod-Version-*
+/.build
+/Gentoo-PerlMod-Version-*
+/tmp/
+/META.json
+/MYMETA.json
+/META.yml
+/MYMETA.yml
+/Makefile
+/Makefile.old
+/blib/
+/pm_to_blib
diff --git a/Changes b/Changes
@@ -1,5 +1,14 @@
 Release history for Gentoo-PerlMod-Version
 
+0.8.0 2015-07-16T23:24:29Z 301fe54
+ [00 Major / Features]
+ - gentoo-perlmod-version.pl is now fatpacked.
+ - This means the code should run better in mixed environments as well as between perl upgrades
+
+ [Dependencies::Stats]
+ - Dependencies changed since 0.7.1, see misc/*.deps* for details
+ - develop: +2 -1 (suggests: ↑1)
+
 0.7.1 2015-06-23T03:30:53Z 8b35638
  [00 Minor]
  - Avoid using an XS dep to simply iterate an array pairwise.

diff --git a/INSTALL.SKIP b/INSTALL.SKIP
@@ -0,0 +1 @@
+CONTRIBUTING\.pod$
diff --git a/MANIFEST b/MANIFEST
@@ -4,6 +4,7 @@
 .perltidyrc
 .travis.yml
 Changes
+INSTALL.SKIP
 LICENSE
 MANIFEST
 META.json
@@ -16,6 +17,8 @@ dist.ini.meta
 lib/Gentoo/PerlMod/Version.pm
 lib/Gentoo/PerlMod/Version/Env.pm
 lib/Gentoo/PerlMod/Version/Error.pm
+maint/fatpack.pl
+maint/gentoo-perlmod-version.pl
 maint/perlcritic.rc.gen.pl
 misc/Changes.deps
 misc/Changes.deps.all
@@ -40,6 +43,5 @@ xt/author/eol.t
 xt/release/cpan-changes.t
 xt/release/distmeta.t
 xt/release/kwalitee.t
-xt/release/minimum-version.t
 xt/release/pod-coverage.t
 xt/release/pod-syntax.t
diff --git a/META.json b/META.json
@@ -29,6 +29,7 @@
          },
          "requires" : {
             "Dist::Zilla" : "5",
+            "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : "0.001003",
             "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.004002",
             "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001002",
             "Dist::Zilla::Plugin::Authority" : "1.006",
@@ -65,13 +66,13 @@
             "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0",
             "Dist::Zilla::Plugin::Readme::Brief" : "0",
             "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0",
+            "Dist::Zilla::Plugin::RemovePrereqs::Provided" : "0",
             "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0",
             "Dist::Zilla::Plugin::RunExtraTests" : "0",
             "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0",
             "Dist::Zilla::Plugin::Test::Compile::PerFile" : "0",
             "Dist::Zilla::Plugin::Test::EOL" : "0",
             "Dist::Zilla::Plugin::Test::Kwalitee" : "0",
-            "Dist::Zilla::Plugin::Test::MinimumVersion" : "0",
             "Dist::Zilla::Plugin::Test::Perl::Critic" : "0",
             "Dist::Zilla::Plugin::Test::ReportPrereqs" : "0",
             "Dist::Zilla::Plugin::TestRelease" : "0",
@@ -88,7 +89,7 @@
          },
          "suggests" : {
             "Dist::Zilla::App::Command::bakeini" : "0.002005",
-            "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.024002"
+            "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025001"
          }
       },
       "runtime" : {
@@ -122,15 +123,15 @@
    "provides" : {
       "Gentoo::PerlMod::Version" : {
          "file" : "lib/Gentoo/PerlMod/Version.pm",
-         "version" : "v0.7.1"
+         "version" : "v0.8.0"
       },
       "Gentoo::PerlMod::Version::Env" : {
          "file" : "lib/Gentoo/PerlMod/Version/Env.pm",
-         "version" : "v0.7.1"
+         "version" : "v0.8.0"
       },
       "Gentoo::PerlMod::Version::Error" : {
          "file" : "lib/Gentoo/PerlMod/Version/Error.pm",
-         "version" : "v0.7.1"
+         "version" : "v0.8.0"
       }
    },
    "release_status" : "stable",
@@ -145,7 +146,7 @@
          "web" : "https://github.com/kentnl/Gentoo-PerlMod-Version"
       }
    },
-   "version" : "0.7.1",
+   "version" : "0.8.0",
    "x_BuiltWith" : {
       "external_file" : "misc/built_with.json"
    },
@@ -230,7 +231,9 @@
                      "README",
                      "README.mkdn",
                      "README.pod",
-                     "LICENSE"
+                     "CONTRIBUTING.pod",
+                     "LICENSE",
+                     "Makefile.PL"
                   ],
                   "exclude_match" : [],
                   "follow_symlinks" : "0",
@@ -277,6 +280,24 @@
             "name" : "@Author::KENTNL/Author::KENTNL::TravisCI",
             "version" : "0.001002"
          },
+         {
+            "class" : "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING",
+            "config" : {
+               "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : {
+                  "document_version" : "0.1"
+               },
+               "Dist::Zilla::Plugin::GenerateFile::ShareDir" : {
+                  "destination_filename" : "CONTRIBUTING.pod",
+                  "dist" : "Dist-Zilla-Plugin-Author-KENTNL-CONTRIBUTING",
+                  "encoding" : "UTF-8",
+                  "location" : "root",
+                  "phase" : "build",
+                  "source_filename" : "contributing-0.1.pod"
+               }
+            },
+            "name" : "@Author::KENTNL/Author::KENTNL::CONTRIBUTING",
+            "version" : "0.001004"
+         },
          {
             "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild",
             "name" : "@Author::KENTNL/CopyXBuild",
@@ -329,11 +350,6 @@
             "name" : "@Author::KENTNL/Test::EOL",
             "version" : "0.18"
          },
-         {
-            "class" : "Dist::Zilla::Plugin::Test::MinimumVersion",
-            "name" : "@Author::KENTNL/Test::MinimumVersion",
-            "version" : "2.000006"
-         },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : "@Author::KENTNL/Test::Compile::PerFile/AUTOVIV/:InstallModulesPM",
@@ -528,7 +544,7 @@
          {
             "class" : "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes",
             "name" : "@Author::KENTNL/Author::KENTNL::RecommendFixes",
-            "version" : "0.004003"
+            "version" : "0.005001"
          },
          {
             "class" : "Dist::Zilla::Plugin::Readme::Brief",
@@ -537,6 +553,11 @@
          },
          {
             "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
+            "config" : {
+               "Dist::Zilla::Role::FileWatcher" : {
+                  "version" : "0.006"
+               }
+            },
             "name" : "@Author::KENTNL/ReadmeAnyFromPod",
             "version" : "0.150250"
          },
@@ -615,7 +636,7 @@
                "Dist::Zilla::Plugin::Git::Tag" : {
                   "branch" : null,
                   "signed" : 0,
-                  "tag" : "0.7.1-source",
+                  "tag" : "0.8.0-source",
                   "tag_format" : "%v-source",
                   "tag_message" : "v%v",
                   "time_zone" : "local"
@@ -629,6 +650,11 @@
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::NextRelease",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::NextRelease" : {
+                  "default_branch" : "master"
+               }
+            },
             "name" : "@Author::KENTNL/Git::NextRelease",
             "version" : "0.004000"
          },
@@ -686,7 +712,7 @@
                "Dist::Zilla::Plugin::Git::Tag" : {
                   "branch" : "releases",
                   "signed" : 0,
-                  "tag" : "0.7.1",
+                  "tag" : "0.8.0",
                   "tag_format" : "%v",
                   "tag_message" : "v%v",
                   "time_zone" : "local"
@@ -749,6 +775,11 @@
             "name" : "@Author::KENTNL/always_latest_develop_bundle",
             "version" : "0.003001"
          },
+         {
+            "class" : "Dist::Zilla::Plugin::RemovePrereqs::Provided",
+            "name" : "@Author::KENTNL/RemovePrereqs::Provided",
+            "version" : "0.001000"
+         },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
             "config" : {

diff --git a/META.yml b/META.yml
@@ -22,13 +22,13 @@ name: Gentoo-PerlMod-Version
 provides:
   Gentoo::PerlMod::Version:
     file: lib/Gentoo/PerlMod/Version.pm
-    version: v0.7.1
+    version: v0.8.0
   Gentoo::PerlMod::Version::Env:
     file: lib/Gentoo/PerlMod/Version/Env.pm
-    version: v0.7.1
+    version: v0.8.0
   Gentoo::PerlMod::Version::Error:
     file: lib/Gentoo/PerlMod/Version/Error.pm
-    version: v0.7.1
+    version: v0.8.0
 requires:
   Carp: '0'
   Data::Dumper: '0'
@@ -42,4 +42,4 @@ resources:
   bugtracker: https://github.com/kentnl/Gentoo-PerlMod-Version/issues
   homepage: https://github.com/kentnl/Gentoo-PerlMod-Version
   repository: https://github.com/kentnl/Gentoo-PerlMod-Version.git
-version: 0.7.1
+version: 0.8.0
diff --git a/Makefile.PL b/Makefile.PL
@@ -35,7 +35,7 @@ my %WriteMakefileArgs = (
     "Test::Fatal" => 0,
     "Test::More" => "0.96"
   },
-  "VERSION" => "0.7.1",
+  "VERSION" => "0.8.0",
   "test" => {
     "TESTS" => "t/*.t t/00-compile/*.t"
   }

diff --git a/bin/gentoo-perlmod-version.pl b/bin/gentoo-perlmod-version.pl
@@ -1,11 +1,73 @@
 #!/usr/bin/env perl
+
+## no critic
+# This chunk of stuff was generated by App::FatPacker. To find the original
+# file's code, look for the end of this BEGIN block or the string 'FATPACK'
+BEGIN {
+my %fatpacked;
+
+$fatpacked{"Gentoo/PerlMod/Version.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'GENTOO_PERLMOD_VERSION';
+  use 5.006;use strict;use warnings;package Gentoo::PerlMod::Version;our$VERSION='0.8.0';use Sub::Exporter::Progressive -setup=>{exports=>[qw(gentooize_version)]};use version 0.77;sub gentooize_version {my ($perlver,$config)=@_;$config ||= {};if (not defined$perlver){return _err_perlver_undefined($config)}$config->{lax}=0 unless defined$config->{lax};if (_env_hasopt('always_lax')){$config->{lax}=_env_getopt('always_lax')}if ($perlver =~ /\Av?[\d.]+\z/msx){return _lax_cleaning_0($perlver)}if ($perlver =~ /\Av?[\d._]+(-TRIAL)?\z/msx){if ($config->{lax}> 0){return _lax_cleaning_1($perlver)}return _err_matches_trial_regex_nonlax($perlver,$config)}if (2==$config->{lax}){return _lax_cleaning_2($perlver)}return _err_not_decimal_or_trial($perlver,$config)}my$char_map={(map {$_=>$_}0 .. 9),(map {chr($_ + 65)=>$_ + 10}0 .. 25),(map {chr($_ + 97)=>$_ + 10}0 .. 25),};sub _code_for {my$char=shift;if (not exists$char_map->{$char}){my$char_ord=ord$char;return _err_bad_char($char,$char_ord)}return$char_map->{$char}}sub _enc_pair {my (@tokens)=@_;if (not @tokens){return q{}}if (@tokens < 2){return _code_for(shift@tokens)}return (_code_for($tokens[0])* 36)+ (_code_for($tokens[1]))}sub _ascii_to_int {my$string=shift;my@chars=split //msx,$string;my@output;while (@chars){push@output,_enc_pair(splice@chars,0,2,())}return join q{.},@output}sub _lax_cleaning_0 {my$version=shift;return _expand_numeric($version)}sub _lax_cleaning_1 {my$version=shift;my$isdev=0;my$prereleasever=undef;if ($version =~ s/-TRIAL\z//msx){$isdev=1}if ($version =~ s/_(.*)\z/$1/msx){$prereleasever="$1";$isdev=1;if ($prereleasever =~ /_/msx){return _err_lax_multi_underscore($version)}}$version=_expand_numeric($version);if ($isdev){$version .= '_rc'}return$version}sub _lax_cleaning_2 {my$version=shift;my$istrial=0;my$has_v=0;if ($version =~ s/-TRIAL\z//msx){$istrial=1}if ($version =~ s/\Av//msx){$has_v=1}my@parts=split /([._])/msx,$version;my@out;for (@parts){if (/\A[_.]\z/msx){push@out,$_;next}if (/\A\d\z/msx){push@out,$_;next}push@out,_ascii_to_int($_)}my$version_out=join q{},@out;if ($istrial){$version_out .= '-TRIAL'}if ($has_v){$version_out='v' .$version_out}return _lax_cleaning_1($version_out)}sub _expand_numeric {my$perlver=shift;my$ver=version->parse($perlver)->normal;$ver =~ s/\Av//msx;my@tokens=split /[.]/msx,$ver;my@out;for (@tokens){s/\A0+([1-9])/$1/msx;push@out,$_}return join q{.},@out}BEGIN {for my$err (qw(perlver_undefined matches_trial_regex_nonlax not_decimal_or_trial bad_char lax_multi_underscore)){my$code=sub {require Gentoo::PerlMod::Version::Error;my$sub=Gentoo::PerlMod::Version::Error->can($err);goto$sub};no strict 'refs';*{__PACKAGE__ .'::_err_' .$err}=$code}for my$env (qw(opts hasopt getopt)){my$code=sub {require Gentoo::PerlMod::Version::Env;my$sub=Gentoo::PerlMod::Version::Env->can($env);goto$sub};no strict 'refs';*{__PACKAGE__ .'::_env_' .$env}=$code}}1;
+GENTOO_PERLMOD_VERSION
+
+$fatpacked{"Gentoo/PerlMod/Version/Env.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'GENTOO_PERLMOD_VERSION_ENV';
+  use 5.006;use strict;use warnings;package Gentoo::PerlMod::Version::Env;our$VERSION='0.8.0';my$state;my$env_key='GENTOO_PERLMOD_VERSION_OPTS';sub opts {return$state if defined$state;$state={};return$state if not defined$ENV{$env_key};my (@tokes)=split /\s+/msx,$ENV{$env_key};for my$token (@tokes){if ($token =~ /\A([^=]+)=(.+)\z/msx){$state->{"$1"}="$2"}elsif ($token =~ /\A-(.+)\z/msx){delete$state->{"$1"}}else {$state->{$token}=1}}return$state}sub hasopt {my ($opt)=@_;return exists opts()->{$opt}}sub getopt {my ($opt)=@_;return opts()->{$opt}}1;
+GENTOO_PERLMOD_VERSION_ENV
+
+$fatpacked{"Gentoo/PerlMod/Version/Error.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'GENTOO_PERLMOD_VERSION_ERROR';
+  use 5.006;use strict;use warnings;package Gentoo::PerlMod::Version::Error;our$VERSION='0.8.0';BEGIN {for my$env (qw(opts hasopt getopt)){my$code=sub {require Gentoo::PerlMod::Version::Env;my$sub=Gentoo::PerlMod::Version::Env->can($env);goto$sub};no strict 'refs';*{__PACKAGE__ .'::_env_' .$env}=$code}}sub perlver_undefined {my ($config)=@_;return _fatal({code=>'perlver_undefined',config=>$config,message=>'Argument \'$perlver\' to gentooize_version was undefined',},)}sub matches_trial_regex_nonlax {my ($perlver,$config,)=@_;return _fatal({code=>'matches_trial_regex_nonlax',config=>$config,want_lax=>1,message=>'Invalid version format (non-numeric data, either _ or -TRIAL ).',message_extra_tainted=>qq{ Version: >$perlver< },version=>$perlver,},)}sub not_decimal_or_trial {my ($perlver,$config)=@_;return _fatal({code=>'not_decimal_or_trial',config=>$config,want_lax=>2,message=>'Invalid version format (non-numeric/ASCII data).',message_extra_tainted=>qq{ Version: >$perlver< },version=>$perlver,},)}sub bad_char {my ($char,$char_ord)=@_;return _fatal({code=>'bad_char',message=>'A Character in the version is not in the ascii-to-int translation table.',message_extra_tainted=>qq{ Missing character: $char ( $char_ord )},},)}sub lax_multi_underscore {my ($version)=@_;return _fatal({code=>'lax_multi_underscore',message=>q{More than one _ in a version is not permitted},message_extra_tainted=>qq{ Version: >$version< },version=>$version,},)}sub _format_error {my ($conf)=@_;my$message=$conf->{message};if (exists$conf->{want_lax}){my$lax=$conf->{want_lax};$message .= qq{\n Set { lax => $lax } for more permissive behaviour. }}if (_env_hasopt('taint_safe')){return$message}if (_env_hasopt('carp_debug')){$conf->{env_config}=_env_opts;require Data::Dumper;local$Data::Dumper::Indent=2;local$Data::Dumper::Purity=0;local$Data::Dumper::Useqq=1;local$Data::Dumper::Terse=1;local$Data::Dumper::Quotekeys=0;return Data::Dumper::Dumper($conf)}if (exists$conf->{'message_extra_tainted'}){$message .= $conf->{'message_extra_tainted'}}if (exists$conf->{'stack'}){for (@{$conf->{stack}}){if ($_->[0]!~ /\AGentoo::PerlMod::Version(?:|::Error|::Env)\z/msx){$message .= sprintf qq[\n - From %s in %s at line %s\n],$_->[0]|| q[],$_->[1]|| q[],$_->[2]|| q[];last}}}return$message}use overload q[""]=>\&_format_error;sub _fatal {my ($conf)=@_;require Carp;$conf->{stack}=[map {[$_->[0],$_->[1],$_->[2],]}map {[caller $_,]}0 .. 10,];return Carp::croak(bless$conf,__PACKAGE__)}1;
+GENTOO_PERLMOD_VERSION_ERROR
+
+$fatpacked{"Sub/Exporter/Progressive.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'SUB_EXPORTER_PROGRESSIVE';
+  package Sub::Exporter::Progressive;use strict;use warnings;our$VERSION='0.001011';use Carp ();use List::Util ();sub import {my ($self,@args)=@_;my$inner_target=caller;my$export_data=sub_export_options($inner_target,@args);my$full_exporter;no strict 'refs';@{"${inner_target}::EXPORT_OK"}=@{$export_data->{exports}};@{"${inner_target}::EXPORT"}=@{$export_data->{defaults}};%{"${inner_target}::EXPORT_TAGS"}=%{$export_data->{tags}};*{"${inner_target}::import"}=sub {use strict;my ($self,@args)=@_;if (List::Util::first {ref ||!m/ \A [:-]? \w+ \z /xm}@args){Carp::croak 'your usage of Sub::Exporter::Progressive requires Sub::Exporter to be installed' unless eval {require Sub::Exporter};$full_exporter ||= Sub::Exporter::build_exporter($export_data->{original});goto$full_exporter}elsif (defined(my$num=List::Util::first {!ref and m/^\d/}@args)){die "cannot export symbols with a leading digit: '$num'"}else {require Exporter;s/ \A - /:/xm for@args;@_=($self,@args);goto \&Exporter::import}};return}my$too_complicated=<<'DEATH';sub sub_export_options {my ($inner_target,$setup,$options)=@_;my@exports;my@defaults;my%tags;if ($setup eq '-setup'){my%options=%$options;OPTIONS: for my$opt (keys%options){if ($opt eq 'exports'){Carp::croak$too_complicated if ref$options{exports}ne 'ARRAY';@exports=@{$options{exports}};Carp::croak$too_complicated if List::Util::first {ref}@exports}elsif ($opt eq 'groups'){%tags=%{$options{groups}};for my$tagset (values%tags){Carp::croak$too_complicated if List::Util::first {/ \A - (?! all \b ) /x || ref}@{$tagset}}@defaults=@{$tags{default}|| []}}else {Carp::croak$too_complicated}}@{$_}=map {/ \A  [:-] all \z /x ? @exports : $_}@{$_}for \@defaults,values%tags;$tags{all}||= [@exports ];my%exports=map {$_=>1}@exports;my@errors=grep {not $exports{$_}}@defaults;Carp::croak join(', ',@errors)." is not exported by the $inner_target module\n" if@errors}return {exports=>\@exports,defaults=>\@defaults,original=>$options,tags=>\%tags,}}1;
+  You are using Sub::Exporter::Progressive, but the features your program uses from
+  Sub::Exporter cannot be implemented without Sub::Exporter, so you might as well
+  just use vanilla Sub::Exporter
+  DEATH
+SUB_EXPORTER_PROGRESSIVE
+
+s/^  //mg for values %fatpacked;
+
+my $class = 'FatPacked::'.(0+\%fatpacked);
+no strict 'refs';
+*{"${class}::files"} = sub { keys %{$_[0]} };
+
+if ($] < 5.008) {
+  *{"${class}::INC"} = sub {
+     if (my $fat = $_[0]{$_[1]}) {
+       return sub {
+         return 0 unless length $fat;
+         $fat =~ s/^([^\n]*\n?)//;
+         $_ = $1;
+         return 1;
+       };
+     }
+     return;
+  };
+}
+
+else {
+  *{"${class}::INC"} = sub {
+    if (my $fat = $_[0]{$_[1]}) {
+      open my $fh, '<', \$fat
+        or die "FatPacker error loading $_[1] (could be a perl installation issue?)";
+      return $fh;
+    }
+    return;
+  };
+}
+
+unshift @INC, bless \%fatpacked, $class;
+  } # END OF FATPACK CODE
+
+## use critic
 use 5.006;
 use strict;
 use warnings;
 
 package Gentoo::PerlMod::Version::Tool;
 
-our $VERSION = '0.7.1';
+our $VERSION = '0.8.0';
 
 # PODNAME: gentoo-perlmod-version.pl
 
@@ -100,7 +162,7 @@ =head1 NAME
 
 =head1 VERSION
 
-version 0.7.1
+version 0.8.0
 
 =head1 SYNOPSIS