riemann-nut 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8d999a380da9285d3c39a59292c682402d97915dbb1a306a1bc84184131356d
-  data.tar.gz: 3d82e598d164b145d184bacd822b9a6322215d39f2cb4cd9a0e3e82d7fcf13db
+  metadata.gz: 38e773d99ac3d388b014f3c2bb483d4e2582f0c294b0d33e24d2a55ef20cf777
+  data.tar.gz: cac19ed5db214ee4f4fd999018713a6250f2dee7bdde61450590867842d817c0
 SHA512:
-  metadata.gz: 10d8b47a8b3ee1bb77474e33002589c7e63e1b4fce440e0b4ee660f67f2b0c48a86c984d5c94473013fc16dcd3eb983cc74c9537af1e2a836fa0a135ad297d97
-  data.tar.gz: 6a6ef233519ae9aa635094ddb17fa6dde70420eea80a5cee45b71a592908e6cba779d9caed4a8d96ef80a5697c5a28b91d695967953e4bca2a64c8965572d2b5
+  metadata.gz: 7d0285346f4b29052b7565e0e44cac861566ae877d958043a787b32de11f5c204deb64d542eda53728bae7be9a082908a7e6ffe7156d76e0b4d7d43320b2297c
+  data.tar.gz: a190a474838c2ed13e40f88944ab7762795fc9e6ee4389d92360766f783ef22fc871bca56c6e209bf60d641135f5400993a77e51ebe280c949360d05629ae2b7

data/.github/workflows/ci.yml

@@ -10,33 +10,42 @@ on:
       - main
 
 jobs:
-  lint:
+  rubocop:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: 3.0
           bundler-cache: true
-      - name: Run rubocop
+      - name: Run static code analysis
         run: bundle exec rubocop
-  test:
-    needs: lint
+  unit:
     runs-on: ubuntu-latest
+    needs: rubocop
     strategy:
       matrix:
-        ruby-version:
-          - 2.6
-          - 2.7
-          - 3.0
-          - 3.1
+        ruby:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+    name: Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Ruby
+      - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby-version }}
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - name: Run the test suite
-        run: bundle exec rspec
+      - name: Run tests without uploading code coverage
+        if: ${{ matrix.ruby != '3.0' }}
+        run: bundle exec rake
+      - name: Run tests and upload coverage to Code Climate
+        if: ${{ matrix.ruby == '3.0' }}
+        uses: paambaati/codeclimate-action@v3.0.0
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
+        with:
+          coverageCommand: bundle exec rake

data/.rubocop.yml

@@ -1,7 +1,13 @@
 ---
 AllCops:
+  TargetRubyVersion: '2.6'
+  AllowSymlinksInCacheRootDirectory: true
+  NewCops: enable
   Exclude:
     - vendor/bundle/**/*
+require:
+- rubocop-rake
+- rubocop-rspec
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table
 Layout/LineLength:
@@ -20,6 +26,12 @@ Metrics/ParameterLists:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
+RSpec/NamedSubject:
+  Enabled: false
+RSpec/SubjectStub:
+  Enabled: false
 Style/Documentation:
   Enabled: false
 Style/TrailingCommaInArguments:

data/.simplecov

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# vim:set syntax=ruby:
+
+SimpleCov.start do
+  add_filter '/spec/'
+end

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
-## [1.0.1](https://github.com/opus-codium/riemann-nut/tree/1.0.1) (2022-08-08)
+## [1.0.2](https://github.com/opus-codium/riemann-nut/tree/1.0.2) (2022-09-19)
 
-[Full Changelog](https://github.com/opus-codium/riemann-nut/compare/v1.0.0...1.0.1)
+[Full Changelog](https://github.com/opus-codium/riemann-nut/compare/v1.0.1...1.0.2)
+
+**Fixed bugs:**
+
+- Do not report missing metrics as critical [\#3](https://github.com/opus-codium/riemann-nut/pull/3) ([smortex](https://github.com/smortex))
+
+## [v1.0.1](https://github.com/opus-codium/riemann-nut/tree/v1.0.1) (2022-08-08)
+
+[Full Changelog](https://github.com/opus-codium/riemann-nut/compare/v1.0.0...v1.0.1)
 
 **Fixed bugs:**
 

data/Rakefile

@@ -3,6 +3,11 @@
 require 'riemann/tools/nut/version'
 
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec
 
 require 'github_changelog_generator/task'
 

data/lib/riemann/tools/nut/version.rb

@@ -3,7 +3,7 @@
 module Riemann
   module Tools # :nodoc:
     class Nut
-      VERSION = '1.0.1'
+      VERSION = '1.0.2'
     end
   end
 end

data/lib/riemann/tools/nut.rb

@@ -82,6 +82,8 @@ module Riemann
 
       def report_battery_voltage
         opts[:ups].each do |ups|
+          next unless upsc[ups]['battery.voltage']
+
           service = "#{ups} battery voltage"
           battery_voltage = Float(upsc[ups]['battery.voltage'])
 
@@ -91,16 +93,19 @@ module Riemann
             state: 'ok',
             description: "#{battery_voltage} V",
           )
-        rescue TypeError
+        rescue TypeError => e
           report(
             service: service,
             state: 'critical',
+            description: e.message,
           )
         end
       end
 
       def report_input_voltage
         opts[:ups].each do |ups|
+          next unless upsc[ups]['input.voltage']
+
           service = "#{ups} input voltage"
           input_voltage = Float(upsc[ups]['input.voltage'])
 
@@ -110,10 +115,11 @@ module Riemann
             state: 'ok',
             description: "#{input_voltage} V",
           )
-        rescue TypeError
+        rescue TypeError => e
           report(
             service: service,
             state: 'critical',
+            description: e.message,
           )
         end
       end
@@ -148,10 +154,11 @@ module Riemann
             state: ups_state,
             description: "#{ups_load} W",
           )
-        rescue TypeError
+        rescue TypeError => e
           report(
             service: service,
             state: 'critical',
+            description: e.message,
           )
         end
       end

data/riemann-nut.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri']   = spec.homepage
 
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
@@ -36,4 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-nut
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Romain Tartière
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-tools
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - romain@blogreen.org
@@ -121,6 +135,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".simplecov"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -137,6 +152,7 @@ metadata:
   homepage_uri: https://github.com/opus-codium/riemann-nut
   source_code_uri: https://github.com/opus-codium/riemann-nut
   changelog_uri: https://github.com/opus-codium/riemann-nut
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -152,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Submits nut information to riemann