check_disk 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b755cacc90b2df969b93ee370d04da3bd23806b
-  data.tar.gz: cf515342fb6a4cd7696feec1e4c4fed166775146
+  metadata.gz: cb363a728a29f9ad725dd1a6bf9d82b6f8a4d396
+  data.tar.gz: 3a6af8c3c9dfb5b0a654b5c022122043814ff651
 SHA512:
-  metadata.gz: 71556149db3ca216e8906077dfe7bac59dd9ac29b94629482e3a73031a3592ee375781d58e4edb87183224920047062e64e5af91b649dce35bf9fddd4f621243
-  data.tar.gz: 12d75b592527d1e9c6773fab67589563d8d04f3658461960b2757ef335418a7514d596c6508e3e3769f5da88e3d00f459bf550fa09c721008c09638a98da4fe5
+  metadata.gz: 0293897ed89e0667f7de913966482802b6518d01641023d9ce130a491a0a0fd9905f32b9a11b8edbf6e7b8179cb0dab7916960eae89cc13aba0077ac7a85be45
+  data.tar.gz: f6f75a57d61a9f0e9551c9baa7ec5488658cb5570bb903a801545f28e479a0bf0e694b2c942bdaa26f24cea178686e6c2bcf5e8925327b3ec62913d44844e84f

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+cache:
+- bundler
+rvm:
+- 2.1.2
+gemfile: Gemfile
+script: bundle exec rake test:minitest

data/bin/check_disk.rb

@@ -25,9 +25,27 @@ module CheckDisk
 
     # Sensu check run loop.
     def run
-      check_blocks if config[:blocks]
-      check_inodes if config[:inodes]
-      ok 'You need to pass either `-i` or `-b`.'
+      blocks if config[:blocks]
+      inodes if config[:inodes]
+      check_blocks_and_inodes
+    end
+
+    private
+
+    def blocks
+      check_blocks
+      ok
+    end
+
+    def inodes
+      check_inodes
+      ok
+    end
+
+    def check_blocks_and_inodes
+      check_blocks
+      check_inodes
+      ok 'block and inode usage lower than warning threshold.'
     end
 
     def check_blocks
@@ -44,11 +62,8 @@ module CheckDisk
       message(disk.message)
       warning if disk.warning?
       critical if disk.critical?
-      ok
     end
 
-    private
-
     # Adds a `-p` or `--path` option to our CLI.
     # Sets `config[:path]`
     # @return [String] The `path` or `mount point` we are checking.

data/check_disk.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(/^bin/) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(/^(test|spec|features)/)
   spec.require_paths = %w(lib)
-  spec.cert_chain    = ['certs/miah_johnson.pem']
-  spec.signing_key   = '/Users/miah/.gem_certs/gem-private_key.pem'
-
+  unless ENV['CI'].eql?('true') || ENV['CONTINUOUS_INTEGRATION'].eql?('true')
+    spec.cert_chain  = ['certs/miah_johnson.pem']
+    spec.signing_key = '/Users/miah/.gem_certs/gem-private_key.pem'
+  end
   spec.add_runtime_dependency 'sensu-plugin', '~> 0.3', '>= 0.3.0'
   spec.add_runtime_dependency 'sys-filesystem', '~> 1.1', '>= 1.1.2'
   spec.add_development_dependency 'minitest', '~> 5.3', '>= 5.3.1'

data/lib/check_disk.rb

@@ -1,4 +1,4 @@
 # CheckDisk Version
 module CheckDisk
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/unit/check_disk_unit.rb

