dogapi 1.14.0 → 1.15.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 Changes
 =======
+# 1.15.0 / 2015-02-03
+* Encode capistrano output messages to UTF-8 before manipulating them. (thanks [@byroot][] [#52](https://github.com/DataDog/dogapi-rb/pull/52))
+* Add open_timeout to avoid stuck HTTP calls (thanks [@Kaixiang][] [#55](https://github.com/DataDog/dogapi-rb/pull/55))
+
 # 1.14.0 / 2015-01-09
 * Add get_all_screenboards [#61](https://github.com/DataDog/dogapi-rb/pull/61)
 * Remove required start argument from schedule_downtime [#60](https://github.com/DataDog/dogapi-rb/pull/60)
@@ -99,3 +103,5 @@ Changes
 [@ansel1]: https://github.com/ansel1
 [@arielo]: https://github.com/arielo
 [@treeder]: https://github.com/treeder
+[@Kaixiang]: https://github.com/Kaixiang
+[@byroot]: https://github.com/byroot

data/lib/capistrano/datadog.rb

@@ -92,7 +92,7 @@ module Capistrano
           message_content = (@logging_output[name] || []).join('')
           message = if !message_content.empty? then
             # Strip out color control characters
-            message_content = message_content.gsub(/\e\[(\d+)m/, '')
+            message_content = sanitize_encoding(message_content).gsub(/\e\[(\d+)m/, '')
             "@@@\n#{message_content}@@@" else "" end
 
           Dogapi::Event.new(message,
@@ -105,6 +105,11 @@ module Capistrano
           )
         end
       end
+
+      def sanitize_encoding(string)
+        return string unless defined?(::Encoding) && string.encoding == Encoding::BINARY
+        string.encode(Encoding::UTF_8, Encoding::BINARY, invalid: :replace, undef: :replace, replace: '')
+      end
     end
 
   end

data/lib/dogapi/common.rb

@@ -92,6 +92,7 @@ module Dogapi
 
       uri = URI.parse(@api_host)
       session = connection.new(uri.host, uri.port)
+      session.open_timeout = @timeout
       session.use_ssl = uri.scheme == 'https'
       session.start do |conn|
         conn.read_timeout = @timeout

data/lib/dogapi/version.rb

@@ -1,3 +1,3 @@
 module Dogapi
-  VERSION = "1.14.0"
+  VERSION = "1.15.0"
 end

data/tests/test_screenboard.rb

@@ -58,9 +58,6 @@ class TestScreenboard < Test::Unit::TestCase
     assert_equal status, "200", "invalid HTTP response => #{status}"
     assert result["widgets"] == board["widgets"]
 
-    status, result = dog.get_all_screenboards()
-    assert_equal status, "200", "invalid HTTP response => #{status}"
-
     status, result = dog.update_screenboard(result["id"], updated_board)
     assert_equal status, "200", "invalid HTTP response => #{status}"
     assert result["widgets"] == updated_board["widgets"]
@@ -73,5 +70,8 @@ class TestScreenboard < Test::Unit::TestCase
     assert_equal status, "200", "invalid HTTP response => #{status}"
     assert del_result["id"] == result["id"]
 
+    status, result = dog.get_all_screenboards()
+    assert_equal status, "200", "invalid HTTP response => #{status}"
+
   end
 end

metadata

@@ -1,71 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: dogapi
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
+  prerelease: 
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16861780 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+  version_requirements: *16861780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16860800 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *16860800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16859820 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10'
+  version_requirements: *16859820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16858980 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *16858980
 description: Ruby bindings for Datadog's API
 email:
 - packages@datadoghq.com
@@ -139,7 +128,6 @@ files:
 homepage: http://datadoghq.com/
 licenses:
 - BSD
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -151,20 +139,22 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby bindings for Datadog's API
 test_files:
 - spec/alerts_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7a2330cb3e89fca5eeabf84fbcdffb53efa658cf
-  data.tar.gz: 01463c055324568ca094f9153f984083ef40de59
-SHA512:
-  metadata.gz: 7b6f6500aac95e6b21dde0511b88089e2203023f894764eca3ac72acdec8e869224a0e80d818956ffdb2180a3bb8c2b0d8753382fea0a7667fa31d32270f354f
-  data.tar.gz: b9bd1c6aa13837610cca2092d459a8820a363eb30b721f74619a1be026636bfef77686a49276816a11115ce2adae9fdf921427320a4b7e7089911fd4017b321f