nagios_output 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ebd9834f69026b161b769f7fbd32fac374017bd88673aa2549807a49962b76
-  data.tar.gz: 3ad6ac12234a3c829bd8dad2868d38e4c3593b364c71579e837bfc11c053ab9c
+  metadata.gz: 4172f5d8746d3b5e1e9e087d4831a7906f3e8cb1496fc93ebe5b47c5089b776d
+  data.tar.gz: 11b3228d492c3815cbd91543e29ee457a81aae0d62d528079068136a873f0c17
 SHA512:
-  metadata.gz: '09021e4e4f59cace6ed07ac74bc99f35c5a9c72bd173a14849b42109a889ef20538951ae6c6cec2419ffd5cbddda06341ff798c64dd5016bc3eb071440d48a77'
-  data.tar.gz: 86f2c2265967cc491110397a90cb729edd486cf719fb488d8ae838ec6571b517366f7c65e487034ec30c7c5972945d02da0ee8784063db39b921e96004d49e64
+  metadata.gz: d7158efab6d70fdb0c65b56c562d444790d40af3987bd2d0cdcd8d3eb2645b98aa0d7d693c67899b2037acb708c11c1edc879e09c4b05da5f89d67ababb8db1d
+  data.tar.gz: 5e44474adf8eb041d28661e56bc05c866df4d19fb808caeff7c82c0d444314f64767c14a872dda2923ae5c45fe5c8522e70d94fed37bf1878bb8fd2c37c16edf

data/.travis.yml

@@ -30,7 +30,5 @@ matrix:
       - ./travis/awesomebot/scan.sh
 notifications:
   email: false
-  slack:
-notifications:
   slack:
     secure: N7+MOIX567Z2E2eyKaLngafy8QeJ4uvgWkWhp7nEWTbw989namVeymljYrNLSuykVgX6rn0Wq95LUPm0uUuRawULzMgzFv0wIMcbbbX+4ZAuEUvWxHWCGo8qfins15Px9EgkT/UrYYblywYlwelQHOu++MkxyQ9mHwypKS4z5IyzW/mwFoZ+HKQCOqYw8TrR7aHGSpe9PUVK9Lj2XXmK1QaaBW7GabW6ugmHMbL46xhxMdBBpJfotRbwdHnyKXPfrhSbj95+tZxY1NY33ZOBdgiQDuOYpkA51GObBUZ4TKwhQS3OX0pp490QvJBR0Jf84waF7sMBx1E03haPgFwNiLayvtA8YkpJBJTOaVhCc6i504r9Sf3ZBBdjVULLG0W1hGZuhXZrsrTE6IyTomIjifmA1L795CRgLAPyecqAVf2Z2JQlN48Pt7TbGEUWXxUlCSlen45B4XBZaNoqX02AzugcztqEdqdAAe6mga0bHwjrzErkAxUXP4u9GyTKCy8FV8KEg6k//g0TLkQzaFM1p521TBMI9AsGwO4OvE0mXq3sRK5wJ1ojQCleINP6ijAg0F186DzD4l8Uj22K44IidSa4P9rxRM2drMttNscNGfFddBbcG8isLTVoldsZHvzMa90lVe86xtiGo2/Kjt7g490pvMRXOf2XzEG3yy3nec8=

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.0.0 (January 25, 2019)
+
+IMPROVEMENTS:
+
+* Move the code inside of a module namespace. ([@TGWolf][])
+* Extend the string class so that str.ok, str.warn, str.critical and str.unknown works. ([@TGWolf][])
+* Extend the integer class so that str.ok, str.warn, str.critical and str.unknown works. ([@TGWolf][])
+* Update the documentation. ([@TGWolf][])
+* Removed the old static and global access methods as they were a hack. ([@TGWolf][])
+
 ## 1.0.0 (January 18, 2019)
 
 * Initial Release ([@TGWolf][])

data/README.md

@@ -28,43 +28,85 @@ Or install it yourself as:
 
 ## Usage
 
-There are 3 different ways to access the 4 nagios output methods. Those methods are ok, warning, critical and unknown, they have the following spective exit codes 0, 1, 2 and 3.
+### OK Messages
 
