rack-jsonz 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b1f9796c7d7c2369e61b3bcfa76b8fd5fbcc066
-  data.tar.gz: 1ac20d51ba18127c8cd8cc0745ad345d464735c6
+  metadata.gz: de3ab72fc2689917da6343629d54265f695291ae
+  data.tar.gz: 3dbde2b53434c1802c743237ed47f451b68ba08c
 SHA512:
-  metadata.gz: e9df32dd5874e08cec19f1bceacbf6867770b0592fd924c8378f1448c4a08baaf4543d4b84dda608cd8464cd132eac5e2f91d923cb389605827b4ef6feff916f
-  data.tar.gz: d9c4d9b3e3e2865087e8e164f59ab6948dbe931b71b19febe9e28148e12221e31577360d61f96e1ca0a9eec9ceb345a88215031f045714c2beb5e2641143fc25
+  metadata.gz: 9f378936941ab2e9b46b4dbdc3ffc11213e2c9b16599c134b1159919451240843f01f1710d6a27dca9bdad7e95d402efdd99aaf52c7d780d88e66789f48ed3be
+  data.tar.gz: 7c297a48bf67c10ebe538fb712209bace3e0d473ead8f021d5f7286e7cfd2dda8e42bc6bf2aad155376feeb52327dd02ef04179bf7f92d90c63d208cf7de9d50

data/lib/rack/jsonz.rb

@@ -24,8 +24,8 @@ module Rack
       ret = {}
 
       cpu = CPU.new
-      cpu.metrics.each_pair do |k, v|
-        ret["/cpu/#{k}"] = v
+      cpu.each_metric do |k, v|
+        ret["/#{cpu.metric_group}/#{k}"] = v.to_s
       end
 
       return ret

data/lib/rack/jsonz/cpu.rb

@@ -1,13 +1,21 @@
+require 'rack/jsonz/metric'
+
 require 'system'
+require 'usagewatch_ext'
 
 module Rack
   class Jsonz
-    class CPU
+    class CPU < Metric
       def metrics
         return {
-          :count => System::CPU.count
+          :count => System::CPU.count.to_f,
+          :load => Usagewatch.uw_load.to_f,
         }
       end
+
+      def metric_group
+        "cpu"
+      end
     end
   end
 end

data/lib/rack/jsonz/metric.rb

@@ -0,0 +1,9 @@
+module Rack
+  class Jsonz
+    class Metric
+      def each_metric(&block)
+        self.metrics.each_pair(&block)
+      end
+    end
+  end
+end

data/lib/rack/jsonz/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Jsonz
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/rack-jsonz.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oj"
   spec.add_dependency "rack"
   spec.add_dependency "system"
+  spec.add_dependency "usagewatch"
+  spec.add_dependency "usagewatch_ext"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-jsonz
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nat Welch
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: usagewatch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: usagewatch_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +122,7 @@ files:
 - Rakefile
 - lib/rack/jsonz.rb
 - lib/rack/jsonz/cpu.rb
+- lib/rack/jsonz/metric.rb
 - lib/rack/jsonz/version.rb
 - rack-jsonz.gemspec
 homepage: http://github.com/icco/rack-jsonz