@@ -0,0 +1,52 @@
+require_relative 'sensu_plugin_helper'
+require 'English'
+
+# Unit Test for `bin/check_disk`
+class TestCheckExternal < MiniTest::Test
+  include SensuPluginTestHelper
+
+  def setup
+    script 'bin/check_disk.rb'
+  end
+
+  # Warning and Critical at 100%, should exit ok.
+  def test_ok
+    run_script '-p / -w 100 -c 100'
+    assert $CHILD_STATUS.exitstatus == 0, 'Did not exit ok.'
+  end
+
+  # If the disk is more than 1% used we should exit warning.
+  def test_warning
+    run_script '-p / -c 100 -w 1'
+    assert $CHILD_STATUS.exitstatus == 1, 'Did not exit warning.'
+  end
+
+  # If the disk is more than 1% used we should exit critical.
+  def test_critical
+    run_script '-p / -c 1 -w 100'
+    assert $CHILD_STATUS.exitstatus == 2, 'Did not exit critical.'
+  end
+
+  def test_fallthrough
+    run_script
+    assert $CHILD_STATUS.exitstatus == 1
+  end
+
+  def test_exception
+    output = run_script '-f'
+    assert $CHILD_STATUS.exitstatus == 2 && output.include?('failed')
+  end
+
+  # Do we see the right message when OK?
+  def test_argv
+    output = run_script '-p / -w 100 -c 100'
+    assert $CHILD_STATUS.exitstatus == 0 && output.include?('threshold')
+  end
+
+  def test_bad_commandline
+    output = run_script '--doesnotexist'
+    assert $CHILD_STATUS.exitstatus == 2 &&
+      output.include?('doesnotexist') &&
+      output.include?('invalid option')
+  end
+end

data/test/unit/sensu_plugin_helper.rb

@@ -0,0 +1,22 @@
+require 'minitest/autorun'
+
+module SensuPluginTestHelper
+  def script(script)
+    s = Pathname.new(script)
+    @script = s.expand_path
+  end
+
+  def run_script(*args)
+    IO.popen(([@script] + args).join(' '), 'r+') do |child|
+      child.read
+    end
+  end
+
+  def run_script_with_input(input, *args)
+    IO.popen(([@script] + args).join(' '), 'r+') do |child|
+      child.puts input
+      child.close_write
+      child.read
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: check_disk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Miah Johnson
@@ -30,7 +30,7 @@ cert_chain:
   HceOUVz35kgamNj0WW4lNAHyZi7cS0MeI/0B/AGUkaG7gWvyGBAgr1gJ2+4kMmcY
   vg9xNKI52TEvhr97dNRNTQ==
   -----END CERTIFICATE-----
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -161,6 +161,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Makefile
 - README.md
@@ -172,10 +173,11 @@ files:
 - lib/check_disk/blocks.rb
 - lib/check_disk/inodes.rb
 - lib/check_disk/template.rb
-- test/spec/check_disk_spec.rb
 - test/spec/lib/check_disk/blocks_spec.rb
 - test/spec/lib/check_disk/inodes_spec.rb
 - test/spec/spec_helper.rb
+- test/unit/check_disk_unit.rb
+- test/unit/sensu_plugin_helper.rb
 homepage: https://github.com/SimpleFinance/check_disk
 licenses:
 - Apache-2.0
@@ -201,7 +203,8 @@ signing_key:
 specification_version: 4
 summary: Sensu CLI Command Check for disk inode and block usage.
 test_files:
-- test/spec/check_disk_spec.rb
 - test/spec/lib/check_disk/blocks_spec.rb
 - test/spec/lib/check_disk/inodes_spec.rb
 - test/spec/spec_helper.rb
+- test/unit/check_disk_unit.rb
+- test/unit/sensu_plugin_helper.rb

data/test/spec/check_disk_spec.rb

@@ -1,30 +0,0 @@
-require_relative 'spec_helper'
-require_relative '../../bin/check_disk'
-
-describe CheckDisk, '' do
-  let(:check) { CheckDisk::CLI.new }
-
-  before :each do
-    @check = check
-  end
-
-  describe 'Object Ancestry Checks' do
-    it 'Is a Sensu CLI Check Plugin?' do
-      @check.must_be_kind_of(Sensu::Plugin::Check::CLI)
-    end
-  end
-
-  describe 'Command Line Arguments.' do
-    it 'Takes in a warning' do
-      skip
-    end
-
-    it 'Takes in a critical' do
-      skip
-    end
-
-    it 'Takes in a path' do
-      skip
-    end
-  end
-end