-### Class Method
+```ruby
+  require 'nagios_output'
+
+  NagiosOutput::Nagios.ok('Everything is ok')
+
+  # or
+
+  'Everything is ok'.nagios_ok
+```
+
+### Warning Messages
+
+```ruby
+  require 'nagios_output'
+
+  NagiosOutput::Nagios.warning('This is a warning')
+
+  # or
+
+  'This is a warning'.nagios_warning
+```
+
+### Critical Messages
 
 ```ruby
-require 'nagios_output'
+  require 'nagios_output'
 
-n = NagiosOutput.new
-n.ok('Everything is ok (Class))')
-n.warning('Everything is ok-ish (Class)')
-n.critical('Everything is cirtial (Class)')
-n.unknown('Everything is erm - I don\'t know (Class)')
+  NagiosOutput::Nagios.critical('Everything is on fire')
+
+  # or
+
+  'Everything is on fire'.nagios_critical
 ```
 
-### Static Method 
+### Unknown Messages
 
 ```ruby
-require 'nagios_output'
+  require 'nagios_output'
+
+  NagiosOutput::Nagios.unknown('Everything is erm...')
+
+  # or
 
-NagiosOutputStatic.ok('Everything is ok (Static)')
-NagiosOutputStatic.warning('Everything is ok-ish (Static)')
-NagiosOutputStatic.critical('Everything is cirtial (Static)')
-NagiosOutputStatic.unknown('Everything is erm - I don\'t know (Static)')
+  'Everything is erm...'.nagios_unknown
 ```
 
-### Direct Method
+## Colours
+
+By default output is coloured however this can be turned off (or back on)
 
 ```ruby
-require 'nagios_output'
+  require 'nagios_output'
+
+  NagiosOutput::Nagios.use_colour(false)
+
+  # or
 
-ok('Everything is ok (Direct)')
-warning('Everything is ok-ish (Direct)')
-critical('Everything is cirtial (Direct)')
-unknown('Everything is erm - I don\'t know (Direct)')
+  NagiosOutput::Nagios.use_color(false)
 ```
 
-It is worth noting that the above examples will not function as you might first expect if you cut and paste them and run them. They will all show the ok() message then stop. Remember each function also makes a call to exit().
+You can also turn colour off for single alerts
+
+```ruby
+  require 'nagios_output'
+
+  'message'.nagios_ok(false)
+  'message'.nagios_warning(false)
+  'message'.nagios_critical(false)
+  'message'.nagios_unknown(false)
+
+  # or
+
+  'message'.nagios_ok(false)
+  'message'.nagios_warning(false)
+  'message'.nagios_critical(false)
+  'message'.nagios_unknown(false)
+```
 
 ## Development
 

data/example/example.rb

@@ -13,76 +13,50 @@
 
 require 'nagios_output'
 
-n = NagiosOutput.new
-
-begin
-    n.ok('Everything is ok (Class))')
-rescue SystemExit => e
-    _actual = e
-end
-
-begin
-    n.warning('Everything is ok-ish (Class)')
-rescue SystemExit => e
-    _actual = e
-end
-
-begin
-    n.critical('Everything is cirtial (Class)')
-rescue SystemExit => e
-    _actual = e
-end
-
-begin
-    n.unknown('Everything is erm - I don\'t know (Class)')
-rescue SystemExit => e
-    _actual = e
-end
-
 begin
-    NagiosOutputStatic.ok('Everything is ok (Static)')
+    NagiosOutput::Nagios.ok('Everything is ok')
 rescue SystemExit => e
     _actual = e
 end
 
 begin
-    NagiosOutputStatic.warning('Everything is ok-ish (Static)')
+    NagiosOutput::Nagios.warning('Everything is ok-ish')
 rescue SystemExit => e
     _actual = e
 end
 
 begin
-    NagiosOutputStatic.critical('Everything is cirtial (Static)')
+    NagiosOutput::Nagios.critical('Everything is critical')
 rescue SystemExit => e
     _actual = e
 end
 
 begin
-    NagiosOutputStatic.unknown('Everything is erm - I don\'t know (Static)')
+    NagiosOutput::Nagios.unknown('Everything is erm - I don\'t know')
 rescue SystemExit => e
     _actual = e
 end
 
 begin
-    ok('Everything is ok (Direct)')
+    'Everything is ok'.nagios_ok
 rescue SystemExit => e
     _actual = e
 end
 
 begin
-    warning('Everything is ok-ish (Direct)')
+    'Everything is ok-ish'.nagios_warning
 rescue SystemExit => e
     _actual = e
 end
 
 begin
-    critical('Everything is cirtial (Direct)')
+    'Everything is critical'.nagios_critical
 rescue SystemExit => e
     _actual = e
 end
 
 begin
-    unknown('Everything is erm - I don\'t know (Direct)')
+    'Everything is erm - I don\'t know'.nagios_unknown
 rescue SystemExit => e
     _actual = e
 end

data/lib/nagios_output.rb

@@ -1,110 +1,94 @@
 require 'colorize'
+
 require 'nagios_output/version'
+require 'nagios_output/overloads'
+
+#
+# Docs to follow
+#
+module NagiosOutput
+    #
+    # Docs to follow
+    #
+    class Nagios
+        $use_colour = true
+
+        def self.use_colour(colour = true)
+            raise ArgumentError.new('Invalid option: use true or false only') unless [true, false].include? colour
+
+            $use_colour = colour
+        end
 
-# -------------------------------------------------------------------------------- #
-# Description                                                                      #
-# -------------------------------------------------------------------------------- #
-# Display elapsed time in a more human readable way.                               #
-# -------------------------------------------------------------------------------- #
+        singleton_class.send(:alias_method, :use_color, :use_colour)
 
-def ok(message = nil, config = { 'colour' => true })
-    n = NagiosOutput.new(config)
-    n.ok(message)
-end
+        def self.check_colour(use_colour_local = nil)
+            unless use_colour_local.nil?
+                return true if use_colour_local
+                return false unless use_colour_local
+            end
+            return true if $use_colour
+            return false unless $use_colour
+        end
 
-def warning(message = nil, config = { 'colour' => true })
-    n = NagiosOutput.new(config)
-    n.warning(message)
-end
+        def self.clean_string(message)
+            return nil if message.nil?
 
-def critical(message = nil, config = { 'colour' => true })
-    n = NagiosOutput.new(config)
-    n.critical(message)
-end
+            message = message.to_s.rstrip
+            return nil if message.empty?
 
-def unknown(message = nil, config = { 'colour' => true })
-    n = NagiosOutput.new(config)
-    n.unknown(message)
-end
-
-# -------------------------------------------------------------------------------- #
-# Description                                                                      #
-# -------------------------------------------------------------------------------- #
-# This is a static access wrapper to the main HumanDuration class below.           #
-# -------------------------------------------------------------------------------- #
-class NagiosOutputStatic
-    def self.ok(message = nil, config = { 'colour' => true })
-        n = NagiosOutput.new(config)
-        n.ok(message)
-    end
+            message
+        end
 
-    def self.warning(message = nil, config = { 'colour' => true })
-        n = NagiosOutput.new(config)
-        n.warning(message)
-    end
+        def self.ok(message = nil, use_colour_local = nil)
+            message = clean_string(message)
 
-    def self.critical(message = nil, config = { 'colour' => true })
-        n = NagiosOutput.new(config)
-        n.critical(message)
-    end
+            exit 0 if message.nil?
 
-    def self.unknown(message = nil, config = { 'colour' => true })
-        n = NagiosOutput.new(config)
-        n.unknown(message)
-    end
-end
+            if check_colour(use_colour_local)
+                puts "OK - #{message}".green
+            else
+                puts "OK - #{message}"
+            end
+            exit 0
+        end
 
-# -------------------------------------------------------------------------------- #
-# Description                                                                      #
-# -------------------------------------------------------------------------------- #
-# Display elapsed time in a more human readable way.                               #
-# -------------------------------------------------------------------------------- #
-class NagiosOutput
-    def initialize(config = { 'colour' => true })
-        @colour = config['colour']
-    end
+        def self.warning(message = nil, use_colour_local = nil)
+            message = clean_string(message)
 
-    def ok(message = nil)
-        exit 0 if message.nil? || message.empty?
+            exit 1 if message.nil?
 
-        if @colour
-            puts "OK - #{message}".green
-        else
-            puts "OK - #{message}"
+            if check_colour(use_colour_local)
+                puts "WARNING - #{message}".yellow
+            else
+                puts "WARNING - #{message}"
+            end
+            exit 1
         end
-        exit 0
-    end
 
-    def warning(message = nil)
-        exit 1 if message.nil? || message.empty?
+        def self.critical(message = nil, use_colour_local = nil)
+            message = clean_string(message)
 
