Mqtt lwt wildcards

.travis.yml

@@ -6,10 +6,10 @@ os:
 dist: trusty
 
 perl:
+    - "5.30"
     - "5.24"
     - "5.18"
     - "5.16"
-    - "5.08"
 
 install: true
 

README.md

@@ -1,7 +1,7 @@
 MisterHouse
 ===========
 
-[![Build Status](https://travis-ci.org/hollie/misterhouse.svg?branch=master)](https://travis-ci.org/hollie/misterhouse)
+[![Build Status](https://travis-ci.com/hollie/misterhouse.svg?branch=master)](https://travis-ci.com/hollie/misterhouse)
 
 Perl open source home automation program. It's fun, it's free, and it's entirely geeky.
 

bin/alpha_page

@@ -31,7 +31,9 @@ BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
+
 }
 
 use Getopt::Long;

bin/get_earthquakes

@@ -55,7 +55,8 @@ eof
 }
 
 BEGIN {
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }                                # Use BEGIN eval to keep perl2exe happy
 require 'handy_utilities.pl';    # For read_mh_opts funcion
 

bin/get_email

@@ -31,7 +31,8 @@ BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }
 
 use Getopt::Long;

bin/get_tcp

@@ -0,0 +1,125 @@
+#!/usr/bin/env perl
+# -*- Perl -*-
+
+use strict;
+use IO::Socket;
+
+# Similar to get_url, open a socket and then get the data. Useful to spawn off as a process_item to avoid pauses
+
+my ( $Pgm_Path, $Pgm_Name );
+
+BEGIN {
+    ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
+    ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
+}
+
+my ( %config_parms, %parms );
+
+use Getopt::Long;
+
+if (
+    !&GetOptions( \%parms, 'h', 'help', 'quiet', 'timeout=s', 'rn')
+    or !@ARGV
+    or $parms{h}
+    or $parms{help}
+  )
+{
+
+    print <<eof;
+
+    $Pgm_Name similar to get_url, opens a socket to host and echos response to STDOUT or a local file.
+
+Usage:
+
+    $Pgm_Name [-quiet] host:post data [local_file]
+
+    -quiet: no output on stdout
+    -timeout: in seconds. Defaults is 3 seconds
+    -rn: send \r\n to the data
+
+    If local_file is specified, data is stored there.
+    If local_file = /dev/null, data is not returned.
+    Otherwise, data is echoed to STDOUT.
+
+
+eof
+    exit;
+}
+
+my $timeout = 3;
+$timeout = $parms{timeout} if ($parms{timeout});
+
+my $location = shift;
+
+my ($host, $port) = $location =~ /^(\S+)(:\d+)/;
+
+$port =~ s/://g;
+
+my $data = shift;
+
+$data .= "\r\n" if ($parms{rn});
+
+unless ($host and $port and $data) {
+    print "get_tcp_error: missing parameters: ";
+    print "host " unless ($host);
+    print "port " unless ($port);
+    print "data " unless ($data);
+    print "\n";
+    exit;
+}
+
+
+# Get parms from mh.ini
+require 'handy_utilities.pl';
+&main::read_mh_opts( \%config_parms, $Pgm_Path );
+
+my $file = shift;
+my $response = "";
+my $error = 1;
+
+my $tcp = new IO::Socket::INET(
+PeerHost => $host,
+PeerPort => $port,
+Timeout  => $timeout,
+Proto => "tcp") or $response = "get_tcp_error: opening socket: $!.\n";
+#print "error $host:$port\n" if ($tcp->connected());
+
+unless ($response) {
+    $error = 0;
+    print "Sending data to $location " unless $parms{quiet}; 
+    print "into $file" unless ($parms{quiet} or !$file);
+    print "..." unless $parms{quiet};
+
+    $tcp->send($data) or $response = "get_tcp_error: Couldn't send: $!";
+
+    unless ($response) {
+        $tcp->recv($response, 1024);
+        print " data retrieved\n" unless $parms{quiet};
+    } else {
+        $error = 1;
+    }
+}
+    if ($file) {
+        #       print $data;
+        unless ( $file eq '/dev/null' ) {
+            if ($response) {
+                open( OUT, ">$file" )
+                  or die "get_tcp_error: could not open file '$file' for output: $!\n";
+                binmode OUT;
+                print OUT $response;
+                close OUT;
+            }
+            else {
+                print " empty data response\n";
+            }
+        }
+    } else {
+        print $response;
+    }
+
+
+$tcp->close() unless ($error);
+
+

bin/get_tv_grid

@@ -45,7 +45,8 @@ BEGIN {
     ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }
 
 require "RedirAgent.pm";

bin/get_tv_grid_ge

@@ -40,7 +40,8 @@ BEGIN {
     ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }
 my %parms;
 use Getopt::Long;

bin/get_tv_grid_xmltv

@@ -57,7 +57,8 @@ BEGIN {
     ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # So perl2exe works
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";    # So perl2exe works
 }
 
 use XMLTV::Version '$Id$ ';

bin/get_tv_info

@@ -26,7 +26,8 @@ BEGIN {
 
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }
 
 my %parms;

bin/get_tv_info_ge

@@ -23,7 +23,8 @@ BEGIN {
 
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }
 
 my %parms;

bin/get_url

@@ -9,7 +9,8 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }
 
 my ( %config_parms, %parms );
