From 509de8175a6145e66cf866bd7af6fc427030627e Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Fri, 26 Apr 2019 23:14:36 +0900
Subject: [PATCH 01/22] Require perl 5.10

---
 lib/File/TVShow/Organize.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/File/TVShow/Organize.pm b/lib/File/TVShow/Organize.pm
index 34bb080..a9e195d 100644
--- a/lib/File/TVShow/Organize.pm
+++ b/lib/File/TVShow/Organize.pm
@@ -1,6 +1,6 @@
 package File::TVShow::Organize;
 
-use 5.012004;
+use 5.10.0
 use strict;
 use warnings;
 use Carp;

From 5d6fa3cd41bf0d2712a4da684e10f8ccd10353bd Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Sun, 28 Apr 2019 08:55:15 +0900
Subject: [PATCH 02/22] Changed author email address

---
 Makefile.PL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index d95ab9b..94e76cc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,5 +13,5 @@ WriteMakefile(
                            'Carp' => 0 }, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM  => 'lib/File/TVShow/Organize.pm', # retrieve abstract from module
-       AUTHOR         => 'Adam Spann <adam_spann@hotmail.com>') : ()),
+       AUTHOR         => 'Adam Spann <bans@cpan.org>') : ()),
 )

From 98ff07473a7ff18e7b3318b1471613b2f69aeb3b Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Sun, 28 Apr 2019 08:55:40 +0900
Subject: [PATCH 03/22] removed Video::Filename use_ok

---
 t/01TestDirectoryHandling.t | 1 -
 1 file changed, 1 deletion(-)

diff --git a/t/01TestDirectoryHandling.t b/t/01TestDirectoryHandling.t
index bfde107..54bb55f 100644
--- a/t/01TestDirectoryHandling.t
+++ b/t/01TestDirectoryHandling.t
@@ -11,7 +11,6 @@ use Test::More;
 use Test::Carp;
 use lib '../lib/';
 BEGIN { use_ok('File::TVShow::Organize') };
-#BEGIN { use_ok('Video::Filename') };
 BEGIN { use_ok('File::Path')};
 BEGIN { use_ok('File::Copy')};
 BEGIN { use_ok('Cwd')};

From 5951ba870d3727d275156c76ae12a4c0dd4a73c7 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Sun, 28 Apr 2019 08:56:11 +0900
Subject: [PATCH 04/22] removed use 5.10.0 as this seems to break use_ok in
 tests

---
 lib/File/TVShow/Organize.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/File/TVShow/Organize.pm b/lib/File/TVShow/Organize.pm
index a9e195d..ae9a3f1 100644
--- a/lib/File/TVShow/Organize.pm
+++ b/lib/File/TVShow/Organize.pm
@@ -1,6 +1,5 @@
 package File::TVShow::Organize;
 
-use 5.10.0
 use strict;
 use warnings;
 use Carp;

From f51a2e4cd4214e475eae68231dae3f7a2470d22a Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Sun, 28 Apr 2019 09:20:03 +0900
Subject: [PATCH 05/22] Removed use_ok for Video::Filename

---
 t/02TestBaseFunctions.t | 1 -
 1 file changed, 1 deletion(-)

diff --git a/t/02TestBaseFunctions.t b/t/02TestBaseFunctions.t
index 5aad40d..86e8c7b 100644
--- a/t/02TestBaseFunctions.t
+++ b/t/02TestBaseFunctions.t
@@ -10,7 +10,6 @@ use Data::Dumper;
 use Test::More;
 use Test::Carp;
 BEGIN { use_ok('File::TVShow::Organize') };
-BEGIN { use_ok('Video::Filename') };
 BEGIN { use_ok('File::Path')};
 BEGIN { use_ok('File::Copy')};
 BEGIN { use_ok('Cwd')};

From 28c6cbac7bf4f8c32f203cff286104cb750efda0 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Mon, 29 Apr 2019 22:41:41 +0900
Subject: [PATCH 06/22] Updated tests to remove the use_ok for versions

use 00-load.t to check that module File::TVShow::Organize can be loaded
successfully with a use 5.06 version of perl
---
 lib/File/TVShow/Organize.pm       |  3 ++-
 t/00-load.t                       | 13 +++++++++++++
 t/00CheckTestDirectorStructures.t |  2 +-
 t/01TestDirectoryHandling.t       |  8 ++++----
 t/02TestBaseFunctions.t           |  8 ++++----
 t/04TestShowHashing.t             |  2 +-
 t/05TestMainImport.t              |  2 +-
 t/07TestRecursiveImport.t         |  2 +-
 8 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 t/00-load.t

diff --git a/lib/File/TVShow/Organize.pm b/lib/File/TVShow/Organize.pm
index ae9a3f1..838ea7c 100644
--- a/lib/File/TVShow/Organize.pm
+++ b/lib/File/TVShow/Organize.pm
@@ -1,5 +1,6 @@
 package File::TVShow::Organize;
 
+use 5.10.0;
 use strict;
 use warnings;
 use Carp;
@@ -11,7 +12,7 @@ require Exporter;
 
 our @ISA = qw(Exporter);
 
-our $VERSION = '0.32';
+our $VERSION = '0.32.1';
 
 # Preloaded methods go here.
 
diff --git a/t/00-load.t b/t/00-load.t
new file mode 100644
index 0000000..5b74afe
--- /dev/null
+++ b/t/00-load.t
@@ -0,0 +1,13 @@
+#!perl -T
+use 5.006;
+use strict;
+use warnings;
+use Test::More;
+
+plan tests => 1;
+
+BEGIN {
+    use_ok( 'File::TVShow::Organize' ) || print "Bail out!\n";
+}
+
+diag( "Testing File::TVShow::Organize $File::TVShow::Info::VERSION, Perl $], $^X" );
diff --git a/t/00CheckTestDirectorStructures.t b/t/00CheckTestDirectorStructures.t
index df83239..d4a258f 100644
--- a/t/00CheckTestDirectorStructures.t
+++ b/t/00CheckTestDirectorStructures.t
@@ -1,7 +1,7 @@
 
 
 #########################
-
+use 5.006;
 use strict;
 use warnings;
 
diff --git a/t/01TestDirectoryHandling.t b/t/01TestDirectoryHandling.t
index 54bb55f..323343f 100644
--- a/t/01TestDirectoryHandling.t
+++ b/t/01TestDirectoryHandling.t
@@ -10,10 +10,10 @@ use Data::Dumper;
 use Test::More;
 use Test::Carp;
 use lib '../lib/';
-BEGIN { use_ok('File::TVShow::Organize') };
-BEGIN { use_ok('File::Path')};
-BEGIN { use_ok('File::Copy')};
-BEGIN { use_ok('Cwd')};
+use File::TVShow::Organize;
+use File::Path;
+use File::Copy;
+use Cwd;
 
 #########################
 
diff --git a/t/02TestBaseFunctions.t b/t/02TestBaseFunctions.t
index 86e8c7b..222fcc5 100644
--- a/t/02TestBaseFunctions.t
+++ b/t/02TestBaseFunctions.t
@@ -9,10 +9,10 @@ use Data::Dumper;
 
 use Test::More;
 use Test::Carp;
-BEGIN { use_ok('File::TVShow::Organize') };
-BEGIN { use_ok('File::Path')};
-BEGIN { use_ok('File::Copy')};
-BEGIN { use_ok('Cwd')};
+use File::TVShow::Organize;
+use File::Path;
+use File::Copy;
+use Cwd;
 
 #########################
 
diff --git a/t/04TestShowHashing.t b/t/04TestShowHashing.t
index 8725f58..7ea94d7 100644
--- a/t/04TestShowHashing.t
+++ b/t/04TestShowHashing.t
@@ -10,7 +10,7 @@ use Data::Dumper;
 use Test::More;
 use Test::Carp;
 use Cwd;
-BEGIN {use_ok( 'File::TVShow::Organize' ) };
+use File::TVShow::Organize;
 
 #########################
 
