diff --git a/Changes b/Changes index aac4e76..ce44e14 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +4.10_03 ????-??-?? Duncan Ferguson +- Fix for multiple range expansion, as in 'h{a,b}{1,2}' (Github issue #97) (Thanks to lazyfrosch) + 4.10_02 2017-08-08 Duncan Ferguson - Include coverage tests in the resources - Include the version of cssh in the utility documentation and README diff --git a/THANKS b/THANKS index fe7e234..5944526 100644 --- a/THANKS +++ b/THANKS @@ -47,3 +47,4 @@ Deny Dias Bill Rushmore Ankit Vadehra Azenet +Markus Frosch (lazyfrosch) diff --git a/lib/App/ClusterSSH.pm b/lib/App/ClusterSSH.pm index 172ddc9..f642aa7 100644 --- a/lib/App/ClusterSSH.pm +++ b/lib/App/ClusterSSH.pm @@ -3,7 +3,7 @@ package App::ClusterSSH; use 5.008.004; use warnings; use strict; -use version; our $VERSION = version->new('4.10_02'); +use version; our $VERSION = version->new('4.10_03'); use Carp qw/cluck :DEFAULT/; diff --git a/lib/App/ClusterSSH/Range.pm b/lib/App/ClusterSSH/Range.pm index fbba5aa..78b1227 100644 --- a/lib/App/ClusterSSH/Range.pm +++ b/lib/App/ClusterSSH/Range.pm @@ -62,7 +62,7 @@ sub expand { next; } - my ( $base, $spec ) = $item =~ m/^(.*?\{(.*)\}.*?)$/; + my ( $base, $spec ) = $item =~ m/^(.*?\{(.*?)\}.*?)$/; for my $section ( split( /,/, $spec ) ) { my ( $start, $end ); diff --git a/t/range.t b/t/range.t index bed8fdc..13b1043 100644 --- a/t/range.t +++ b/t/range.t @@ -23,6 +23,8 @@ my %tests = ( 'l{0..2,7..9,e..g}' => 'l0 l1 l2 l7 l8 l9 le lf lg', 'm{0,1}' => 'm0 m1', 'n0..2}' => 'n0..2}', + 'host{a,b}-test{1,2}' => + 'hosta-test1 hosta-test2 hostb-test1 hostb-test2', # NOTE: the following are not "as expected" in line with above tests # due to bsd_glob functionality. See output from: