rorvswild 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c19e1237b3b9c450b21a294e2c13f7aa2d5ff2ee
-  data.tar.gz: 485ddeb9246497e3994ee81805b2ba3e26f084a9
+  metadata.gz: a59fa9bea7794855a7efa8ba8421e6d9aa5cfd07
+  data.tar.gz: 2989fc278d1ad9c9ef1a3c308763154ee05b349e
 SHA512:
-  metadata.gz: f36090b6aa9a61a8846cc7c6a3ade26ed05181a18b088cc88b8ae78c3cd8ec83496749bffa7a5947edd531e9eb87f1c5bb2b618360bc4bfe8897642a60a549b7
-  data.tar.gz: 5330075509becd02e23b9fa0599426ee8ba05d46fe8f9524cb483315662aac8d21591fa865151b3b980cb50c716893c01d5ff0fb3e3f305e5789e8c7443e3538
+  metadata.gz: 0510261d172670aa8a3b4e9ec9536a5a84b010464560e4d2f268d6a43b3f1d2c86fa80c9e302da2f8999dec748007fbef31397a151113805e4c947d3371bcd4f
+  data.tar.gz: 3429bf64bc6895e0aff2258d3fa621d1ccd46c9cbc483d6fc15df67f5b68058177d983707662df1e629c9f44d53dec6770fb3305279fc8daa5f787c78b6039ff

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rorvswild.gemspec
 gemspec
+
+gem "mocha"
+gem "top_tests"

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 class Rorvswild
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/rorvswild.rb

@@ -2,9 +2,22 @@ require "rorvswild/version"
 
 module RorVsWild
   def self.new(*args)
+    warn "WARNING: RorVsWild.new is deprecated. Use RorVsWild::Client.new instead."
     Client.new(*args) # Compatibility with 0.0.1
   end
 
+  def self.register_default_client(client)
+    @default_client = client
+  end
+
+  def self.default_client
+    @default_client
+  end
+
+  def self.measure_job(code)
+    default_client ? default_client.measure_job(code) : eval(code)
+  end
+
   class Client
     def self.default_config
       {
@@ -24,6 +37,7 @@ module RorVsWild
       @api_key = config[:api_key]
       @app_id = config[:app_id]
       setup_callbacks
+      RorVsWild.register_default_client(self)
     end
 
     def setup_callbacks
@@ -32,8 +46,8 @@ module RorVsWild
       ActiveSupport::Notifications.subscribe("process_action.action_controller", &method(:after_http_request))
       ActiveSupport::Notifications.subscribe("start_processing.action_controller", &method(:before_http_request))
 
-      this = self
-      ApplicationController.rescue_from(StandardError) { |exception| this.after_exception(exception, self) }
+      client = self
+      ActionController::Base.rescue_from(StandardError) { |exception| client.after_exception(exception, self) }
     end
 
     def before_http_request(name, start, finish, id, payload)
@@ -93,6 +107,33 @@ module RorVsWild
       raise exception
     end
 
+    def measure_job(code)
+      @queries = []
+      @job = {name: code}
+      started_at = Time.now
+      cpu_time_offset = cpu_time
+      eval(code)
+    rescue => exception
+      file, line = exception.backtrace.first.split(":")
+      job[:error] = {
+        line: line.to_i,
+        file: relative_path(file),
+        message: exception.message,
+        backtrace: exception.backtrace,
+        exception: exception.class.to_s,
+      }
+      raise
+    ensure
+      job[:runtime] = (Time.now - started_at) * 1000
+      job[:cpu_runtime] = cpu_time -  cpu_time_offset
+      post_job
+    end
+
+    def cpu_time
+      time = Process.times
+      time.utime + time.stime + time.cutime + time.cstime
+    end
+
     #######################
     ### Private methods ###
     #######################
@@ -107,6 +148,10 @@ module RorVsWild
       @views
     end
 
+    def job
+      @job
+    end
+
     def push_query(query)
       if query[:sql] || query[:plan]
         queries << query
@@ -140,6 +185,12 @@ module RorVsWild
       log_error(exception)
     end
 
+    def post_job
+      post("/jobs", job: job.merge(queries: slowest_queries))
+    rescue => exception
+      log_error(exception)
+    end
+
     def extract_file_and_line_from_call_stack(stack)
       return unless location = stack.find { |str| str.include?(Rails.root.to_s) }
       file, line, method = location.split(":")

data/test/ror_vs_wild_test.rb

@@ -0,0 +1,51 @@
+root_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
+$LOAD_PATH.unshift(root_path + "/lib")
+
+require "rorvswild"
+
+require "minitest/autorun"
+require 'mocha/mini_test'
+require "top_tests"
+
+class RorVsWildTest < MiniTest::Unit::TestCase
+  include TopTests
+
+  def test_measure_job
+    client.expects(:post_job)
+    assert_equal(2, client.measure_job("1 + 1"))
+    assert_equal("1 + 1", client.send(:job)[:name])
+    assert(client.send(:job)[:runtime] > 0)
+    assert_equal(0, client.send(:job)[:cpu_runtime])
+  end
+
+  def test_measure_job_when_raising
+    client.expects(:post_job)
+    assert_raises(RuntimeError) { client.measure_job("raise 'error'") }
+    assert_equal(("raise 'error'"), client.send(:job)[:name])
+    assert(client.send(:job)[:cpu_runtime])
+    assert(client.send(:job)[:runtime])
+    assert(client.send(:job)[:error])
+  end
+
+  private
+
+  def client
+    if !@client
+      RorVsWild::Client.any_instance.stubs(:setup_callbacks)
+      @client ||= RorVsWild::Client.new({})
+      @client.stubs(:post_request)
+      @client.stubs(:post_task)
+    end
+    @client
+  end
+end
+
+# Simulate Rails.root
+
+require "pathname"
+
+module Rails
+  def self.root
+    Pathname.new("foo")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,7 @@ files:
 - lib/rorvswild.rb
 - lib/rorvswild/version.rb
 - rorvswild.gemspec
+- test/ror_vs_wild_test.rb
 homepage: http://www.rorvswild.com
 licenses:
 - MIT
@@ -64,4 +65,5 @@ signing_key:
 specification_version: 4
 summary: Simple Ruby on Rails application monitoring for hardcore developers with
   no time to waste.
-test_files: []
+test_files:
+- test/ror_vs_wild_test.rb