hinoki 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132ed86ba9f3e9114eed5124c1fe6c5d5c175a14
-  data.tar.gz: 1c14203f306d34c1214a2d90b2c1a83ad4f015b0
+  metadata.gz: 8446fd8cc41684f7bd2063be59ab013aa7b6b9ab
+  data.tar.gz: c1137cfa77ed25ad24454e1f029fa7c911ab1573
 SHA512:
-  metadata.gz: 67b55f8fd4457a099761493f53bcd3aa337097cc6399d0f3bb10ddf776637524a6df6a10ec1d09539b29f403c7c0b88e967dbd16b2328cb00fe58e05dca7b40a
-  data.tar.gz: 74b9bb76222c203d73b9027bb73b98d1dde3b1e6b309a1adf9d58de781dfba1d84fc1695bf6be2c179cd77c3b4711d31f55fc51340e1a8a7865decb3fc9a585e
+  metadata.gz: c02c402318119a587eab2dca2bc7bbb414138ddefa4989364d8fc061bb2cb9cfcc858c2fdf219a49b8a036bee9dfd647b7834e7205604e442f317a5c4b5d69ab
+  data.tar.gz: 37fcd0ad903e100fd9c1537267770a15dfe1edf28f5b2a7820493c1931e74df5f9d7971f20d6e1c9593e0f5b6a9e2e1ca85fe8821d7a4ac01d7fe23719076dc8

data/lib/hinoki/aggregates.rb

@@ -5,15 +5,13 @@ require 'hinoki/connection'
 class Hinoki
   module Aggregates
 
-    @conn = Hinoki::Connection.new
-
     # Return a list of all aggregates
     def self.all(limit=nil, offset=nil)
       url = "/aggregates"
       if limit  then url.append("?limit=#{limit}") end
       if offset then url.append("&offset=#{offset}") end
 
-      return @conn.get(url)
+      return Hinoki.conn.get(url)
     end
 
     # Return a specific aggregate check
@@ -21,12 +19,12 @@ class Hinoki
       url = "/aggregates/#{name}"
       if age then url.append("?age=#{age}") end
 
-      return @conn.get(url)
+      return Hinoki.conn.get(url)
     end
 
     # Delete an aggregate check
     def self.delete(name)
-      return @conn.delete("/aggregates/#{name}")
+      return Hinoki.conn.delete("/aggregates/#{name}")
     end
 
     # Returns the list of aggregates
@@ -40,7 +38,7 @@ class Hinoki
         url.append("?results=#{results}") 
       end
 
-      return @conn.get(url)
+      return Hinoki.conn.get(url)
     end
 
   end

data/lib/hinoki/base.rb

@@ -10,8 +10,8 @@ require 'hinoki/stashes'
 class Hinoki
   attr_accessor(:aggregates, :clients, :checks, :events, :stashes)
   
-  def initialize
-    @conn       = Hinoki::Connection.new
+  def initialize(host=nil, port=nil)
+    @@conn      = Hinoki::Connection.new(host, port)
     @aggregates = Hinoki::Aggregates
     @checks     = Hinoki::Checks
     @clients    = Hinoki::Clients
@@ -19,14 +19,18 @@ class Hinoki
     @stashes    = Hinoki::Stashes
   end
 
+  # Helper for modules to grab onto the connection
+  def self.conn
+    @@conn
+  end
+
   # Delivers information about Sensu and RabbitMQ performance
   def health(consumers=1, messages=1)
-    return @conn.get("/health?consumers=#{consumers}&messages=#{messages}")
+    return self.conn.get("/health?consumers=#{consumers}&messages=#{messages}")
   end
 
   # Metadata about the Sensu installation
   def info
-    return @conn.get('/info')
+    return self.conn.get('/info')
   end
-
 end

data/lib/hinoki/checks.rb

@@ -5,23 +5,21 @@ require 'hinoki/connection'
 class Hinoki
   module Checks
 
-    @conn = Hinoki::Connection.new
-
     # Lists all checks
     def self.all
-      return @conn.get('/checks')
+      return Hinoki.conn.get('/checks')
     end
 
     # Returns info about a specific check
     def self.by_name(check)
-      return @conn.get("/checks/#{check}")
+      return Hinoki.conn.get("/checks/#{check}")
     end
 
     # Request a check to be run
     def self.request(check, subscribers=[])
       payload = JSON.generate({check: check, subscribers: subscribers})
 
-      return @conn.post("/checks", payload)
+      return Hinoki.conn.post("/checks", payload)
     end
 
   end

data/lib/hinoki/clients.rb

@@ -5,30 +5,28 @@ require 'hinoki/connection'
 class Hinoki
   module Clients
     
