Skip to content

Allow negative %d counts in pathmap pattern replacements #773

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

Open
afurm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow negative %d counts in pathmap pattern replacements #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/rake/ext/string.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def pathmap(spec=nil, &block)
result << "%"
when /%(-?\d+)d/
result << pathmap_partial($1.to_i)
when /^%\{([^}]*)\}(\d*[dpfnxX])/
when /^%\{([^}]*)\}(-?\d+d|[dpfnxX])/
patterns, operator = $1, $2
result << pathmap("%" + operator).pathmap_replace(patterns, &block)
when /^%/
Expand Down
9 changes: 9 additions & 0 deletions test/test_rake_path_map.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,15 @@ def test_multiple_patterns
def test_partial_directory_selection_works_with_patterns
assert_equal "this/is/a/long",
"this/is/a/really/long/path/ok.rb".pathmap("%{/really/,/}5d")
assert_equal "long/dir",
"this/is/a/really/long/path/ok.rb".pathmap("%{path,dir}-2d")
end

def test_pattern_with_count_on_non_directory_operator
ex = assert_raises(ArgumentError) do
"dir/abc.rb".pathmap("%{a,x}-2f")
end
assert_match(/unknown.*pathmap.*spec.*-2f/i, ex.message)
end

def test_pattern_with_invalid_operator
Expand Down
Loading