mackerel-client 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91ab71f2c21720288ec7c6c1d44079f4d98326d5
-  data.tar.gz: 3e6e4f6bc08ad6c72949538141eacf94d16407d6
+  metadata.gz: 50fe10ec4bbe6d4c05ba4ded9dc8dc3890986d62
+  data.tar.gz: abce163f8af5de40bb2dddb16ac1a107f611e5d1
 SHA512:
-  metadata.gz: cd2297ae218d4c491c51c0a82e5985aa7f7674b0bed2d22ed0246f919155d0e96a8a6fca22b31fc4f81bf49be10057c992988e27543521a1a765f2e874e0292c
-  data.tar.gz: 98363c727e49f46c2250dc30ab730fb53d852eb150c5342cf590697cf91709f4daab37360fa0427cf2e8f725ebfe5db5b2e6878c7ad6adf5d2c6f7e589d5e926
+  metadata.gz: 3f15c1177dd45f34b7a0dae2ace107a92505732557f31310a6da47965bd47182b1cd2612e2f930c6d7579c5439a2c25d7b39e78f72b0789d60035c458822b22b
+  data.tar.gz: a43f37ae3bc1777d55aa4fa544bff81646bdb865291376062e8d669dc2914c5cefa87e79e9ebfca524bd2bc8e9cccd1aaa6859166c13fc27a7972e2d665f1c52

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/lib/mackerel/client.rb

@@ -8,9 +8,11 @@ module Mackerel
 
   class Client
 
+    ERROR_MESSAGE_FOR_API_KEY_ABSENCE = "API key is absent. Set your API key in a environment variable called MACKEREL_APIKEY."
+
     def initialize(args = {})
       @origin  = args[:mackerel_origin] || 'https://mackerel.io'
-      @api_key = args[:mackerel_api_key]
+      @api_key = args[:mackerel_api_key] || raise(ERROR_MESSAGE_FOR_API_KEY_ABSENCE)
     end
 
     def get_host(host_id)
@@ -80,6 +82,23 @@ module Mackerel
       data = JSON.parse(response.body)
     end
 
+    def get_latest_metrics(hostIds, names)
+      query = (hostIds.map{ |hostId| "hostId=#{hostId}" } +
+               names.map{ |name| "name=#{name}" }).join('&')
+
+      client = http_client
+      response = client.get "/api/v0/tsdb/latest?#{query}" do |req|
+        req.headers['X-Api-Key'] = @api_key
+      end
+
+      unless response.success?
+        raise "/api/v0/tsdb/latest?#{query} faild: #{response.status}"
+      end
+
+      data = JSON.parse(response.body)
+      data["tsdbLatest"]
+    end
+
     def post_service_metrics(service_name, metrics)
       client = http_client
 

data/spec/mackerel/client_spec.rb

@@ -6,6 +6,13 @@ describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
+  describe 'initialization' do
+    it 'display an error message when api_key is absent' do
+      expected_message = "API key is absent. Set your API key in a environment variable called MACKEREL_APIKEY."
+      expect { Mackerel::Client.new() }.to raise_error(expected_message)
+    end
+  end
+
   describe '#get_host' do
     let(:stubbed_response) {
       [
@@ -168,6 +175,48 @@ describe Mackerel::Client do
     end
   end
 
+  describe "#get_latest_metrics" do
+    let(:stubbed_response) {
+      [
+       200,
+       {},
+       JSON.dump(response_object)
+      ]
+    }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.adapter :test do |stubs|
+          stubs.get(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:hostId) { '21obeF4PhZN' }
+
+    let(:metric_name) { "loadavg5" }
+
+    let(:api_path) { "/api/v0/tsdb/latest" }
+
+    let(:response_object) {
+      {
+        "tsdbLatest" => {
+          hostId => {
+            metric_name => {"time"=>1407898200, "value"=>0.03666666666666667},
+          }
+        }
+      }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it "successfully post metrics" do
+      expect(client.get_latest_metrics([hostId], [metric_name])).to eq(response_object["tsdbLatest"])
+    end
+  end
+
   describe '#post_service_metrics' do
     let(:stubbed_response) {
       [

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mackerel-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Mackerel developer team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   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
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 description: Mackerel client is a library to access Mackerel (https://mackerel.io/).
@@ -75,9 +75,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,17 +101,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Mackerel client implemented by Ruby.