checkson 0.9 → 0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cac8e522bab24c578456dfb2c52f859989e63be405d2d63ec6d828059303a69
-  data.tar.gz: 8f6c0543e1f88bb628a858e041073b1dbbb822ea7aa496edaadc302c6ef8ec7b
+  metadata.gz: df976ff2fcf7b747b191dd42d58ed08b21378592f6b5706fa32c26db32ff99b9
+  data.tar.gz: ddbc6847732551eeb853db80394e1a8bf7931f7b487c4e5c0046589b4a4f2217
 SHA512:
-  metadata.gz: 6f857be6d9da861cecbc4baa81095150b9cc6db6bca5883682dd5f5e7e0d9012a16c004deb784223101c07afd5b9fb16d73751c83de2fbfd2826a2c42f48b6e0
-  data.tar.gz: 82b818b24e66189fc6ecc9af6f5643c7c25dc0cce0dec8eff45c24738983c02d57a8e9695f072e7a1c73d2f0018c4ca5a209e25e08f2640d43a205c35bbd21ed
+  metadata.gz: 64681b78f3914c5e0d74cd8d23076b912290002b7b070ff03b15033764952aa8741e11d6697b57c9fe904346028a1addb5e89e9901b96572bc520b4b9a6bee0d
+  data.tar.gz: 9b79ac4cb702bb119cc99e9e88bb229df229a242960b6bb8c29c04c7a97c9e64edb205295683a074f82ee350257f33b105d138e5a09f96d2de6296256d46503f

data/lib/checkson/ui.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 require 'optparse'
-require 'logger'
 require 'uri'
+require 'json'
 
 module Checkson
   # Simple user interface for checkson
   class UI
     def initialize
+      @jsonout = []
+
       set_default_options
       parse_options
       start_checks
@@ -29,16 +31,22 @@ module Checkson
         c = check.klass.new(check.params)
         c.check
         @num_ok += 1 if c.status.eql? :ok
-        output c, check if @opts[:verbose]
+        output_plain c, check if @opts[:verbose]
+        if @opts[:jsonexport]
+          @opts[:verbose] = false
+          jsonadd(c, check)
+        end
       end
       @num_failed = (@num_checks - @num_ok)
-      puts "-> #{@num_checks} checks performed: #{@num_ok} ok, #{@num_failed} failed"
+      puts "-> #{@num_checks} checks performed: #{@num_ok} ok, #{@num_failed} failed" unless @opts[:jsonexport]
+      output_json if @opts[:jsonexport]
     end
 
     def set_default_options
       @opts = {
         datasource: :file,
         verbose: false,
+        jsonexport: false,
         config_file: '/etc/checkson.rb',
         endpoint: 'https://checkson.fsrv.services:8080'
       }
@@ -50,6 +58,9 @@ module Checkson
         opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
           @opts[:verbose] = v
         end
+        opts.on('-j', '--[no-]jsonexport', 'do output as json') do |j|
+          @opts[:jsonexport] = j
+        end
         opts.on('-d', '--datasource [TYPE]', %i[file api], 'Set datasource type', '(file, api)') do |d|
           @opts[:datasource] = d
         end
@@ -68,11 +79,13 @@ module Checkson
           end
         end
       end.parse!
-      logger = Logger.new(STDOUT)
-      logger.info "Using datasource `#{@opts[:datasource]}`"
     end
 
-    def output(sym, check)
+    def output_json
+      puts @jsonout.to_json
+    end
+
+    def output_plain(sym, check)
       status_column = winsize[1] / 3 * 2
       print check.description
       case sym.status
@@ -85,6 +98,11 @@ module Checkson
       end
     end
 
+    def jsonadd(sym, check)
+      data = { desription: check.description, status: sym.status }
+      @jsonout.append(data)
+    end
+
     def winsize
       require 'io/console'
       IO.console.winsize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkson
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.91'
 platform: ruby
 authors:
 - Florian Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies: []
 description: A simple framework for checking node facts
 email: florian@fsrv.xyz