hinoki 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6526cf9b1b85f55f001d4d3fe587c57919e1ae59
-  data.tar.gz: 823f01aa8524a96f2ee0b409c2e9ca2847452968
+  metadata.gz: a1aabb20bcfa898e0fa04fb24857ab8e96519a8b
+  data.tar.gz: b359fa720ef72c4c9e9f6f795e3fd8940fc06fc1
 SHA512:
-  metadata.gz: cbbb150fed32133c3d4266c4d9387cf5993968b1aa38147593844e0fa3e97532c9d668609aac4721417a0d3cb8a8a1ce9e0045c2365269625458b0f5b979800e
-  data.tar.gz: 4f4b87260f9f84003941a5a5eb3b7b243128ab84018219559dedc1b662bd14f1df353c2053055a23ae08f6987e7c00b5bfd3e9eb225cbaf7a044c1eafb4076c1
+  metadata.gz: 9a5dddd278c78f6087820f84f05445cf97b09d7903c53128ea8dafb1f33ea35051ce72d8f188f62aed47779ba64e8c7d13be7d8dbfa012cc0bedba1f7287ee94
+  data.tar.gz: 615ceb2fb75c24f49ecdf0afd21a25422d7981aaa0787fcc8ca1e7484250ee40b30b95269aa5f0bae7c33faa7724cc633a2bc301ff808c87914d97e408564b2a

data/README.md

@@ -12,8 +12,12 @@ same terminology is used across endpoints.
 ### Configuration
 Hinoki looks for a config file in `~/.hinoki`. If it does not find this
 configuration file, it will assume it should contact `localhost:4567` for all
-requests. The config file is JSON format and accepts only a `host` and `port`
-parameter at present.
+requests. The config file is JSON format and accepts the following parameters:
+
+* `host` - Host of the Sensu API
+* `port` - Port of the Sensu API
+* `user` - HTTP basic auth username
+* `password` - HTTP basic auth password
 
 ``` json
 {

data/lib/hinoki/base.rb

@@ -10,8 +10,8 @@ require 'hinoki/stashes'
 class Hinoki
   attr_accessor(:aggregates, :clients, :checks, :events, :stashes)
   
-  def initialize(host=nil, port=nil)
-    @@conn      = Hinoki::Connection.new(host, port)
+  def initialize(host=nil, port=nil, user=nil, pass=nil)
+    @@conn      = Hinoki::Connection.new(host, port, user, pass)
     @aggregates = Hinoki::Aggregates
     @checks     = Hinoki::Checks
     @clients    = Hinoki::Clients

data/lib/hinoki/config.rb

@@ -4,12 +4,14 @@ require 'json'
 
 class Hinoki
   class Config
-    attr_accessor(:host, :port)
+    attr_accessor(:host, :port, :user, :pass)
 
     def initialize
       @config = parse_config_file
       @host = @config['host']
       @port = @config['port']
+      @user = @config['user']
+      @pass = @config['password']
     end
 
     private

data/lib/hinoki/connection.rb

@@ -7,30 +7,35 @@ require 'hinoki/config'
 class Hinoki
   class Connection
 
-    def initialize(host=nil, port=nil)
+    def initialize(host=nil, port=nil, user=nil, pass=nil)
       @config = Hinoki::Config.new
+      @config.user = user if user
+      @config.pass = pass if pass
       @http = Net::HTTP.new(host || @config.host, port || @config.port)
     end
 
     # Wrapper around Net::HTTP.get
     def get(path)
-      return interpret_response(@http.get(path))
+      request(Net::HTTP::Get.new(path))
     end
 
     # Wrapper around Net::HTTP.post
     def post(path)
-      return interpret_response(@http.post(path))
+      request(Net::HTTP::Post.new(path))
     end
-    
+
     # Wrapper around Net::HTTP.delete
     def delete(path)
-      return interpret_response(@http.delete(path))
+      request(Net::HTTP::Delete.new(path))
     end
 
     def request(req)
+      if @config.user && @config.pass
+        req.basic_auth(@config.user, @config.pass)
+      end
       return interpret_response(@http.request(req))
     end
-   
+
     private
 
     # Helper to basically handle any repsonse we could get.

data/lib/hinoki/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hinoki
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jake Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies: []
 description: A programmatic CLI utility for interacting with the Sensu API
 email: jake.davis5989@gmail.com
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sensu CLI utility