dogapi 1.4.0 → 1.4.1

data/README.rdoc

@@ -1,9 +1,13 @@
-= Ruby client for Datadog API v1.3.6
+= Ruby client for Datadog API v1.4.0
 
 The Ruby client is a library suitable for inclusion in existing Ruby projects or for development of standalone scripts. It provides an abstraction on top of Datadog's raw HTTP interface for reporting events and metrics.
 
 = What's new?
 
+== v1.4.0
+
+* Added support for the dashboard, search and comment API endpoints.
+
 == v1.3.6
 
 * Small fix for capistrano integration

data/lib/dogapi/v1/event.rb

@@ -78,7 +78,8 @@ module Dogapi
             params[:sources] = options[:sources]
           end
           if options[:tags]
-            params[:tags] = options[:tags]
+            tags = options[:tags]
+            params[:tags] = tags.kind_of?(Array) ? tags.join(",") : tags
           end
 
           request(Net::HTTP::Get, '/api/' + API_VERSION + '/events', params, nil, false)

data/tests/test_base.rb

@@ -2,16 +2,7 @@ require 'test/unit'
 require 'dogapi'
 require 'time'
 
-unless Kernel.respond_to?(:require_relative)
-  module Kernel
-    def require_relative(path)
-      require File.join(File.dirname(caller[0]), path.to_str)
-    end
-  end
-end
-
-
-class TestBase < Test::Unit::TestCase
+module TestBase
 
   def config_client_test_env
     @api_key = ENV['DATADOG_API_KEY']
@@ -25,5 +16,10 @@ class TestBase < Test::Unit::TestCase
   def setup
     config_client_test_env()
   end
+
+  def random
+    Kernel.rand 100000
+  end
+
 end
 

data/tests/test_client.rb

@@ -1,11 +1,12 @@
 require 'dogapi'
 require 'time'
-require_relative 'test_base.rb'
+require 'test_base.rb'
 
-class TestClient < TestBase
+class TestClient < Test::Unit::TestCase
+  include TestBase
 
   def test_tags
-    hostname = 'test.tag.host'
+    hostname = "test.tag.host.#{random}"
     dog = Dogapi::Client.new(@api_key, @app_key)
 
     # post a metric to make sure the test host context exists
@@ -14,6 +15,8 @@ class TestClient < TestBase
     # Disable this call until we fix the timeouts
     # dog.all_tags()
 
+    sleep 3
+
     dog.detach_tags(hostname)
     code, resp = dog.host_tags(hostname)
     assert resp["tags"].size == 0
@@ -47,6 +50,8 @@ class TestClient < TestBase
   def test_events
     now = Time.now()
 
+    tags = ["test-run:#{random}"]
+
     now_ts = now
     now_title = 'dogapi-rb end test title ' + now_ts.to_i.to_s
     now_message = 'test message ' + now_ts.to_i.to_s
@@ -58,8 +63,11 @@ class TestClient < TestBase
     dog = Dogapi::Client.new(@api_key, @app_key)
     dog_r = Dogapi::Client.new(@api_key)
 
-    e1 = Dogapi::Event.new(now_message, :msg_title =>now_title, :date_happened => now_ts)
-    e2 = Dogapi::Event.new(before_message, :msg_title =>before_title, :date_happened => before_ts)
+    # Tag the events with the build number, because traivs
+    e1 = Dogapi::Event.new(now_message, :msg_title =>now_title, :date_happened => now_ts, :tags => tags)
+    e2 = Dogapi::Event.new(before_message, :msg_title =>before_title,
+    :date_happened => before_ts, :tags => tags)
+
     code, resp = dog_r.emit_event(e1)
     now_event_id = resp["event"]["id"]
     code, resp = dog_r.emit_event(e2)
@@ -67,11 +75,12 @@ class TestClient < TestBase
 
     sleep 3
 
-    code, resp = dog.stream(before_ts, now_ts + 1)
+    code, resp = dog.stream(before_ts, now_ts + 1, :tags => tags)
     stream = resp["events"]
 
-    assert stream.last['title'] == before_title
-    assert stream.first['title'] == now_title
+    assert_equal 2, stream.length()
+    assert_equal stream.last['title'],  before_title
+    assert_equal stream.first['title'], now_title
 
     code, resp = dog.get_event(now_event_id)
     now_event = resp['event']

data/tests/test_comments.rb

@@ -1,8 +1,10 @@
 require 'dogapi'
 require 'time'
-require_relative 'test_base.rb'
+require 'test_base.rb'
+
+class TestComments < Test::Unit::TestCase
+  include TestBase
 
-class TestComments < TestBase
 
   def test_comments
     dog = Dogapi::Client.new(@api_key, @app_key)

data/tests/test_dashes.rb

@@ -1,8 +1,9 @@
 require 'dogapi'
 require 'time'
-require_relative 'test_base.rb'
+require 'test_base.rb'
 
-class TestDashes < TestBase
+class TestDashes < Test::Unit::TestCase
+  include TestBase
 
   def test_dashes
     dog = Dogapi::Client.new(@api_key, @app_key)

data/tests/test_search.rb

@@ -1,8 +1,9 @@
 require 'dogapi'
 require 'time'
-require_relative 'test_base.rb'
+require 'test_base.rb'
 
-class TestSearch < TestBase
+class TestSearch < Test::Unit::TestCase
+  include TestBase
 
   def test_search
     dog = Dogapi::Client.new(@api_key, @app_key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dogapi
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json