copperegg 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    copperegg (0.0.0)
+    copperegg (0.5.3.pre2)
+      multi_json (>= 1.3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    multi_json (1.5.0)
 
 PLATFORMS
   ruby

data/lib/copperegg/metrics.rb

@@ -23,8 +23,26 @@ module CopperEgg
       return
     end
 
-    def samples(starttime, endtime, group_name, metricname)
-      samples = @util.make_api_get_request("/samples.json", @apikey, nil)
+    def samples(group_name, metricname, starttime=nil, duration=nil, sample_size=nil)
+      return if group_name.nil?
+      return if metricname.nil?
+
+      metric_name = []
+      metrics = {}
+      metric_gid = []
+      query = {}
+      params = {}
+
+      metric_name = [metricname]
+      metrics["metrics"] = metric_name
+      metric_gid = [metrics]
+      query[group_name] = metric_gid
+      params["queries"] = query
+      params["starttime"] = starttime if !starttime.nil?
+      params["duration"] = duration if !duration.nil?
+      params["sample_size"] = sample_size if !sample_size.nil?
+
+      samples = @util.make_api_get_request("/samples.json", @apikey, params)
       return samples
     end
 
@@ -58,7 +76,9 @@ module CopperEgg
       dashes = @util.make_api_get_request("/dashboards.json", @apikey, nil)
       return nil if dashes.nil?
 
-      dashboards = JSON.parse(dashes.body)
+#      dashboards = JSON.parse(dashes.body)
+# modified 12-10-2012 ... get returns the body
+      dashboards = JSON.parse(dashes)
       dashboards.each do |dash|
         if dash["name"] == dashboard_name
           return dash

data/lib/copperegg/util.rb

@@ -42,20 +42,38 @@ module CopperEgg
       end
 
       if type == "get"
-        uri.query = URI.encode_www_form(params) if !params.nil?
         request = Net::HTTP::Get.new(uri.request_uri)
+        request.body = MultiJson.dump(params)
       else
         request = Net::HTTP::Post.new(uri.request_uri)
         request.body = MultiJson.dump(params)
       end
-      
+
       request.basic_auth(apikey, "U")
       request["Content-Type"] = "application/json"
-      response = http.request(request)
-      if response.code != "200"
+
+      connect_try_count = 0
+      response = nil
+      begin
+        response = http.request(request)
+      rescue Exception => e
+        connect_try_count += 1
+        if connect_try_count > 1
+          log "#{e.inspect}"
+          raise e
+        end
+        sleep 0.5
+        retry
+      end
+
+      if response == nil || response.code != "200"
         return nil
       end
-      return response
+      if type == "get"
+        return response.body
+      else
+        return response
+      end
     end
 
   end

data/lib/copperegg/ver.rb

@@ -1,3 +1,3 @@
 module CopperEgg
-  GEM_VERSION = '0.5.2'
+  GEM_VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copperegg
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -38,7 +38,10 @@ files:
 - ./LICENSE
 - ./README.md
 - ./Rakefile
+- ./copperegg-0.5.2.1.gem
 - ./copperegg-0.5.2.gem
+- ./copperegg-0.5.3.pre.gem
+- ./copperegg-0.5.3.pre2.gem
 - ./copperegg.gemspec
 - ./examples/example.rb
 - ./lib/copperegg/metrics.rb