-        if @colour
-            puts "WARNING - #{message}".yellow
-        else
-            puts "WARNING - #{message}"
-        end
-        exit 1
-    end
-
-    def critical(message = nil)
-        exit 2 if message.nil? || message.empty?
+            exit 2 if message.nil?
 
-        if @colour
-            puts "CRITICAL - #{message}".red
-        else
-            puts "CRITICAL - #{message}"
+            if check_colour(use_colour_local)
+                puts "CRITICAL - #{message}".red
+            else
+                puts "CRITICAL - #{message}"
+            end
+            exit 2
         end
-        exit 2
-    end
 
-    def unknown(message = nil)
-        exit 3 if message.nil? || message.empty?
+        def self.unknown(message = nil, use_colour_local = nil)
+            message = clean_string(message)
+
+            exit 3 if message.nil?
 
-        if @colour
-            puts "UNKNOWN - #{message}".blue
-        else
-            puts "UNKNOWN - #{message}"
+            if check_colour(use_colour_local)
+                puts "UNKNOWN - #{message}".blue
+            else
+                puts "UNKNOWN - #{message}"
+            end
+            exit 3
         end
-        exit 3
     end
 end

data/lib/nagios_output/overloads.rb

@@ -0,0 +1,41 @@
+#
+# Overload the integer class
+#
+class Integer
+    def nagios_ok(colour = nil)
+        NagiosOutput::Nagios.ok(to_s, colour)
+    end
+
+    def nagios_warning(colour = nil)
+        NagiosOutput::Nagios.warning(to_s, colour)
+    end
+
+    def nagios_critical(colour = nil)
+        NagiosOutput::Nagios.critical(to_s, colour)
+    end
+
+    def nagios_unknown(colour = nil)
+        NagiosOutput::Nagios.unknown(to_s, colour)
+    end
+end
+
+#
+# Overload the string class
+#
+class String
+    def nagios_ok(colour = nil)
+        NagiosOutput::Nagios.ok(self, colour)
+    end
+
+    def nagios_warning(colour = nil)
+        NagiosOutput::Nagios.warning(self, colour)
+    end
+
+    def nagios_critical(colour = nil)
+        NagiosOutput::Nagios.critical(self, colour)
+    end
+
+    def nagios_unknown(colour = nil)
+        NagiosOutput::Nagios.unknown(self, colour)
+    end
+end

data/lib/nagios_output/version.rb

@@ -1,3 +1,3 @@
-class NagiosOutput
-    VERSION = '1.0.0'.freeze
+module NagiosOutput
+    VERSION = '2.0.0'.freeze
 end

data/spec/nagios_output_spec.rb

@@ -7,10 +7,10 @@ RSpec.describe NagiosOutput do
         expect(NagiosOutput::VERSION).not_to be nil
     end
 
-    context 'Test ok()' do
-        context 'Class method access' do
+    context 'Class Accessor Method' do
+        context 'Test ok()' do
             before(:each) do
-                @n = NagiosOutput.new
+                @n = NagiosOutput::Nagios
             end
 
             context 'With a message' do
@@ -50,91 +50,9 @@ RSpec.describe NagiosOutput do
             end
         end
 
-        context 'Static method access' do
+        context 'Test warning()' do
             before(:each) do
-                @n = NagiosOutputStatic
-            end
-
-            context 'With a message' do
-                it 'says OK - test 1 2 3' do
-                    begin
-                        expect(@n.ok('test 1 2 3')).to eql('OK - test 1 2 3')
-                    rescue SystemExit => e
-                        _actual = e.status
-                    end
-                end
-
-                it 'the exit value should be 0' do
-                    begin
-                        @n.ok('test 1 2 3')
-                    rescue SystemExit => e
-                        expect(e.status).to eq(0)
-                    end
-                end
-            end
-
-            context 'Without a message' do
-                it 'says nothing at all' do
-                    begin
-                        expect(@n.ok).to eql
-                    rescue SystemExit => e
-                        _actual = e.status
-                    end
-                end
-
-                it 'the exit value should be 0' do
-                    begin
-                        @n.ok
-                    rescue SystemExit => e
-                        expect(e.status).to eq(0)
-                    end
-                end
-            end
-        end
-
-        context 'Direct method access' do
-            context 'With a message' do
-                it 'says OK - test 1 2 3' do
-                    begin
-                        expect(ok('test 1 2 3')).to eql('OK - test 1 2 3')
-                    rescue SystemExit => e
-                        _actual = e.status
-                    end
-                end
-
-                it 'the exit value should be 0' do
-                    begin
-                        ok('test 1 2 3')
-                    rescue SystemExit => e
-                        expect(e.status).to eq(0)
-                    end
-                end
-            end
-
-            context 'Without a message' do
-                it 'says nothing at all' do
-                    begin
-                        expect(ok).to eql
-                    rescue SystemExit => e
-                        _actual = e.status
-                    end
-                end
-
-                it 'the exit value should be 0' do
-                    begin
-                        ok
-                    rescue SystemExit => e
-                        expect(e.status).to eq(0)
-                    end
-                end
-            end
-        end
-    end
-
-    context 'Test warning()' do
-        context 'Class method access' do
-            before(:each) do
-                @n = NagiosOutput.new
+                @n = NagiosOutput::Nagios
             end
 
             context 'With a message' do
