rorvswild 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af8c234822923144b958f222e3cd52ccce3d9304
-  data.tar.gz: f9722694ba63f629530ad5cf3a7be34d7dc7a2b5
+  metadata.gz: 8f3058ebf12d59185c06a6e58d0708b768cbbd5e
+  data.tar.gz: 180c22cf8f25b526509164cd053fad4ddda35376
 SHA512:
-  metadata.gz: 6df568fff50b1acc8c56315da929978c1d057dca8375f8a20a47a9a230a886a59511a0af3a4c061545332c351e39f69228eb1df6f83ea91bb9807760a76fef92
-  data.tar.gz: b6087bcbd33ed5364b94d1f587157756b4ae15161debcb61b5f87044d964d1ef5a1dd5bcd352f1f7b16532d1c87ce28981121b87819203685bc42b2de113ab98
+  metadata.gz: 4c7a6ba4143a8a1c1060a2bbd5b2ebaac29d3f29eb8a44d54aba7e170008903c9ff8b9dae020b2236864ed8fa3a24ce76222aab4c99251929fd1765e001e22d2
+  data.tar.gz: e4daa2f6ed71388c9a935ea3d6757a426e25e93206c688887f5cb02d90355329e354c47306a62dff887ad3b942fd71cd9b9790bd67bafdbab1a4a3c26448ced1

data/README.md

@@ -1,6 +1,6 @@
 # RorVsWild
 
-Simple Ruby on Rails application monitoring for hardcore developers with no time to waste: http://www.rorvswild.com.
+All-in-one monitoring for Ruby on Rails applications.
 
 ## Installation
 

data/lib/rorvswild.rb

@@ -14,13 +14,15 @@ module RorVsWild
     return if !defined?(Rails)
     Rails::Railtie.initializer "rorvswild.detect_config_file" do
       if !RorVsWild.default_client && (path = Rails.root.join("config/rorvswild.yml")).exist?
-        RorVsWild.load_config_file(path, Rails.env)
+        if config = RorVsWild.load_config_file(path)[Rails.env]
+          RorVsWild::Client.new(config.symbolize_keys)
+        end
       end
     end
   end
 
-  def self.load_config_file(path, environment)
-    config = YAML.load_file(path)[environment.to_s] and Client.new(config.symbolize_keys)
+  def self.load_config_file(path)
+    YAML.load(ERB.new(path.read).result)
   end
 
   def self.register_default_client(client)
@@ -226,19 +228,16 @@ module RorVsWild
       @data.delete(Thread.current.object_id)
     end
 
+    MEANINGLESS_QUERIES = %w[BEGIN  COMMIT].freeze
+
     def push_query(query)
-      if hash = queries.find { |hash| hash[:line] == query[:line] && hash[:file] == query[:file] }
-        if query[:runtime] > hash[:max_runtime]
-          hash[:max_runtime] = query[:runtime]
-          hash[:plan] = query[:plan]
-          hash[:sql] = query[:sql]
-        end
-        hash[:runtime] += query[:runtime]
+      hash = queries.find { |hash| hash[:line] == query[:line] && hash[:file] == query[:file] }
+      queries << hash = {file: query[:file], line: query[:line], runtime: 0, times: 0} if !hash
+      hash[:runtime] += query[:runtime]
+      if !MEANINGLESS_QUERIES.include?(query[:sql])
         hash[:times] += 1
-      else
-        query[:times] = 1
-        query[:max_runtime] = query[:runtime]
-        queries << query
+        hash[:sql] ||= query[:sql]
+        hash[:plan] ||= query[:plan] if query[:plan]
       end
     end
 
@@ -275,11 +274,21 @@ module RorVsWild
       post("/errors".freeze, error: hash)
     end
 
-    GEM_HOME_REGEX = ENV["GEM_HOME"] ? /\A#{ENV["GEM_HOME"]}/.freeze : nil
+    def gem_home
+      if ENV["GEM_HOME"] && !ENV["GEM_HOME"].empty?
+        ENV["GEM_HOME"]
+      elsif ENV["GEM_PATH"] && !(first_gem_path = ENV["GEM_PATH"].split(":").first)
+        first_gem_path if first_gem_path && !first_gem_path.empty?
+      end
+    end
+
+    def gem_home_regex
+      @gem_home_regex ||= gem_home ? /\A#{gem_home}/.freeze : /\/gems\//.freeze
+    end
 
     def extract_most_relevant_location(stack)
