scout 5.6.9 → 5.6.10

data/.gitignore

@@ -5,5 +5,6 @@ pkg/*
 .idea
 working_dir/
 .rvmrc
+.ruby-version
 Gemfile.lock
-.bundle
+.bundle

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 5.6.10
+
+* Fix for plugin.properties that contain '=' in the property value
+
 # 5.6.9
 
 * Install command generates a script for cron to run when using RVM or Bundler

data/lib/scout/server.rb

@@ -602,7 +602,7 @@ module Scout
             line.strip!
             next if line[0] == '#'
             next unless line.include? "="
-            k,v =line.split('=')
+            k,v =line.split('=',2)
             temp_configs[k]=v
           end
           debug("#{temp_configs.size} plugin config(s) loaded.")

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.6.9"
+  VERSION = "5.6.10"
 end

data/test/scout_test.rb

@@ -4,9 +4,9 @@
 # Scout internal note: See documentation in scout_sinatra for running tests.
 #
 $VERBOSE=nil
-
-
 require 'rubygems'
+
+gem "activerecord", "=2.2.2" # quick fix for now for the agent tests to continue to run when the rails 2.3 gem is present
 require "active_record"
 require "json"          # the data format
 require "erb"           # only for loading rails DB config for now
@@ -331,26 +331,29 @@ EOS
             default: 0
         EOS
         def build_report
-          report :foo_value=>option(:foo)
+          report :foo_value=>option(:foo), :url_value=>option(:url)
         end
       end
     EOC
 
     run_scout_test(code, 'foo=13') do |res|
-      assert_match ':fields=>{:foo_value=>"13"', res
+      assert_match ':foo_value=>"13"', res
     end
 
     properties=<<-EOS
 # this is a properties file
 myfoo=99
 mybar=100
+myurl=http://foo.com?foo=bar
     EOS
 
     properties_path=File.join(AGENT_DIR,"plugins.properties")
     File.open(properties_path,"w") {|f| f.write properties}
 
-    run_scout_test(code, 'foo=lookup:myfoo') do |res|
-      assert_match ':fields=>{:foo_value=>"99"', res
+    run_scout_test(code, 'foo=lookup:myfoo url=lookup:myurl') do |res|
+      puts res
+      assert_match ':foo_value=>"99"', res
+      assert_match ':url_value=>"http://foo.com?foo=bar"', res
     end
 
     #cleanup

metadata

@@ -1,44 +1,50 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: scout
-version: !ruby/object:Gem::Version
-  version: 5.6.9
+version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
+  segments: 
+  - 5
+  - 6
+  - 10
+  version: 5.6.10
 platform: ruby
-authors:
+authors: 
 - Andre Lewis
 - Derek Haynes
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-31 00:00:00 -07:00
+default_executable: 
+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
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'The scout gem reports metrics to scoutapp.com, an easy-to-use hosted
-  server monitoring service.
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+description: |
+  The scout gem reports metrics to scoutapp.com, an easy-to-use hosted server monitoring service.
 
-'
 email: support@scoutapp.com
-executables:
+executables: 
 - scout
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
@@ -215,32 +221,40 @@ files:
 - vendor/signature/spec/signature_spec.rb
 - vendor/signature/spec/spec_helper.rb
 - vendor/util/lib/core_extensions.rb
+has_rdoc: true
 homepage: http://scoutapp.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: scout
-rubygems_version: 1.8.24
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-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:
+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