@@ -174,25 +92,25 @@ RSpec.describe NagiosOutput do
             end
         end
 
-        context 'Static method access' do
+        context 'Test critical()' do
             before(:each) do
-                @n = NagiosOutputStatic
+                @n = NagiosOutput::Nagios
             end
 
             context 'With a message' do
-                it 'says Warning - test 1 2 3' do
+                it 'says CRITICAL - test 1 2 3' do
                     begin
-                        expect(@n.warning('test 1 2 3')).to eql('WARNING - test 1 2 3')
+                        expect(@n.critical('test 1 2 3')).to eql('CRITICAL - test 1 2 3')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 1' do
+                it 'the exit value should be 2' do
                     begin
-                        @n.warning('test 1 2 3')
+                        @n.critical('test 1 2 3')
                     rescue SystemExit => e
-                        expect(e.status).to eq(1)
+                        expect(e.status).to eq(2)
                     end
                 end
             end
@@ -200,37 +118,41 @@ RSpec.describe NagiosOutput do
             context 'Without a message' do
                 it 'says nothing at all' do
                     begin
-                        expect(@n.warning).to eql
+                        expect(@n.critical).to eql
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 0' do
+                it 'the exit value should be 2' do
                     begin
-                        @n.warning
+                        @n.critical
                     rescue SystemExit => e
-                        expect(e.status).to eq(1)
+                        expect(e.status).to eq(2)
                     end
                 end
             end
         end
 
-        context 'Direct method access' do
+        context 'Test unknown()' do
+            before(:each) do
+                @n = NagiosOutput::Nagios
+            end
+
             context 'With a message' do
-                it 'says WARNING - test 1 2 3' do
+                it 'says UNKNOWN - test 1 2 3' do
                     begin
-                        expect(warning('test 1 2 3')).to eql('WARNING - test 1 2 3')
+                        expect(@n.unknown('test 1 2 3')).to eql('UNKNOWN - test 1 2 3')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 1' do
+                it 'the exit value should be 3' do
                     begin
-                        warning('test 1 2 3')
+                        @n.unknown('test 1 2 3')
                     rescue SystemExit => e
-                        expect(e.status).to eq(1)
+                        expect(e.status).to eq(3)
                     end
                 end
             end
@@ -238,43 +160,39 @@ RSpec.describe NagiosOutput do
             context 'Without a message' do
                 it 'says nothing at all' do
                     begin
-                        expect(warning).to eql
+                        expect(@n.unknown).to eql
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 1' do
+                it 'the exit value should be 3' do
                     begin
-                        warning
+                        @n.unknown
                     rescue SystemExit => e
-                        expect(e.status).to eq(1)
+                        expect(e.status).to eq(3)
                     end
                 end
             end
         end
     end
 
-    context 'Test critical()' do
-        context 'Class method access' do
-            before(:each) do
-                @n = NagiosOutput.new
-            end
-
+    context 'String Accessor Method' do
+        context 'Test ok()' do
             context 'With a message' do
-                it 'says CRITICAL - test 1 2 3' do
+                it 'says OK - test 1 2 3' do
                     begin
-                        expect(@n.critical('test 1 2 3')).to eql('CRITICAL - test 1 2 3')
+                        expect('test 1 2 3'.nagios_ok).to eql('OK - test 1 2 3')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 2' do
+                it 'the exit value should be 0' do
                     begin