-      location = stack.find { |str| str =~ app_root_regex && !(str =~ GEM_HOME_REGEX) } if app_root_regex
-      location ||= stack.find { |str| !(str =~ GEM_HOME_REGEX) } if GEM_HOME_REGEX
+      location = stack.find { |str| str =~ app_root_regex && !(str =~ gem_home_regex) } if app_root_regex
+      location ||= stack.find { |str| !(str =~ gem_home_regex) } if gem_home_regex
       split_file_location(relative_path(location || stack.first))
     end
 

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.5".freeze
 end

data/rorvswild.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = RorVsWild::VERSION
   spec.authors       = ["Alexis Bernard"]
   spec.email         = ["alexis@bernard.io"]
-  spec.summary       = "Simple Ruby on Rails application monitoring for hardcore developers with no time to waste."
-  spec.description   = "Simple Ruby on Rails application monitoring for hardcore developers with no time to waste."
+  spec.summary       = "All-in-one monitoring for Ruby on Rails applications."
+  spec.description   = "All-in-one monitoring for Ruby on Rails applications."
   spec.homepage      = "http://www.rorvswild.com"
   spec.license       = "MIT"
 

data/test/ror_vs_wild_test.rb

@@ -7,7 +7,7 @@ require "minitest/autorun"
 require 'mocha/mini_test'
 require "top_tests"
 
-class RorVsWildTest < MiniTest::Unit::TestCase
+class RorVsWildTest < Minitest::Test
   include TopTests
 
   def test_measure_code
@@ -79,12 +79,34 @@ class RorVsWildTest < MiniTest::Unit::TestCase
     assert_equal(["/app/models/user.rb", "3", "method3"], client.send(:extract_most_relevant_location, callstack))
   end
 
+  def test_extract_most_relevant_location_when_gem_path_is_set_instead_of_gem_home
+    original_gem_home, original_gem_path = ENV["GEM_HOME"], ENV["GEM_PATH"]
+    ENV["GEM_HOME"], ENV["GEM_PATH"] = "", "/gem/path"
+
+    callstack = ["/gem/path/lib/sql.rb:1:in `method1'", "/usr/lib/ruby/net/http.rb:2:in `method2'", "/rails/root/app/models/user.rb:3:in `method3'"]
+    assert_equal(%w[/app/models/user.rb 3 method3], client.send(:extract_most_relevant_location, callstack))
+  ensure
+    ENV["GEM_HOME"], ENV["GEM_PATH"] = original_gem_home,  original_gem_path
+  end
+
+  def test_extract_most_relevant_location_when_gem_path_and_gem_home_are_undefined
+    original_gem_home, original_gem_path = ENV["GEM_HOME"], ENV["GEM_PATH"]
+    ENV["GEM_HOME"], ENV["GEM_PATH"] = "", ""
+
+    callstack = ["/gem/path/lib/sql.rb:1:in `method1'", "/usr/lib/ruby/net/http.rb:2:in `method2'", "/rails/root/app/models/user.rb:3:in `method3'"]
+    assert_equal(%w[/app/models/user.rb 3 method3], client.send(:extract_most_relevant_location, callstack))
+  ensure
+    ENV["GEM_HOME"], ENV["GEM_PATH"] = original_gem_home,  original_gem_path
+  end
+
   def test_push_query
     client = initialize_client
     client.send(:data)[:queries] = []
+    client.send(:push_query, {file: "file", line: 123, sql: "BEGIN", runtime: 10})
+    client.send(:push_query, {file: "file", line: 123, sql: "SELECT 1", runtime: 10})
     client.send(:push_query, {file: "file", line: 123, sql: "SELECT 1", runtime: 10})
-    client.send(:push_query, {file: "file", line: 123, sql: "SELECT 2", runtime: 11})
-    assert_equal([{file: "file", line: 123, sql: "SELECT 2", runtime: 21, max_runtime: 11, times: 2, plan: nil,}], client.send(:queries))
+    client.send(:push_query, {file: "file", line: 123, sql: "COMMIT", runtime: 10})
+    assert_equal([{file: "file", line: 123, sql: "SELECT 1", runtime: 40, times: 2}], client.send(:queries))
   end
 
   def test_after_exception

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,8 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: Simple Ruby on Rails application monitoring for hardcore developers with
-  no time to waste.
+description: All-in-one monitoring for Ruby on Rails applications.
 email:
 - alexis@bernard.io
 executables: []
@@ -62,10 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Simple Ruby on Rails application monitoring for hardcore developers with
-  no time to waste.
+summary: All-in-one monitoring for Ruby on Rails applications.
 test_files:
 - test/ror_vs_wild_test.rb