rackspace-monitoring 0.2.18 → 0.3.1

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "rackspace-fog", "= 1.4.2"
+gem "fog", ">= 1.11.1", :path => '/w/fog'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: /w/fog
+  specs:
+    fog (1.12.1)
+      builder
+      excon (~> 0.25.0)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    builder (3.2.2)
+    excon (0.25.0)
+    formatador (0.2.4)
+    git (1.2.5)
+    i18n (0.6.1)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.8.0)
+    mime-types (1.23)
+    multi_json (1.7.7)
+    net-scp (1.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
+    nokogiri (1.5.10)
+    rake (10.1.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    ruby-hmac (0.4.0)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.3)
+    shoulda-matchers (2.2.0)
+      activesupport (>= 3.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  fog (>= 1.11.1)!
+  jeweler (~> 1.8.3)
+  rdoc (~> 3.12)
+  shoulda

data/README.md

@@ -2,6 +2,18 @@
 
 This project contains the Ruby bindings for the Rackspace Cloud Monitoring product.  It is based off the most awesome Fog cloud services library here - https://github.com/fog/fog.  This library is used heavily in the https://github.com/racker/cookbook-cloudmonitoring chef cookbook.
 
+# Example Code
+
+Below is an example to list entities on your account:
+
+```ruby
+require 'rackspace-monitoring'
+
+monitoring = Fog::Monitoring::Rackspace.new(:rackspace_api_key => '<API-KEY>', :rackspace_username => '<USERNAME>')
+print monitoring.entities.overview
+
+```
+
 # Contributing
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
@@ -12,6 +24,7 @@ This project contains the Ruby bindings for the Rackspace Cloud Monitoring produ
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+
 # Publish a New Version
 
 * Run tests `rake test`

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.3.1

data/lib/rackspace-monitoring.rb

@@ -1,5 +1,5 @@
-require 'rackspace-fog'
-require 'rackspace-fog/core'
+require 'fog'
+require 'fog/core'
 
 module Fog
   module Monitoring

data/lib/rackspace-monitoring/monitoring/models/agent_token.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/model'
+require 'fog/core/model'
 require 'rackspace-monitoring/monitoring/models/base'
 
 module Fog
@@ -23,9 +23,9 @@ module Fog
         def save
           options = prep
           if identity then
-            data = connection.update_agent_token(identity, options)
+            data = service.update_agent_token(identity, options)
           else
-            data = connection.create_agent_token(options)
+            data = service.create_agent_token(options)
           end
           true
         end

data/lib/rackspace-monitoring/monitoring/models/agent_tokens.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/collection'
+require 'fog/core/collection'
 require 'rackspace-monitoring/monitoring/models/agent_token'
 
 module Fog
@@ -12,7 +12,7 @@ module Fog
           data = []
           opts = {}
           begin
-            new_tokens = connection.list_agent_tokens(opts)
+            new_tokens = service.list_agent_tokens(opts)
             data.concat(new_tokens.body['values'])
             opts = {:marker => new_tokens.body['metadata']['next_marker']}
           end until opts[:marker].nil?
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(id)
-          data = connection.get_agent_token(id).body
+          data = service.get_agent_token(id).body
           new(data)
         rescue Fog::Monitoring::Rackspace::NotFound
           nil

data/lib/rackspace-monitoring/monitoring/models/alarm.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/model'
+require 'fog/core/model'
 require 'rackspace-monitoring/monitoring/models/base'
 
 module Fog
@@ -30,11 +30,11 @@ module Fog
           requires :notification_plan_id
           options = prep
           if identity then
-            data = connection.update_alarm(get_entity_id, identity, options)
+            data = service.update_alarm(get_entity_id, identity, options)
           else
             options['check_type'] = check_type if check_type
             options['check_id'] = check_id if check_id
-            data = connection.create_alarm(get_entity_id, options)
+            data = service.create_alarm(get_entity_id, options)
           end
           true
         end

data/lib/rackspace-monitoring/monitoring/models/alarm_example.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/model'
+require 'fog/core/model'
 require 'rackspace-monitoring/monitoring/models/base'
 
 module Fog

data/lib/rackspace-monitoring/monitoring/models/alarm_examples.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/collection'
+require 'fog/core/collection'
 require 'rackspace-monitoring/monitoring/models/alarm_example'
 
 module Fog
@@ -9,19 +9,19 @@ module Fog
         model Fog::Monitoring::Rackspace::AlarmExample
 
         def all
-          data = connection.list_alarm_examples.body['values']
+          data = service.list_alarm_examples.body['values']
           load(data)
         end
 
         def get(alarm_example_id)
-          data = connection.get_alarm_example(alarm_example_id).body
+          data = service.get_alarm_example(alarm_example_id).body
           new(data)
         rescue Fog::Monitoring::Rackspace::NotFound
           nil
         end
 
         def evaluate(alarm_example_id, options={})
-          data = connection.evaluate_alarm_example(alarm_example_id, options).body
+          data = service.evaluate_alarm_example(alarm_example_id, options).body
           new(data)
         end
 

data/lib/rackspace-monitoring/monitoring/models/alarms.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/collection'
+require 'fog/core/collection'
 require 'rackspace-monitoring/monitoring/models/alarm'
 
 module Fog
@@ -12,13 +12,13 @@ module Fog
 
         def all
           requires :entity
-          data = connection.list_alarms(entity.identity).body['values']
+          data = service.list_alarms(entity.identity).body['values']
           load(data)
         end
 
         def get(alarm_id)
           requires :entity
-          data = connection.get_alarm(entity.identity, alarm_id).body
+          data = service.get_alarm(entity.identity, alarm_id).body
           new(data)
         rescue Fog::Monitoring::Rackspace::NotFound
           nil

data/lib/rackspace-monitoring/monitoring/models/check.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/model'
+require 'fog/core/model'
 require 'rackspace-monitoring/monitoring/models/base'
 
 module Fog
@@ -48,11 +48,11 @@ module Fog
           end
           options = prep
           if identity then
-            data = connection.update_check(entity_id, identity, options)
+            data = service.update_check(entity_id, identity, options)
           else
             requires :type
             options['type'] = type
-            data = connection.create_check(entity_id, options)
+            data = service.create_check(entity_id, options)
           end
           true
         end
@@ -61,7 +61,7 @@ module Fog
           @metrics ||= begin
             Fog::Monitoring::Rackspace::Metrics.new(
               :check      => self,
-              :connection => connection
+              :service => service
             )
           end
         end

data/lib/rackspace-monitoring/monitoring/models/check_type.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/model'
+require 'fog/core/model'
 require 'rackspace-monitoring/monitoring/models/base'
 
 module Fog

data/lib/rackspace-monitoring/monitoring/models/check_types.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/collection'
+require 'fog/core/collection'
 require 'rackspace-monitoring/monitoring/models/check_type'
 
 module Fog
@@ -9,7 +9,7 @@ module Fog
         model Fog::Monitoring::Rackspace::CheckType
 
         def all
-          data = connection.list_check_types.body['values']
+          data = service.list_check_types.body['values']
           load(data)
         end
 

data/lib/rackspace-monitoring/monitoring/models/checks.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/collection'
+require 'fog/core/collection'
 require 'rackspace-monitoring/monitoring/models/check'
 
 module Fog
@@ -12,13 +12,13 @@ module Fog
 
         def all
           requires :entity
-          data = connection.list_checks(entity.identity).body['values']
+          data = service.list_checks(entity.identity).body['values']
           load(data)
         end
 
         def get(check_id)
           requires :entity
-          data = connection.get_check(entity.identity, check_id).body
+          data = service.get_check(entity.identity, check_id).body
           new(data)
         rescue Fog::Monitoring::Rackspace::NotFound
           nil

data/lib/rackspace-monitoring/monitoring/models/data_point.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/model'
+require 'fog/core/model'
 require 'rackspace-monitoring/monitoring/models/base'
 
 module Fog

data/lib/rackspace-monitoring/monitoring/models/data_points.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/collection'
+require 'fog/core/collection'
 require 'rackspace-monitoring/monitoring/models/data_point'
 
 module Fog
@@ -34,7 +34,7 @@ module Fog
           if options[:resolution]
             options[:resolution] = options[:resolution].upcase
           end
-          data = connection.list_data_points(metric.check.entity.id, metric.check.id, metric.name, options).body['values']
+          data = service.list_data_points(metric.check.entity.id, metric.check.id, metric.name, options).body['values']
           load(data)
         end
 

data/lib/rackspace-monitoring/monitoring/models/entities.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/collection'
+require 'fog/core/collection'
 require 'rackspace-monitoring/monitoring/models/entity'
 require 'rackspace-monitoring/monitoring/models/check'
 
@@ -10,12 +10,12 @@ module Fog
         model Fog::Monitoring::Rackspace::Entity
 
         def all
-          data = connection.list_entities.body['values']
+          data = service.list_entities.body['values']
           load(data)
         end
 
         def get(entity_id)
-          data = connection.get_entity(entity_id).body
+          data = service.get_entity(entity_id).body
           new(data)
         rescue Fog::Monitoring::Rackspace::NotFound
           nil
@@ -25,7 +25,7 @@ module Fog
           entities = []
           opts = {}
           begin
-            new_entities = connection.list_overview(opts)
+            new_entities = service.list_overview(opts)
             entities.concat(new_entities.body['values'])
             opts = {:marker => new_entities.body['metadata']['next_marker']}
           end while(!opts[:marker].nil?)

data/lib/rackspace-monitoring/monitoring/models/entity.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/model'
+require 'fog/core/model'
 require 'rackspace-monitoring/monitoring/models/base'
 
 module Fog
@@ -29,9 +29,9 @@ module Fog
         def save
           options = prep
           if identity then
-            data = connection.update_entity(identity, options)
+            data = service.update_entity(identity, options)
           else
-            data = connection.create_entity(options)
+            data = service.create_entity(options)
           end
           true
         end
@@ -40,7 +40,7 @@ module Fog
           @checks ||= begin
             Fog::Monitoring::Rackspace::Checks.new(
               :entity     => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -49,14 +49,14 @@ module Fog
           @alarms ||= begin
             Fog::Monitoring::Rackspace::Alarms.new(
               :entity     => self,
-              :connection => connection
+              :service => service
             )
           end
         end
 
         def destroy
           requires :id
-          connection.delete_entity(id)
+          service.delete_entity(id)
         end
 
       end

data/lib/rackspace-monitoring/monitoring/models/metric.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/model'
+require 'fog/core/model'
 require 'rackspace-monitoring/monitoring/models/base'
 
 module Fog
@@ -13,7 +13,7 @@ module Fog
           @datapoints ||= begin
             Fog::Monitoring::Rackspace::DataPoints.new(
               :metric        => self,
-              :connection    => connection
+              :service       => service
             )
           end
         end

data/lib/rackspace-monitoring/monitoring/models/metrics.rb

@@ -1,4 +1,4 @@
-require 'rackspace-fog/core/collection'
+require 'fog/core/collection'
 require 'rackspace-monitoring/monitoring/models/metric'
 
 module Fog
@@ -12,7 +12,7 @@ module Fog
 
         def all
           requires :check
-          data = connection.list_metrics(check.entity.id, check.id).body['values']
+          data = service.list_metrics(check.entity.id, check.id).body['values']
           load(data)
         end
 

data/rackspace-monitoring.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rackspace-monitoring"
-  s.version = "0.2.18"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Di Spaltro"]
-  s.date = "2013-04-12"
+  s.date = "2013-06-22"
   s.description = "Rackspace Cloud Monitoring Ruby Bindings, built on top of fog."
   s.email = "dan.dispaltro@gmail.com"
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -72,27 +73,27 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/racker/rackspace-monitoring-rb"
   s.licenses = ["APACHE"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "1.8.24"
   s.summary = "Rackspace Cloud Monitoring Ruby Bindings"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rackspace-fog>, ["= 1.4.2"])
+      s.add_runtime_dependency(%q<fog>, [">= 1.11.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
-      s.add_dependency(%q<rackspace-fog>, ["= 1.4.2"])
+      s.add_dependency(%q<fog>, [">= 1.11.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
-    s.add_dependency(%q<rackspace-fog>, ["= 1.4.2"])
+    s.add_dependency(%q<fog>, [">= 1.11.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rackspace-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rackspace-fog
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.11.1
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,7 @@ extra_rdoc_files:
 files:
 - .document
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -163,6 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3279114146114637358
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rackspace Cloud Monitoring Ruby Bindings