Hello community, here is the log from the commit of package ack for openSUSE:Factory checked in at 2019-04-04 15:22:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ack (Old) and /work/SRC/openSUSE:Factory/.ack.new.3908 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ack" Thu Apr 4 15:22:18 2019 rev:24 rq:689346 version:2.28 Changes: -------- --- /work/SRC/openSUSE:Factory/ack/ack.changes 2018-08-12 20:55:53.525530535 +0200 +++ /work/SRC/openSUSE:Factory/.ack.new.3908/ack.changes 2019-04-04 15:27:33.230901441 +0200 @@ -1,0 +2,13 @@ +Fri Mar 22 21:11:41 UTC 2019 - Matthias Eliasson <[email protected]> + +- ack 2.28: + * The --help-rgb-colors option now displays the RGB codes organized by HSL + values for easier picking. +- includes 2.26: + * Added --help-colors and --help-rgb-colors options to display colors + available for color options. + * Clarified the docs for --lines option. + * Use File::Temp for temp files during tests on Win32. +- cleanup with spec-cleaner + +------------------------------------------------------------------- Old: ---- ack-2.24.tar.gz New: ---- ack-2.28.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ack.spec ++++++ --- /var/tmp/diff_new_pack.GrhNGa/_old 2019-04-04 15:27:38.022903285 +0200 +++ /var/tmp/diff_new_pack.GrhNGa/_new 2019-04-04 15:27:38.022903285 +0200 @@ -1,7 +1,7 @@ # # spec file for package ack # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ %endif %{!?perl_make_install: %global perl_make_install make DESTDIR=%{buildroot} install_vendor} Name: ack -Version: 2.24 +Version: 2.28 Release: 0 Summary: Grep-Like Text Finder License: Artistic-2.0 @@ -97,10 +97,11 @@ %files %doc rpmdoc_ack/* %{_bindir}/ack -%{_mandir}/man1/ack.1%{ext_man} +%{_mandir}/man1/ack.1%{?ext_man} %files -n perl-App-Ack -%doc Changes README.md LICENSE.md +%license LICENSE.md +%doc Changes README.md %dir %{perl_vendorlib}/App %{perl_vendorlib}/App/Ack.pm %{perl_vendorlib}/App/Ack ++++++ ack-2.24.tar.gz -> ack-2.28.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ack-2.24/Ack.pm new/ack-2.28/Ack.pm --- old/ack-2.24/Ack.pm 2018-06-22 05:49:29.000000000 +0200 +++ new/ack-2.28/Ack.pm 2019-03-19 04:52:05.000000000 +0100 @@ -13,15 +13,15 @@ =head1 VERSION -Version 2.24 +Version 2.28 =cut our $VERSION; our $COPYRIGHT; BEGIN { - $VERSION = '2.24'; - $COPYRIGHT = 'Copyright 2005-2018 Andy Lester.'; + $VERSION = '2.28'; + $COPYRIGHT = 'Copyright 2005-2019 Andy Lester.'; } our $fh; @@ -268,7 +268,7 @@ -Q, --literal Quote all metacharacters; PATTERN is literal Search output: - --lines=NUM Only print line(s) NUM of each file + --lines=NUMS Only print line(s) NUMS of each file. -l, --files-with-matches Only print filenames containing matches -L, --files-without-matches Only print filenames with no matches --output=expr Output the evaluation of expr for each line @@ -318,6 +318,8 @@ --color-match=COLOR --color-lineno=COLOR Set the color for filenames, matches, and line numbers. + --help-colors Show a list of possible color combinations. + --help-rgb-colors Show a list of advanced color specifications. --flush Flush output immediately, even when ack is used non-interactively (when output goes to a pipe or file). @@ -368,6 +370,9 @@ to standard output. --help, -? This help --help-types Display all known types + --help-types Display all known types, and how they're defined. + --help-colors Show a list of possible color combinations. + --help-rgb-colors Show a list of advanced color specifications. --dump Dump information on which options are loaded from which RC files --[no]filter Force ack to treat standard input as a pipe @@ -391,6 +396,147 @@ } +=head2 show_help_colors() + +Display the colors help subpage. + +=cut + +sub show_help_colors { + App::Ack::print( <<'END_OF_HELP' ); +ack allows customization of the colors it uses when presenting matches +onscreen. See the "ACK COLORS" section of the ack manual (ack --man). + +Here is a chart of how various color combinations appear: Each of the eight +foreground colors, on each of the eight background colors or no background +color, with and without the bold modifier. + +Run ack --help-rgb-colors for a chart of the RGB colors. + +END_OF_HELP + + _show_color_grid(); + + return; +} + + +=head2 show_help_rgb() + +Display the RGB help subpage. + +=cut + +sub show_help_rgb { + App::Ack::print( <<'END_OF_HELP' ); +ack allows customization of the colors it uses when presenting matches +onscreen. See the "ACK COLORS" section of the ack manual (ack --man). + +Colors may be specified as "rggNNN" where "NNN" is a triplet of digits +from 0 to 5 specifying the intensity of red, green and blue, respectively. + +Here is a grid of the 216 possible values for NNN. + +END_OF_HELP + + _show_rgb_grid(); + + App::Ack::say( 'Here are the 216 possible colors with the "reverse" modifier applied.', "\n" ); + + _show_rgb_grid( 'reverse' ); + + return; +} + + +sub _show_color_grid { + my $cell_width = 7; + + my @fg_colors = qw( black red green yellow blue magenta cyan white ); + my @bg_colors = map { "on_$_" } @fg_colors; + + App::Ack::say( + _color_cell( '' ), + map { _color_cell( $_ ) } @fg_colors + ); + + App::Ack::say( + _color_cell( '' ), + map { _color_cell( '-' x $cell_width ) } @fg_colors + ); + + for my $bg ( '', @bg_colors ) { + App::Ack::say( + _color_cell( '' ), + ( map { _color_cell( $_, "$_ $bg" ) } @fg_colors ), + $bg + ); + + App::Ack::say( + _color_cell( 'bold' ), + ( map { _color_cell( $_, "bold $_ $bg" ) } @fg_colors ), + $bg + ); + App::Ack::say(); + } + + return; +} + + +sub _color_cell { + my $text = shift; + my $color = shift; + + my $cell_width = 7; + $text = sprintf( '%-*s', $cell_width, $text ); + + return ($color ? Term::ANSIColor::colored( $text, $color ) : $text) . ' '; +} + + +sub _show_rgb_grid { + my $modifier = shift || ''; + + my $grid = <<'HERE'; +544 544 544 544 544 554 554 554 554 554 454 454 454 454 454 455 455 455 455 455 445 445 445 445 445 545 545 545 545 545 +533 533 533 543 543 553 553 553 453 453 353 353 353 354 354 355 355 355 345 345 335 335 335 435 435 535 535 535 534 534 +511 521 531 531 541 551 451 451 351 251 151 152 152 153 154 155 145 145 135 125 115 215 215 315 415 515 514 514 513 512 +500 510 520 530 540 550 450 350 250 150 050 051 052 053 054 055 045 035 025 015 005 105 205 305 405 505 504 503 502 501 +400 410 410 420 430 440 340 340 240 140 040 041 041 042 043 044 034 034 024 014 004 104 104 204 304 404 403 403 402 401 +300 300 310 320 320 330 330 230 130 130 030 030 031 032 032 033 033 023 013 013 003 003 103 203 203 303 303 302 301 301 +200 200 200 210 210 220 220 220 120 120 020 020 020 021 021 022 022 022 012 012 002 002 002 102 102 202 202 202 201 201 +100 100 100 100 100 110 110 110 110 110 010 010 010 010 010 011 011 011 011 011 001 001 001 001 001 101 101 101 101 101 + +522 522 532 542 542 552 552 452 352 352 252 252 253 254 254 255 255 245 235 235 225 225 325 425 425 525 525 524 523 523 + +411 411 421 431 431 441 441 341 241 241 141 141 142 143 143 144 144 134 124 124 114 114 214 314 314 414 414 413 412 412 + +422 422 432 432 432 442 442 442 342 342 242 242 242 243 243 244 244 244 234 234 224 224 224 324 324 424 424 424 423 423 + +311 311 311 321 321 331 331 331 231 231 131 131 131 132 132 133 133 133 123 123 113 113 113 213 213 313 313 313 312 312 + +433 433 433 433 433 443 443 443 443 443 343 343 343 343 343 344 344 344 344 344 334 334 334 334 334 434 434 434 434 434 +211 211 211 211 211 221 221 221 221 221 121 121 121 121 121 122 122 122 122 122 112 112 112 112 112 212 212 212 212 212 + +322 322 322 322 322 332 332 332 332 332 232 232 232 232 232 233 233 233 233 233 223 223 223 223 223 323 323 323 323 323 + +555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 555 +444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 +333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 333 +222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 222 +111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 111 +000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 000 +HERE + + $grid =~ s/(\d\d\d)/Term::ANSIColor::colored( "$1", "$modifier rgb$1" )/eg; + + App::Ack::say( $grid ); + + return; +} + + =head2 show_help_types() Display the filetypes help subpage. @@ -492,6 +638,7 @@ sub print { print {$fh} @_; return; } +sub say { print {$fh} @_, "\n"; return; } sub print_blank_line { App::Ack::print( "\n" ); return; } sub print_filename { App::Ack::print( $_[0], $_[1] ); return; } @@ -538,7 +685,7 @@ =head1 COPYRIGHT & LICENSE -Copyright 2005-2018 Andy Lester. +Copyright 2005-2019 Andy Lester. This program is free software; you can redistribute it and/or modify it under the terms of the Artistic License v2.0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ack-2.24/Changes new/ack-2.28/Changes --- old/ack-2.24/Changes 2018-06-22 05:49:29.000000000 +0200 +++ new/ack-2.28/Changes 2019-03-19 04:52:05.000000000 +0100 @@ -1,5 +1,24 @@ History file for ack. https://beyondgrep.com/ +2.28 Mon Mar 18 22:48:57 CDT 2019 +==================================== +[ENHANCEMENTS] +The --help-rgb-colors option now displays the RGB codes organized by +HSL values for easier picking. Thanks, Bill Ricker. + + +2.26 Sun Mar 17 22:00:00 CDT 2019 +==================================== +[ENHANCEMENTS] +Added --help-colors and --help-rgb-colors options to display colors +available for color options. + +Clarified the docs for --lines option. Thanks, Rob Hoelz. (GH #673) + +[FIXES] +Use File::Temp for temp files during tests on Win32. Thanks, Tim Gim Yee. +(GH #671) + 2.24 Thu Jun 21 22:41:49 CDT 2018 ==================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ack-2.24/ConfigLoader.pm new/ack-2.28/ConfigLoader.pm --- old/ack-2.24/ConfigLoader.pm 2018-01-06 21:01:46.000000000 +0100 +++ new/ack-2.28/ConfigLoader.pm 2019-03-18 04:06:16.000000000 +0100 @@ -398,6 +398,8 @@ 'version' => sub { App::Ack::print_version_statement(); exit; }, 'help|?:s' => sub { shift; App::Ack::show_help(@_); exit; }, 'help-types' => sub { App::Ack::show_help_types(); exit; }, + 'help-colors' => sub { App::Ack::show_help_colors(); exit; }, + 'help-rgb-colors' => sub { App::Ack::show_help_rgb(); exit; }, 'man' => sub { App::Ack::show_man(); exit; }, $extra_specs ? %{$extra_specs} : (), }; # arg_specs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ack-2.24/META.json new/ack-2.28/META.json --- old/ack-2.24/META.json 2018-06-22 05:54:17.000000000 +0200 +++ new/ack-2.28/META.json 2019-03-19 04:52:12.000000000 +0100 @@ -4,7 +4,7 @@ "Andy Lester <[email protected]>" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.143240", + "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010", "license" : [ "artistic_2" ], @@ -64,5 +64,6 @@ }, "x_MailingList" : "https://groups.google.com/group/ack-users"; }, - "version" : "2.24" + "version" : "2.28", + "x_serialization_backend" : "JSON::PP version 2.27400_02" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ack-2.24/META.yml new/ack-2.28/META.yml --- old/ack-2.24/META.yml 2018-06-22 05:54:17.000000000 +0200 +++ new/ack-2.28/META.yml 2019-03-19 04:52:12.000000000 +0100 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.143240' +generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010' license: artistic_2 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -38,4 +38,5 @@ homepage: https://beyondgrep.com/ license: http://www.perlfoundation.org/artistic_license_2_0 repository: git://github.com/beyondgrep/ack2.git -version: '2.24' +version: '2.28' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ack-2.24/ack new/ack-2.28/ack --- old/ack-2.24/ack 2018-06-22 05:49:29.000000000 +0200 +++ new/ack-2.28/ack 2019-03-19 04:52:05.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '2.24'; # Check https://beyondgrep.com/ for updates +our $VERSION = '2.28'; # Check https://beyondgrep.com/ for updates use 5.008008; use Getopt::Long 2.38 (); @@ -1348,10 +1348,11 @@ =item B<--lines=I<NUM>> -Only print line I<NUM> of each file. Multiple lines can be given with multiple -B<--lines> options or as a comma separated list (B<--lines=3,5,7>). B<--lines=4-7> -also works. The lines are always output in ascending order, no matter the -order given on the command line. +Only print line I<NUM> of each file. Multiple lines can be given with +multiple B<--lines> options or as a comma separated list (B<--lines=3,5,7>). +B<--lines=4-7> also works, as well as any combination +(B<--lines=3,15-20,43>) The lines are always output in ascending order, no +matter the order given on the command line. No pattern is matched. =item B<-l>, B<--files-with-matches> @@ -2269,6 +2270,7 @@ How appropriate to have I<ack>nowledgements! Thanks to everyone who has contributed to ack in any way, including +Tim Gim Yee, Michele Campeotto, H.Merijn Brand, Duke Leto, @@ -2385,7 +2387,7 @@ =head1 COPYRIGHT & LICENSE -Copyright 2005-2018 Andy Lester. +Copyright 2005-2019 Andy Lester. This program is free software; you can redistribute it and/or modify it under the terms of the Artistic License v2.0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ack-2.24/t/Util.pm new/ack-2.28/t/Util.pm --- old/ack-2.24/t/Util.pm 2018-01-07 06:37:41.000000000 +0100 +++ new/ack-2.28/t/Util.pm 2019-03-18 04:06:16.000000000 +0100 @@ -289,8 +289,10 @@ if ( is_windows() ) { require Win32::ShellQuote; # Capture stderr & stdout output into these files (only on Win32). - my $catchout_file = 'stdout.log'; - my $catcherr_file = 'stderr.log'; + my $catchout = File::Temp->new; + my $catcherr = File::Temp->new; + my $catchout_file = $catchout->filename; + my $catcherr_file = $catcherr->filename; open(SAVEOUT, ">&STDOUT") or die "Can't dup STDOUT: $!"; open(SAVEERR, ">&STDERR") or die "Can't dup STDERR: $!";
