rackspace-monitoring 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/rackspace-monitoring.rb

@@ -9,7 +9,7 @@ module Fog
       ENDPOINT = 'https://monitoring.api.rackspacecloud.com/v1.0'
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url, :persistent
+      recognizes :rackspace_auth_url, :persistent, :raise_errors
       recognizes :rackspace_auth_token, :rackspace_service_url, :rackspace_account_id
 
       model_path  'rackspace-monitoring/monitoring/models'
@@ -66,8 +66,16 @@ module Fog
           @rackspace_service_url = options[:rackspace_service_url] || ENDPOINT
           @rackspace_must_reauthenticate = false
           @connection_options = options[:connection_options] || {}
+
+          if options.has_key("raise_errors")
+              @raise_errors = options[:raise_errors]
+          else
+              @raise_errors = true
+          end
+
           authenticate
           @persistent = options[:persistent] || false
+
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
@@ -75,37 +83,48 @@ module Fog
           @connection.reset
         end
 
+        def raise_error(error)
+          if @raise_errors
+            raise error
+          else
+            print "Error occurred: " + error.message
+          end
+        end
+
         def request(params)
-          print params
           begin
-            response = @connection.request(params.merge({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::Unauthorized => error
-            if error.response.body != 'Bad username or password' # token expiration
-              @rackspace_must_reauthenticate = true
-              authenticate
-              retry
-            else # bad credentials
-              raise error
+            begin
+              response = @connection.request(params.merge({
+                :headers  => {
+                  'Content-Type' => 'application/json',
+                  'X-Auth-Token' => @auth_token
+                }.merge!(params[:headers] || {}),
+                :host     => @host,
+                :path     => "#{@path}/#{params[:path]}"
+              }))
+            rescue Excon::Errors::Unauthorized => error
+              if error.response.body != 'Bad username or password' # token expiration
+                @rackspace_must_reauthenticate = true
+                authenticate
+                retry
+              else # bad credentials
+                raise error
+              end
+            rescue Excon::Errors::HTTPStatusError => error
+              raise case error
+              when Excon::Errors::NotFound
+                Fog::Monitoring::Rackspace::NotFound.slurp(error)
+              else
+                error
+              end
             end
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Monitoring::Rackspace::NotFound.slurp(error)
-            else
-              error
+            unless response.body.empty?
+              response.body = JSON.parse(response.body)
             end
+            response
+          rescue Exception => error
+            raise_error(error)
           end
-          unless response.body.empty?
-            response.body = JSON.parse(response.body)
-          end
-          response
         end
 
         private
@@ -117,7 +136,14 @@ module Fog
               :rackspace_username => @rackspace_username,
               :rackspace_auth_url => @rackspace_auth_url
             }
-            credentials = Fog::Rackspace.authenticate(options)
+
+            begin
+              credentials = Fog::Rackspace.authenticate(options)
+            rescue Exception => error
+              raise_error(error)
+              return
+            end
+
             @auth_token = credentials['X-Auth-Token']
             @account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
           else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rackspace-monitoring
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Dan Di Spaltro
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-21 00:00:00 Z
+date: 2012-07-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -29,12 +30,12 @@ dependencies:
         - 7
         - 0
         version: 0.7.0
+  version_requirements: *id001
   name: fog
   prerelease: false
-  type: :runtime
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id002
   name: shoulda
   prerelease: false
-  type: :development
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -58,12 +59,12 @@ dependencies:
         - 3
         - 12
         version: "3.12"
+  version_requirements: *id003
   name: rdoc
   prerelease: false
-  type: :development
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,12 +75,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id004
   name: bundler
   prerelease: false
-  type: :development
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,10 +91,9 @@ dependencies:
         - 8
         - 3
         version: 1.8.3
+  version_requirements: *id005
   name: jeweler
   prerelease: false
-  type: :development
-  requirement: *id005
 description: Rackspace Cloud Monitoring Ruby Bindings, built on top of fog.
 email: dan.dispaltro@gmail.com
 executables: []
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Rackspace Cloud Monitoring Ruby Bindings