scout_api 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,16 +1,22 @@
-== 0.9.0
+== 1.0.2
 
-Initial release.
+* Removed Server#active_alerts. This XML is not being returned.
+* Changed require calls to relative paths
+* No longer requiring a specific version of HTTParty to fix compatibly issues w/Ruby Gems 1.6+
 
-== 0.9.1
+== 1.0.1
 
-* Fixed Ruby 1.9.2 issue accessing Server#key
-* Documentation updates
+* Removed debugging output in Metric#to_sparkline
 
 == 1.0.0
 
 * Updates for YARD documentation formatting
 
-== 1.0.1
+== 0.9.1
+
+* Fixed Ruby 1.9.2 issue accessing Server#key
+* Documentation updates
+
+== 0.9.0
 
-* Removed debugging output in Metric#to_sparkline
+Initial release.

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 gem "hashie", "~> 0.1.8"
-gem "httparty", "~> 0.5.0"
+gem "httparty"
 gem "nokogiri"
 
 group :development do

data/Gemfile.lock

@@ -20,6 +20,6 @@ PLATFORMS
 DEPENDENCIES
   fakeweb
   hashie (~> 0.1.8)
-  httparty (~> 0.5.0)
+  httparty
   jeweler (~> 1.5.0)
   nokogiri

data/lib/scout_api/server.rb

@@ -33,10 +33,6 @@ class Scout::Server < Hashie::Mash
   attr_reader :metrics
   
   def initialize(hash) #:nodoc:
-    if hash['active_alerts']
-      @alert_hash = hash['active_alerts']
-      hash.delete('active_alerts')
-    end
     @metrics = Scout::MetricProxy.new(self)
     super(hash)
   end
@@ -144,13 +140,6 @@ class Scout::Server < Hashie::Mash
     end
   end
 
-  # Active alerts for this server
-  #
-  # @return [Array] An array of {Scout::Alert} objects
-  def active_alerts
-    @active_alerts ||= @alert_hash.map { |a| decorate_with_server(Scout::Alert.new(a)) }
-  end
-
   # Recent alerts for this server
   #
   # @return [Array] An array of {Scout::Alert} objects

data/lib/scout_api/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/scout_api.rb

@@ -3,17 +3,18 @@ require 'hashie'
 require 'httparty'
 require 'nokogiri'
 require 'cgi'
-require 'scout_api/version'
-require 'scout_api/account'
-require 'scout_api/server'
-require 'scout_api/plugin'
-require 'scout_api/trigger'
-require 'scout_api/alert'
-require 'scout_api/group.rb'
-require 'scout_api/metric.rb'
-require 'scout_api/person'
-require 'scout_api/metric_proxy'
-require 'scout_api/metric_calculation'
+require File.expand_path('../scout_api/version.rb', __FILE__)
+require File.expand_path('../scout_api/account.rb', __FILE__)
+require File.expand_path('../scout_api/server.rb', __FILE__)
+require File.expand_path('../scout_api/plugin.rb', __FILE__)
+require File.expand_path('../scout_api/trigger.rb', __FILE__)
+require File.expand_path('../scout_api/alert.rb', __FILE__)
+require File.expand_path('../scout_api/group.rb', __FILE__)
+require File.expand_path('../scout_api/metric.rb', __FILE__)
+require File.expand_path('../scout_api/person.rb', __FILE__)
+require File.expand_path('../scout_api/metric_proxy.rb', __FILE__)
+require File.expand_path('../scout_api/metric_calculation.rb', __FILE__)
+
 
 
 module Scout

data/scout_api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scout_api}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesse Newland", "Derek Haynes"]
-  s.date = %q{2011-05-04}
+  s.date = %q{2011-10-07}
   s.description = %q{A library for interacting with Scout (http://scoutapp.com), a hosted server monitoring service. Query for metric data, manage servers, and more.}
   s.email = %q{support@scoutapp.com}
   s.extra_rdoc_files = [
@@ -73,20 +73,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hashie>, ["~> 0.1.8"])
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.0"])
     else
       s.add_dependency(%q<hashie>, ["~> 0.1.8"])
-      s.add_dependency(%q<httparty>, ["~> 0.5.0"])
+      s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.0"])
     end
   else
     s.add_dependency(%q<hashie>, ["~> 0.1.8"])
-    s.add_dependency(%q<httparty>, ["~> 0.5.0"])
+    s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.0"])

data/test/server_test.rb

@@ -25,8 +25,6 @@ class ServerTest < Test::Unit::TestCase
     servers = Scout::Server.all
     assert_equal 2, servers.size
     assert servers.first.is_a?(Scout::Server)
-    assert servers.last.active_alerts.first.is_a?(Scout::Alert)
-    assert servers.last.active_alerts.first.title =~ /Passenger/
   end
   
   def test_plugin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scout_api
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jesse Newland
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -07:00
+date: 2011-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,26 +31,24 @@ dependencies:
         - 1
         - 8
         version: 0.1.8
-  requirement: *id001
   prerelease: false
-  name: hashie
+  requirement: *id001
   type: :runtime
+  name: hashie
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 0
-        version: 0.5.0
-  requirement: *id002
+        version: "0"
   prerelease: false
-  name: httparty
+  requirement: *id002
   type: :runtime
+  name: httparty
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,10 +59,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   prerelease: false
-  name: nokogiri
+  requirement: *id003
   type: :runtime
+  name: nokogiri
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,10 +73,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   prerelease: false
-  name: fakeweb
+  requirement: *id004
   type: :development
+  name: fakeweb
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,10 +89,10 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
-  requirement: *id005
   prerelease: false
-  name: jeweler
+  requirement: *id005
   type: :development
+  name: jeweler
 description: A library for interacting with Scout (http://scoutapp.com), a hosted server monitoring service. Query for metric data, manage servers, and more.
 email: support@scoutapp.com
 executables: []