log_query 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a5eace67508a8f9b304887399b8850934c394e
-  data.tar.gz: 40b0398eed248d957935748636fb9cbdb1b6b1a9
+  metadata.gz: bbbbbacb431cb36ca4af41d23f449c91c9625f16
+  data.tar.gz: 42c08499a6f0e4b0a72664dbdf581c9e6d97743d
 SHA512:
-  metadata.gz: 1fea3044667c84a0d59691382da0216465d3738480cbd87bb5ab4929e238528e499d8fe378baaea9b4391f29edaa1790e0399a0bac08703249a465ef0c9cc276
-  data.tar.gz: 66ca2acebdd27e20842e861848dc2da2eb08fe5eb27d795d6a6513d29b9de801e9d57693f2c79cb5a706850fb14d21d8e791fa2a5d74211190e31cdfe250a816
+  metadata.gz: 0edc108cf0477232b70372cbf21ac9d6b57939aadd655b2b29e32ad8e9a5e4f2d970e83fa7c8adc2416dd54afc2a39240915a0ad9e83191e87862f96e5fae55b
+  data.tar.gz: 99b03af2d2dbdb06b2d210e8dcd18319e9576f5e33114281828f665f831608ff65fc55fd5de4e7e41904f43bffe119a320a33ad905123df30191a015eb29dee6

data/bin/lq

@@ -12,7 +12,7 @@ program :name, 'Log Query'
 program :version, LogQuery::VERSION
 program :description, 'CLI based analytics for heroku logs'
 
-global_option('-g', '--group_by ATTRIBUTE', 'Attribute to group by')
+global_option('-g', '--group_by ATTRIBUTE[,ATTRIBUTE]', Array, 'Attributes to group by')
 global_option('-m', '--measure ATTRIBUTE', 'Attribute to measure')
 global_option('-a', '--average', 'Perform average')
 global_option('-p', '--percentile NUMBER', Integer,'Find nth percentile')
@@ -31,21 +31,21 @@ command :run do |c|
 
      # check which type group_by is in
      if options.group_by
-       unless Messages.class_from_attribute(options.group_by).detect { |klass| message.is_a?(klass) }
+       unless Messages.class_from_attributes(options.group_by).detect { |klass| message.is_a?(klass) }
          #screen.line("#{options.group_by} is not in #{message.class} with attributes #{message.class&.attributes}")
          next
        end
      end
 
      # check which type measure is in
-     unless Messages.class_from_attribute(options.measure).detect { |klass| message.is_a?(klass) }
+     unless Messages.class_from_attributes([options.measure]).detect { |klass| message.is_a?(klass) }
        #screen.line("#{options.measure} is not in #{message.class} with attributes #{message.class&.attributes}")
        next
      end
 
      entries << entry
      
-     data = entries.group_by { |e| e.message.send(options.group_by) } if options.group_by
+     data = entries.group_by { |e| options.group_by.map {|g| e.message.send(g) }.join(' ') } if options.group_by
      data ||= { all: entries }
 
      data.

data/lib/log_query/messages.rb

@@ -2,9 +2,9 @@ require_relative './messages/heroku_router'
 require_relative './messages/heroku_web/rails'
 
 module Messages
-  def self.class_from_attribute(attr)
+  def self.class_from_attributes(attrs)
     [HerokuRouter, HerokuWeb::Rails].select do |klass|
-      klass.attributes.include?(attr.to_sym)
+      attrs.map(&:to_sym).all? { |a| klass.attributes.include?(a) }
     end
   end
 

data/lib/log_query/messages/heroku_router.rb

@@ -32,7 +32,7 @@ module Messages
       when :sock, :at, :code, :desc, :method, :host, :request_id, :fwd, :dyno, :status
         value
       when :path
-        value.split('?')[0]
+        value.split('?')[0].gsub(/-[a-f0-9]{64}/, '')
       when :connect, :service
         Integer(value.match(/([0-9]*)ms/)[1])
       when :bytes

data/lib/log_query/version.rb

@@ -1,3 +1,3 @@
 module LogQuery
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_query
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jasper Lyons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descriptive_statistics