-                        @n.critical('test 1 2 3')
+                        'test 1 2 3'.nagios_ok
                     rescue SystemExit => e
-                        expect(e.status).to eq(2)
+                        expect(e.status).to eq(0)
                     end
                 end
             end
@@ -282,41 +200,37 @@ RSpec.describe NagiosOutput do
             context 'Without a message' do
                 it 'says nothing at all' do
                     begin
-                        expect(@n.critical).to eql
+                        expect(''.nagios_ok).to eql('')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 2' do
+                it 'the exit value should be 0' do
                     begin
-                        @n.critical
+                        expect(''.nagios_ok)
                     rescue SystemExit => e
-                        expect(e.status).to eq(2)
+                        expect(e.status).to eq(0)
                     end
                 end
             end
         end
 
-        context 'Static method access' do
-            before(:each) do
-                @n = NagiosOutputStatic
-            end
-
+        context 'Test warning()' do
             context 'With a message' do
-                it 'says CRITICAL - test 1 2 3' do
+                it 'says WARNING - test 1 2 3' do
                     begin
-                        expect(@n.critical('test 1 2 3')).to eql('CRITICAL - test 1 2 3')
+                        expect('test 1 2 3'.nagios_warning).to eql('WARNING - test 1 2 3')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 2' do
+                it 'the exit value should be 1' do
                     begin
-                        @n.critical('test 1 2 3')
+                        'test 1 2 3'.nagios_warning
                     rescue SystemExit => e
-                        expect(e.status).to eq(2)
+                        expect(e.status).to eq(1)
                     end
                 end
             end
@@ -324,27 +238,27 @@ RSpec.describe NagiosOutput do
             context 'Without a message' do
                 it 'says nothing at all' do
                     begin
-                        expect(@n.critical).to eql
+                        expect(''.nagios_warning).to eql('')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 2' do
+                it 'the exit value should be 1' do
                     begin
-                        @n.critical
+                        ''.nagios_warning
                     rescue SystemExit => e
-                        expect(e.status).to eq(2)
+                        expect(e.status).to eq(1)
                     end
                 end
             end
         end
 
-        context 'Direct method access' do
+        context 'Test critical()' do
             context 'With a message' do
                 it 'says CRITICAL - test 1 2 3' do
                     begin
-                        expect(critical('test 1 2 3')).to eql('CRITICAL - test 1 2 3')
+                        expect('test 1 2 3'.nagios_critical).to eql('CRITICAL - test 1 2 3')
                     rescue SystemExit => e
                         _actual = e.status
                     end
@@ -352,7 +266,7 @@ RSpec.describe NagiosOutput do
 
                 it 'the exit value should be 2' do
                     begin
-                        critical('test 1 2 3')
+                        'test 1 2 3'.nagios_critical
                     rescue SystemExit => e
                         expect(e.status).to eq(2)
                     end
@@ -362,7 +276,7 @@ RSpec.describe NagiosOutput do
             context 'Without a message' do
                 it 'says nothing at all' do
                     begin
-                        expect(critical).to eql
+                        expect(''.nagios_critical).to eql('')
                     rescue SystemExit => e
                         _actual = e.status
                     end
@@ -370,25 +284,19 @@ RSpec.describe NagiosOutput do
 
                 it 'the exit value should be 2' do
                     begin
-                        critical
+                        ''.nagios_critical
                     rescue SystemExit => e
                         expect(e.status).to eq(2)
                     end
                 end
             end
         end
-    end
-
-    context 'Test unknown()' do
-        context 'Class method access' do
-            before(:each) do
-                @n = NagiosOutput.new
-            end
 
+        context 'Test unknown()' do
             context 'With a message' do
                 it 'says UNKNOWN - test 1 2 3' do
                     begin
-                        expect(@n.unknown('test 1 2 3')).to eql('UNKNOWN - test 1 2 3')
+                        expect('test 1 2 3'.nagios_unknown).to eql('UNKNOWN - test 1 2 3')
                     rescue SystemExit => e
                         _actual = e.status
                     end
@@ -396,7 +304,7 @@ RSpec.describe NagiosOutput do
 
                 it 'the exit value should be 3' do
                     begin
-                        @n.unknown('test 1 2 3')
+                        'test 1 2 3'.nagios_unknown
                     rescue SystemExit => e
                         expect(e.status).to eq(3)
                     end