@@ -19,7 +20,7 @@ use Getopt::Long;
 #print "get_url: @ARGV\n";
 if (
     !&GetOptions( \%parms, 'h', 'help', 'quiet', 'cookies=s', 'cookie_file_in=s', 'cookie_file_out=s', 'post=s', 'header=s', 'userid=s', 'password=s', 'ua',
-        'put=s', 'json', 'response_code' )
+        'put=s', 'timeout=s', 'json', 'response_code' )
     or !@ARGV
     or $parms{h}
     or $parms{help}
@@ -32,7 +33,7 @@ if (
 
 Usage:
 
-    $Pgm_Name [-quiet] [-cookies 'cookiestr'] [-post 'poststr'] [-header header_file] url [local_file]
+    $Pgm_Name [-quiet] [-cookies 'cookiestr'] [-post 'poststr'] [-header header_file] [-timeout X] url [local_file]
 
     -quiet: no output on stdout
 
@@ -59,6 +60,7 @@ Usage:
 
     -response_code: STDOUT only: Prepend output with RESPONSECODE: <response code>\n
 
+    -timeout: XX : number of seconds to wait for command to complete
 
     If local_file is specified, data is stored there.
     If local_file = /dev/null, data is not returned.
@@ -113,6 +115,8 @@ sub use_ua {
       if $config_parms{proxy};
 
     $ua->timeout(30);                 # Time out after 30 seconds
+    $ua->timeout($parms{timeout} ) if $parms{timeout};
+
     $ua->env_proxy();
     $ua->agent( $config_parms{get_url_ua} ) if $config_parms{get_url_ua};
 

bin/get_weather

@@ -81,9 +81,9 @@ $opt_v++ if $parms{v};    # Geo::Weather looks at this
 my $caller = caller;
 my $return_flag = ( $caller and $caller ne 'main' ) ? 1 : 0;
 
-#use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
 BEGIN {
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }                         # Use BEGIN eval to keep perl2exe happy
 
 require 'handy_utilities.pl';    # For read_mh_opts funcion

bin/get_weather_ca

@@ -75,9 +75,9 @@ use vars qw(%Weather @Weather_Forecast);
 my $caller = caller;
 my $return_flag = ( $caller and $caller ne 'main' ) ? 1 : 0;
 
-#use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
 BEGIN {
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site';";    # Use BEGIN eval to keep perl2exe happy
+    eval "push \@INC, '$Pgm_Path/../lib/fallback';";
 }    # Use BEGIN eval to keep perl2exe happy
 
 require 'handy_utilities.pl';    # For read_mh_opts funcion