watchmonkey_cli 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0402993ee90f4420cf6ef881e75e54034745d0c9
-  data.tar.gz: 31ef5cb4ab287f6d85b4a89dad0d9424df64389e
+SHA256:
+  metadata.gz: f520c622c2fbd97082aae49885ac87d40fc3cbae0e78e123e16bdc951f6ab40d
+  data.tar.gz: a1fc9e07a10fbc66498ffb8716f5178eb60592dee2fa75d5e8742571e0efcc5b
 SHA512:
-  metadata.gz: d1a53b66cd588368d4a71a3b4bfc465090dbdf7a3cbfa174d5b196593e1ab524a886de63dabb7893e2a1544846a83d04bd8f0beeeae88d80cc3a1f1a0032f5a7
-  data.tar.gz: fea9197ddc193e83b746b4cd250ab42a89e183724e8a20944923e8db17cef2a892330ec6fc874bbc8564df4315a1f682704855eab37aa9d15ad1f3ed7d7fc32e
+  metadata.gz: e2465f14f285a3072b2c1ce88e4c35513cf7738b93f237f0b8c60cc8d9f0961ae02e70394484e8fd6da5b90a8d0e72445b861ef4d73927cdeeaa597d7c435152
+  data.tar.gz: 3e8be97c0ca8c54064ae93ce96ee3d646e93aae0e03a6b192141ef6fdf9ca24f3a648afe68e3260930186d5119db580f1c822fb1d246f026f68ecf5f6c36389f

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

data/lib/watchmonkey_cli/checkers/ssl_expiration.rb

@@ -4,7 +4,7 @@ module WatchmonkeyCli
       self.checker_name = "ssl_expiration"
 
       def enqueue page, opts = {}
-        opts = { threshold: 1.months }.merge(opts)
+        opts = { threshold: 1.months, verify: true }.merge(opts)
         app.enqueue(self, page, opts)
       end
 
@@ -12,7 +12,7 @@ module WatchmonkeyCli
         uri = URI.parse(page)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.verify_mode = opts[:verify] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
         cert = nil
         http.start do |h|
           cert = h.peer_cert

data/lib/watchmonkey_cli/checkers/unix_mdadm.rb

@@ -25,7 +25,7 @@ module WatchmonkeyCli
             return if status == "chunks"
             result.error! "#{dev} seems broken (expected U+, got `#{status}')" if status !~ /\[U+\]/
             if opts[:log_checking] && progress && m = progress.match(/\[[=>\.]+\]\s+([^\s]+)\s+=\s+([^\s]+)\s+\(([^\/]+)\/([^\)]+)\)\s+finish=([^\s]+)\s+speed=([^\s]+)/i)
-              info "#{dev} on is checking (status:#{m[1]}|done:#{m[2]}|eta:#{m[5]}|speed:#{m[6]}|blocks_done:#{m[3]}/#{m[4]})"
+              result.info "#{dev} is checking (status:#{m[1]}|done:#{m[2]}|eta:#{m[5]}|speed:#{m[6]}|blocks_done:#{m[3]}/#{m[4]})"
             end
           end
         end

data/lib/watchmonkey_cli/checkers/www_availability.rb

@@ -31,11 +31,12 @@ module WatchmonkeyCli
         end
 
         # body
+        fixed_body = result.result.body.force_encoding("utf-8")
         if rx = opts[:body]
           if rx.is_a?(String)
-            result.error! "body does not include `#{rx}'!" if !result.result.body.include?(rx)
+            result.error! "body does not include `#{rx}'!" if !fixed_body.include?(rx)
           elsif rx.is_a?(Regexp)
-            result.error! "body does not match `#{rx}'!" if !result.result.body.match(rx)
+            result.error! "body does not match `#{rx}'!" if !fixed_body.match(rx)
           end
         end
 

data/lib/watchmonkey_cli/version.rb

@@ -1,4 +1,4 @@
 module WatchmonkeyCli
-  VERSION = "1.8.1"
+  VERSION = "1.8.2"
   UPDATE_URL = "https://raw.githubusercontent.com/2called-chaos/watchmonkey_cli/master/VERSION"
 end

data/lib/watchmonkey_cli.rb

@@ -7,8 +7,9 @@ require "thread"
 require "monitor"
 require "optparse"
 require "open3"
+require "shellwords"
 require "net/ftp"
-require 'net/https'
+require "net/https"
 
 # 3rd party
 require "active_support"
@@ -16,7 +17,7 @@ require "active_support/core_ext"
 require "active_support/time_with_zone"
 begin ; require "pry" ; rescue LoadError ; end
 require "httparty"
-require 'net/ssh'
+require "net/ssh"
 
 # lib
 require "watchmonkey_cli/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Sven Pachnit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Watchmonkey CLI - dead simple agentless monitoring via SSH, HTTP, FTP, etc.