scout 5.9.7.1 → 5.9.7.2.pre

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 140399efe8eee3eba1aec08b48196a4f87140e31
+  data.tar.gz: 3ba82c2aadc04ddace97c6d33ef1a63b728df903
+SHA512:
+  metadata.gz: c57acbf53039f8e08e19583939f1c29ba9759ae6d7f25f8f380b65284da397763710d845dc35857571f84969fc9445c550dd6cf1880aec6846629e5929d9dc40
+  data.tar.gz: 6508b1e69bf1b2a6f1aee09950fe114b634abe1955b576fae2fdc4e97f6b59797dd88d4bb6ab69e2311ce321bb6ca3e30ac76224d89344ead1149ce9d5ac7b38

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 5.9.7.2
+
+* Convert alert/error/report strings to UTF-8
+
 # 5.9.7.1
 
 * write a bit more information about system metrics in the realtime log

data/lib/scout.rb

@@ -5,6 +5,7 @@ require "server_metrics"
 
 require "scout/version"
 
+require "scout/helpers"
 require "scout/http"
 require "scout/command"
 require "scout/plugin"

data/lib/scout/helpers.rb

@@ -0,0 +1,21 @@
+class Hash
+  def convert_to_utf8
+    result_hash = {}
+    self.each do |k,v|
+      new_key = k.respond_to?(:convert_to_utf8) ? k.convert_to_utf8 : k
+      new_value = v.respond_to?(:convert_to_utf8) ? v.convert_to_utf8 : v
+      result_hash[new_key] = new_value
+    end
+    return result_hash
+  end
+end
+
+class String
+  def convert_to_utf8
+    if self.respond_to?('encode') # We can convert natively using Ruby >1.9 encode()
+      return self.encode('UTF-8', {:invalid => :replace, :undef => :replace, :replace => '?'})
+    else # We can't convert natively, do nothing.
+      return self
+    end
+  end
+end

data/lib/scout/plugin.rb

@@ -116,17 +116,17 @@ module Scout
         
         if "#{kind}" == "report"
           def report(new_entry)
-            reports << new_entry
+            reports << new_entry.convert_to_utf8
           end
         elsif "#{kind}" == "summary"
           def summary(new_entry)
-            summaries << new_entry
+            summaries << new_entry.convert_to_utf8
           end
         else
           def #{kind}(*fields)
             #{kind}s << ( fields.first.is_a?(Hash) ?
-                          fields.first :
-                          {:subject => fields.first, :body => fields.last} )
+                          fields.first.convert_to_utf8 :
+                          {:subject => fields.first.convert_to_utf8, :body => fields.last.convert_to_utf8} )
           end
         end
         alias_method :add_#{kind}, :#{kind}

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.9.7.1"
+  VERSION = "5.9.7.2.pre"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.9.7.1
-  prerelease: 
+  version: 5.9.7.2.pre
 platform: ruby
 authors:
 - Andre Lewis
@@ -11,51 +10,45 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: server_metrics
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.5
-description: ! 'The scout gem reports metrics to scoutapp.com, an easy-to-use hosted
-  server monitoring service.
-
-'
+description: |
+  The scout gem reports metrics to scoutapp.com, an easy-to-use hosted server monitoring service.
 email: support@scoutapp.com
 executables:
 - scout
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE
@@ -77,6 +70,7 @@ files:
 - lib/scout/daemon_spawn.rb
 - lib/scout/data_file.rb
 - lib/scout/environment.rb
+- lib/scout/helpers.rb
 - lib/scout/http.rb
 - lib/scout/plugin.rb
 - lib/scout/plugin_options.rb
@@ -321,32 +315,27 @@ files:
 - vendor/util/lib/core_extensions.rb
 homepage: http://scoutapp.com
 licenses: []
+metadata: {}
 post_install_message: 
 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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby
   gem reports metrics to our service. The agent runs plugins, configured via the Scout
   web interface, to monitor a server.
-test_files:
-- test/plugins/disk_usage.rb
-- test/scout_test.rb
-- test/streamer_test.rb
-has_rdoc: 
+test_files: []