.gitignore @@ -125,7 +125,9 @@ END [ '--before-context', '-B', GetoptLong::REQUIRED_ARGUMENT ], [ '--context', '-C', GetoptLong::OPTIONAL_ARGUMENT ], [ '-g', GetoptLong::REQUIRED_ARGUMENT ], - [ '-x', '--line-regexp', GetoptLong::NO_ARGUMENT ] + [ '-x', '--line-regexp', GetoptLong::NO_ARGUMENT ], + [ '-s', '--line-start', GetoptLong::NO_ARGUMENT ], + [ '-e', '--line-end', GetoptLong::NO_ARGUMENT ] ) dir = nil @@ -145,6 +147,8 @@ END opt[:print_match] = false opt[:match_whole_words] = false opt[:match_whole_lines] = false + opt[:match_line_starts] = false + opt[:match_line_ends] = false opt[:print_file_each_line] = false opt[:print_file_if_match] = false opt[:print_file_if_no_match] = false @@ -280,6 +284,10 @@ END opt[:filename_regex] = arg when '-x' opt[:match_whole_lines] = true + when '-s' + opt[:match_line_starts] = true + when '-e' + opt[:match_line_ends] = true end end rescue GetoptLong::InvalidOption => ex @@ -474,6 +482,12 @@ END if opt[:match_whole_lines] str = "^" + str + "$" end + if opt[:match_line_starts] + str = "^" + str + end + if opt[:match_line_ends] + str = str + "$" + end if $use_onig if opt[:ignore_case] re = Oniguruma::ORegexp.new(str, :options => Oniguruma::OPTION_IGNORECASE) @@ -517,7 +531,7 @@ END code << %{ elsif fn.is_a? IO } code << %{ f = fn } code << %{ end } - + code << %{ f.each_line do |line| } code << %{ i += 1 } code << %{ rest = line } @@ -687,6 +701,8 @@ Searching: -w, --word-regexp Force PATTERN to match only whole words -x, --line-regexp Force PATTERN to match only whole lines -Q, --literal Quote all metacharacters; expr is literal + -s, --line-start Match only at the start of a line + -e, --line-start Match only at the end of a line Search output: -l, --files-with-matches bin/rak @@ -461,6 +461,22 @@ END END end + + it "-s means match only at the start of a line" do + asterize_ansi(%x{rak -s "foo Cap"}).should == t=<<END +*foo.rb* + 4|*foo Cap*sicum foo foo foo foo foo + +END + end + + it "-e means match only at the end of a line" do + asterize_ansi(%x{rak -e "kon foo foo"}).should == t=<<END +*foo.rb* + 6|foo foo foo foo foo Pi*kon foo foo* + +END + end end describe "Rak", "with combinations of options" do spec/rak_spec.rb 52379eb4f3d92beeb943ffaaca01159b0677a213 Daniel Lucraft dbl@zabrieski.doc.ic.ac.uk http://github.com/danlucraft/rak/commit/f5b9d692fd999e7e4c6ccf0b1cf3df7b4dc06d8a f5b9d692fd999e7e4c6ccf0b1cf3df7b4dc06d8a 2007-11-07T04:24:00-08:00 2007-11-07T04:24:00-08:00 Added -e and -s options. 8c6d25fcdf0154b0a53783c361a5ce1f3b2f7b1f Daniel Lucraft dbl@zabrieski.doc.ic.ac.uk