lita-libratoo 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 641821ba24a20cbbf66cb240ad8a2b820d4a5a39
-  data.tar.gz: f445a0003b17f61c080c7e14e6a7b896cfef9313
+  metadata.gz: 32264559607afd62e61078d32be2bb169b9445e9
+  data.tar.gz: f4c9304f055db2911ad978c8bfbb258e374033a2
 SHA512:
-  metadata.gz: 9baa4cd5c0b0910c7e14f4ee6db2e4326300bfd32613c29156c0f501b69756ca0d6bd0a2a9efc02f33ee91367dd444d4f26d067d5a03dc0f111c04318ff234cb
-  data.tar.gz: f0029a05d3ab3a37d93390a82e2257fe6b02fead29b58fc2dce7514a53d92ae5ba7dc8e8a69ae00c6a0ee454b3f49ff3419bac96b60cce100987dfd0f51acf8d
+  metadata.gz: 6facfde14fa34c258fa8b87b3d222150989f61fc9afc31c15588ed98b4d48d6cd1d447a17d6f1bf9cd673a2a5eddbd7c2373773e583ccb69dd8deb75165de79d
+  data.tar.gz: 5c0887c9459513e5e5741e0b672ffeecd020e69b3d7b7854adbaf8921b7f0173130e2976761c624fb24c83c4987458fab39c554aca339c2a87bdab1f2aee7654

data/lib/lita/handlers/libratoo.rb

@@ -1,32 +1,26 @@
 require "librato/metrics"
+require "chronic"
+
 module Lita
   module Handlers
     class Libratoo < Handler
       config :email, required: true
       config :api_key, required: true
 
-      route(/^librato get\s(.+)/, :librato_get, command: true, help: {
+      route(/^librato get\s([^ ]+)\s(.+)/, :librato_get, command: true, help: {
         "librato get [metric] [options]" =>
-          "example: 'lita librato get AWS.RDS.ReplicaLag source: * count: 5 start_time: 2016-03-11-02:00'"
+          "example: 'lita librato get AWS.RDS.ReplicaLag, source: *, count: 5, start_time: \"an hour ago\"'"
       })
 
       def librato_get(response)
         Librato::Metrics.authenticate config.email, config.api_key
 
-        arguments = response.matches[0][0].delete(':').split
-
-        if arguments[0] == "search"
-          metrics = Librato::Metrics.metrics.map{|v| v["name"] }
-          response_text = metrics.grep(/#{arguments[1]}/i).join(', ')
-          response_text = "No results" if response_text.empty?
-          return reply_or_whisper_long response, response_text
-        end
-
-        metric, options = arguments[0].to_sym, arguments[1..-1]
-        options = symbolize_keys Hash[*options]
+        metric = response.matches[0][0]
+        options = parse_options response.matches[0][1]
         options = { count: 1 }.merge options
+
         if options.key?(:start_time) && !options[:start_time].is_a?(Numeric)
-          options[:start_time] = DateTime.parse(options[:start_time]).to_time
+          options[:start_time] = Chronic.parse(options[:start_time]).utc
         end
 
         results = Librato::Metrics.get_measurements metric, options
@@ -45,21 +39,20 @@ module Lita
         reply_or_whisper_long response, e.message
       end
 
-      route(/^librato sum\s(.+)/, :librato_sum, command: true, help: {
+      route(/^librato sum\s([^ ]+)\s(.+)/, :librato_sum, command: true, help: {
         "librato sum [metric] [options]" =>
-          "example: 'lita librato sum payments_controller.stripe.success start_time: 2016-03-11-02:00'"
+          "example: 'lita librato sum payments_controller.stripe.success, start_time: \"an hour ago\"'"
       })
 
       def librato_sum(response)
         Librato::Metrics.authenticate config.email, config.api_key
 
-        arguments = response.matches[0][0].delete(':').split
-
-        metric, options = arguments[0].to_sym, arguments[1..-1]
-        options = symbolize_keys Hash[*options]
+        metric = response.matches[0][0]
+        options = parse_options response.matches[0][1]
         options = { resolution: 1 }.merge options
+
         if options.key?(:start_time) && !options[:start_time].is_a?(Numeric)
-          options[:start_time] = DateTime.parse(options[:start_time]).to_time.to_i
+          options[:start_time] = Chronic.parse(options[:start_time]).utc.to_i
         end
 
         results = Librato::Metrics.get_composite %Q[sum(s("#{metric}", "*", {function: "sum"}))], options
@@ -100,6 +93,10 @@ module Lita
 
       private
 
+      def parse_options(options)
+        symbolize_keys Hash[*options.scan(/('.*?'|".*?"|\S+)/).flatten.map{|e| e.tr %Q['":], '' }]
+      end
+
       def reply_or_whisper_long(response, response_text)
         response_text = response_text.to_s
         if response_text.length > 400 && !response.message.source.private_message

data/lita-libratoo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-libratoo"
-  spec.version       = "0.1.3"
+  spec.version       = "0.1.4"
   spec.authors       = ["Eric Boehs"]
   spec.email         = ["ericboehs@gmail.com"]
   spec.description   = "Query librato metrics from Lita"
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "lita", ">= 4.7"
   spec.add_runtime_dependency "librato-metrics", "~> 1.6"
+  spec.add_runtime_dependency "chronic", "~> 0.10"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-libratoo
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eric Boehs
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement