ppisar pushed to perl-Dist-Zilla-Plugins-CJM (master). "Revert "Do not use Dist::Zilla::Path::path() becaue it's not in Dist-Zilla 5" (..more)"

From 890890a0a1e2fdc668c0935b59efa4b64630a02c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com&gt;
Date: Thu, 26 Jan 2017 16:34:19 +0100
Subject: Revert "Do not use Dist::Zilla::Path::path() becaue it's not in
 Dist-Zilla 5"

This reverts commit 30c4e1ac83db4825c70da2fe8d24a4a1b9495e0d.
---
 ...ts-from-depreated-methods-to-Dist-Zilla-P.patch | 74 ++++++++++++++++++++++
 perl-Dist-Zilla-Plugins-CJM.spec                   |  4 +-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644
Dist-Zilla-Plugins-CJM-4.27-Migrate-tests-from-depreated-methods-to-Dist-Zilla-P.patch

diff --git
a/Dist-Zilla-Plugins-CJM-4.27-Migrate-tests-from-depreated-methods-to-Dist-Zilla-P.patch
b/Dist-Zilla-Plugins-CJM-4.27-Migrate-tests-from-depreated-methods-to-Dist-Zilla-P.patch
new file mode 100644
index 0000000..4273198
--- /dev/null
+++
b/Dist-Zilla-Plugins-CJM-4.27-Migrate-tests-from-depreated-methods-to-Dist-Zilla-P.patch
@@ -0,0 +1,74 @@
+From 1535d7dab1df2c9e9f62a685d0ed643bda16a6cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com&gt;
+Date: Tue, 24 Jan 2017 18:27:15 +0100
+Subject: [PATCH] Migrate tests from depreated methods to
+ Dist::Zilla::Path::path()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Dist::Zilla::Path 6.008 warns that file() and subdir() methods are
+depracated:
+
+t/arcrel.t .............. 2/6 ->file called on a Dist::Zilla::Path
+object; this will cease to work in Dist::Zilla v7; downstream code
+should be updated to use Path::Tiny API, not Path::Class at t/arcrel.t
+line 82.
+
+This patch uses Dist::Zilla::Path::path() instead.
+
+CPAN RT#119960
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com&gt;
+---
+ t/arcrel.t             | 4 ++--
+ t/gitvercheck.t        | 2 +-
+ t/recommendedprereqs.t | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/t/arcrel.t b/t/arcrel.t
+index 4320f72..9efef9b 100644
+--- a/t/arcrel.t
++++ b/t/arcrel.t
+@@ -79,10 +79,10 @@ sub new_tzil
+ 
+   $tzil->release;
+ 
+-  my $tarball = $tzil->root->file('releases/DZT-Sample-0.001.tar.gz');
++  my $tarball = $tzil->root->path('releases/DZT-Sample-0.001.tar.gz');
+   ok(-e $tarball, 'archived tarball');
+   is($tarball->stat->mode & 0777, 0444, 'tarball is read-only');
+-  ok((not -e $tzil->root->file('DZT-Sample-0.001.tar.gz')),
++  ok((not -e $tzil->root->path('DZT-Sample-0.001.tar.gz')),
+      'tarball was moved');
+ }
+ 
+diff --git a/t/gitvercheck.t b/t/gitvercheck.t
+index b4a312f..5084c35 100644
+--- a/t/gitvercheck.t
++++ b/t/gitvercheck.t
+@@ -96,7 +96,7 @@ sub new_tzil
+   # Something about the copy dzil makes seems to confuse git into
+   # thinking files are modified when they aren't.
+   # Run "git reset --mixed" in the source directory to unconfuse it:
+-  Git::Wrapper->new( $tzil->tempdir->subdir("source")->stringify
)
++  Git::Wrapper->new( $tzil->tempdir->path("source")->stringify )
+               ->reset('--mixed');
+ 
+   $tzil;
+diff --git a/t/recommendedprereqs.t b/t/recommendedprereqs.t
+index aed0764..4b1bf4f 100644
+--- a/t/recommendedprereqs.t
++++ b/t/recommendedprereqs.t
+@@ -21,7 +21,7 @@ my $tzil = Builder->from_config(
+ 
+ $tzil->build;
+ 
+-my $meta =
Parse::CPAN::Meta->load_file($tzil->tempdir->file('build/META.yml'));
++my $meta =
Parse::CPAN::Meta->load_file($tzil->tempdir->path('build/META.yml'));
+ 
+ my $ver = version->new($meta->{'meta-spec'}{version});
+ diag "CPAN::Meta::Spec = $ver";
+-- 
+2.7.4
+
diff --git a/perl-Dist-Zilla-Plugins-CJM.spec b/perl-Dist-Zilla-Plugins-CJM.spec
index bf6a256..b52230a 100644
--- a/perl-Dist-Zilla-Plugins-CJM.spec
+++ b/perl-Dist-Zilla-Plugins-CJM.spec
@@ -9,6 +9,8 @@ Source0:       
http://www.cpan.org/modules/by-module/Dist/Dist-Zilla-Plugins-CJ
 # Adjust tests to Dist-Zilla that reverted to 1.4 YAML META format,
 # CPAN RT#116902
 Patch0:         Dist-Zilla-Plugins-CJM-4.27-Handle-both-CPAN-Meta-Spec-1.4-and-2.x.patch
+# Stop using deprecated Dist::Zilla::Path methods, CPAN RT#119960
+Patch1:        
Dist-Zilla-Plugins-CJM-4.27-Migrate-tests-from-depreated-methods-to-Dist-Zilla-P.patch
 BuildArch:      noarch
 BuildRequires:  findutils
 BuildRequires:  make
@@ -79,6 +81,7 @@ Dist::Zilla, a Perl build an release management tool.
 %prep
 %setup -q -n Dist-Zilla-Plugins-CJM-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor
@@ -101,4 +104,3 @@ make test
 %changelog
 * Tue Jan 24 2017 Petr Pisar <ppisar(a)redhat.com&gt; 4.27-1
 - Specfile autogenerated by cpanspec 1.78.
-- Do not use Dist::Zilla::Path::path() becaue it's not in Dist-Zilla 5
-- 
cgit v1.1


	https://src.fedoraproject.org/cgit/perl-Dist-Zilla-Plugins-CJM.git/commit...