scout_api 1.0.3 → 1.0.4.pre

data/CHANGELOG

@@ -1,3 +1,10 @@
+== Master
+
+* Better error handling
+* Ignoring Gemfile.lock
+* Removing call to #blank? as that requires Rails
+* Returning an empty array when Metric#to_array handles a response w/no records rather than raising an exception
+
 == 1.0.3
 
 * Fixing response header change w/HTTParty 0.8

data/lib/scout_api/account.rb

@@ -61,6 +61,6 @@ class Scout::Account
     uri = "/#{param}" + uri + (uri.include?('?') ? '&' : '?') + "api_version=#{Scout::VERSION}"
     #puts "GET: #{uri}"
     response = http_get(uri)
-    response.code.to_s =~ /^(4|5)/ ? raise( Scout::Error,response.message) : response
+    response.code.to_s =~ /^(4|5)/ ? raise( Scout::Error,response['error'] ? response['error']['message'] : response.message) : response
   end
 end

data/lib/scout_api/metric.rb

@@ -120,12 +120,10 @@ class Scout::Metric < Hashie::Mash
     consolidate,name,ids=series_options(id_or_name,options)
     
     response = Scout::Account.get("/descriptors/series.xml?name=#{CGI.escape(name.to_s)}&ids=#{ids}&function=#{function}&consolidate=#{consolidate}&plugin_ids=#{options[:plugin_ids]}&server_ids=#{options[:server_ids]}&group_ids=#{options[:group_ids]}&start=#{start_time}&end=#{end_time}")
-
     if response['records']
-      response['records']
       response['records'].values.flatten.map { |r| [Time.parse(r['time']),r['value'].to_f] }
     else
-      raise Scout::Error, response['error']
+      []
     end
   end
   
@@ -225,12 +223,7 @@ class Scout::Metric < Hashie::Mash
     end
     
     response = Scout::Account.get("/data/value?name=#{CGI.escape(name.to_s)}&ids=#{ids}&function=#{function}&consolidate=#{consolidate}&plugin_ids=#{options[:plugin_ids]}&server_ids=#{options[:server_ids]}&group_ids=#{options[:group_ids]}&start=#{start_time}&end=#{end_time}")
-
-    if response['data']
-      response['data']
-    else
-      raise Scout::Error, response['error']
-    end
+    response['data']
   end
   
    # API expects times in epoch.

data/lib/scout_api/metric_proxy.rb

@@ -90,7 +90,7 @@ class Scout::MetricProxy
   # @return [String]
   def metric_from_options(options)
     metric_name = options[:name]
-    raise Scout::Error, "The name of the metric is required (:name => metric_name)" if metric_name.blank?
+    raise Scout::Error, "The name of the metric is required (:name => metric_name)" if (metric_name.nil? or metric_name == '')
     metric_name
   end
   

data/lib/scout_api/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = '1.0.3'
+  VERSION = '1.0.4.pre'
 end

data/scout_api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scout_api}
-  s.version = "1.0.3"
+  s.version = "1.0.4.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesse Newland", "Derek Haynes"]
-  s.date = %q{2011-10-10}
+  s.date = %q{2012-04-12}
   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 = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     ".document",
     "CHANGELOG",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: scout_api
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 961915972
+  prerelease: 6
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  - pre
+  version: 1.0.4.pre
 platform: ruby
 authors: 
 - Jesse Newland
@@ -16,13 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 -07:00
+date: 2012-04-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: hashie
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,10 +33,10 @@ dependencies:
         - 8
         version: 0.1.8
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: httparty
+  name: hashie
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,10 +47,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: nokogiri
+  name: httparty
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,10 +61,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: fakeweb
-  type: :development
+  name: nokogiri
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +75,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+  name: fakeweb
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -93,6 +91,9 @@ dependencies:
         - 0
         version: 1.5.0
   requirement: *id005
+  prerelease: false
+  name: jeweler
+  type: :development
 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: []
@@ -106,7 +107,6 @@ files:
 - .document
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -160,12 +160,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/Gemfile.lock

@@ -1,27 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    fakeweb (1.3.0)
-    git (1.2.5)
-    hashie (0.1.8)
-    httparty (0.8.1)
-      multi_json
-      multi_xml
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    multi_json (1.0.3)
-    multi_xml (0.4.1)
-    nokogiri (1.5.0)
-    rake (0.9.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fakeweb
-  hashie (~> 0.1.8)
-  httparty
-  jeweler (~> 1.5.0)
-  nokogiri