Skip to content

Commit

Permalink
Pull in all fixes from 4.13.x
Browse files Browse the repository at this point in the history
  • Loading branch information
duncs committed Mar 15, 2018
2 parents 4599f3d + 205bf68 commit 7670b0b
Show file tree
Hide file tree
Showing 11 changed files with 131 additions and 81 deletions.
36 changes: 28 additions & 8 deletions Build.PL
Expand Up @@ -82,14 +82,28 @@ EOF
$self->SUPER::ACTION_dist;
}
sub ACTION_clean {
my ($self, @args) = @_;
for my $file (keys %{ $self->script_files } ) {
if( -e $file) {
print "Removing '$file'",$/;
unlink $file;
}
}
$self->SUPER::ACTION_clean;
}
},
);

my $build = $class->new(
meta_merge => {
resources => {
Repository => [
'http://clusterssh.git.sourceforge.net/',

#'http://clusterssh.git.sourceforge.net/',
$project_info{repository},
],
bugtracker => $project_info{tracker},
Expand Down Expand Up @@ -126,23 +140,29 @@ my $build = $class->new(
'CPAN::Changes' => 0.27,
'File::Slurp' => 0,
'Test::PerlTidy' => 0,
'Perl::Tidy' => 20171214,
'Perl::Tidy' => 20180220,
},
recommends => { 'Sort::Naturally' => 0, },
configure_requires => { 'Module::Build' => 0, },
add_to_cleanup => ['App-ClusterSSH-*'],
create_makefile_pl => 'traditional',
script_files => [
'bin/cssh', 'bin/csftp',
'bin/ccon', 'bin/crsh',
'bin/ctel', 'bin/clusterssh_bash_completion.dist'
'bin/cssh',
'bin/csftp',
'bin/ccon',
'bin/crsh',
'bin/ctel',
'bin/clusterssh_bash_completion.dist'
],
get_options => { changes => { type => '=s' }, },
PL_files => {
'bin_PL/_build_docs' => [
'bin/cssh', 'bin/csftp',
'bin/ccon', 'bin/crsh',
'bin/ctel', 'bin/clusterssh_bash_completion.dist'
'bin/cssh',
'bin/csftp',
'bin/ccon',
'bin/crsh',
'bin/ctel',
'bin/clusterssh_bash_completion.dist'
],
},
);
Expand Down
9 changes: 8 additions & 1 deletion Changes
@@ -1,6 +1,13 @@
4.13_01 0000-00-00 Duncan Ferguson <duncan_ferguson@user.sf.net>
4.14_01 0000-00-00 Duncan Ferguson <duncan_ferguson@user.sf.net>
- Move all Tk code into its own module as-is

4.13.2 2018-03-14 Duncan Ferguson <duncan_ferguson@user.sf.net>
- Fix for running builds in parallel
- Improvements to SUPPORT and REPORTING BUGS sections in documentation

4.13.1 2018-03-05 Duncan Ferguson <duncan_ferguson@user.sf.net>
- Minor update to fix failing tests due to 3rd party perltidy changes

4.13 2017-12-27 Duncan Ferguson <duncan_ferguson@user.sf.net>
- Ensure ssh_args is keep unset if it is emptied in the configuration file
- Obey configured console position (Debian bug 758215) (Github issue #100)
Expand Down
18 changes: 13 additions & 5 deletions META.json
Expand Up @@ -20,7 +20,7 @@
"File::Slurp" : "0",
"File::Temp" : "0",
"File::Which" : "0",
"Perl::Tidy" : "20171214",
"Perl::Tidy" : "20180220",
"Readonly" : "0",
"Test::Differences" : "0",
"Test::DistManifest" : "0",
Expand Down Expand Up @@ -49,14 +49,15 @@
"Try::Tiny" : "0",
"X11::Protocol" : "0.56",
"X11::Protocol::WM" : "0",
"perl" : "v5.8.4",
"version" : "0.77"
}
}
},
"provides" : {
"App::ClusterSSH" : {
"file" : "lib/App/ClusterSSH.pm",
"version" : "4.13"
"version" : "4.14_01"
},
"App::ClusterSSH::Base" : {
"file" : "lib/App/ClusterSSH/Base.pm",
Expand Down Expand Up @@ -90,9 +91,17 @@
},
"App::ClusterSSH::Range" : {
"file" : "lib/App/ClusterSSH/Range.pm"
},
"App::ClusterSSH::Window" : {
"file" : "lib/App/ClusterSSH/Window.pm",
"version" : "0.01"
},
"App::ClusterSSH::Window::Tk" : {
"file" : "lib/App/ClusterSSH/Window/Tk.pm",
"version" : "0.01"
}
},
"release_status" : "stable",
"release_status" : "testing",
"resources" : {
"bugtracker" : {
"web" : "https://github.com/duncs/clusterssh/issues"
Expand All @@ -102,11 +111,10 @@
"http://dev.perl.org/licenses/"
],
"x_Repository" : [
"http://clusterssh.git.sourceforge.net/",
"http://github.com/duncs/clusterssh"
],
"x_coverage" : "https://coveralls.io/github/duncs/clusterssh"
},
"version" : "4.13",
"version" : "4.14_01",
"x_serialization_backend" : "JSON::PP version 2.94"
}
14 changes: 10 additions & 4 deletions META.yml
Expand Up @@ -7,7 +7,7 @@ build_requires:
File::Slurp: '0'
File::Temp: '0'
File::Which: '0'
Perl::Tidy: '20171214'
Perl::Tidy: '20180220'
Readonly: '0'
Test::Differences: '0'
Test::DistManifest: '0'
Expand All @@ -27,7 +27,7 @@ name: App-ClusterSSH
provides:
App::ClusterSSH:
file: lib/App/ClusterSSH.pm
version: '4.13'
version: 4.14_01
App::ClusterSSH::Base:
file: lib/App/ClusterSSH/Base.pm
version: '0.02'
Expand All @@ -52,6 +52,12 @@ provides:
file: lib/App/ClusterSSH/L10N/en.pm
App::ClusterSSH::Range:
file: lib/App/ClusterSSH/Range.pm
App::ClusterSSH::Window:
file: lib/App/ClusterSSH/Window.pm
version: '0.01'
App::ClusterSSH::Window::Tk:
file: lib/App/ClusterSSH/Window/Tk.pm
version: '0.01'
recommends:
Sort::Naturally: '0'
requires:
Expand All @@ -64,14 +70,14 @@ requires:
Try::Tiny: '0'
X11::Protocol: '0.56'
X11::Protocol::WM: '0'
perl: v5.8.4
version: '0.77'
resources:
Coverage: https://coveralls.io/github/duncs/clusterssh
Repository:
- http://clusterssh.git.sourceforge.net/
- http://github.com/duncs/clusterssh
bugtracker: https://github.com/duncs/clusterssh/issues
homepage: http://github.com/duncs/clusterssh/wiki
license: http://dev.perl.org/licenses/
version: '4.13'
version: 4.14_01
x_serialization_backend: 'CPAN::Meta::YAML version 0.016'
3 changes: 2 additions & 1 deletion Makefile.PL
@@ -1,4 +1,5 @@
# Note: this file was auto-generated by Module::Build::Compat version 0.4224
require 5.008004;
use ExtUtils::MakeMaker;
WriteMakefile
(
Expand All @@ -14,7 +15,7 @@ WriteMakefile
'File::Which' => 0,
'Getopt::Long' => 0,
'Locale::Maketext' => 0,
'Perl::Tidy' => 20171214,
'Perl::Tidy' => 20180220,
'Readonly' => 0,
'Test::Differences' => 0,
'Test::DistManifest' => 0,
Expand Down
56 changes: 28 additions & 28 deletions README
Expand Up @@ -2,7 +2,7 @@ NAME
cssh - Cluster administration tool

VERSION
This documentation is for version: 4.13
This documentation is for version: 4.14_01

SYNOPSIS
cssh [-a '<command>'] [-K <seconds>] [-q] [-c '<filename>'] [-x <cols>]
Expand Down Expand Up @@ -640,52 +640,52 @@ KNOWN BUGS
tell the difference between the two events, there is no fix (apart
from rewriting everything directly in X).

REPORTING BUGS
* If you have issues running cssh, first try:
TROUBLESHOOTING
If you have issues running cssh, first try:

"cssh -e [user@]<hostname>[:port]"
"cssh -e [user@]<hostname>[:port]"

This performs two tests to confirm cssh is able to work properly
with the settings provided within the $HOME/.clusterssh/config file
(or internal defaults).
This performs two tests to confirm cssh is able to work properly with
the settings provided within the $HOME/.clusterssh/config file (or
internal defaults).

1 Test the terminal window works with the options provided
1 Test the terminal window works with the options provided

2 Test ssh works to a host with the configured arguments
2 Test ssh works to a host with the configured arguments

Configuration options to watch for in ssh are
Configuration options to watch for in ssh are:

SSH doesn't understand "-o ConnectTimeout=10" - remove the option
* SSH doesn't understand "-o ConnectTimeout=10" - remove the option
from the $HOME/.clusterssh/config file
OpenSSH-3.8 using untrusted ssh tunnels - use "-Y" instead of "-X"

* OpenSSH-3.8 using untrusted ssh tunnels - use "-Y" instead of "-X"
or use "ForwardX11Trusted yes" in $HOME/.ssh/ssh_config (if you
change the default ssh options from "-x" to "-X")

* If you require support, please run the following commands and post
it on the web site in the support/problems forum:
SUPPORT AND REPORTING BUGS
A web site for comments, requests, bug reports and bug fixes/patches is
available at: <https://github.com/duncs/clusterssh>

If you require support, please run the following commands and create an
issue via: <https://github.com/duncs/clusterssh/issues>

"perl -V"
"perl -V"

"perl -MTk -e 'print $Tk::VERSION,$/'"
"perl -MTk -e 'print $Tk::VERSION,$/'"

"perl -MX11::Protocol -e 'print $X11::Protocol::VERSION,$/'"
"perl -MX11::Protocol -e 'print $X11::Protocol::VERSION,$/'"

"cat /etc/csshrc $HOME/.clusterssh/config"
"cat /etc/csshrc $HOME/.clusterssh/config"

* Using the debug option (--debug) will turn on debugging output.
Repeat the option to increase the amount of debug. However, if
possible please only use this option with one host at a time, e.g.
"cssh --debug <host>" due to the amount of output produced (in both
main and child windows).
Using the debug option (--debug) will turn on debugging output. Repeat
the option to increase the amount of debug. However, if possible please
only use this option with one host at a time, e.g. "cssh --debug <host>"
due to the amount of output produced (in both main and child windows).

SEE ALSO
<http://clusterssh.sourceforge.net/>, "ssh", Tk::overview,
<https://github.com/duncs/clusterssh/wiki/>, "ssh", Tk::overview,
X11::Protocol, "perl"

CREDITS
A web site for comments, requests, bug reports and bug fixes/patches is
available at: <https://github.com/duncs/clusterssh>

AUTHOR
Duncan Ferguson, "<duncan_j_ferguson at yahoo.co.uk>"

Expand Down
13 changes: 6 additions & 7 deletions bin_PL/_build_docs
Expand Up @@ -4,10 +4,9 @@ use strict;
use warnings;

use FindBin qw($Bin $Script);
use File::Basename;

chdir $Bin || die "Unable to chdir into $Bin: $!";

my $bindir="$Bin/../bin";
my $bindir="bin";

if(! -d $bindir) {
mkdir $bindir || die "Could not mkdir $bindir: $!";
Expand All @@ -16,8 +15,8 @@ if(! -d $bindir) {
print "Using perl binary: $^X",$/;
print "Using perl version $^V",$/;

for my $source (glob("*")) {
my $dest="$bindir/$source";
for my $dest (@ARGV) {
my $source=$Bin.'/'.basename($dest);

next if($source =~ m/$Script/);
next if($source =~ m/\.x$/);
Expand All @@ -33,10 +32,10 @@ for my $source (glob("*")) {
print $dfh $_ while(<$sfh>);
close($sfh);

if($source ne "clusterssh_bash_completion.dist") {
if($source !~ m/clusterssh_bash_completion.dist/) {
print $dfh "\n\n__END__\n\n";

my $pod= qx{ $^X ./$source --generate-pod };
my $pod= qx{ $^X $source --generate-pod };
die "Failed to generate pod" if($?);
print $dfh $pod;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/App/ClusterSSH.pm
Expand Up @@ -3,7 +3,7 @@ package App::ClusterSSH;
use 5.008.004;
use warnings;
use strict;
use version; our $VERSION = version->new('4.13_01');
use version; our $VERSION = version->new('4.14_01');

use Carp qw/cluck :DEFAULT/;

Expand Down

0 comments on commit 7670b0b

Please sign in to comment.