fix more Windows bugs (closes #1031)

mojolicious · Jan 10, 2017 · b4400a6 · b4400a6
1 parent d69f603
commit b4400a6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/lib/Mojo/File.pm b/lib/Mojo/File.pm
@@ -14,7 +14,7 @@ use File::Copy     ();
 use File::Find     ();
 use File::Path     ();
 use File::Spec::Functions
-  qw(abs2rel catfile file_name_is_absolute rel2abs splitdir);
+  qw(abs2rel canonpath catfile file_name_is_absolute rel2abs splitdir);
 use File::Temp ();
 use Mojo::Collection;
 
@@ -38,7 +38,7 @@ sub list {
   @files = map { catfile $$self, $_ } @files;
   @files = grep { !-d } @files unless $options->{dir};
 
-  return Mojo::Collection->new(map { $self->new($_) } sort @files);
+  return Mojo::Collection->new(map { $self->new(canonpath($_)) } sort @files);
 }
 
 sub list_tree {
@@ -72,7 +72,7 @@ sub move_to {
 
 sub new {
   my $class = shift;
-  my $value = @_ == 1 ? $_[0] : @_ > 1 ? catfile @_ : getcwd;
+  my $value = @_ == 1 ? $_[0] : @_ > 1 ? catfile @_ : canonpath getcwd;
   return bless \$value, ref $class || $class;
 }
 

diff --git a/lib/Mojo/Home.pm b/lib/Mojo/Home.pm
@@ -10,8 +10,9 @@ sub detect {
   my $detected;
   if ($ENV{MOJO_HOME}) { $detected = Mojo::File->new($ENV{MOJO_HOME})->to_abs }
 
-  # Location of the application class
+  # Location of the application class (Windows mixes slash and backslash)
   elsif ($class && (my $path = $INC{my $file = class_to_path $class})) {
+    $path =~ s/\\/\//g;
     $path =~ s/(?:\/b?lib)?\/\Q$file\E$//;
     $detected = Mojo::File->new($path)->to_abs;
   }

diff --git a/t/mojo/file.t b/t/mojo/file.t
@@ -3,14 +3,14 @@ use Mojo::Base -strict;
 use Test::More;
 use Cwd 'getcwd';
 use File::Basename qw(basename dirname);
-use File::Spec::Functions qw(abs2rel catfile rel2abs splitdir);
+use File::Spec::Functions qw(abs2rel canonpath catfile rel2abs splitdir);
 use File::Temp;
 use Mojo::File qw(path tempdir);
 
 # Constructor
-is(Mojo::File->new, getcwd(), 'same path');
-is path(), getcwd(), 'same path';
-is path()->to_string, getcwd(), 'same path';
+is(Mojo::File->new, canonpath(getcwd), 'same path');
+is path(), canonpath(getcwd), 'same path';
+is path()->to_string, canonpath(getcwd), 'same path';
 is path('/foo/bar'), '/foo/bar', 'same path';
 is path('foo', 'bar', 'baz'), catfile('foo', 'bar', 'baz'), 'same path';
 

diff --git a/t/mojo/home.t b/t/mojo/home.t
@@ -19,23 +19,23 @@ use Mojo::Home;
 # Specific class detection
 {
   my $fake = path->to_abs->child('does_not_exist_2');
-  local $INC{'My/Class.pm'} = $fake->child('My', 'Class.pm');
+  local $INC{'My/Class.pm'} = $fake->child('My', 'Class.pm')->to_string;
   my $home = Mojo::Home->new->detect('My::Class');
   is_deeply $home->to_array, $fake->to_array, 'right path detected';
 }
 
 # Specific class detection (with "lib")
 {
   my $fake = path->to_abs->child('does_not_exist_3');
-  local $INC{'My/Class.pm'} = $fake->child('lib', 'My', 'Class.pm');
+  local $INC{'My/Class.pm'} = $fake->child('lib', 'My', 'Class.pm')->to_string;
   my $home = Mojo::Home->new->detect('My::Class');
   is_deeply $home->to_array, $fake->to_array, 'right path detected';
 }
 
 # Specific class detection (with "blib")
 {
   my $fake = path->to_abs->child('does_not_exist_3');
-  local $INC{'My/Class.pm'} = $fake->child('blib', 'My', 'Class.pm');
+  local $INC{'My/Class.pm'} = $fake->child('blib', 'My', 'Class.pm')->to_string;
   my $home = Mojo::Home->new->detect('My::Class');
   is_deeply $home->to_array, $fake->to_array, 'right path detected';
 }