-    @conn = Hinoki::Connection.new
-
     # Retrieves list of all clients
     def self.all(limit=nil, offset=nil)
       url = "/clients"
       if limit  then url.append("?limit=#{limit}") end
       if offset then url.append("&offset=#{offset}") end
 
-      return @conn.get(url)
+      return Hinoki.conn.get(url)
     end
 
     # Gets info about a specific client
     def self.by_name(client)
-      return @conn.get("/clients/#{client}")
+      return Hinoki.conn.get("/clients/#{client}")
     end
 
     # Deletes a client (and resolves its events)
     def self.delete(client)
-      return @conn.delete("/clients/#{client}")
+      return Hinoki.conn.delete("/clients/#{client}")
     end
 
     # Gets recent history of this client's status
     def self.history(client)
-      return @conn.get("/clients/#{client}/history")
+      return Hinoki.conn.get("/clients/#{client}/history")
     end
 
   end

data/lib/hinoki/connection.rb

@@ -7,9 +7,9 @@ require 'hinoki/config'
 class Hinoki
   class Connection
 
-    def initialize
+    def initialize(host=nil, port=nil)
       @config = Hinoki::Config.new
-      @http = Net::HTTP.new(@config.host, @config.port)
+      @http = Net::HTTP.new(host || @config.host, port || @config.port)
     end
 
     # Wrapper around Net::HTTP.get

data/lib/hinoki/events.rb

@@ -5,21 +5,19 @@ require 'hinoki/connection'
 class Hinoki
   module Events
 
-    @conn = Hinoki::Connection.new
-
     # Lists all events
     def self.all
-      return @conn.get('/events')
+      return Hinoki.conn.get('/events')
     end
 
     # Returns events associated with the given client
     def self.for_client(client)
-      return @conn.get("/events/#{client}")
+      return Hinoki.conn.get("/events/#{client}")
     end
 
     # Clears an event from Sensu
     def self.resolve(client, check)
-      return @conn.delete("/events/#{client}/#{check}")
+      return Hinoki.conn.delete("/events/#{client}/#{check}")
     end
 
   end

data/lib/hinoki/stashes.rb

@@ -6,15 +6,13 @@ require 'hinoki/connection'
 class Hinoki
   module Stashes
 
-    @conn = Hinoki::Connection.new
-
     # Lists all stashes
     def self.all(limit=nil, offset=nil)
       url = "/stashes"
       if limit  then url.append("?limit=#{limit}") end
       if offset then url.append("&offset=#{offset}") end
       
-      return @conn.get(url)
+      return Hinoki.conn.get(url)
     end
 
     # Add a new stash (JSON formatted)
@@ -25,17 +23,17 @@ class Hinoki
       post = Net::HTTP::Post.new('/stashes')
       post.body=JSON.generate(hash)
 
-      return @conn.request(post)
+      return Hinoki.conn.request(post)
     end 
 
     # Get information about a specific stash
     def self.by_name(stash)
-      return @conn.get("/stashes/#{stash}")
+      return Hinoki.conn.get("/stashes/#{stash}")
     end
 
     # Remove a stash
     def self.delete(stash)
-      return @conn.delete("/stashes/#{stash}")
+      return Hinoki.conn.delete("/stashes/#{stash}")
     end
 
   end

data/lib/hinoki/version.rb

@@ -1,5 +1,5 @@
 # hinoki/version.rb
 
 class Hinoki
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/hinoki/clients_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'json'
+
+describe Hinoki::Clients do
+  before do
+    @hinoki = Hinoki.new(host: 'hinoki.test', port: 4567)
+  end
+
+  describe '#all' do
+    it 'should return a list of all clients' do
+      stub_request(:get, "http://hinoki.test:4567/clients")
+
+      @hinoki.clients.all.should be_a(Array)
+    end
+  end
+
+end

data/spec/hinoki_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Hinoki do
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'hinoki'
+require 'webmock/rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hinoki
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jake Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies: []
 description: A programmatic CLI utility for interacting with the Sensu API
 email: jake.davis5989@gmail.com
@@ -29,6 +29,14 @@ files:
 - lib/hinoki/events.rb
 - lib/hinoki/stashes.rb
 - lib/hinoki/version.rb
+- spec/hinoki/aggregates_spec.rb
+- spec/hinoki/checks_spec.rb
+- spec/hinoki/clients_spec.rb
+- spec/hinoki/events_spec.rb
+- spec/hinoki/generic_spec.rb
+- spec/hinoki/stashes_spec.rb
+- spec/hinoki_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/jakedavis/hinoki
 licenses:
 - Apache 2.0