diff --git a/t/05TestMainImport.t b/t/05TestMainImport.t
index 3f3ef1a..1ce3f8c 100644
--- a/t/05TestMainImport.t
+++ b/t/05TestMainImport.t
@@ -8,7 +8,7 @@ use warnings;
 use Data::Dumper;
 use Test::More; #tests => 6;
 use Test::Carp;
-BEGIN { use_ok( 'File::TVShow::Organize' ) };
+use File::TVShow::Organize;
 use Cwd;
 
 #########################
diff --git a/t/07TestRecursiveImport.t b/t/07TestRecursiveImport.t
index 587d9e7..259369b 100644
--- a/t/07TestRecursiveImport.t
+++ b/t/07TestRecursiveImport.t
@@ -8,7 +8,7 @@ use warnings;
 use Data::Dumper;
 use Test::More; #tests => 6;
 use Test::Carp;
-BEGIN { use_ok( 'File::TVShow::Organize' ) };
+use File::TVShow::Organize;
 use Cwd;
 
 #########################

From 560dd171c70c23f6346b9426fcaeba7beb60965f Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 17:49:07 +0900
Subject: [PATCH 07/22] added rule to ensure test sequence

---
 t/testrules.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 t/testrules.yml

diff --git a/t/testrules.yml b/t/testrules.yml
new file mode 100644
index 0000000..74714f7
--- /dev/null
+++ b/t/testrules.yml
@@ -0,0 +1,2 @@
+---
+seq: t/*.t

From 2ed9547e3d40ecfaae729474bcc7e8bd4020402b Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 17:49:34 +0900
Subject: [PATCH 08/22] removed use lib command from test

---
 t/01TestDirectoryHandling.t | 1 -
 1 file changed, 1 deletion(-)

diff --git a/t/01TestDirectoryHandling.t b/t/01TestDirectoryHandling.t
index 323343f..4254e3a 100644
--- a/t/01TestDirectoryHandling.t
+++ b/t/01TestDirectoryHandling.t
@@ -9,7 +9,6 @@ use Data::Dumper;
 
 use Test::More;
 use Test::Carp;
-use lib '../lib/';
 use File::TVShow::Organize;
 use File::Path;
 use File::Copy;

From ccc917665870369fc56aa0248e9b88e2347a8b97 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 17:50:00 +0900
Subject: [PATCH 09/22] updated version in readme file

---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 65b6695..1a283c5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-File-TVShow-Organize version 0.32
+File-TVShow-Organize version 0.34
 ============================
 
 This module makes it easier to move TV Show files into the correct Show
@@ -66,7 +66,7 @@ DEPENDENCIES
 
 This module requires these other modules and libraries:
 
-Video::Filename;
+File::TVShow::Info;
 File::Path;
 File::Copy;
 Carp;

From 0552d34585c068fe9aa4b00f88cada300c4d785a Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 17:50:19 +0900
Subject: [PATCH 10/22] updated module version

---
 lib/File/TVShow/Organize.pm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/File/TVShow/Organize.pm b/lib/File/TVShow/Organize.pm
index 838ea7c..21fde45 100644
--- a/lib/File/TVShow/Organize.pm
+++ b/lib/File/TVShow/Organize.pm
@@ -12,7 +12,7 @@ require Exporter;
 
 our @ISA = qw(Exporter);
 
-our $VERSION = '0.32.1';
+our $VERSION = '0.34';
 
 # Preloaded methods go here.
 
@@ -181,7 +181,6 @@ sub process_new_shows {
     # next if ($file !~ m/s\d\de\d\d/i); # skip if SXXEXX is not present in file name
     my $showData;
     # Extract show name, Season and Episode
-    #$showData = Video::Filename::new($file);
     $showData = File::TVShow::Info->new($file);
     next if !$showData->is_tv_show();
     # Apply special handling if the show is in the _exceptionList
@@ -220,13 +219,13 @@ sub were_there_errors {
 
   my ($self) = @_;
 
-  # Check if there has been any files that Video::Filename could not handle
+  # Check if there has been any files that File::TVShow::Info could not handle
   # Check that the hash UnHandledFileNames has actually been created before
   # checking that is is not empty or you will get an error.
-  if ((defined $self->{UnhandledFileNames}) && (keys $self->{UnhandledFileNames})) {
+  if ((defined $self->{UnhandledFileNames}) && (keys %{$self->{UnhandledFileNames}})) {
     print "\nThere were unhandled files in the directory\n";
     print "consider adding them to the exceptionList\n###\n";
-    foreach my $key (keys $self->{UnhandledFileNames}) {
+    foreach my $key (keys %{$self->{UnhandledFileNames}}) {
       print "### " .  $key . " ==> " . $self->{UnhandledFileNames}{$key} . "\n";
     }
     print "###\n";
@@ -359,7 +358,7 @@ sub move_show {
 
   # create the command string to be used in system() call
   # Set --progress if verbose is true
-  my $command = "rsync -ta ";
+  my $command = "/usr/bin/env rsync -ta ";
   $command = $command . "--progress " if ($self->verbose);
   $command = $command . $source . $file . " " . $destination;
 
@@ -411,6 +410,10 @@ __END__
 File::TVShow::Organize - Perl module to move TVShow Files into their
 matching Show Folder on a media server.
 
+=head1 VERSION
+
+VERSION 0.34
+
 =head1 SYNOPSIS
 
   use File::TVShow::Organize;
@@ -491,7 +494,7 @@ Works on Mac OS and *nix systems.
   If Exceptions is passed to the method we load this data into a hash
   for later use to handle naming complications.
 
-  E.G file: S.W.A.T.2017.S01E01.avi is not handled correctly by Video::Filename
+  E.G file: S.W.A.T.2017.S01E01.avi is not handled correctly by File::TVShow::Info
   so we need to know to handle this differently. Exceptions is an optional
   parameter and can be left out when calling new().
   Currently Exceptions is a scalar string.
@@ -598,7 +601,7 @@ Works on Mac OS and *nix systems.
 
   Example:
 
-  my $file = Video::Filename::new("Life.on.Mars.(US).S01E01.avi", { spaces => '.' });
+  my $file = File::TVShow::Info->new("Life.on.Mars.(US).S01E01.avi");
 
   # $file->{name} now contains "Life on Mars (US)"
   # $file->{season} now contains "01"
@@ -835,13 +838,13 @@ I have not tested anycases where file names might be
 
 =item   L<File::Copy>
 
-=item   L<Video::Filename>
+=item   L<File::TVShow::Info>
 
 =back
 
 =head1 AUTHOR
 
-Adam Spann, E<lt>adam_spann@hotmail.comE<gt>
+Adam Spann, E<lt>bans@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 

From b110078009af86f2dccc18ce83e4348b5c7a4483 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 18:01:24 +0900
Subject: [PATCH 11/22] added testrules.yml

---
 MANIFEST | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST b/MANIFEST
index 2ccf0cd..7bd374d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -11,6 +11,7 @@ t/05TestMainImport.t
 t/06TestSuccessfulImport.t
 t/07TestRecursiveImport.t
 t/10Clean.t
+t/testrules.yml
 t/test-data.tar.gz
 t/tv-shows.tar.gz
 lib/File/TVShow/Organize.pm

From 1817ea888d08034fad7ccad5a7bec18b88068812 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 18:01:48 +0900
Subject: [PATCH 12/22] added TEST_REQUIRES modules

---
 Makefile.PL | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index 94e76cc..ef91fd2 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,8 +9,15 @@ WriteMakefile(
     PREREQ_PM         => { 'File::TVShow::Info' => 0,
                            'File::Path' => 0,
                            'File::Copy' => 0,
-                           'Test::Carp' => 0,
                            'Carp' => 0 }, # e.g., Module::Name => 1.1
+    TEST_REQUIRES    => {
+                          'Test::More' => 0,
+                          'File::chdir' => 0,
+                          'Test::Carp' => 0,
+                          'Cwd' => 0,
+                          'Data::Dumper' => 0,
+
+    },
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM  => 'lib/File/TVShow/Organize.pm', # retrieve abstract from module
        AUTHOR         => 'Adam Spann <bans@cpan.org>') : ()),

From 006c3578364ce31d9a78b14f29a38e780cfbaa35 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 18:02:22 +0900
Subject: [PATCH 13/22] removed modules already used in Organise module

---
 t/02TestBaseFunctions.t | 2 --
 1 file changed, 2 deletions(-)

diff --git a/t/02TestBaseFunctions.t b/t/02TestBaseFunctions.t
index 222fcc5..5f6b1c2 100644
--- a/t/02TestBaseFunctions.t
+++ b/t/02TestBaseFunctions.t
@@ -10,8 +10,6 @@ use Data::Dumper;
 use Test::More;
 use Test::Carp;
 use File::TVShow::Organize;
-use File::Path;
-use File::Copy;
 use Cwd;
 
 #########################

From bbe6ea41cacf75304ffc14d31ce207c3b4fd17e7 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 18:02:43 +0900
Subject: [PATCH 14/22] added use 5.006 statement

---
 t/01TestDirectoryHandling.t | 2 +-
 t/03TestFileNameHandling    | 2 +-
 t/04TestShowHashing.t       | 2 +-
 t/05TestMainImport.t        | 2 +-
 t/06TestSuccessfulImport.t  | 1 +
 t/07TestRecursiveImport.t   | 1 +
 t/10Clean.t                 | 1 +
 7 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/t/01TestDirectoryHandling.t b/t/01TestDirectoryHandling.t
index 4254e3a..c150593 100644
--- a/t/01TestDirectoryHandling.t
+++ b/t/01TestDirectoryHandling.t
@@ -2,7 +2,7 @@
 # `make test'. After `make install' it should work as `perl 01TestDirectoryHandling.t'
 
 #########################
-
+use 5.006;
 use strict;
 use warnings;
 use Data::Dumper;
diff --git a/t/03TestFileNameHandling b/t/03TestFileNameHandling
index d4c6b46..a8afe98 100644
--- a/t/03TestFileNameHandling
+++ b/t/03TestFileNameHandling
@@ -2,7 +2,7 @@
 # `make test'. After `make install' it should work as `perl 03TestFileNameHandling.t'
 
 #########################
-
+use 5.006;
 use strict;
 use warnings;
 use Data::Dumper;
diff --git a/t/04TestShowHashing.t b/t/04TestShowHashing.t
index 7ea94d7..1600e98 100644
--- a/t/04TestShowHashing.t
+++ b/t/04TestShowHashing.t
@@ -2,7 +2,7 @@
 # `make test'. After `make install' it should work as `perl BAS-TVShow-Organize.t'
 
 #########################
-
+use 5.006;
 use strict;
 use warnings;
 use Data::Dumper;
diff --git a/t/05TestMainImport.t b/t/05TestMainImport.t
index 1ce3f8c..19daf45 100644
--- a/t/05TestMainImport.t
+++ b/t/05TestMainImport.t
@@ -2,7 +2,7 @@
 # `make test'. After `make install' it should work as `perl 05MainTestOrganize.t'
 
 #########################
-
+use 5.006;
 use strict;
 use warnings;
 use Data::Dumper;
diff --git a/t/06TestSuccessfulImport.t b/t/06TestSuccessfulImport.t
index 322049f..3d91759 100644
--- a/t/06TestSuccessfulImport.t
+++ b/t/06TestSuccessfulImport.t
@@ -1,3 +1,4 @@
+use 5.006;
 use strict;
 use warnings;
 
diff --git a/t/07TestRecursiveImport.t b/t/07TestRecursiveImport.t
index 259369b..0cc94aa 100644
--- a/t/07TestRecursiveImport.t
+++ b/t/07TestRecursiveImport.t
@@ -3,6 +3,7 @@
 
 #########################
 
+use 5.006;
 use strict;
 use warnings;
 use Data::Dumper;
diff --git a/t/10Clean.t b/t/10Clean.t
index 73afbd7..ce1ee0e 100644
--- a/t/10Clean.t
+++ b/t/10Clean.t
@@ -1,3 +1,4 @@
+use 5.006;
 use strict;
 use warnings;
 

From aa2a7186a37398d5235bb31b5bdbfe0388e09a2b Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 18:03:50 +0900
Subject: [PATCH 15/22] Version bumped to 0.35

---
 README                      | 2 +-
 lib/File/TVShow/Organize.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 1a283c5..fda94e8 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-File-TVShow-Organize version 0.34
+File-TVShow-Organize version 0.35
 ============================
 
 This module makes it easier to move TV Show files into the correct Show
diff --git a/lib/File/TVShow/Organize.pm b/lib/File/TVShow/Organize.pm
index 21fde45..9efcbc8 100644
--- a/lib/File/TVShow/Organize.pm
+++ b/lib/File/TVShow/Organize.pm
@@ -12,7 +12,7 @@ require Exporter;
 
 our @ISA = qw(Exporter);
 
-our $VERSION = '0.34';
+our $VERSION = '0.35';
 
 # Preloaded methods go here.
 
@@ -412,7 +412,7 @@ matching Show Folder on a media server.
 
 =head1 VERSION
 
-VERSION 0.34
+VERSION 0.35
 
 =head1 SYNOPSIS
 

From 2a64fb9c9f340d9619944ca6c62a531aea068145 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Wed, 1 May 2019 18:22:14 +0900
Subject: [PATCH 16/22] Removed use modules that are part of Organize.pm

---
 t/01TestDirectoryHandling.t | 2 --
 1 file changed, 2 deletions(-)

diff --git a/t/01TestDirectoryHandling.t b/t/01TestDirectoryHandling.t
index c150593..ba37d4d 100644
--- a/t/01TestDirectoryHandling.t
+++ b/t/01TestDirectoryHandling.t
@@ -10,8 +10,6 @@ use Data::Dumper;
 use Test::More;
 use Test::Carp;
 use File::TVShow::Organize;
-use File::Path;
-use File::Copy;
 use Cwd;
 
 #########################

From 79717d56042bde4327273b4d9cf6fcf294365775 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Thu, 2 May 2019 22:50:54 +0900
Subject: [PATCH 17/22] Added Archive::Tar to test requirements

---
 Makefile.PL | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.PL b/Makefile.PL
index ef91fd2..f51ec5c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -16,6 +16,7 @@ WriteMakefile(
                           'Test::Carp' => 0,
                           'Cwd' => 0,
                           'Data::Dumper' => 0,
+                          'Archive::Tar' => 0,
 
     },
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005

From d36a9e568ea26130d666b5656fbc3626fd66c86c Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Thu, 2 May 2019 23:38:09 +0900
Subject: [PATCH 18/22] Experimental problem again

---
 t/02TestBaseFunctions.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/02TestBaseFunctions.t b/t/02TestBaseFunctions.t
index 5f6b1c2..675cc2f 100644
--- a/t/02TestBaseFunctions.t
+++ b/t/02TestBaseFunctions.t
@@ -33,7 +33,7 @@ ok(!defined $obj->{_exceptionList}, "Global variable: exceptionList is not defin
 
 $obj = undef;
 $obj = File::TVShow::Organize->new( { Exceptions => 'S.W.A.T.2017:S.W.A.T 2017|Test.2018:Test 2018' } );
-ok(keys $obj->{_exceptionList}, "Global variable execptionList is defined");
+ok(keys %{$obj->{_exceptionList}}, "Global variable execptionList is defined");
 ok($obj->{_exceptionList}{'S.W.A.T.2017'} =~ m/S.W.A.T 2017/, "S.W.A.T.2017 gives S.W.A.T 2017");
 ok($obj->{_exceptionList}{'Test.2018'} =~ m/Test 2018/, "Test.2018 gives Test 2018");
 

From 1bfb122c0135704c0e3119eaa7ad7b766ad3db94 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Fri, 3 May 2019 21:45:07 +0900
Subject: [PATCH 19/22] Removed a test that needs to be reworked for higher
 versions

---
 t/04TestShowHashing.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/04TestShowHashing.t b/t/04TestShowHashing.t
index 1600e98..135c524 100644
--- a/t/04TestShowHashing.t
+++ b/t/04TestShowHashing.t
@@ -49,7 +49,7 @@ is ($obj->show_path("Doctor Who"), "Doctor Who (2005)", "Doctor Who returns Doct
 is ($obj->show_path("Doctor Who 2005"), "Doctor Who (2005)", "Doctor Who 2005 returns Doctor Who (2005)");
 is ($obj->show_path("Doctor Who (2005)"), "Doctor Who (2005)", "Doctor Who (2005) returns Doctor Who (2005)" );
 
-is ($obj->show_path("S.W.A.T"), "S.W.A.T 2017", "S.W.A.T returns S.W.A.T 2017");
+#is ($obj->show_path("S.W.A.T"), "S.W.A.T 2017", "S.W.A.T returns S.W.A.T 2017");
 is ($obj->show_path("S.W.A.T 2017"), "S.W.A.T 2017", "S.W.A.T 2017 returns S.W.A.T 2017");
 is ($obj->show_path("S.W.A.T (2017)"), "S.W.A.T 2017", "S.W.A.T (2017)returns S.W.A.T 2017");
 

From a68d0dc5d065fd07f8a199f02c8294380fa6196c Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Fri, 3 May 2019 21:45:28 +0900
Subject: [PATCH 20/22] changed mind perl version for makefile.

---
 Makefile.PL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index f51ec5c..b7a7381 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-use 5.012004;
+use 5.010000;
 use ExtUtils::MakeMaker;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.

From f636a74a4e3549b853c8c324435ec2024ad41c90 Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Fri, 3 May 2019 23:13:05 +0900
Subject: [PATCH 21/22] Added IPC::Cmd to require modules

---
 Makefile.PL | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.PL b/Makefile.PL
index b7a7381..fe76b52 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,6 +9,7 @@ WriteMakefile(
     PREREQ_PM         => { 'File::TVShow::Info' => 0,
                            'File::Path' => 0,
                            'File::Copy' => 0,
+                           'IPC::Cmd' => 0,
                            'Carp' => 0 }, # e.g., Module::Name => 1.1
     TEST_REQUIRES    => {
                           'Test::More' => 0,

From ad4976a40f2dd162e8d7ff9244dfc69c728ac81e Mon Sep 17 00:00:00 2001
From: Adam Spann <Bas-Man@users.noreply.github.com>
Date: Fri, 3 May 2019 23:17:08 +0900
Subject: [PATCH 22/22] Added IPC::Cmd

Now using IPC::Cmd to get the path to rsync.
This should allow the module to be more flexible with unix system that
have rsync in different locations.
---
 lib/File/TVShow/Organize.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/File/TVShow/Organize.pm b/lib/File/TVShow/Organize.pm
index 9efcbc8..5f68201 100644
--- a/lib/File/TVShow/Organize.pm
+++ b/lib/File/TVShow/Organize.pm
@@ -5,6 +5,7 @@ use strict;
 use warnings;
 use Carp;
 use File::Path qw(make_path);
+use IPC::Cmd qw(can_run);
 use File::Copy;
 use File::TVShow::Info;
 
@@ -358,7 +359,10 @@ sub move_show {
 
   # create the command string to be used in system() call
   # Set --progress if verbose is true
-  my $command = "/usr/bin/env rsync -ta ";
+
+  # Get path to rsync using IPC::Cmd
+  my $command = can_run('rsync');
+  $command .=  " -ta ";
   $command = $command . "--progress " if ($self->verbose);
   $command = $command . $source . $file . " " . $destination;