Hello community,
here is the log from the commit of package perl-Config-GitLike for
openSUSE:Factory checked in at 2015-04-18 10:40:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Config-GitLike (Old)
and /work/SRC/openSUSE:Factory/.perl-Config-GitLike.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Config-GitLike"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Config-GitLike/perl-Config-GitLike.changes
2013-08-13 10:18:29.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Config-GitLike.new/perl-Config-GitLike.changes
2015-04-18 10:40:23.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 16 20:54:07 UTC 2015 - co...@suse.com
+
+- updated to 1.16
+ see /usr/share/doc/packages/perl-Config-GitLike/Changes
+
+-------------------------------------------------------------------
Old:
----
Config-GitLike-1.12.tar.gz
New:
----
Config-GitLike-1.16.tar.gz
cpanspec.yml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Config-GitLike.spec ++++++
--- /var/tmp/diff_new_pack.wLiuoq/_old 2015-04-18 10:40:23.000000000 +0200
+++ /var/tmp/diff_new_pack.wLiuoq/_new 2015-04-18 10:40:23.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Config-GitLike
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,15 @@
Name: perl-Config-GitLike
-Version: 1.12
+Version: 1.16
Release: 0
%define cpan_name Config-GitLike
-Summary: git-compatible config file parsing
+Summary: Git-Compatible Config File Parsing
License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/Config-GitLike/
-Source:
http://www.cpan.org/authors/id/A/AL/ALEXMV/%{cpan_name}-%{version}.tar.gz
+Source0:
http://www.cpan.org/authors/id/A/AL/ALEXMV/%{cpan_name}-%{version}.tar.gz
+Source1: cpanspec.yml
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
@@ -32,16 +33,6 @@
BuildRequires: perl(Moo)
BuildRequires: perl(MooX::Types::MooseLike)
BuildRequires: perl(Test::Exception)
-#BuildRequires: perl(Config::GitLike)
-#BuildRequires: perl(inc::Module::Install)
-#BuildRequires: perl(JSON)
-#BuildRequires: perl(LWP::Simple)
-#BuildRequires: perl(Module::Build)
-#BuildRequires: perl(Module::Install::Base)
-#BuildRequires: perl(MooX::Types::MooseLike::Base)
-#BuildRequires: perl(Parse::CPAN::Meta)
-#BuildRequires: perl(TestConfig)
-#BuildRequires: perl(YAML::Tiny)
Requires: perl(Moo)
Requires: perl(MooX::Types::MooseLike)
%{perl_requires}
++++++ Config-GitLike-1.12.tar.gz -> Config-GitLike-1.16.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/Changes
new/Config-GitLike-1.16/Changes
--- old/Config-GitLike-1.12/Changes 2013-08-05 06:15:35.000000000 +0200
+++ new/Config-GitLike-1.16/Changes 2015-02-17 01:47:10.000000000 +0100
@@ -1,97 +1,99 @@
Revision history for perl module Config::GitLike
-1.12 2013-08-05
+1.16 2015-02-16
+ - Canonicalize paths using File::Spec->canonpath; this addresses
+ failures on Windows where /-separated paths were stored in the
+ origins hash, due to Cwd::abs_path returning them
+
+1.15 2014-06-24
+ - Cope with Cwd::abs_path dying on non-existant paths on Windows
+
+1.14 2014-05-20
+ - Fix tests under MacOS, where TMPDIR is, by default, under a symlink
+
+1.13 2014-04-22
+ - Only expand ~ in paths if they are the first character
+ - Implement include.path, as git 1.7.10 and above do
- - Reformat Changes file to follow CPAN::Changes::Spec; no functional
- changes.
+1.12 2013-08-05
+ - Reformat Changes file to follow CPAN::Changes::Spec; no functional
+ changes.
1.11 2013-08-04
-
- - Switch from the deprecated Any::Moose to Moo
+ - Switch from the deprecated Any::Moose to Moo
1.10 2012-11-07
-
- - Provide and API got accessing the original key that a value was set
- with, in a case-preserving way. If the case of the key in a file
- matters, it is now possible to determine.
- - The 'name' value passed to the 'callback' parameter is now no longer
- forced to lower-case, as a consequence.
+ - Provide and API got accessing the original key that a value was set
+ with, in a case-preserving way. If the case of the key in a file
+ matters, it is now possible to determine.
+ - The 'name' value passed to the 'callback' parameter is now no longer
+ forced to lower-case, as a consequence.
1.09 2012-08-10
-
- - Multiple bug fixes concerning filters, including empty filters,
- valueless keys, and applying filters to single values.
- - Add "human" argument to get_all and get_regexp, to match get
- - Add an add_comment method
- - Add an encoding attribute, which adds the appropriate layer on file I/O
- - Enforce that all keys must have sections, as git 1.7.4.4 began doing
+ - Multiple bug fixes concerning filters, including empty filters,
+ valueless keys, and applying filters to single values.
+ - Add "human" argument to get_all and get_regexp, to match get
+ - Add an add_comment method
+ - Add an encoding attribute, which adds the appropriate layer on file I/O
+ - Enforce that all keys must have sections, as git 1.7.4.4 began doing
1.08 2012-02-15
-
- - Fix loading of user_file, broken in dcdd01f, due to unexpanded ~
- (alexmv, cl...@clkao.org)
+ - Fix loading of user_file, broken in dcdd01f, due to unexpanded ~
+ (alexmv, cl...@clkao.org)
1.07 2011-10-25
-
- - Fix a spelling mistake in Config::GitLike::Cascaded
- (gre...@debian.org, forwarded by car...@debian.org)
+ - Fix a spelling mistake in Config::GitLike::Cascaded (gre...@debian.org,
+ forwarded by car...@debian.org)
1.06 2011-10-12
-
- - Allow calling ->load_file as a class method, for simple use cases
- (alexmv)
- - Fix a parsing bug when quoted strings directly adjoined to unquoted
- strings (alexmv)
- - Calling ->load_file on a nonexistant file no longer sets ->is_loaded
- (alexmv)
- - Document that getters implicitly call ->load (alexmv)
- - Make ->dump implicitly call ->load as well (alexmv)
- - Minor POD fixes (alexmv, spang)
+ - Allow calling ->load_file as a class method, for simple use cases
+ (alexmv)
+ - Fix a parsing bug when quoted strings directly adjoined to unquoted
+ strings (alexmv)
+ - Calling ->load_file on a nonexistant file no longer sets ->is_loaded
+ (alexmv)
+ - Document that getters implicitly call ->load (alexmv)
+ - Make ->dump implicitly call ->load as well (alexmv)
+ - Minor POD fixes (alexmv, spang)
1.05 2011-01-07
-
- - support Module::Install::ExtraTests 0.007 (sunnavy)
- - properly set is => 'rw' in inherited classes (trs, alexmv)
- - silence lc warnings on undef under perl 5.12 (iarn...@gmail.com)
+ - support Module::Install::ExtraTests 0.007 (sunnavy)
+ - properly set is => 'rw' in inherited classes (trs, alexmv)
+ - silence lc warnings on undef under perl 5.12 (iarn...@gmail.com)
1.04 2010-04-03
-
- - The functionality of Config::GitLike::Cascaded has been folded into
- Config::GitLike as a "cascade" option, and the subpackage is now
- deprecated. (alexmv)
- - Config::GitLike::Git->new->load("/path/to/git") when the path is
- lacking a ".git", or is a bare repository, now works. (alexmv)
- - Fixed a bug wherein the home directory config file would be loaded
- twice, causing all values to be multiple, if that was your cwd.
- Reported by rjbs. (alexmv)
- - Allow explicitly calling ->load_file without previously having
- called ->load (alexmv)
+ - The functionality of Config::GitLike::Cascaded has been folded into
+ Config::GitLike as a "cascade" option, and the subpackage is now
+ deprecated. (alexmv)
+ - Config::GitLike::Git->new->load("/path/to/git") when the path is lacking
+ a ".git", or is a bare repository, now works. (alexmv)
+ - Fixed a bug wherein the home directory config file would be loaded
+ twice, causing all values to be multiple, if that was your cwd. Reported
+ by rjbs. (alexmv)
+ - Allow explicitly calling ->load_file without previously having called
+ ->load (alexmv)
1.03 2010-01-03
-
- - Filter without replace_all should only replace the _first_ match
- (alexmv)
- - Having a matching filter with multiple and not replace_all does mean
- replacement (alexmv)
- - Fix a test that failed because multiple now works, and we're too smart
- (alexmv)
- - Fix for when ->set_multiple called with no arguments (alexmv)
+ - Filter without replace_all should only replace the _first_ match
+ (alexmv)
+ - Having a matching filter with multiple and not replace_all does mean
+ replacement (alexmv)
+ - Fix a test that failed because multiple now works, and we're too smart
+ (alexmv)
+ - Fix for when ->set_multiple called with no arguments (alexmv)
1.02 2009-08-19
-
- - Bugfixes and extra tests for escaped \ and " in subsections (sunnavy)
- - win32 fixes (sunnavy)
- - auto-escape \ and " in subsections on set (sunnavy)
+ - Bugfixes and extra tests for escaped \ and " in subsections (sunnavy)
+ - win32 fixes (sunnavy)
+ - auto-escape \ and " in subsections on set (sunnavy)
1.01 2009-08-11
-
- - Fix breakage under Mouse due to Moose references
- - New Config::GitLike::Git module for loading config
- files from the git locations
- - various cleanups of Makefile.PL
- - remove extraneous dep Regexp::Common
+ - Fix breakage under Mouse due to Moose references
+ - New Config::GitLike::Git module for loading config files from the git
+ locations
+ - various cleanups of Makefile.PL
+ - remove extraneous dep Regexp::Common
1.00 2009-07-08
-
- - Initial release
+ - Initial release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/META.yml
new/Config-GitLike-1.16/META.yml
--- old/Config-GitLike-1.12/META.yml 2013-08-05 06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/META.yml 2015-02-17 01:47:45.000000000 +0100
@@ -9,7 +9,7 @@
ExtUtils::MakeMaker: 6.59
distribution_type: module
dynamic_config: 1
-generated_by: 'Module::Install version 1.06'
+generated_by: 'Module::Install version 1.14'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -27,4 +27,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: http://github.com/bestpractical/config-gitlike
-version: 1.12
+version: '1.16'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/Makefile.PL
new/Config-GitLike-1.16/Makefile.PL
--- old/Config-GitLike-1.12/Makefile.PL 2013-08-04 06:53:23.000000000 +0200
+++ new/Config-GitLike-1.16/Makefile.PL 2013-09-16 22:05:22.000000000 +0200
@@ -5,7 +5,7 @@
perl_version '5.008';
requires 'Moo';
-requires 'MooX::Types::MooseLike';
+requires 'MooX::Types::MooseLike'; # MooX::Types::MooseLike::Base
build_requires 'Test::Exception';
extra_tests();
sign();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/SIGNATURE
new/Config-GitLike-1.16/SIGNATURE
--- old/Config-GitLike-1.12/SIGNATURE 2013-08-05 06:17:10.000000000 +0200
+++ new/Config-GitLike-1.16/SIGNATURE 2015-02-17 01:48:22.000000000 +0100
@@ -1,5 +1,5 @@
This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.69.
+signed via the Module::Signature module, version 0.73.
To verify the content in this distribution, first make sure you have
Module::Signature installed, then type:
@@ -14,33 +14,33 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-SHA1 8711d1583126203dd593f8a9bcf6f4a3b812bd35 Changes
+SHA1 1f64bbefe5ddfe61d260cfbc49499401980f31af Changes
SHA1 a5f44319e842c051869036cc24fc6e336166716b MANIFEST
-SHA1 20dda454357d1d5fce5281f166500f3c4c1097b8 META.yml
-SHA1 f9754df5160a87231baa88c358e169f3fa5ca24b Makefile.PL
-SHA1 8a924add836b60fb23b25c8506d45945e02f42f4 inc/Module/Install.pm
-SHA1 2d0fad3bf255f8c1e7e1e34eafccc4f595603ddc inc/Module/Install/Base.pm
-SHA1 f0e01fff7d73cd145fbf22331579918d4628ddb0 inc/Module/Install/Can.pm
-SHA1 57890d379d1c66da7743cf1a07ebae00e078a4f2 inc/Module/Install/ExtraTests.pm
-SHA1 7328966e4fda0c8451a6d3850704da0b84ac1540 inc/Module/Install/Fetch.pm
-SHA1 b62ca5e2d58fa66766ccf4d64574f9e1a2250b34 inc/Module/Install/Makefile.pm
-SHA1 1aa925be410bb3bfcd84a16985921f66073cc1d2 inc/Module/Install/Metadata.pm
-SHA1 e4196994fa75e98bdfa2be0bdeeffef66de88171 inc/Module/Install/Win32.pm
-SHA1 c3a6d0d5b84feb3280622e9599e86247d58b0d18 inc/Module/Install/WriteAll.pm
-SHA1 50b1bfef824733541149e7afde5008d4accfd9cf lib/Config/GitLike.pm
-SHA1 7cff3c4e4acc21bf68132f4616e3c59d4d03e979 lib/Config/GitLike/Cascaded.pm
+SHA1 3e6608c0877c6cbda4a49a2c8723d58c2631bb46 META.yml
+SHA1 4519a356848fefbe4023d2df67470e756b8e6d7f Makefile.PL
+SHA1 d2664c57b65686abbfbbe1e71229761625be4922 inc/Module/Install.pm
+SHA1 da41a8d9904f7b409b49a5f6c338d3eb305a2b4b inc/Module/Install/Base.pm
+SHA1 0db0afe19cd298abba248fa089e5525bd5ab3ab6 inc/Module/Install/Can.pm
+SHA1 b3839b235991bae672b2db69de102cccef72ef8f inc/Module/Install/ExtraTests.pm
+SHA1 e7152bfd5ca67d0e33f96d09c59d600bca5c1f15 inc/Module/Install/Fetch.pm
+SHA1 29ee1cb0dc262b00983e3a2f5cf00b538dff5069 inc/Module/Install/Makefile.pm
+SHA1 e963f80cfe255f16e55067d1feb6841cff3ed2fe inc/Module/Install/Metadata.pm
+SHA1 65a1f09af1f4f9e47a98b6b45667c328b1b2f9c0 inc/Module/Install/Win32.pm
+SHA1 f191c49475b3f51775180cd4f7e41e3bdab7f85a inc/Module/Install/WriteAll.pm
+SHA1 86923faf8b945efe9277bc4d9a76fd4e561b89b7 lib/Config/GitLike.pm
+SHA1 806e7cb2ac15a460866e1e1c9c3984ad41d2f850 lib/Config/GitLike/Cascaded.pm
SHA1 a15b556bdedea16668a170ea52e2ff6f415b7295 lib/Config/GitLike/Git.pm
SHA1 8c30f69743e7a9d743d7206f2306ff9f12bb59a0 t/00_use.t
-SHA1 21719c6e6474a3ef23a0e73dabeb7259835b146f t/casing.t
+SHA1 c790ef9b8eacf745879d8a2d21811804b2ac5ffe t/casing.t
SHA1 34c0acc86d479971c0723abac2dc4bbbca3247bb t/comment.t
SHA1 0e98fd5383d929fbe63e3513a7697478c3abbf51 t/encoding.t
SHA1 e884df4ffae7428768c76b54882ba3872d5a3b47 t/lib/TestConfig.pm
SHA1 24a4fbfdeb3268280fa1a10ac5934274c33a9a55 t/t1300-repo-config.t
SHA1 53b21b0f0227909dd299d8adb033f5aff8f5fc42 t/util/translate.pl
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
+Version: GnuPG v1
-iEYEARECAAYFAlH/J0YACgkQMflWJZZAbqDMTwCeNcj75Zb/1O/geF+2DqLoZuh+
-McUAnRZRip1XbZ3nEy32IiZqBQ6+JB7J
-=Li1j
+iEYEARECAAYFAlTij9YACgkQMflWJZZAbqDD8ACeKu7CBgcwfljj5GxgTrMxUyfB
+IWIAnj6t4YesqsWvnZFTW5J5TlCXwrc7
+=MIzZ
-----END PGP SIGNATURE-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install/Base.pm
new/Config-GitLike-1.16/inc/Module/Install/Base.pm
--- old/Config-GitLike-1.12/inc/Module/Install/Base.pm 2013-08-05
06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install/Base.pm 2015-02-17
01:47:44.000000000 +0100
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.06';
+ $VERSION = '1.14';
}
# Suspend handler for "redefined" warnings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install/Can.pm
new/Config-GitLike-1.16/inc/Module/Install/Can.pm
--- old/Config-GitLike-1.12/inc/Module/Install/Can.pm 2013-08-05
06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install/Can.pm 2015-02-17
01:47:44.000000000 +0100
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.06';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install/ExtraTests.pm
new/Config-GitLike-1.16/inc/Module/Install/ExtraTests.pm
--- old/Config-GitLike-1.12/inc/Module/Install/ExtraTests.pm 2013-08-05
06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install/ExtraTests.pm 2015-02-17
01:47:44.000000000 +0100
@@ -6,7 +6,7 @@
use Module::Install::Base;
BEGIN {
- our $VERSION = '0.007';
+ our $VERSION = '0.008';
our $ISCORE = 1;
our @ISA = qw{Module::Install::Base};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install/Fetch.pm
new/Config-GitLike-1.16/inc/Module/Install/Fetch.pm
--- old/Config-GitLike-1.12/inc/Module/Install/Fetch.pm 2013-08-05
06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install/Fetch.pm 2015-02-17
01:47:44.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.06';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install/Makefile.pm
new/Config-GitLike-1.16/inc/Module/Install/Makefile.pm
--- old/Config-GitLike-1.12/inc/Module/Install/Makefile.pm 2013-08-05
06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install/Makefile.pm 2015-02-17
01:47:44.000000000 +0100
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.06';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -133,7 +133,7 @@
return $args;
}
-# For mm args that take multiple space-seperated args,
+# For mm args that take multiple space-separated args,
# append an argument to the current list.
sub makemaker_append {
my $self = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install/Metadata.pm
new/Config-GitLike-1.16/inc/Module/Install/Metadata.pm
--- old/Config-GitLike-1.12/inc/Module/Install/Metadata.pm 2013-08-05
06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install/Metadata.pm 2015-02-17
01:47:44.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.06';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -347,7 +347,7 @@
^ \s*
package \s*
([\w:]+)
- \s* ;
+ [\s|;]*
/ixms
) {
my ($name, $module_name) = ($1, $1);
@@ -705,7 +705,7 @@
my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
my $meta = $yaml[0];
- # Overwrite the non-configure dependency hashs
+ # Overwrite the non-configure dependency hashes
delete $meta->{requires};
delete $meta->{build_requires};
delete $meta->{recommends};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install/Win32.pm
new/Config-GitLike-1.16/inc/Module/Install/Win32.pm
--- old/Config-GitLike-1.12/inc/Module/Install/Win32.pm 2013-08-05
06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install/Win32.pm 2015-02-17
01:47:44.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.06';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install/WriteAll.pm
new/Config-GitLike-1.16/inc/Module/Install/WriteAll.pm
--- old/Config-GitLike-1.12/inc/Module/Install/WriteAll.pm 2013-08-05
06:16:24.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install/WriteAll.pm 2015-02-17
01:47:44.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.06';
+ $VERSION = '1.14';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/inc/Module/Install.pm
new/Config-GitLike-1.16/inc/Module/Install.pm
--- old/Config-GitLike-1.12/inc/Module/Install.pm 2013-08-05
06:16:23.000000000 +0200
+++ new/Config-GitLike-1.16/inc/Module/Install.pm 2015-02-17
01:47:44.000000000 +0100
@@ -17,7 +17,7 @@
# 3. The ./inc/ version of Module::Install loads
# }
-use 5.005;
+use 5.006;
use strict 'vars';
use Cwd ();
use File::Find ();
@@ -31,7 +31,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.06';
+ $VERSION = '1.14';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -156,10 +156,10 @@
sub autoload {
my $self = shift;
my $who = $self->_caller;
- my $cwd = Cwd::cwd();
+ my $cwd = Cwd::getcwd();
my $sym = "${who}::AUTOLOAD";
$sym->{$cwd} = sub {
- my $pwd = Cwd::cwd();
+ my $pwd = Cwd::getcwd();
if ( my $code = $sym->{$pwd} ) {
# Delegate back to parent dirs
goto &$code unless $cwd eq $pwd;
@@ -239,7 +239,7 @@
# ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin);
- unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
+ unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) {
delete $args{prefix};
}
return $args{_self} if $args{_self};
@@ -338,7 +338,7 @@
if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
my $content = Module::Install::_read($subpath . '.pm');
my $in_pod = 0;
- foreach ( split //, $content ) {
+ foreach ( split /\n/, $content ) {
$in_pod = 1 if /^=\w/;
$in_pod = 0 if /^=cut/;
next if ($in_pod || /^=cut/); # skip pod text
@@ -378,6 +378,7 @@
sub _read {
local *FH;
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+ binmode FH;
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
@@ -386,6 +387,7 @@
sub _read {
local *FH;
open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ binmode FH;
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
@@ -416,6 +418,7 @@
sub _write {
local *FH;
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+ binmode FH;
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
@@ -425,6 +428,7 @@
sub _write {
local *FH;
open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ binmode FH;
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
@@ -434,7 +438,7 @@
# _version is for processing module versions (eg, 1.03_05) not
# Perl versions (eg, 5.8.1).
-sub _version ($) {
+sub _version {
my $s = shift || 0;
my $d =()= $s =~ /(\.)/g;
if ( $d >= 2 ) {
@@ -450,12 +454,12 @@
return $l + 0;
}
-sub _cmp ($$) {
+sub _cmp {
_version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
-sub _CLASS ($) {
+sub _CLASS {
(
defined $_[0]
and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/lib/Config/GitLike/Cascaded.pm
new/Config-GitLike-1.16/lib/Config/GitLike/Cascaded.pm
--- old/Config-GitLike-1.12/lib/Config/GitLike/Cascaded.pm 2013-08-04
06:53:23.000000000 +0200
+++ new/Config-GitLike-1.16/lib/Config/GitLike/Cascaded.pm 2013-09-16
22:12:33.000000000 +0200
@@ -26,10 +26,11 @@
This module exists purely for backwards compatibility; its use is
deprecated, and will be removed in a future release.
-=head1 DESCRIPTION
+=head1 METHODS
-This module simply defaults L<Config::GitLike/cascaded> to a true
-value.
+=head2 cascade
+
+This module simply defaults L<Config::GitLike/cascade> to a true value.
=head1 SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/lib/Config/GitLike.pm
new/Config-GitLike-1.16/lib/Config/GitLike.pm
--- old/Config-GitLike-1.12/lib/Config/GitLike.pm 2013-08-05
06:15:51.000000000 +0200
+++ new/Config-GitLike-1.16/lib/Config/GitLike.pm 2015-02-17
01:47:28.000000000 +0100
@@ -1,6 +1,6 @@
package Config::GitLike;
use Moo;
-use MooX::Types::MooseLike::Base qw(Bool HashRef ArrayRef Maybe Str);
+use MooX::Types::MooseLike::Base qw(Bool HashRef ArrayRef Maybe Str Int);
use File::Spec;
use Cwd;
@@ -8,7 +8,7 @@
use Fcntl qw(O_CREAT O_EXCL O_WRONLY);
use 5.008;
-our $VERSION = '1.12';
+our $VERSION = '1.16';
has 'confname' => (
@@ -70,6 +70,18 @@
isa => Maybe[Str],
);
+has 'include' => (
+ is => 'rw',
+ isa => Str,
+ default => sub { "include.path" },
+);
+
+has 'max_depth' => (
+ is => 'rw',
+ isa => Int,
+ default => sub { 10 },
+);
+
sub set_multiple {
my $self = shift;
my ($name, $mult) = (@_, 1);
@@ -160,7 +172,6 @@
sub load_file {
my $ref = shift;
- my ($filename) = @_;
my $self;
if (ref $ref) {
@@ -170,32 +181,73 @@
$self = $ref->new( confname => "" );
}
+ unshift @_, "filename" if @_ % 2;
+ my %args = (
+ filename => undef,
+ silent => 0,
+ relative => Cwd::cwd(),
+ depth => 0,
+ force => 0,
+ includes => 1,
+ @_,
+ );
+
+ my $filename = $args{filename};
+
# Do some canonicalization
- $filename =~ s/~/$ENV{'HOME'}/g;
- $filename = File::Spec->rel2abs($filename);
+ $filename =~ s/^~/$ENV{'HOME'}/g;
+ $filename = eval { Cwd::abs_path( File::Spec->rel2abs($filename,
$args{relative}) ) }
+ || $filename;
+ $filename = File::Spec->canonpath( $filename );
- return $self->data if grep {$_ eq $filename} @{$self->config_files};
+ return $self->data if grep {$_ eq $filename} @{$self->config_files}
+ and not $args{force};
my $c = $self->_read_config($filename);
+ return $self->data if not $c and $args{silent};
unless (defined $c) {
die "Failed to load $filename: $!\n" if not ref $ref;
return;
}
+ # Note this filename as having been loaded
+ push @{$self->config_files}, $filename;
+
+ $self->set_multiple( $self->include ) if $self->include
+ and $args{includes};
+
$self->data({}) unless $self->is_loaded;
$self->parse_content(
content => $c,
callback => sub {
+ my %def = @_;
$self->define(@_, origin => $filename);
+
+ return unless $self->include and $args{includes};
+ my ($sec, $subsec, $name) = _split_key($self->include);
+ return unless lc( $def{section} || '') eq lc( $sec || '');
+ return unless ($def{subsection} || '') eq ($subsec || '');
+ return unless lc( $def{name} || '') eq lc( $name || '');
+
+ die "Exceeded maximum include depth (".$self->max_depth.") ".
+ "while including $def{value} from $filename"
+ if $args{depth} > $self->max_depth;
+
+ my (undef, $dir, undef) = File::Spec->splitpath($filename);
+
+ $self->load_file(
+ filename => $def{value},
+ silent => 1,
+ relative => $dir,
+ depth => $args{depth}+1,
+ force => 1,
+ );
},
error => sub {
error_callback( @_, filename => $filename );
},
);
- # note this filename as having been loaded
- push @{$self->config_files}, $filename;
-
return $self->data;
}
@@ -1655,6 +1707,28 @@
file cannot be read. If called as an instance method, returns undef on
failure.
+This method may also be passed additional key-value parameters which
+control how the file is loaded:
+
+=over
+
+=item silent
+
+Defaults to off; if set, merely returns instead of die'ing if the file
+cannot be found or read.
+
+=item includes
+
+Defaults to on; if passed a false value, ignores the L</include>
+directive.
+
+=item force
+
+Defaults to off; if set, will re-load a file even if it was previously
+loaded.
+
+=back
+
=head2 parse_content
Parameters:
@@ -1704,6 +1778,15 @@
the line, and contents of the bad line; if you find the need to use
L<"parse_content"> elsewhere, you may find it useful as well.
+=head2 include ( $name )
+
+When reading configuration files, Git versions 1.7.10 and later parse
+the C<include.path> key as a directive to include an additional
+configuration file. This option controls the equivalent behavior;
+setting it to a false value will disable inclusion, and any true value
+will be taken as the name of the configuration parameter which controls
+inclusion. Defaults to C<include.path>, as Git does.
+
=head2 set_multiple( $name )
Mark the key string C<$name> as containing multiple values.
@@ -1723,7 +1806,7 @@
name => 'str'
value => 'str'
-Given a section, a key name, and a value¸ store this information
+Given a section, a key name, and a value, store this information
in memory in the config object.
Returns the value that was just defined on success, or undef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Config-GitLike-1.12/t/casing.t
new/Config-GitLike-1.16/t/casing.t
--- old/Config-GitLike-1.12/t/casing.t 2012-11-07 18:21:48.000000000 +0100
+++ new/Config-GitLike-1.16/t/casing.t 2014-05-21 01:07:01.000000000 +0200
@@ -3,11 +3,12 @@
use Test::More;
use File::Spec;
+use Cwd;
use File::Temp qw/tempdir/;
use lib 't/lib';
use TestConfig;
-my $config_dirname = tempdir( CLEANUP => !$ENV{CONFIG_GITLIKE_DEBUG} );
+my $config_dirname = Cwd::abs_path( tempdir( CLEANUP =>
!$ENV{CONFIG_GITLIKE_DEBUG} ) );
my $config_filename = File::Spec->catfile( $config_dirname, 'config' );
diag "config file is: $config_filename" if $ENV{TEST_VERBOSE};
++++++ cpanspec.yml ++++++
---
#description_paragraphs: 3
#no_testing: broken upstream
#sources:
# - source1
# - source2
#patches:
# foo.patch: -p1
# bar.patch:
#preamble: |-
# BuildRequires: gcc-c++
#post_prep: |-
# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'`
# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL
#post_install: |-
# sed on %{name}.files
#license: SUSE-NonFree
#skip_noarch: 1
#custom_build: -
#./Build build flags=%{?_smp_mflags} --myflag