@@ -406,7 +314,7 @@ RSpec.describe NagiosOutput do
             context 'Without a message' do
                 it 'says nothing at all' do
                     begin
-                        expect(@n.unknown).to eql
+                        expect(''.nagios_unknown).to eql('')
                     rescue SystemExit => e
                         _actual = e.status
                     end
@@ -414,79 +322,81 @@ RSpec.describe NagiosOutput do
 
                 it 'the exit value should be 3' do
                     begin
-                        @n.unknown
+                        ''.nagios_unknown
                     rescue SystemExit => e
                         expect(e.status).to eq(3)
                     end
                 end
             end
         end
+    end
 
-        context 'Static method access' do
-            before(:each) do
-                @n = NagiosOutputStatic
-            end
-
+    context 'Int Accessor Method' do
+        context 'Test ok()' do
             context 'With a message' do
-                it 'says WARNING - test 1 2 3' do
+                it 'says OK - 123' do
                     begin
-                        expect(@n.unknown('test 1 2 3')).to eql('WARNING - test 1 2 3')
+                        expect(123.nagios_ok).to eql('OK - 123')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 3' do
+                it 'the exit value should be 0' do
                     begin
-                        @n.unknown('test 1 2 3')
+                        123.nagios_ok
                     rescue SystemExit => e
-                        expect(e.status).to eq(3)
+                        expect(e.status).to eq(0)
                     end
                 end
             end
+        end
 
-            context 'Without a message' do
-                it 'says nothing at all' do
+        context 'Test warning()' do
+            context 'With a message' do
+                it 'says WARNING - 123' do
                     begin
-                        expect(@n.unknown).to eql
+                        expect(123.nagios_warning).to eql('WARNING - 123')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 3' do
+                it 'the exit value should be 1' do
                     begin
-                        @n.unknown
+                        123.nagios_warning
                     rescue SystemExit => e
-                        expect(e.status).to eq(3)
+                        expect(e.status).to eq(1)
                     end
                 end
             end
         end
 
-        context 'Direct method access' do
+        context 'Test critical()' do
             context 'With a message' do
-                it 'says UNKNOWN - test 1 2 3' do
+                it 'says CRITICAL - 123' do
                     begin
-                        expect(unknown('test 1 2 3')).to eql('UNKNOWN - test 1 2 3')
+                        expect(123.nagios_critical).to eql('CRITICAL - 123')
                     rescue SystemExit => e
                         _actual = e.status
                     end
                 end
 
-                it 'the exit value should be 3' do
+                it 'the exit value should be 2' do
                     begin
-                        unknown('test 1 2 3')
+                        123.nagios_critical
                     rescue SystemExit => e
-                        expect(e.status).to eq(3)
+                        expect(e.status).to eq(2)
                     end
                 end
             end
+        end
 
-            context 'Without a message' do
-                it 'says nothing at all' do
+        context 'Test unknown()' do
+            context 'With a message' do
+                it 'says UNKNOWN - 123' do
                     begin
-                        expect(unknown).to eql
+                        expect(123.nagios_unknown).to eql('UNKNOWN - 123')
                     rescue SystemExit => e
                         _actual = e.status
                     end
@@ -494,7 +404,7 @@ RSpec.describe NagiosOutput do
 
                 it 'the exit value should be 3' do
                     begin
-                        unknown
+                        123.nagios_unknown
                     rescue SystemExit => e
                         expect(e.status).to eq(3)
                     end
@@ -502,6 +412,16 @@ RSpec.describe NagiosOutput do
             end
         end
     end
+
+    context 'Test Error Handling' do
+        it 'Test invalid set colour type raises an exception direct call' do
+            expect { NagiosOutput::Nagios.use_colour('invalid') }.to raise_error(ArgumentError, 'Invalid option: use true or false only')
+        end
+
+        it 'Test invalid set colour type raises an exception aliases call' do
+            expect { NagiosOutput::Nagios.use_color('invalid') }.to raise_error(ArgumentError, 'Invalid option: use true or false only')
+        end
+    end
 end
 
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios_output
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Gurney aka Wolf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - bin/setup
 - example/example.rb
 - lib/nagios_output.rb
+- lib/nagios_output/overloads.rb
 - lib/nagios_output/version.rb
 - nagios_output.gemspec
 - spec/nagios_output_spec.rb