rapporteur-load_check 1.1.0 → 2.0.0

data/.travis.yml

@@ -5,3 +5,8 @@ rvm:
   - jruby
 notifications:
   email: false
+  campfire:
+    on_success: change
+    on_failure: always
+    rooms:
+      - secure: "AVi2J9hq3ZBvNt9/eDwslgGfqyhURtcoJFlHScOgffK+9woQOeJXDQcpqxxE\nto7C1lnRn8c0VE2Z0gP5CPZUzHrLnlqUYZkyL4BuHtO29HPgrYT1SPuc80zo\nFv6o0TEzBmOUDxlrmSq8PBZbW1PkBDHWmMf3Tcs/zNjaL6QglLY="

data/CHANGELOG.md

@@ -4,6 +4,17 @@
 
 * No significant changes.
 
+## [2.0.0][v2.0.0] / 2013-05-31
+
+* Add missing English locales.
+* Add a halt! when the load is high. Because we don't want to overburden an
+  already dying machine.
+
+### :boom: Backward incompatible changes
+
+* Change the I18n key for an excessive load failure to
+  "rapporteur.errors.load.excessive".
+
 ## [1.1.0][v1.1.0] / 2013-05-30
 
 * Allow adjustment of load failure threshold.
@@ -12,5 +23,6 @@
 
 * Initial public release.
 
-[unreleased]: https://github.com/codeschool/rapporteur-load_check/compare/v1.1.0...master
+[unreleased]: https://github.com/codeschool/rapporteur-load_check/compare/v2.0.0...master
+[v2.0.0]: https://github.com/codeschool/rapporteur-load_check/compare/v1.1.0...v2.0.0
 [v1.1.0]: https://github.com/codeschool/rapporteur-load_check/compare/v1.0.0...v1.1.0

data/README.md

@@ -23,14 +23,14 @@ application configuration files or initializers, such as:
 
 ```ruby
 # config/initializers/production.rb
-Rapporteur::Checker.add_check(Rapporteur::Checks::LoadCheck)
+Rapporteur.add_check(Rapporteur::Checks::LoadCheck)
 ```
 
 By default, a load value of 8 or greater triggers a failure. You can adjust
 this value by passing the threshold to LoadCheck.new, like so:
 
 ```ruby
-Rapporteur::Checker.add_check(Rapporteur::Checks::LoadCheck.new(4))
+Rapporteur.add_check(Rapporteur::Checks::LoadCheck.new(4))
 ```
 
 The above would cause the checker to fail if load goes above 4.0.

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  rapporteur:
+    errors:
+      load:
+        excessive: 'above allowed threshold (%{value} > %{tolerance})'

data/lib/rapporteur/load_check.rb

@@ -3,6 +3,8 @@ require "rapporteur"
 
 module Rapporteur
   module Checks
+    LoadCheckEngine = Class.new(Rails::Engine)
+
     class LoadCheck
       extend FFI::Library
 
@@ -21,8 +23,13 @@ module Rapporteur
 
       def call(checker)
         loadavg = self.class.current_load
-        checker.add_error(:excess_load) if loadavg > @tolerance
-        checker.add_message(:load, loadavg)
+
+        if loadavg > @tolerance
+          checker.add_error(:load, :excessive, tolerance: @tolerance, value: loadavg)
+          checker.halt!
+        else
+          checker.add_message(:load, loadavg)
+        end
       end
 
       def self.call(checker)

data/rapporteur-load_check.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rapporteur-load_check"
-  spec.version       = "1.1.0"
+  spec.version       = "2.0.0"
   spec.authors       = ["Envy Labs", "Code School"]
   spec.email         = [""]
   spec.description   = %q{Machine load reporting for rapporteur}
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "ffi"
-  spec.add_dependency "rapporteur", "~> 1.1"
+  spec.add_dependency "rapporteur", "~> 2.0"
 
   spec.add_development_dependency "combustion", "~> 0.5"
   spec.add_development_dependency "rails", "~> 3.1"

data/spec/requests/load_check_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'A status request with a LoadCheck' do
   before do
-    Rapporteur::Checker.add_check(Rapporteur::Checks::LoadCheck)
+    Rapporteur.add_check(Rapporteur::Checks::LoadCheck)
     Rapporteur::Checks::LoadCheck.stub(:current_load).and_return(current_load)
   end
 
@@ -15,7 +15,7 @@ describe 'A status request with a LoadCheck' do
 
     it 'contains the load value in the messages' do
       json = JSON.parse(subject.body)
-      expect(json["messages"]["load"]).to eq(1.0)
+      expect(json.fetch("load")).to eq(1.0)
     end
   end
 
@@ -25,7 +25,7 @@ describe 'A status request with a LoadCheck' do
     it_behaves_like 'an erred status response'
 
     it 'contains a message regarding the excess load' do
-      expect(subject).to include_status_error_message(I18n.t('activemodel.errors.models.rapporteur/checker.attributes.base.excess_load'))
+      expect(subject).to include_status_error_message(:load, I18n.t('rapporteur.errors.load.excessive', value: current_load, tolerance: 8.0))
     end
   end
 end

data/spec/spec_helper.rb

@@ -16,5 +16,5 @@ RSpec.configure do |config|
 
   config.order = "random"
 
-  config.before { Rapporteur::Checker.clear }
+  config.before { Rapporteur.clear_checks }
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rapporteur-load_check
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Envy Labs
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -28,20 +31,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rapporteur
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -91,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +124,7 @@ files:
 - README.md
 - Rakefile
 - config.ru
+- config/locales/en.yml
 - lib/rapporteur/load_check.rb
 - rapporteur-load_check.gemspec
 - spec/internal/config/database.yml
@@ -124,26 +138,33 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1685104190720083401
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1685104190720083401
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Machine load reporting for rapporteur
 test_files:
 - spec/internal/config/database.yml

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzU5ZjlhOWU0ZjllNDdjNDg3ZmYwOTExOWU1ZDY1ZjdmOGI2OTBmNg==
-  data.tar.gz: !binary |-
-    MmViZjNlZmJiM2JhZGQyOGQ3YjQxZjk5MGE5ZDU4ZDcxMGFlODZjZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OTEwNDNiYmVkMzYyMTM1ZGZmZDQ0NzQ0NzE5ZWYxNWU5ZWU5YzIxMjFhYjQ1
-    MmMxNTM5YzdlNGRkNjI3MzBjYjE4ZmEyZWM1ZGQ4ZGY1ZGEyM2ZhOTUzMGUx
-    MWVmMWZiNDI5MDcyNzVjZjY5NDUwMjFhZWE0N2Y3YTkwY2Y1NjM=
-  data.tar.gz: !binary |-
-    NzVhYWVhYjc0Y2Y0M2YzODQ0NjQyMjYxZjdiNmY0ZWJkNmNhNjFkNzBiN2Ux
-    YjIzYzU4OWQxYTg1ZTRkY2RmODQ3NjFlODUxYTUwZTdmYjZkNmMwZjIxYzRm
-    Yjc0MTJhODhlYTFhZmFhNjkzZTVkOWFlMTNmODEyNTAyMmY2Mzc=