watchmonkey_cli 1.7 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 312311aaf04df5cc1d42249ec5202c0e01a35ef6
-  data.tar.gz: b1e0f912c416b626a876d16663fa466e75bb9b7d
+  metadata.gz: 86ce6eed439d29ac6eef7d4d0813803b4d7b2beb
+  data.tar.gz: 9cd0a3af426a68459e11164b7df367f5f62264af
 SHA512:
-  metadata.gz: 1fb4acc683cbe5fc57b3bc37034f0c5f8e2b339aad8d21e226d2adefe07c1e560f7484d69073fb3e951ab09d61f58f502a3b0b37607a1ec0158ca7195df315d8
-  data.tar.gz: 3f9b86d3acb7956be9b9cef6dceddbf2d2aa63c730139f4d7e1b760e8a39837e54bbf009e45a19f04a3ac297983a816dc35a9519396993835cfe3f8d39cb3c14
+  metadata.gz: 32a1fa7651b825530353a9c2f4946dc0b8a5da0e79f1db0e605e54720143341c26cfecb51e2cb97905b570c4491866079b405c26f94b291c8ae9cd28b8111c24
+  data.tar.gz: 0c4a6c26666917532d37aca96b3f02b5d1b9211f1b75c619ed55ce3508e17389bb4a9dc01933cd7f14cd0abc4269553afeed63618258b2b61955d942aa66910c

data/VERSION

@@ -1 +1 @@
-1.7
+1.7.1

data/lib/watchmonkey_cli/checkers/ts3_license.rb

@@ -1,66 +1,68 @@
-module WatchmonkeyCliCustom
-  class Ts3License < WatchmonkeyCli::Checker
-    self.checker_name = "ts3_license"
+module WatchmonkeyCli
+  module Checkers
+    class Ts3License < Checker
+      self.checker_name = "ts3_license"
 
-    def enqueue host, file, opts = {}
-      opts = { threshold: 1.months }.merge(opts)
-      host = app.fetch_connection(:loopback, :local) if !host || host == :local
-      host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
-      app.enqueue(self, host, file, opts)
-    end
+      def enqueue host, file, opts = {}
+        opts = { threshold: 1.months }.merge(opts)
+        host = app.fetch_connection(:loopback, :local) if !host || host == :local
+        host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
+        app.enqueue(self, host, file, opts)
+      end
 
-    def check! result, host, file, opts = {}
-      result.command = "cat #{Shellwords.escape(file)}"
-      result.result = host.exec(result.command).force_encoding('UTF-8')
+      def check! result, host, file, opts = {}
+        result.command = "cat #{Shellwords.escape(file)}"
+        result.result = host.exec(result.command).force_encoding('UTF-8')
 
-      if result.result.downcase["no such file"]
-        result.error! "Failed to read file #{file} (#{result.result})"
-      else
-        result.data = _parse_response(result.result)
-        start_at = zone_parse "UTC", result.data["start date"]
-        end_at   = zone_parse "UTC", result.data["end date"]
+        if result.result.downcase["no such file"]
+          result.error! "Failed to read file #{file} (#{result.result})"
+        else
+          result.data = _parse_response(result.result)
+          start_at = zone_parse "UTC", result.data["start date"]
+          end_at   = zone_parse "UTC", result.data["end date"]
 
-        if start_at > Time.current
-          result.error! "TS3 license is not yet valid (will in #{human_seconds(start_at - Time.current)}, #{start_at})!"
-          return
-        end
+          if start_at > Time.current
+            result.error! "TS3 license is not yet valid (will in #{human_seconds(start_at - Time.current)}, #{start_at})!"
+            return
+          end
 
-        if end_at <= Time.current
-          result.error! "TS3 license is EXPIRED (since #{human_seconds(end_at - Time.current)}, #{end_at})!"
-          return
-        end
+          if end_at <= Time.current
+            result.error! "TS3 license is EXPIRED (since #{human_seconds(end_at - Time.current)}, #{end_at})!"
+            return
+          end
 
-        if end_at <= Time.current + opts[:threshold]
-          result.error! "TS3 license is about to expire within threshold (in #{human_seconds(end_at - Time.current)}, #{end_at})!"
-          return
-        else
-          result.info! "TS3 license for `#{page}' expires in #{human_seconds(end_at - Time.current)} (#{end_at})!"
+          if end_at <= Time.current + opts[:threshold]
+            result.error! "TS3 license is about to expire within threshold (in #{human_seconds(end_at - Time.current)}, #{end_at})!"
+            return
+          else
+            result.info! "TS3 license for `#{page}' expires in #{human_seconds(end_at - Time.current)} (#{end_at})!"
+          end
         end
       end
-    end
 
-    def zone_parse tz, date
-      tz_was = Time.zone
-      Time.zone = "UTC"
-      Time.zone.parse(date)
-    ensure
-      Time.zone = tz_was
-    end
+      def zone_parse tz, date
+        tz_was = Time.zone
+        Time.zone = "UTC"
+        Time.zone.parse(date)
+      ensure
+        Time.zone = tz_was
+      end
 
-    def _parse_response res
-      {}.tap do |r|
-        lines = res.split("\n")
-        reached_key = false
-        lines.each do |l|
-          next if l.blank?
-          if l[":"]
-            c = l.split(":", 2)
-            r[c[0].strip] = c[1].strip
-          elsif l["==key=="]
-            reached_key = true
-          elsif reached_key
-            r["key"] ||= ""
-            r["key"] += l
+      def _parse_response res
+        {}.tap do |r|
+          lines = res.split("\n")
+          reached_key = false
+          lines.each do |l|
+            next if l.blank?
+            if l[":"]
+              c = l.split(":", 2)
+              r[c[0].strip] = c[1].strip
+            elsif l["==key=="]
+              reached_key = true
+            elsif reached_key
+              r["key"] ||= ""
+              r["key"] += l
+            end
           end
         end
       end

data/lib/watchmonkey_cli/version.rb

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

data/lib/watchmonkey_cli.rb

@@ -41,4 +41,5 @@ require "watchmonkey_cli/checkers/unix_file_exists"
 require "watchmonkey_cli/checkers/unix_load"
 require "watchmonkey_cli/checkers/unix_mdadm"
 require "watchmonkey_cli/checkers/unix_memory"
+require "watchmonkey_cli/checkers/ts3_license"
 require "watchmonkey_cli/checkers/www_availability"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: 1.7.1
 platform: ruby
 authors:
 - Sven Pachnit