public
Last active

  • Download Gist
File-HomeDir.patch
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289
Index: t/11_darwin.t
===================================================================
--- t/11_darwin.t (revision 9435)
+++ t/11_darwin.t (working copy)
@@ -48,7 +48,7 @@
unless ( defined $users_home ) {
skip( "File::HomeDir->users_home('$user') undefined", 1 );
}
- unless ( $my_home eq $users_home ) {
+ if ( $my_home eq $users_home ) {
skip( "Users '$me' and '$user' have same home", 1 );
}
my $my_data = eval { File::HomeDir->my_data() };
Index: t/12_darwin_nocarbon.t
===================================================================
--- t/12_darwin_nocarbon.t (revision 0)
+++ t/12_darwin_nocarbon.t (revision 0)
@@ -0,0 +1,67 @@
+#!/usr/bin/perl
+
+use strict;
+BEGIN {
+ $| = 1;
+ $^W = 1;
+ $ENV{PERL_FILE_HOMEDIR_NO_CARBON} = 1;
+}
+
+use Test::More;
+use File::HomeDir;
+
+if ( $File::HomeDir::IMPLEMENTED_BY eq 'File::HomeDir::DarwinNoCarbon' ) {
+ plan( tests => 2 );
+} else {
+ plan( skip_all => "Not running on Darwin" );
+ exit(0);
+}
+
+SKIP: {
+ my $user;
+ foreach (0 .. 9) {
+ my $temp = sprintf 'fubar%04d', rand(10000);
+ getpwnam $temp and next;
+ $user = $temp;
+ last;
+ }
+ $user or skip("Unable to find non-existent user", 1);
+ $@ = undef;
+ my $home = eval {File::HomeDir->users_home($user)};
+ $@ and skip("Unable to execute File::HomeDir->users_home('$user')");
+ ok (!defined $home, "Home of non-existent user should be undef");
+}
+
+SKIP: {
+ my $user;
+ foreach my $uid (501 .. 540) {
+ $uid == $< and next;
+ $user = getpwuid $uid or next;
+ last;
+ }
+ $user or skip("Unable to find another user", 1);
+ my $me = getpwuid $<;
+ my $my_home = eval { File::HomeDir->my_home() };
+ unless ( defined $my_home ) {
+ skip( "File::HomeDir->my_home() undefined", 1 );
+ }
+ my $users_home = eval { File::HomeDir->users_home($user) };
+ unless ( defined $users_home ) {
+ skip( "File::HomeDir->users_home('$user') undefined", 1 );
+ }
+ if ( $my_home eq $users_home ) {
+ skip( "Users '$me' and '$user' have same home", 1 );
+ }
+ my $my_data = eval { File::HomeDir->my_data() };
+ unless ( defined $my_data ) {
+ skip( "File::HomeDir->my_data() undefined", 1 );
+ }
+ my $users_data = eval { File::HomeDir->users_data($user) };
+ unless ( defined $users_data ) {
+ skip( "File::HomeDir->users_data('$user') undefined", 1 );
+ }
+ ok (
+ $my_data ne $users_data,
+ "Users '$me' and '$user' should have different data",
+ );
+}
 
Property changes on: t/12_darwin_nocarbon.t
___________________________________________________________________
Name: svn:executable
+ *
 
Index: lib/File/HomeDir.pm
===================================================================
--- lib/File/HomeDir.pm (revision 9435)
+++ lib/File/HomeDir.pm (working copy)
@@ -54,9 +54,14 @@
} elsif ( $^O eq 'MSWin32' ) {
# All versions of Windows
$IMPLEMENTED_BY = 'File::HomeDir::Windows';
-} elsif ( $^O eq 'darwin' && $Config::Config{ptrsize} != 8 ) {
- # Modern Max OS X, but fallback to unix on 64 bit
- $IMPLEMENTED_BY = 'File::HomeDir::Darwin';
+} elsif ( $^O eq 'darwin') {
+ # Modern Max OS X, but fallback to NoCarbon in 64bit or no Mac::Carbon
+ if ($Config::Config{ptrsize} != 8 &&
+ !$ENV{PERL_FILE_HOMEDIR_NO_CARBON} && eval { require Mac::Files; 1 }) {
+ $IMPLEMENTED_BY = 'File::HomeDir::Darwin';
+ } else {
+ $IMPLEMENTED_BY = 'File::HomeDir::DarwinNoCarbon';
+ }
} elsif ( $^O eq 'MacOS' ) {
# Legacy Mac OS
$IMPLEMENTED_BY = 'File::HomeDir::MacOS9';
Index: lib/File/HomeDir/Darwin.pm
===================================================================
--- lib/File/HomeDir/Darwin.pm (revision 9435)
+++ lib/File/HomeDir/Darwin.pm (working copy)
@@ -170,12 +170,12 @@
Note -- since this module requires Mac::Carbon and Mac::Carbon does not
work with 64-bit perls, on such systems, File::HomeDir will fall back
-to File::HomeDir::Unix instead.
+to File::HomeDir::DarwinNoCarbon instead.
=head1 SYNOPSIS
use File::HomeDir;
-
+
# Find directories for the current user
$home = File::HomeDir->my_home; # /Users/mylogin
$desktop = File::HomeDir->my_desktop; # /Users/mylogin/Desktop
@@ -189,8 +189,6 @@
=over 4
-=item * Fallback to Unix if no Mac::Carbon available
-
=item * Test with Mac OS (versions 7, 8, 9)
=item * Some better way for users_* ?
Index: lib/File/HomeDir/DarwinNoCarbon.pm
===================================================================
--- lib/File/HomeDir/DarwinNoCarbon.pm (revision 0)
+++ lib/File/HomeDir/DarwinNoCarbon.pm (revision 0)
@@ -0,0 +1,143 @@
+package File::HomeDir::DarwinNoCarbon;
+
+use 5.00503;
+use strict;
+use Cwd ();
+use Carp ();
+use File::HomeDir::Unix ();
+
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.86';
+ @ISA = 'File::HomeDir::Unix';
+}
+
+#####################################################################
+# Current User Methods
+
+sub my_home {
+ my ($class) = @_;
+
+ if ( exists $ENV{HOME} and defined $ENV{HOME} ) {
+ return $ENV{HOME};
+ }
+
+ my $home = (getpwuid($<))[7];
+ return $home if $home && -d $home;
+
+ return undef;
+}
+
+sub _my_home {
+ my($class, $path) = @_;
+ my $home = $class->my_home;
+ return undef unless defined $home;
+
+ my $folder = "$home/$path";
+ unless ( -d $folder ) {
+ # Make sure that symlinks resolve to directories.
+ return unless -l $folder;
+ my $dir = readlink $folder or return;
+ return unless -d $dir;
+ }
+
+ return Cwd::abs_path($folder);
+}
+
+sub my_desktop {
+ my ($class) = @_;
+ $class->_my_home('Desktop');
+}
+
+sub my_documents {
+ my ($class) = @_;
+ $class->_my_home('Documents');
+}
+
+sub my_data {
+ my ($class) = @_;
+ $class->_my_home('Library/Application Support');
+}
+
+sub my_music {
+ my ($class) = @_;
+ $class->_my_home('Music');
+}
+
+sub my_pictures {
+ my ($class) = @_;
+ $class->_my_home('Pictures');
+}
+
+sub my_videos {
+ my ($class) = @_;
+ $class->_my_home('Movies');
+}
+
+#####################################################################
+# Arbitrary User Methods
+
+sub users_home {
+ my $class = shift;
+ my $home = $class->SUPER::users_home(@_);
+ return defined $home ? Cwd::abs_path($home) : undef;
+}
+
+sub users_desktop {
+ my ($class, $name) = @_;
+ return undef if $name eq 'root';
+ $class->_to_user( $class->my_desktop, $name );
+}
+
+sub users_documents {
+ my ($class, $name) = @_;
+ return undef if $name eq 'root';
+ $class->_to_user( $class->my_documents, $name );
+}
+
+sub users_data {
+ my ($class, $name) = @_;
+ $class->_to_user( $class->my_data, $name )
+ || $class->users_home($name);
+}
+
+# cheap hack ... not entirely reliable, perhaps, but ... c'est la vie, since
+# there's really no other good way to do it at this time, that i know of -- pudge
+sub _to_user {
+ my ($class, $path, $name) = @_;
+ my $my_home = $class->my_home;
+ my $users_home = $class->users_home($name);
+ defined $users_home or return undef;
+ $path =~ s/^\Q$my_home/$users_home/;
+ return $path;
+}
+
+1;
+
+=pod
+
+=head1 NAME
+
+File::HomeDir::DarwinNoCarbon - find your home and other directories, on Darwin (OS X) without Carbon
+
+=head1 DESCRIPTION
+
+This module provides Mac OS X specific file path for determining
+common user directories in pure perl, by just using C<$ENV{HOME}>
+without Carbon API calls. In normal usage this module will always be
+used via L<File::HomeDir>.
+
+=head1 SYNOPSIS
+
+ use File::HomeDir;
+
+ # Find directories for the current user
+ $home = File::HomeDir->my_home; # /Users/mylogin
+ $desktop = File::HomeDir->my_desktop; # /Users/mylogin/Desktop
+ $docs = File::HomeDir->my_documents; # /Users/mylogin/Documents
+ $music = File::HomeDir->my_music; # /Users/mylogin/Music
+ $pics = File::HomeDir->my_pictures; # /Users/mylogin/Pictures
+ $videos = File::HomeDir->my_videos; # /Users/mylogin/Movies
+ $data = File::HomeDir->my_data; # /Users/mylogin/Library/Application Support
+
+=back

Please sign in to comment on this gist.

Something went wrong with that request. Please try again.