Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes 'dot-' preprocessing fails for dot-directories (#33, Savannah#56727) #70

Merged
merged 4 commits into from
Apr 6, 2024
Merged

Fixes 'dot-' preprocessing fails for dot-directories (#33, Savannah#56727) #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4e4135
Fixes Bug #56727
AitorATuin May 24, 2020
a2db7a9
Add $level variable in stow_contents and stow_node
AitorATuin May 25, 2020
056d648
Add more tests for testing directories in dotfiles.t
AitorATuin May 25, 2020
a41118d
Fix missing variable
AitorATuin May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions lib/Stow.pm.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ sub plan_unstow {
$self->{stow_path},
$package,
'.',
$path,
);
}
debug(2, "Planning unstow of package $package... done");
Expand Down Expand Up @@ -316,6 +317,7 @@ sub plan_stow {
$package,
'.',
$path, # source from target
0,
);
debug(2, "Planning stow of package $package... done");
$self->{action_count}++;
Expand Down Expand Up @@ -367,10 +369,12 @@ sub within_target_do {
#============================================================================
sub stow_contents {
my $self = shift;
my ($stow_path, $package, $target, $source) = @_;

my $path = join_paths($stow_path, $package, $target);
my ($stow_path, $package, $target, $source, $level) = @_;

# Remove leading $level times .. from $source
my $n = 0;
my $path = join '/', map { (++$n <= $level) ? ( ) : $_ } (split m{/+}, $source);

return if $self->should_skip_target_which_is_stow_dir($target);

my $cwd = getcwd();
Expand Down Expand Up @@ -407,6 +411,7 @@ sub stow_contents {
$package,
$node_target, # target
join_paths($source, $node), # source
$level
);
}
}
Expand All @@ -429,7 +434,7 @@ sub stow_contents {
#============================================================================
sub stow_node {
my $self = shift;
my ($stow_path, $package, $target, $source) = @_;
my ($stow_path, $package, $target, $source, $level) = @_;

my $path = join_paths($stow_path, $package, $target);

Expand Down Expand Up @@ -499,12 +504,14 @@ sub stow_node {
$existing_package,
$target,
join_paths('..', $existing_source),
$level + 1,
);
$self->stow_contents(
$self->{stow_path},
$package,
$target,
join_paths('..', $source),
$level + 1,
);
}
else {
Expand All @@ -531,6 +538,7 @@ sub stow_node {
$package,
$target,
join_paths('..', $source),
$level + 1,
);
}
else {
Expand All @@ -554,6 +562,7 @@ sub stow_node {
$package,
$target,
join_paths('..', $source),
$level + 1,
);
}
else {
Expand Down Expand Up @@ -740,9 +749,7 @@ sub unstow_node_orig {
#============================================================================
sub unstow_contents {
my $self = shift;
my ($stow_path, $package, $target) = @_;

my $path = join_paths($stow_path, $package, $target);
my ($stow_path, $package, $target, $path) = @_;

return if $self->should_skip_target_which_is_stow_dir($target);

Expand Down Expand Up @@ -778,7 +785,7 @@ sub unstow_contents {
$node_target = $adj_node_target;
}

$self->unstow_node($stow_path, $package, $node_target);
$self->unstow_node($stow_path, $package, $node_target, join_paths($path, $node));
}
if (-d $target) {
$self->cleanup_invalid_links($target);
Expand All @@ -798,7 +805,7 @@ sub unstow_contents {
#============================================================================
sub unstow_node {
my $self = shift;
my ($stow_path, $package, $target) = @_;
my ($stow_path, $package, $target, $source) = @_;

my $path = join_paths($stow_path, $package, $target);

Expand Down Expand Up @@ -872,7 +879,7 @@ sub unstow_node {
elsif (-e $target) {
debug(4, " Evaluate existing node: $target");
if (-d $target) {
$self->unstow_contents($stow_path, $package, $target);
$self->unstow_contents($stow_path, $package, $target, $source);

# This action may have made the parent directory foldable
if (my $parent = $self->foldable($target)) {
Expand Down
82 changes: 81 additions & 1 deletion t/dotfiles.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use warnings;

use testutil;

use Test::More tests => 6;
use Test::More tests => 10;
use English qw(-no_match_vars);

use testutil;
Expand Down Expand Up @@ -86,6 +86,64 @@ is(
=> 'processed dotfile folder'
);

#
# process folder marked with 'dot' prefix
# when directory exists is target
#

$stow = new_Stow(dir => '../stow', dotfiles => 1);

make_path('../stow/dotfiles/dot-emacs.d');
make_file('../stow/dotfiles/dot-emacs.d/init.el');
make_path('.emacs.d');

$stow->plan_stow('dotfiles');
$stow->process_tasks();
is(
readlink('.emacs.d/init.el'),
'../../stow/dotfiles/dot-emacs.d/init.el',
=> 'processed dotfile folder when folder exists (1 level)'
);

#
# process folder marked with 'dot' prefix
# when directory exists is target (2 levels)
#

$stow = new_Stow(dir => '../stow', dotfiles => 1);

make_path('../stow/dotfiles/dot-emacs.d/dot-emacs.d');
make_file('../stow/dotfiles/dot-emacs.d/dot-emacs.d/init.el');
make_path('.emacs.d');

$stow->plan_stow('dotfiles');
$stow->process_tasks();
is(
readlink('.emacs.d/.emacs.d'),
'../../stow/dotfiles/dot-emacs.d/dot-emacs.d',
=> 'processed dotfile folder exists (2 levels)'
);

#
# process folder marked with 'dot' prefix
# when directory exists is target
#

$stow = new_Stow(dir => '../stow', dotfiles => 1);

make_path('../stow/dotfiles/dot-one/dot-two');
make_file('../stow/dotfiles/dot-one/dot-two/three');
make_path('.one/.two');

$stow->plan_stow('dotfiles');
$stow->process_tasks();
is(
readlink('./.one/.two/three'),
'../../../stow/dotfiles/dot-one/dot-two/three',
=> 'processed dotfile 2 folder exists (2 levels)'
);


#
# corner case: paths that have a part in them that's just "$DOT_PREFIX" or
# "$DOT_PREFIX." should not have that part expanded.
Expand Down Expand Up @@ -129,3 +187,25 @@ ok(
-f '../stow/dotfiles/dot-bar' && ! -e '.bar'
=> 'unstow a simple dotfile'
);

#
# unstow process folder marked with 'dot' prefix
# when directory exists is target
#

$stow = new_Stow(dir => '../stow', dotfiles => 1);

make_path('../stow/dotfiles/dot-emacs.d');
make_file('../stow/dotfiles/dot-emacs.d/init.el');
make_path('.emacs.d');
make_link('.emacs.d/init.el', '../../stow/dotfiles/dot-emacs.d/init.el');

$stow->plan_unstow('dotfiles');
$stow->process_tasks();
ok(
$stow->get_conflict_count == 0 &&
-f '../stow/dotfiles/dot-emacs.d/init.el' &&
! -e '.emacs.d/init.el' &&
-d '.emacs.d/'
=> 'unstow dotfile folder when folder already exists'
);