Hello community,
here is the log from the commit of package perl-DBIx-Class-Fixtures for
openSUSE:Factory checked in at 2015-04-18 10:40:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-DBIx-Class-Fixtures (Old)
and /work/SRC/openSUSE:Factory/.perl-DBIx-Class-Fixtures.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-DBIx-Class-Fixtures"
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-DBIx-Class-Fixtures/perl-DBIx-Class-Fixtures.changes
2015-02-25 02:16:40.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.perl-DBIx-Class-Fixtures.new/perl-DBIx-Class-Fixtures.changes
2015-04-18 10:40:29.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Apr 16 20:25:50 UTC 2015 - co...@suse.com
+
+- updated to 1.001028
+ see /usr/share/doc/packages/perl-DBIx-Class-Fixtures/Changes
+
+ 1.001028 2015-01-05 00:40:41+00:00 Europe/London
+
+ - releasing as stable
+
+ 1.001027_02 2014-12-30 19:50:50+00:00 Europe/London
+
+ - changed tests to use portable directory management
+
+ 1.001027_01 2014-12-26 17:06:08+00:00 Europe/London
+
+ - Fix fixture filenames to be compatible with ntfs systems - mrf++
+
+-------------------------------------------------------------------
Old:
----
DBIx-Class-Fixtures-1.001026.tar.gz
New:
----
DBIx-Class-Fixtures-1.001028.tar.gz
cpanspec.yml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-DBIx-Class-Fixtures.spec ++++++
--- /var/tmp/diff_new_pack.pHLwkY/_old 2015-04-18 10:40:30.000000000 +0200
+++ /var/tmp/diff_new_pack.pHLwkY/_new 2015-04-18 10:40:30.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-DBIx-Class-Fixtures
#
-# Copyright (c) 2014 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-DBIx-Class-Fixtures
-Version: 1.001026
+Version: 1.001028
Release: 0
%define cpan_name DBIx-Class-Fixtures
Summary: Dump data and repopulate a database using rules
License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/DBIx-Class-Fixtures/
-Source:
http://www.cpan.org/authors/id/S/SK/SKAUFMAN/%{cpan_name}-%{version}.tar.gz
+Source0:
http://www.cpan.org/authors/id/S/SK/SKAUFMAN/%{cpan_name}-%{version}.tar.gz
+Source1: cpanspec.yml
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
@@ -41,9 +42,8 @@
BuildRequires: perl(DateTime::Format::Pg)
BuildRequires: perl(DateTime::Format::SQLite) >= 0.1
BuildRequires: perl(File::Copy::Recursive) >= 0.38
-BuildRequires: perl(File::Path) >= 2.09
-BuildRequires: perl(File::Spec::Functions) >= 3.4
BuildRequires: perl(Hash::Merge) >= 0.1
+BuildRequires: perl(IO::All) >= 0.85
BuildRequires: perl(JSON::Syck) >= 1.27
BuildRequires: perl(Path::Class) >= 0.32
BuildRequires: perl(Scalar::Util) >= 1.27
@@ -60,9 +60,8 @@
Requires: perl(DateTime::Format::Pg)
Requires: perl(DateTime::Format::SQLite) >= 0.1
Requires: perl(File::Copy::Recursive) >= 0.38
-Requires: perl(File::Path) >= 2.09
-Requires: perl(File::Spec::Functions) >= 3.4
Requires: perl(Hash::Merge) >= 0.1
+Requires: perl(IO::All) >= 0.85
Requires: perl(JSON::Syck) >= 1.27
Requires: perl(Path::Class) >= 0.32
Requires: perl(Scalar::Util) >= 1.27
++++++ DBIx-Class-Fixtures-1.001026.tar.gz ->
DBIx-Class-Fixtures-1.001028.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/Changes
new/DBIx-Class-Fixtures-1.001028/Changes
--- old/DBIx-Class-Fixtures-1.001026/Changes 2014-12-01 17:43:14.000000000
+0100
+++ new/DBIx-Class-Fixtures-1.001028/Changes 2015-01-05 01:40:44.000000000
+0100
@@ -1,5 +1,17 @@
Revision history for DBIx-Class-Fixtures
+1.001028 2015-01-05 00:40:41+00:00 Europe/London
+
+- releasing as stable
+
+1.001027_02 2014-12-30 19:50:50+00:00 Europe/London
+
+- changed tests to use portable directory management
+
+1.001027_01 2014-12-26 17:06:08+00:00 Europe/London
+
+- Fix fixture filenames to be compatible with ntfs systems - mrf++
+
1.001026 2014-12-01 16:43:10+00:00 Europe/London
- bugfix: not relying on $src->from to be a string anymore, use $src->name or
$src->source_name. mrf++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/META.yml
new/DBIx-Class-Fixtures-1.001028/META.yml
--- old/DBIx-Class-Fixtures-1.001026/META.yml 2014-12-01 17:43:14.000000000
+0100
+++ new/DBIx-Class-Fixtures-1.001028/META.yml 2015-01-05 01:40:44.000000000
+0100
@@ -30,9 +30,8 @@
DateTime::Format::Pg: '0'
DateTime::Format::SQLite: '0.1'
File::Copy::Recursive: '0.38'
- File::Path: '2.09'
- File::Spec::Functions: '3.4'
Hash::Merge: '0.1'
+ IO::All: '0.85'
JSON::Syck: '1.27'
MIME::Base64: '0'
Path::Class: '0.32'
@@ -40,8 +39,9 @@
Test::Compile::Internal: '0'
perl: v5.6.1
resources:
+ bugtracker: https://github.com/dbsrgits/DBIx-Class-Fixtures/issues
repository: https://github.com/dbsrgits/DBIx-Class-Fixtures.git
-version: '1.001026'
+version: '1.001028'
x_authority: cpan:SKAUFMAN
x_contributors:
- 'Ash Berlin <ash_git...@firemirror.com>'
@@ -57,11 +57,12 @@
- 'John Napiorkowski <jjnapi...@cpan.org>'
- 'Justin Hunter <justin.d.hun...@gmail.com>'
- 'Luke Saunders <luke.saund...@gmail.com>'
+ - 'luke saunders <luke.saund...@gmail.com>'
- 'Matt S Trout <m...@shadowcat.co.uk>'
- 'Mike Francis <ungri...@gmail.com>'
- 'Peter Rabbitson <de...@rabbit.us>'
- 'Ramin Motakef <ra...@motakef.de>'
- 'Rob Kinyon <rob.kin...@gmail.com>'
- - 'Tim Bunce <tim.bu...@ig.co.uk>'
- - 'luke saunders <luke.saund...@gmail.com>'
+ - 'Samuel Kaufman <skauf...@cpan.org>'
- 'skaufman <s...@socialflow.com>'
+ - 'Tim Bunce <tim.bu...@ig.co.uk>'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/Makefile.PL
new/DBIx-Class-Fixtures-1.001028/Makefile.PL
--- old/DBIx-Class-Fixtures-1.001026/Makefile.PL 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/Makefile.PL 2015-01-05
01:40:44.000000000 +0100
@@ -37,9 +37,8 @@
"DateTime::Format::Pg" => 0,
"DateTime::Format::SQLite" => "0.1",
"File::Copy::Recursive" => "0.38",
- "File::Path" => "2.09",
- "File::Spec::Functions" => "3.4",
"Hash::Merge" => "0.1",
+ "IO::All" => "0.85",
"JSON::Syck" => "1.27",
"MIME::Base64" => 0,
"Path::Class" => "0.32",
@@ -52,7 +51,7 @@
"IPC::Open3" => 0,
"Test::More" => "0.98"
},
- "VERSION" => "1.001026",
+ "VERSION" => "1.001028",
"test" => {
"TESTS" => "t/*.t"
}
@@ -73,10 +72,9 @@
"DateTime::Format::SQLite" => "0.1",
"ExtUtils::MakeMaker" => "6.59",
"File::Copy::Recursive" => "0.38",
- "File::Path" => "2.09",
"File::Spec" => 0,
- "File::Spec::Functions" => "3.4",
"Hash::Merge" => "0.1",
+ "IO::All" => "0.85",
"IO::Handle" => 0,
"IPC::Open3" => 0,
"JSON::Syck" => "1.27",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/README
new/DBIx-Class-Fixtures-1.001028/README
--- old/DBIx-Class-Fixtures-1.001026/README 2014-12-01 17:43:14.000000000
+0100
+++ new/DBIx-Class-Fixtures-1.001028/README 2015-01-05 01:40:44.000000000
+0100
@@ -1,7 +1,7 @@
This archive contains the distribution DBIx-Class-Fixtures,
-version 1.001026:
+version 1.001028:
Dump data and repopulate a database using rules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/dist.ini
new/DBIx-Class-Fixtures-1.001028/dist.ini
--- old/DBIx-Class-Fixtures-1.001026/dist.ini 2014-12-01 17:43:14.000000000
+0100
+++ new/DBIx-Class-Fixtures-1.001028/dist.ini 2015-01-05 01:40:44.000000000
+0100
@@ -11,8 +11,7 @@
do_munging = 0
[MetaResources]
-;Old issues are still in RT, if I move em over I'll change it to github.
-;bugtracker.web = https://github.com/dbsrgits/DBIx-Class-Fixtures/issues
+bugtracker.web = https://github.com/dbsrgits/DBIx-Class-Fixtures/issues
repository.url = https://github.com/dbsrgits/DBIx-Class-Fixtures.git
repository.web = https://github.com/dbsrgits/DBIx-Class-Fixtures
repository.type = git
@@ -21,6 +20,7 @@
[NextRelease]
[Git::Tag]
+[Git::Contributors]
[VersionFromModule]
[Git::Push]
@@ -41,7 +41,6 @@
[ConfirmRelease]
[UploadToCPAN]
-[ContributorsFromGit]
[GatherDir]
exclude_match=.*\.db
exclude_filename = Makefile.PL
@@ -72,8 +71,6 @@
DateTime::Format::Pg = 0
DateTime::Format::SQLite = 0.1
File::Copy::Recursive = 0.38
-File::Path = 2.09
-File::Spec::Functions = 3.4
Hash::Merge = 0.1
JSON::Syck = 1.27
MIME::Base64 = 0
@@ -81,3 +78,4 @@
Scalar::Util = 1.27
perl = 5.6.1
Test::Compile::Internal = 0
+IO::All = 0.85
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/DBI/Pg.pm
new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/DBI/Pg.pm
--- old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/DBI/Pg.pm
2014-12-01 17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/DBI/Pg.pm
2015-01-05 01:40:44.000000000 +0100
@@ -1,5 +1,5 @@
package DBIx::Class::Fixtures::DBI::Pg;
-$DBIx::Class::Fixtures::DBI::Pg::VERSION = '1.001026';
+$DBIx::Class::Fixtures::DBI::Pg::VERSION = '1.001028';
use strict;
use warnings;
use base qw/DBIx::Class::Fixtures::DBI/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/DBI/mysql.pm
new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/DBI/mysql.pm
--- old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/DBI/mysql.pm
2014-12-01 17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/DBI/mysql.pm
2015-01-05 01:40:44.000000000 +0100
@@ -1,5 +1,5 @@
package DBIx::Class::Fixtures::DBI::mysql;
-$DBIx::Class::Fixtures::DBI::mysql::VERSION = '1.001026';
+$DBIx::Class::Fixtures::DBI::mysql::VERSION = '1.001028';
use strict;
use warnings;
use base qw/DBIx::Class::Fixtures::DBI/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/DBI.pm
new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/DBI.pm
--- old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/DBI.pm
2014-12-01 17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/DBI.pm
2015-01-05 01:40:44.000000000 +0100
@@ -1,5 +1,5 @@
package DBIx::Class::Fixtures::DBI;
-$DBIx::Class::Fixtures::DBI::VERSION = '1.001026';
+$DBIx::Class::Fixtures::DBI::VERSION = '1.001028';
use strict;
use warnings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/External/File.pm
new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/External/File.pm
--- old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/External/File.pm
2014-12-01 17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/External/File.pm
2015-01-05 01:40:44.000000000 +0100
@@ -1,5 +1,5 @@
package DBIx::Class::Fixtures::External::File;
-$DBIx::Class::Fixtures::External::File::VERSION = '1.001026';
+$DBIx::Class::Fixtures::External::File::VERSION = '1.001028';
use strict;
use warnings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/Schema.pm
new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/Schema.pm
--- old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures/Schema.pm
2014-12-01 17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures/Schema.pm
2015-01-05 01:40:44.000000000 +0100
@@ -1,5 +1,5 @@
package DBIx::Class::Fixtures::Schema;
-$DBIx::Class::Fixtures::Schema::VERSION = '1.001026';
+$DBIx::Class::Fixtures::Schema::VERSION = '1.001028';
use strict;
use warnings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures.pm
new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures.pm
--- old/DBIx-Class-Fixtures-1.001026/lib/DBIx/Class/Fixtures.pm 2014-12-01
17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/lib/DBIx/Class/Fixtures.pm 2015-01-05
01:40:44.000000000 +0100
@@ -6,18 +6,15 @@
use DBIx::Class 0.08100;
use DBIx::Class::Exception;
use Class::Accessor::Grouped;
-use Path::Class qw(dir file tempdir);
-use File::Spec::Functions 'catfile', 'catdir';
use Config::Any::JSON;
use Data::Dump::Streamer;
use Data::Visitor::Callback;
-use File::Path;
-use File::Copy::Recursive qw/dircopy/;
-use File::Copy qw/move/;
use Hash::Merge qw( merge );
use Data::Dumper;
use Class::C3::Componentised;
use MIME::Base64;
+use IO::All;
+use File::Temp qw/tempdir/;
use base qw(Class::Accessor::Grouped);
@@ -26,7 +23,7 @@
__PACKAGE__->mk_group_accessors( 'simple' => qw/config_dir
_inherited_attributes debug schema_class dumped_objects config_attrs/);
-our $VERSION = '1.001026';
+our $VERSION = '1.001028';
$VERSION = eval $VERSION;
@@ -40,8 +37,8 @@
...
- my $fixtures = DBIx::Class::Fixtures->new({
- config_dir => '/home/me/app/fixture_configs'
+ my $fixtures = DBIx::Class::Fixtures->new({
+ config_dir => '/home/me/app/fixture_configs'
});
$fixtures->dump({
@@ -89,7 +86,7 @@
}
]
}
- ]
+ ]
}
This will fetch artists with primary keys 1 and 3, the producer with primary
@@ -115,12 +112,12 @@
{
"class": "Artist",
"ids": ["1", "3"]
- },
+ },
{
"class": "Producer",
"ids": ["5"],
"fetch": [
- {
+ {
"rel": "artists",
"quantity": "2"
}
@@ -150,11 +147,11 @@
"rel": "cds",
"quantity": "all"
} ]
- },
+ },
{
"class": "Producer",
"ids": ["5"],
- "fetch": [ {
+ "fetch": [ {
"rel": "artists",
"quantity": "2",
"fetch": [ {
@@ -326,7 +323,7 @@
=head2 has_many
Specifies whether to fetch has_many rels for this set. Must be a hash
-containing keys fetch and quantity.
+containing keys fetch and quantity.
Set fetch to 1 if you want to fetch them, and quantity to either 'all' or an
integer.
@@ -442,16 +439,16 @@
=over
-=item config_dir:
+=item config_dir:
required. must contain a valid path to the directory in which your .json
configs reside.
-=item debug:
+=item debug:
determines whether to be verbose
-=item ignore_sql_errors:
+=item ignore_sql_errors:
ignore errors on import of DDL etc
@@ -501,20 +498,20 @@
return DBIx::Class::Exception->throw('config_dir param not specified');
}
- my $config_dir = dir($params->{config_dir});
+ my $config_dir = io->dir($params->{config_dir});
unless (-e $params->{config_dir}) {
return DBIx::Class::Exception->throw('config_dir directory doesn\'t
exist');
}
my $self = {
- config_dir => $config_dir,
+ config_dir => $config_dir,
_inherited_attributes => [qw/datetime_relative might_have rules
belongs_to/],
- debug => $params->{debug} || 0,
- ignore_sql_errors => $params->{ignore_sql_errors},
- dumped_objects => {},
- use_create => $params->{use_create} || 0,
- use_find_or_create => $params->{use_find_or_create} || 0,
- config_attrs => $params->{config_attrs} || {},
+ debug => $params->{debug} || 0,
+ ignore_sql_errors => $params->{ignore_sql_errors},
+ dumped_objects => {},
+ use_create => $params->{use_create} || 0,
+ use_find_or_create => $params->{use_find_or_create} || 0,
+ config_attrs => $params->{config_attrs} || {},
};
bless $self, $class;
@@ -532,10 +529,10 @@
my @config_sets;
sub available_config_sets {
@config_sets = scalar(@config_sets) ? @config_sets : map {
- $_->basename;
- } grep {
- -f $_ && $_=~/json$/;
- } dir((shift)->config_dir)->children;
+ $_->filename;
+ } grep {
+ -f "$_" && $_=~/json$/;
+ } shift->config_dir->all;
}
=head2 dump
@@ -600,16 +597,16 @@
my $schema = $params->{schema};
my $config;
if ($params->{config}) {
- $config = ref $params->{config} eq 'HASH' ?
- $params->{config} :
+ $config = ref $params->{config} eq 'HASH' ?
+ $params->{config} :
do {
#read config
- my $config_file = $self->config_dir->file($params->{config});
- $self->load_config_file($config_file);
+ my $config_file = io->catfile($self->config_dir, $params->{config});
+ $self->load_config_file("$config_file");
};
} elsif ($params->{all}) {
my %excludes = map {$_=>1} @{$params->{excludes}||[]};
- $config = {
+ $config = {
might_have => { fetch => 0 },
has_many => { fetch => 0 },
belongs_to => { fetch => 0 },
@@ -624,16 +621,16 @@
DBIx::Class::Exception->throw('must pass config or set all');
}
- my $output_dir = dir($params->{directory});
- unless (-e $output_dir) {
+ my $output_dir = io->dir($params->{directory});
+ unless (-e "$output_dir") {
$output_dir->mkpath ||
DBIx::Class::Exception->throw("output directory does not exist at
$output_dir");
}
$self->msg("generating fixtures");
- my $tmp_output_dir = tempdir();
+ my $tmp_output_dir = io->dir(tempdir);
- if (-e $tmp_output_dir) {
+ if (-e "$tmp_output_dir") {
$self->msg("- clearing existing $tmp_output_dir");
$tmp_output_dir->rmtree;
}
@@ -641,14 +638,10 @@
$tmp_output_dir->mkpath;
# write version file (for the potential benefit of populate)
- $tmp_output_dir->file('_dumper_version')
- ->openw
- ->print($VERSION);
+ $tmp_output_dir->file('_dumper_version')->print($VERSION);
# write our current config set
- $tmp_output_dir->file('_config_set')
- ->openw
- ->print( Dumper $config );
+ $tmp_output_dir->file('_config_set')->print( Dumper $config );
$config->{rules} ||= {};
my @sources = sort { $a->{class} cmp $b->{class} } @{delete $config->{sets}};
@@ -670,22 +663,22 @@
if ($source->{cond} and ref $source->{cond} eq 'HASH') {
# if value starts with \ assume it's meant to be passed as a scalar ref
# to dbic. ideally this would substitute deeply
- $source->{cond} = {
- map {
- $_ => ($source->{cond}->{$_} =~ s/^\\//) ? \$source->{cond}->{$_}
- : $source->{cond}->{$_}
- } keys %{$source->{cond}}
+ $source->{cond} = {
+ map {
+ $_ => ($source->{cond}->{$_} =~ s/^\\//) ? \$source->{cond}->{$_}
+ : $source->{cond}->{$_}
+ } keys %{$source->{cond}}
};
}
- $rs = $rs->search($source->{cond}, { join => $source->{join} })
+ $rs = $rs->search($source->{cond}, { join => $source->{join} })
if $source->{cond};
$self->msg("- dumping $source->{class}");
my %source_options = ( set => { %{$config}, %{$source} } );
if ($source->{quantity}) {
- $rs = $rs->search({}, { order_by => $source->{order_by} })
+ $rs = $rs->search({}, { order_by => $source->{order_by} })
if $source->{order_by};
if ($source->{quantity} =~ /^\d+$/) {
@@ -709,24 +702,24 @@
}
# clear existing output dir
- foreach my $child ($output_dir->children) {
+ foreach my $child ($output_dir->all) {
if ($child->is_dir) {
- next if ($child eq $tmp_output_dir);
- if (grep { $_ =~ /\.fix/ } $child->children) {
+ next if ("$child" eq "$tmp_output_dir");
+ if (grep { $_ =~ /\.fix/ } $child->all) {
$child->rmtree;
}
} elsif ($child =~ /_dumper_version$/) {
- $child->remove;
+ $child->unlink;
}
}
$self->msg("- moving temp dir to $output_dir");
- dircopy($tmp_output_dir, $output_dir);
+ $tmp_output_dir->copy("$output_dir");
- if (-e $output_dir) {
+ if (-e "$output_dir") {
$self->msg("- clearing tmp dir $tmp_output_dir");
# delete existing fixture set
- $tmp_output_dir->remove;
+ $tmp_output_dir->rmtree;
}
$self->msg("done");
@@ -737,7 +730,7 @@
sub load_config_file {
my ($self, $config_file) = @_;
DBIx::Class::Exception->throw("config does not exist at $config_file")
- unless -e $config_file;
+ unless -e "$config_file";
my $config = Config::Any::JSON->load($config_file);
@@ -747,27 +740,27 @@
DBIx::Class::Exception->throw(
'includes params of config must be an array ref of hashrefs'
) unless ref $incs eq 'ARRAY';
-
+
foreach my $include_config (@$incs) {
DBIx::Class::Exception->throw(
'includes params of config must be an array ref of hashrefs'
) unless (ref $include_config eq 'HASH') && $include_config->{file};
-
+
my $include_file = $self->config_dir->file($include_config->{file});
DBIx::Class::Exception->throw("config does not exist at $include_file")
- unless -e $include_file;
-
+ unless -e "$include_file";
+
my $include = Config::Any::JSON->load($include_file);
$self->msg($include);
$config = merge( $config, $include );
}
delete $config->{includes};
}
-
+
# validate config
return DBIx::Class::Exception->throw('config has no sets')
- unless $config && $config->{sets} &&
+ unless $config && $config->{sets} &&
ref $config->{sets} eq 'ARRAY' && scalar @{$config->{sets}};
$config->{might_have} = { fetch => 0 } unless exists $config->{might_have};
@@ -784,9 +777,9 @@
$self->dump_object($row, $params);
}
}
-
+
sub dump_object {
- my ($self, $object, $params) = @_;
+ my ($self, $object, $params) = @_;
my $set = $params->{set};
my $v = Data::Visitor::Callback->new(
@@ -811,21 +804,21 @@
},
catfile => sub {
my ($self, @args) = @_;
- catfile(@args);
+ "".io->catfile(@args);
},
catdir => sub {
my ($self, @args) = @_;
- catdir(@args);
+ "".io->catdir(@args);
},
};
- my $subsre = join( '|', keys %$subs );
+ my $subsre = join( '|', keys %$subs );
$_ =~ s{__($subsre)(?:\((.+?)\))?__}{ $subs->{ $1 }->( $self, $2 ?
split( /,/, $2 ) : () ) }eg;
return $_;
}
);
-
+
$v->visit( $set );
die 'no dir passed to dump_object' unless $params->{set_dir};
@@ -834,7 +827,7 @@
my @inherited_attrs = @{$self->_inherited_attributes};
my @pk_vals = map {
- $object->get_column($_)
+ $object->get_column($_)
} $object->primary_columns;
my $key = join("\0", @pk_vals);
@@ -844,17 +837,17 @@
# write dir and gen filename
- my $source_dir = $params->{set_dir}->subdir($self->_name_for_source($src));
+ my $source_dir = io->catdir($params->{set_dir},
$self->_name_for_source($src));
$source_dir->mkpath(0, 0777);
- # strip dir separators from file name
- my $file = $source_dir->file(
- join('-', map { s|[/\\]|_|g; $_; } @pk_vals) . '.fix'
+ # Convert characters not allowed on windows
+ my $file = io->catfile("$source_dir",
+ join('-', map { s|[/\\:\*\|\?"<>]|_|g; $_; } @pk_vals) . '.fix'
);
# write file
unless ($exists) {
- $self->msg('-- dumping ' . $file->stringify, 2);
+ $self->msg('-- dumping ' . "$file", 2);
my %ds = $object->get_columns;
if($set->{external}) {
@@ -905,7 +898,7 @@
# do the actual dumping
my $serialized = Dump(\%ds)->Out();
- $file->openw->print($serialized);
+ $file->print($serialized);
}
# don't bother looking at rels unless we are actually planning to dump at
least one type
@@ -926,19 +919,19 @@
# if belongs_to or might_have with might_have param set or has_many with
# has_many param set then
if (
- ( $info->{attrs}{accessor} eq 'single' &&
- (!$info->{attrs}{join_type} || $might_have)
+ ( $info->{attrs}{accessor} eq 'single' &&
+ (!$info->{attrs}{join_type} || $might_have)
)
- || $info->{attrs}{accessor} eq 'filter'
- ||
+ || $info->{attrs}{accessor} eq 'filter'
+ ||
($info->{attrs}{accessor} eq 'multi' && $has_many)
) {
- my $related_rs = $object->related_resultset($name);
+ my $related_rs = $object->related_resultset($name);
my $rule = $set->{rules}->{$related_rs->result_source->source_name};
# these parts of the rule only apply to has_many rels
- if ($rule && $info->{attrs}{accessor} eq 'multi') {
+ if ($rule && $info->{attrs}{accessor} eq 'multi') {
$related_rs = $related_rs->search(
- $rule->{cond},
+ $rule->{cond},
{ join => $rule->{join} }
) if ($rule->{cond});
@@ -948,23 +941,23 @@
) if ($rule->{quantity} && $rule->{quantity} ne 'all');
$related_rs = $related_rs->search(
- {},
+ {},
{ order_by => $rule->{order_by} }
- ) if ($rule->{order_by});
+ ) if ($rule->{order_by});
}
- if ($set->{has_many}{quantity} &&
+ if ($set->{has_many}{quantity} &&
$set->{has_many}{quantity} =~ /^\d+$/) {
$related_rs = $related_rs->search(
- {},
+ {},
{ rows => $set->{has_many}->{quantity} }
);
}
my %c_params = %{$params};
# inherit date param
- my %mock_set = map {
- $_ => $set->{$_}
+ my %mock_set = map {
+ $_ => $set->{$_}
} grep { $set->{$_} } @inherited_attrs;
$c_params{set} = \%mock_set;
@@ -972,14 +965,14 @@
if $rule && $rule->{fetch};
$self->dump_rs($related_rs, \%c_params);
- }
+ }
}
}
-
+
return unless $set && $set->{fetch};
foreach my $fetch (@{$set->{fetch}}) {
# inherit date param
- $fetch->{$_} = $set->{$_} foreach
+ $fetch->{$_} = $set->{$_} foreach
grep { !$fetch->{$_} && $set->{$_} } @inherited_attrs;
my $related_rs = $object->related_resultset($fetch->{rel});
my $rule = $set->{rules}->{$related_rs->result_source->source_name};
@@ -991,22 +984,22 @@
} elsif ($rule->{fetch}) {
$fetch = merge( $fetch, { fetch => $rule->{fetch} } );
}
- }
+ }
- die "relationship $fetch->{rel} does not exist for " . $src->source_name
+ die "relationship $fetch->{rel} does not exist for " . $src->source_name
unless ($related_rs);
if ($fetch->{cond} and ref $fetch->{cond} eq 'HASH') {
# if value starts with \ assume it's meant to be passed as a scalar ref
# to dbic. ideally this would substitute deeply
- $fetch->{cond} = { map {
- $_ => ($fetch->{cond}->{$_} =~ s/^\\//) ? \$fetch->{cond}->{$_}
- : $fetch->{cond}->{$_}
+ $fetch->{cond} = { map {
+ $_ => ($fetch->{cond}->{$_} =~ s/^\\//) ? \$fetch->{cond}->{$_}
+ : $fetch->{cond}->{$_}
} keys %{$fetch->{cond}} };
}
$related_rs = $related_rs->search(
- $fetch->{cond},
+ $fetch->{cond},
{ join => $fetch->{join} }
) if $fetch->{cond};
@@ -1015,7 +1008,7 @@
{ rows => $fetch->{quantity} }
) if $fetch->{quantity} && $fetch->{quantity} ne 'all';
$related_rs = $related_rs->search(
- {},
+ {},
{ order_by => $fetch->{order_by} }
) if $fetch->{order_by};
@@ -1054,8 +1047,8 @@
$pre_schema->storage->txn_do(sub {
$pre_schema->storage->with_deferred_fk_checks(sub {
foreach my $table (@tables) {
- eval {
- $dbh->do("drop table $table" . ($params->{cascade} ? ' cascade' :
'') )
+ eval {
+ $dbh->do("drop table $table" . ($params->{cascade} ? ' cascade' :
'') )
};
}
});
@@ -1107,7 +1100,7 @@
configs => [qw/one.json other.json/],
directory_template => sub {
my ($fixture, $params, $set) = @_;
- return File::Spec->catdir('var', 'fixtures',
$params->{schema}->version, $set);
+ return io->catdir('var', 'fixtures', $params->{schema}->version, $set);
},
});
@@ -1150,7 +1143,7 @@
schema => $schema,
directory_template => sub {
my ($fixture, $params, $set) = @_;
- return File::Spec->catdir('var', 'fixtures',
$params->{schema}->version, $set);
+ return io->catdir('var', 'fixtures', $params->{schema}->version, $set);
},
});
@@ -1176,13 +1169,13 @@
$fixtures->populate( {
# directory to look for fixtures in, as specified to dump
- directory => '/home/me/app/fixtures',
+ directory => '/home/me/app/fixtures',
# DDL to deploy
- ddl => '/home/me/app/sql/ddl.sql',
+ ddl => '/home/me/app/sql/ddl.sql',
# database to clear, deploy and then populate
- connection_details => ['dbi:mysql:dbname=app_dev', 'me', 'password'],
+ connection_details => ['dbi:mysql:dbname=app_dev', 'me', 'password'],
# DDL to deploy after populating records, ie. FK constraints
post_ddl => '/home/me/app/sql/post_ddl.sql',
@@ -1190,7 +1183,7 @@
# use CASCADE option when dropping tables
cascade => 1,
- # optional, set to 1 to run ddl but not populate
+ # optional, set to 1 to run ddl but not populate
no_populate => 0,
# optional, set to 1 to run each fixture through ->create rather than have
@@ -1225,7 +1218,7 @@
attribute which will make the drop table functionality cascade, ie 'DROP TABLE
$table CASCADE'.
-C<directory> is a required attribute.
+C<directory> is a required attribute.
If you wish for DBIx::Class::Fixtures to clear the database for you pass in
C<dll> (path to a DDL sql file) and C<connection_details> (array ref of DSN,
@@ -1246,23 +1239,23 @@
DBIx::Class::Exception->throw('directory param not specified')
unless $params->{directory};
- my $fixture_dir = dir(delete $params->{directory});
+ my $fixture_dir = io->dir(delete $params->{directory});
DBIx::Class::Exception->throw("fixture directory '$fixture_dir' does not
exist")
- unless -d $fixture_dir;
+ unless -d "$fixture_dir";
my $ddl_file;
my $dbh;
my $schema;
if ($params->{ddl} && $params->{connection_details}) {
- $ddl_file = file(delete $params->{ddl});
- unless (-e $ddl_file) {
+ $ddl_file = io->file(delete $params->{ddl});
+ unless (-e "$ddl_file") {
return DBIx::Class::Exception->throw('DDL does not exist at ' .
$ddl_file);
}
unless (ref $params->{connection_details} eq 'ARRAY') {
return DBIx::Class::Exception->throw('connection details must be an
arrayref');
}
- $schema = $self->_generate_schema({
- ddl => $ddl_file,
+ $schema = $self->_generate_schema({
+ ddl => "$ddl_file",
connection_details => delete $params->{connection_details},
%{$params}
});
@@ -1273,13 +1266,12 @@
}
- return 1 if $params->{no_populate};
-
+ return 1 if $params->{no_populate};
+
$self->msg("\nimporting fixtures");
- my $tmp_fixture_dir = tempdir();
- my $version_file = file($fixture_dir, '_dumper_version');
- my $config_set_path = file($fixture_dir, '_config_set');
- my $config_set = -e $config_set_path ? do { my $VAR1;
eval($config_set_path->slurp); $VAR1 } : '';
+ my $tmp_fixture_dir = io->dir(tempdir());
+ my $config_set_path = io->file($fixture_dir, '_config_set');
+ my $config_set = -e "$config_set_path" ? do { my $VAR1;
eval($config_set_path->slurp); $VAR1 } : '';
my $v = Data::Visitor::Callback->new(
plain_value => sub {
@@ -1303,21 +1295,21 @@
},
catfile => sub {
my ($self, @args) = @_;
- catfile(@args);
+ io->catfile(@args);
},
catdir => sub {
my ($self, @args) = @_;
- catdir(@args);
+ io->catdir(@args);
},
};
- my $subsre = join( '|', keys %$subs );
+ my $subsre = join( '|', keys %$subs );
$_ =~ s{__($subsre)(?:\((.+?)\))?__}{ $subs->{ $1 }->( $self, $2 ?
split( /,/, $2 ) : () ) }eg;
return $_;
}
);
-
+
$v->visit( $config_set );
@@ -1327,22 +1319,19 @@
@{$config_set->{sets}}
}
-# DBIx::Class::Exception->throw('no version file found');
-# unless -e $version_file;
-
- if (-e $tmp_fixture_dir) {
+ if (-e "$tmp_fixture_dir") {
$self->msg("- deleting existing temp directory $tmp_fixture_dir");
$tmp_fixture_dir->rmtree;
}
$self->msg("- creating temp dir");
$tmp_fixture_dir->mkpath();
for ( map { $self->_name_for_source($schema->source($_)) } $schema->sources)
{
- my $from_dir = $fixture_dir->subdir($_);
- next unless -e $from_dir;
- dircopy($from_dir, $tmp_fixture_dir->subdir($_) );
+ my $from_dir = io->catdir($fixture_dir, $_);
+ next unless -e "$from_dir";
+ $from_dir->copy( io->catdir($tmp_fixture_dir, $_)."" );
}
- unless (-d $tmp_fixture_dir) {
+ unless (-d "$tmp_fixture_dir") {
DBIx::Class::Exception->throw("Unable to create temporary fixtures dir:
$tmp_fixture_dir: $!");
}
@@ -1359,7 +1348,7 @@
$formatter->format_datetime(DateTime->today->add_duration($_))
};
}
- $callbacks{object} ||= "visit_ref";
+ $callbacks{object} ||= "visit_ref";
$fixup_visitor = new Data::Visitor::Callback(%callbacks);
}
@@ -1368,8 +1357,8 @@
foreach my $source (sort $schema->sources) {
$self->msg("- adding " . $source);
my $rs = $schema->resultset($source);
- my $source_dir = $tmp_fixture_dir->subdir(
$self->_name_for_source($rs->result_source) );
- next unless (-e $source_dir);
+ my $source_dir = io->catdir($tmp_fixture_dir,
$self->_name_for_source($rs->result_source));
+ next unless (-e "$source_dir");
my @rows;
while (my $file = $source_dir->next) {
next unless ($file =~ /\.fix$/);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/01-new.t
new/DBIx-Class-Fixtures-1.001028/t/01-new.t
--- old/DBIx-Class-Fixtures-1.001026/t/01-new.t 2014-12-01 17:43:14.000000000
+0100
+++ new/DBIx-Class-Fixtures-1.001028/t/01-new.t 2015-01-05 01:40:44.000000000
+0100
@@ -2,9 +2,10 @@
use DBIx::Class::Fixtures;
use Test::More tests => 3;
+use IO::All;
-my $config_dir = 't/var/configs';
-my $imaginary_config_dir = 't/var/not_there';
+my $config_dir = io->catfile(qw't var configs')->name;
+my $imaginary_config_dir = io->catfile(qw't var not_there')->name;
eval {
DBIx::Class::Fixtures->new({ });
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/02-dump-basic.t
new/DBIx-Class-Fixtures-1.001028/t/02-dump-basic.t
--- old/DBIx-Class-Fixtures-1.001026/t/02-dump-basic.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/02-dump-basic.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,20 +6,21 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
{
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
- ok($fixtures->dump({ config => 'simple.json', schema => $schema, directory
=> 't/var/fixtures' }), 'simple dump executed okay');
+ ok($fixtures->dump({ config => 'simple.json', schema => $schema, directory
=> io->catfile(qw't var fixtures')->name }), 'simple dump executed okay');
# check dump is okay
- my $dir = dir('t/var/fixtures/artist');
- ok(-e 't/var/fixtures/artist', 'artist directory created');
+ my $dir = dir(io->catfile(qw't var fixtures artist')->name);
+ ok(-e io->catfile(qw't var fixtures artist')->name, 'artist directory
created');
my @children = $dir->children;
is(scalar(@children), 1, 'right number of fixtures created');
@@ -54,12 +55,12 @@
}]
},
schema => $schema,
- directory => 't/var/fixtures',
+ directory => io->catfile(qw't var fixtures')->name,
}), 'simple dump executed okay');
# check dump is okay
- my $dir = dir('t/var/fixtures/artist');
- ok(-e 't/var/fixtures/artist', 'artist directory created');
+ my $dir = dir(io->catfile(qw't var fixtures artist')->name);
+ ok(-e io->catfile(qw't var fixtures artist')->name, 'artist directory
created');
my @children = $dir->children;
is(scalar(@children), 1, 'right number of fixtures created');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/03-dump-quantity.t
new/DBIx-Class-Fixtures-1.001028/t/03-dump-quantity.t
--- old/DBIx-Class-Fixtures-1.001026/t/03-dump-quantity.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/03-dump-quantity.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,18 +6,18 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
-
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
-ok($fixtures->dump({ config => 'quantity.json', schema => $schema, directory
=> 't/var/fixtures' }), 'quantity dump executed okay');
+ok($fixtures->dump({ config => 'quantity.json', schema => $schema, directory
=> io->catfile(qw't var fixtures')->name }), 'quantity dump executed okay');
# check dump is okay
-my $dir = dir('t/var/fixtures/CD');
+my $dir = dir(io->catfile(qw't var fixtures CD')->name);
my @children = $dir->children;
is(scalar(@children), 3, 'right number of cd fixtures created');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/04-dump-fetch.t
new/DBIx-Class-Fixtures-1.001028/t/04-dump-fetch.t
--- old/DBIx-Class-Fixtures-1.001026/t/04-dump-fetch.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/04-dump-fetch.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,18 +6,19 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
-ok($fixtures->dump({ config => 'fetch.json', schema => $schema, directory =>
't/var/fixtures' }), 'fetch dump executed okay');
+ok($fixtures->dump({ config => 'fetch.json', schema => $schema, directory =>
io->catfile(qw't var fixtures')->name }), 'fetch dump executed okay');
# check dump is okay
-my $dir = dir('t/var/fixtures/artist');
+my $dir = dir(io->catfile(qw't var fixtures artist')->name);
my @children = $dir->children;
is(scalar(@children), 3, 'right number of artist fixtures created');
@@ -31,7 +32,7 @@
my $artist1 = $schema->resultset('Artist')->find(1);
my @artist1_cds = $artist1->cds->all;
foreach my $cd (@artist1_cds) {
- my $cd_fix_file = dir('t/var/fixtures', 'CD', $cd->id . '.fix');
+ my $cd_fix_file = dir(io->catfile(qw't var fixtures')->name, 'CD', $cd->id .
'.fix');
ok(-e $cd_fix_file, "artist1's cd rel dumped okay");
}
@@ -39,11 +40,11 @@
my $artist2 = $schema->resultset('Artist')->find(2);
my @artist2_cds = $artist2->cds->search({ year => { '>' => 2002 } });
foreach my $cd (@artist2_cds) {
- my $cd_fix_file = dir('t/var/fixtures', 'CD', $cd->id . '.fix');
+ my $cd_fix_file = dir(io->catfile(qw't var fixtures')->name, 'CD', $cd->id .
'.fix');
ok(-e $cd_fix_file, "artist2's cd rel dumped okay");
}
-my $cd_dir = dir('t/var/fixtures/CD');
+my $cd_dir = dir(io->catfile(qw't var fixtures CD')->name);
@children = $cd_dir->children;
is(scalar(@children), scalar(@artist1_cds) + scalar(@artist2_cds), 'no extra
cd fixtures dumped');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/05-dump-rules.t
new/DBIx-Class-Fixtures-1.001028/t/05-dump-rules.t
--- old/DBIx-Class-Fixtures-1.001026/t/05-dump-rules.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/05-dump-rules.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,18 +6,19 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
-ok($fixtures->dump({ config => 'rules.json', schema => $schema, directory =>
't/var/fixtures' }), 'fetch dump executed okay');
+ok($fixtures->dump({ config => 'rules.json', schema => $schema, directory =>
io->catfile(qw't var fixtures')->name }), 'fetch dump executed okay');
# check dump is okay
-my $dir = dir('t/var/fixtures');
+my $dir = dir(io->catfile(qw't var fixtures')->name);
my $cd_dir = dir($dir, 'CD');
my $track_dir = dir($dir, 'track');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/06-dump-date.t
new/DBIx-Class-Fixtures-1.001028/t/06-dump-date.t
--- old/DBIx-Class-Fixtures-1.001026/t/06-dump-date.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/06-dump-date.t 2015-01-05
01:40:44.000000000 +0100
@@ -16,12 +16,12 @@
# set up and populate schema
ok(my $schema = DBICTest->init_schema( dsn => $ENV{FIXTURETEST_DSN}, user =>
$ENV{FIXTURETEST_USER}, pass => $ENV{FIXTURETEST_PASS}), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
-ok($fixtures->dump({ config => 'date.json', schema => $schema, directory =>
't/var/fixtures' }), 'date dump executed okay');
-ok($fixtures->populate({ ddl => DBICTest->get_ddl_file($schema),
connection_details => [$ENV{FIXTURETEST_DSN}, $ENV{FIXTURETEST_USER} || '',
$ENV{FIXTURETEST_PASS} || ''], directory => 't/var/fixtures' }), 'date populate
okay');
+ok($fixtures->dump({ config => 'date.json', schema => $schema, directory =>
io->catfile(qw't var fixtures')->name }), 'date dump executed okay');
+ok($fixtures->populate({ ddl => DBICTest->get_ddl_file($schema),
connection_details => [$ENV{FIXTURETEST_DSN}, $ENV{FIXTURETEST_USER} || '',
$ENV{FIXTURETEST_PASS} || ''], directory => io->catfile(qw't var
fixtures')->name }), 'date populate okay');
my $track = $schema->resultset('Track')->find(9);
my $now = DateTime->now();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/07-dump-all.t
new/DBIx-Class-Fixtures-1.001028/t/07-dump-all.t
--- old/DBIx-Class-Fixtures-1.001026/t/07-dump-all.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/07-dump-all.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,14 +6,14 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
-
+use IO::All;
plan tests => 16;
# set up and populate schema
ok(my $schema = DBICTest->init_schema( ), 'got schema');
-my $config_dir = 't/var/configs';
-my $fixture_dir = 't/var/fixtures';
+my $config_dir = io->catfile(qw't var configs')->name;
+my $fixture_dir = io->catfile(qw't var fixtures')->name;
# do dump
{
@@ -31,12 +31,22 @@
# do dump with excludes
{
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
- ok($fixtures->dump({ all => 1, schema => $schema, excludes => ['Tag'],
directory => "$fixture_dir/excludes" }), 'fetch dump executed okay');
+ ok(
+ $fixtures->dump(
+ {
+ all => 1,
+ schema => $schema,
+ excludes => ['Tag'],
+ directory => io->catfile( $fixture_dir, 'excludes' )->name
+ }
+ ),
+ 'fetch dump executed okay'
+ );
foreach my $source ($schema->sources) {
my $rs = $schema->resultset($source);
next if $rs->result_source->from eq 'tags';
- my $dir = dir("$fixture_dir/excludes", ref
$rs->result_source->name ? $rs->result_source->source_name :
$rs->result_source->name);
+ my $dir = dir(io->catfile($fixture_dir,"excludes")->name, ref
$rs->result_source->name ? $rs->result_source->source_name :
$rs->result_source->name);
my @children = $dir->children;
is (scalar(@children), $rs->count, 'all objects from $source
dumped');
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/08-dump-includes.t
new/DBIx-Class-Fixtures-1.001028/t/08-dump-includes.t
--- old/DBIx-Class-Fixtures-1.001026/t/08-dump-includes.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/08-dump-includes.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,24 +6,25 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
-ok($fixtures->dump({ config => 'includes.json', schema => $schema, directory
=> 't/var/fixtures' }), 'simple dump executed okay');
+ok($fixtures->dump({ config => 'includes.json', schema => $schema, directory
=> io->catfile(qw't var fixtures')->name }), 'simple dump executed okay');
# check dump is okay
-my $producer_dir = dir('t/var/fixtures/producer');
+my $producer_dir = dir(io->catfile(qw't var fixtures producer')->name);
ok(-e $producer_dir, 'producer directory created');
my @producer_children = $producer_dir->children;
is(scalar(@producer_children), 1, 'right number of fixtures created');
-my $artist_dir = dir('t/var/fixtures/artist');
+my $artist_dir = dir(io->catfile(qw't var fixtures artist')->name);
ok(-e $artist_dir, 'artist directory created');
my @artist_children = $artist_dir->children;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/09-dump-scalar-ref.t
new/DBIx-Class-Fixtures-1.001028/t/09-dump-scalar-ref.t
--- old/DBIx-Class-Fixtures-1.001026/t/09-dump-scalar-ref.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/09-dump-scalar-ref.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,20 +6,21 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
-ok($fixtures->dump({ config => 'scalar_ref.json', schema => $schema, directory
=> 't/var/fixtures' }), 'simple dump executed okay');
+ok($fixtures->dump({ config => 'scalar_ref.json', schema => $schema, directory
=> io->catfile(qw't var fixtures')->name }), 'simple dump executed okay');
{
# check dump is okay
- my $dir = dir('t/var/fixtures/artist');
+ my $dir = dir(io->catfile(qw't var fixtures artist')->name);
my @children = $dir->children;
is(scalar(@children), 1, 'right number of fixtures created');
@@ -31,7 +32,7 @@
{
# check dump is okay
- my $dir = dir('t/var/fixtures/CD');
+ my $dir = dir(io->catfile(qw't var fixtures CD')->name);
my @children = $dir->children;
is(scalar(@children), 1, 'right number of fixtures created');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/10-dump-cleanup.t
new/DBIx-Class-Fixtures-1.001028/t/10-dump-cleanup.t
--- old/DBIx-Class-Fixtures-1.001026/t/10-dump-cleanup.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/10-dump-cleanup.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,22 +6,23 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir }),
'object created with correct config dir');
-my $output_dir = dir('t/var/fixtures');
+my $output_dir = dir(io->catfile(qw't var fixtures')->name);
$output_dir->mkpath;
my $file = file($output_dir, 'test_file');
my $fh = $file->open('w');
print $fh 'test file';
$fh->close;
-ok($fixtures->dump({ config => 'simple.json', schema => $schema, directory =>
't/var/fixtures' }), 'simple dump executed okay');
+ok($fixtures->dump({ config => 'simple.json', schema => $schema, directory =>
io->catfile(qw't var fixtures')->name }), 'simple dump executed okay');
ok(-e $file, 'file still exists');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/12-populate-basic.t
new/DBIx-Class-Fixtures-1.001028/t/12-populate-basic.t
--- old/DBIx-Class-Fixtures-1.001026/t/12-populate-basic.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/12-populate-basic.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,10 +6,11 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({
@@ -25,18 +26,18 @@
ok($fixtures->dump({
config => "$set.json",
schema => $schema,
- directory => 't/var/fixtures'
+ directory => io->catfile(qw't var fixtures')->name
}), "$set dump executed okay"
);
$fixtures->populate({
- ddl => 't/lib/sqlite.sql',
- connection_details => ['dbi:SQLite:t/var/DBIxClass.db', '', ''],
- directory => 't/var/fixtures'
+ ddl => io->catfile(qw[t lib sqlite.sql])->name,
+ connection_details => ['dbi:SQLite:'.io->catfile(qw[ t var DBIxClass.db
])->name, '', ''],
+ directory => io->catfile(qw't var fixtures')->name
});
$schema = DBICTest->init_schema( no_deploy => 1);
- my $fixture_dir = dir('t/var/fixtures');
+ my $fixture_dir = dir(io->catfile(qw't var fixtures')->name);
foreach my $class ($schema->sources) {
my $source_dir = dir($fixture_dir, lc($class));
is($schema->resultset($class)->count,
@@ -68,13 +69,13 @@
ok( $fixtures->dump({
config => "use_create.json",
schema => $schema,
- directory => 't/var/fixtures'
+ directory => io->catfile(qw't var fixtures')->name
}), "use_create dump executed okay"
);
$schema = DBICTest->init_schema( no_populate => 1 );
$fixtures->populate({
- directory => 't/var/fixtures',
- connection_details => ['dbi:SQLite:t/var/DBIxClass.db', '', ''],
+ directory => io->catfile(qw't var fixtures')->name,
+ connection_details => ['dbi:SQLite:'.io->catfile(qw[ t var DBIxClass.db
])->name, '', ''],
schema => $schema,
no_deploy => 1,
use_create => 1
@@ -84,16 +85,16 @@
$schema = DBICTest->init_schema( no_populate => 1 );
$fixtures->populate({
- directory => 't/var/fixtures',
- connection_details => ['dbi:SQLite:t/var/DBIxClass.db', '', ''],
+ directory => io->catfile(qw't var fixtures')->name,
+ connection_details => ['dbi:SQLite:'.io->catfile(qw[ t var DBIxClass.db
])->name, '', ''],
schema => $schema,
no_deploy => 1,
use_find_or_create => 1
});
is( $schema->resultset( "Artist" )->find({ artistid => 4 })->name, "Test
Name", "use_find_or_create => 1 ok" );
$fixtures->populate({
- directory => 't/var/fixtures',
- connection_details => ['dbi:SQLite:t/var/DBIxClass.db', '', ''],
+ directory => io->catfile(qw't var fixtures')->name,
+ connection_details => ['dbi:SQLite:'.io->catfile(qw[ t var DBIxClass.db
])->name, '', ''],
schema => $schema,
no_deploy => 1,
use_find_or_create => 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/13-populate-two-dbs.t
new/DBIx-Class-Fixtures-1.001028/t/13-populate-two-dbs.t
--- old/DBIx-Class-Fixtures-1.001026/t/13-populate-two-dbs.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/13-populate-two-dbs.t 2015-01-05
01:40:44.000000000 +0100
@@ -8,12 +8,14 @@
use Data::Dumper;
use DBICTest::Schema2;
+use IO::All;
+
# set up and populate normal schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
-
+my $config_dir = io->catfile(qw't var configs')->name;
+my $dbix_class_different = io->catfile(qw[ t var DBIxClassDifferent.db
])->name;
my @different_connection_details = (
- 'dbi:SQLite:t/var/DBIxClassDifferent.db',
+ "dbi:SQLite:$dbix_class_different",
'',
''
)
@@ -23,9 +25,9 @@
ok $schema2;
-unlink('t/var/DBIxClassDifferent.db') if (-e 't/var/DBIxClassDifferent.db');
+unlink($dbix_class_different) if (-e $dbix_class_different );
-DBICTest->deploy_schema($schema2, 't/lib/sqlite_different.sql');
+DBICTest->deploy_schema($schema2, 't lib sqlite_different.sql');
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({
@@ -37,21 +39,21 @@
ok($fixtures->dump({
config => "simple.json",
schema => $schema,
- directory => 't/var/fixtures'
+ directory => io->catfile(qw't var fixtures')->name
}),
"simple dump executed okay");
ok($fixtures->populate({
- ddl => 't/lib/sqlite_different.sql',
+ ddl => io->catfile(qw[t lib sqlite_different.sql])->name,
connection_details => [@different_connection_details],
- directory => 't/var/fixtures'
+ directory => io->catfile(qw't var fixtures')->name
}),
'mysql populate okay');
ok($fixtures->populate({
- ddl => 't/lib/sqlite.sql',
- connection_details => ['dbi:SQLite:t/var/DBIxClass.db', '', ''],
- directory => 't/var/fixtures'
+ ddl => io->catfile(qw[ t lib sqlite.sql ])->name,
+ connection_details => ['dbi:SQLite:'.io->catfile(qw[ t var DBIxClass.db
])->name, '', ''],
+ directory => io->catfile(qw't var fixtures')->name
}),
'sqlite populate okay');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/14-populate-post.t
new/DBIx-Class-Fixtures-1.001028/t/14-populate-post.t
--- old/DBIx-Class-Fixtures-1.001026/t/14-populate-post.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/14-populate-post.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,10 +6,11 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({
@@ -20,15 +21,15 @@
ok($fixtures->dump({
config => "simple.json",
schema => $schema,
- directory => 't/var/fixtures'
+ directory => io->catfile(qw't var fixtures' )->name
}),
"simple dump executed okay");
$fixtures->populate({
- ddl => 't/lib/sqlite.sql',
- connection_details => ['dbi:SQLite:t/var/DBIxClass.db', '', ''],
- directory => 't/var/fixtures',
- post_ddl => 't/lib/post_sqlite.sql'
+ ddl => io->catfile(qw't lib sqlite.sql')->name,
+ connection_details => ['dbi:SQLite:'.io->catfile(qw't var
DBIxClass.db')->name, '', ''],
+ directory => io->catfile(qw't var fixtures')->name,
+ post_ddl => io->catfile(qw't lib post_sqlite.sql')->name
});
$schema = DBICTest->init_schema(no_deploy => 1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/t/15-multiple-belongs-to.t
new/DBIx-Class-Fixtures-1.001028/t/15-multiple-belongs-to.t
--- old/DBIx-Class-Fixtures-1.001026/t/15-multiple-belongs-to.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/15-multiple-belongs-to.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,23 +6,24 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
-ok($fixtures->dump({ config => 'multiple-has-many.json', schema => $schema,
directory => 't/var/fixtures' }), 'fetch dump executed okay');
+ok($fixtures->dump({ config => 'multiple-has-many.json', schema => $schema,
directory => io->catfile(qw't var fixtures')->name }), 'fetch dump executed
okay');
# check dump is okay
-my $dir = dir('t/var/fixtures');
+my $dir = dir(io->catfile(qw't var fixtures')->name);
-ok( -e 't/var/fixtures/producer', "We fetched some producers" );
-ok( -e 't/var/fixtures/cd_to_producer', "We fetched some cd/producer xrefs" );
-ok( -e 't/var/fixtures/CD', "We fetched some cds" );
-ok( -e 't/var/fixtures/artist', "We fetched some artists" );
+ok( -e io->catfile(qw't var fixtures producer')->name, "We fetched some
producers" );
+ok( -e io->catfile(qw't var fixtures cd_to_producer')->name, "We fetched some
cd producer xrefs" );
+ok( -e io->catfile(qw't var fixtures CD')->name, "We fetched some cds" );
+ok( -e io->catfile(qw't var fixtures artist')->name, "We fetched some artists"
);
__END__
while ( my ($dirname, $sourcename) = each %dirs ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/16-rules-hasmany.t
new/DBIx-Class-Fixtures-1.001028/t/16-rules-hasmany.t
--- old/DBIx-Class-Fixtures-1.001026/t/16-rules-hasmany.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/16-rules-hasmany.t 2015-01-05
01:40:44.000000000 +0100
@@ -6,15 +6,16 @@
use DBICTest;
use Path::Class;
use Data::Dumper;
+use IO::All;
# set up and populate schema
ok(my $schema = DBICTest->init_schema(), 'got schema');
-my $config_dir = 't/var/configs';
+my $config_dir = io->catfile(qw't var configs')->name;
# do dump
ok(my $fixtures = DBIx::Class::Fixtures->new({ config_dir => $config_dir,
debug => 0 }), 'object created with correct config dir');
-ok($fixtures->dump({ config => 'rules2.json', schema => $schema, directory =>
't/var/fixtures' }), 'quantity dump executed okay');
+ok($fixtures->dump({ config => 'rules2.json', schema => $schema, directory =>
io->catfile(qw't var fixtures')->name }), 'quantity dump executed okay');
# check dump is okay
foreach my $test (
@@ -22,7 +23,7 @@
[ 'CD', 2, 'CD', 'cdid' ],
) {
my ($dirname, $count, $moniker, $id) = @$test;
- my $dir = dir("t/var/fixtures/$dirname");
+ my $dir = dir(io->catfile(qw"t var fixtures",$dirname)->name);
my @children = $dir->children;
is(scalar(@children), $count, "right number of $dirname fixtures created");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/t/17-dump_all_config_sets.t
new/DBIx-Class-Fixtures-1.001028/t/17-dump_all_config_sets.t
--- old/DBIx-Class-Fixtures-1.001026/t/17-dump_all_config_sets.t
2014-12-01 17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/17-dump_all_config_sets.t
2015-01-05 01:40:44.000000000 +0100
@@ -6,15 +6,16 @@
use Path::Class;
use Data::Dumper;
use File::Spec;
+use IO::All;
-ok my $config_dir = 't/var/configs';
+ok my $config_dir = io->catfile(qw't var configs')->name;
ok my $schema = DBICTest->init_schema(), 'got schema';
ok my $fixtures = DBIx::Class::Fixtures->new({config_dir => $config_dir}),
'object created with correct config dir';
my $ret = $fixtures->dump_config_sets({
- configs => [qw/date.json rules.json/],
+ configs => [qw[ date.json rules.json ]],
schema => $schema,
directory_template => sub {
my ($fixture, $params, $set) = @_;
@@ -22,10 +23,10 @@
},
});
-ok -e 't/var/fixtures/multi/date.json/artist',
+ok -e io->catfile(qw't var fixtures multi date.json artist')->name,
'artist directory created';
-my $dir = dir('t/var/fixtures/multi/date.json/artist');
+my $dir = dir(io->catfile(qw't var fixtures multi date.json artist')->name);
my @children = $dir->children;
is(scalar(@children), 1, 'right number of fixtures created');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/DBIx-Class-Fixtures-1.001026/t/18-extra.t
new/DBIx-Class-Fixtures-1.001028/t/18-extra.t
--- old/DBIx-Class-Fixtures-1.001026/t/18-extra.t 2014-12-01
17:43:14.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/18-extra.t 2015-01-05
01:40:44.000000000 +0100
@@ -4,11 +4,12 @@
use lib qw(t/lib);
use ExtraTest::Schema;
+use IO::All;
(my $schema = ExtraTest::Schema->connect(
'DBI:SQLite::memory:','',''))->init_schema;
-open(my $fh, '<', 't/18-extra.t') ||
+open(my $fh, '<', io->catfile(qw't 18-extra.t')->name) ||
die "Can't open the filehandle, test is trash!";
ok my $row = $schema
@@ -22,15 +23,15 @@
my $fixtures = DBIx::Class::Fixtures
->new({
- config_dir => 't/var/configs',
- config_attrs => { photo_dir => './t/var/files' },
+ config_dir => io->catfile(qw't var configs')->name,
+ config_attrs => { photo_dir => io->catfile(qw't var files')->name },
debug => 0 });
ok(
$fixtures->dump({
config => 'extra.json',
schema => $schema,
- directory => "t/var/fixtures/photos" }),
+ directory => io->catfile(qw"t var fixtures photos")->name }),
'fetch dump executed okay');
ok my $key = $schema->resultset('Photo')->first->file;
@@ -45,7 +46,7 @@
$fixtures->populate({
no_deploy => 1,
schema => $schema,
- directory => "t/var/fixtures/photos"}),
+ directory => io->catfile(qw"t var fixtures photos")->name}),
'populated');
is $key, $schema->resultset('Photo')->first->file,
@@ -56,6 +57,6 @@
done_testing;
END {
- rmtree 't/var/files';
- rmtree 't/var/fixtures/photos';
+ rmtree io->catfile(qw't var files')->name;
+ rmtree io->catfile(qw't var fixtures photos')->name;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/t/var/fixtures/_dumper_version
new/DBIx-Class-Fixtures-1.001028/t/var/fixtures/_dumper_version
--- old/DBIx-Class-Fixtures-1.001026/t/var/fixtures/_dumper_version
2014-12-01 17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/var/fixtures/_dumper_version
2015-01-05 01:40:44.000000000 +0100
@@ -1 +1 @@
-1.001023
\ No newline at end of file
+1.00102702
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/t/var/fixtures/excludes/_dumper_version
new/DBIx-Class-Fixtures-1.001028/t/var/fixtures/excludes/_dumper_version
--- old/DBIx-Class-Fixtures-1.001026/t/var/fixtures/excludes/_dumper_version
2014-12-01 17:43:15.000000000 +0100
+++ new/DBIx-Class-Fixtures-1.001028/t/var/fixtures/excludes/_dumper_version
2015-01-05 01:40:44.000000000 +0100
@@ -1 +1 @@
-1.001023
\ No newline at end of file
+1.00102702
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/t/var/fixtures/multi/date.json/_dumper_version
new/DBIx-Class-Fixtures-1.001028/t/var/fixtures/multi/date.json/_dumper_version
---
old/DBIx-Class-Fixtures-1.001026/t/var/fixtures/multi/date.json/_dumper_version
2014-12-01 17:43:15.000000000 +0100
+++
new/DBIx-Class-Fixtures-1.001028/t/var/fixtures/multi/date.json/_dumper_version
2015-01-05 01:40:44.000000000 +0100
@@ -1 +1 @@
-1.001023
\ No newline at end of file
+1.00102702
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/DBIx-Class-Fixtures-1.001026/t/var/fixtures/multi/rules.json/_dumper_version
new/DBIx-Class-Fixtures-1.001028/t/var/fixtures/multi/rules.json/_dumper_version
---
old/DBIx-Class-Fixtures-1.001026/t/var/fixtures/multi/rules.json/_dumper_version
2014-12-01 17:43:15.000000000 +0100
+++
new/DBIx-Class-Fixtures-1.001028/t/var/fixtures/multi/rules.json/_dumper_version
2015-01-05 01:40:44.000000000 +0100
@@ -1 +1 @@
-1.001023
\ No newline at end of file
+1.00102702
\ No newline at end of file
++++++ 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
