stack_tracy 0.1.5 → 0.1.6

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = StackTracy CHANGELOG
 
+== Version 0.1.6 (August 28, 2012)
+
+* Always logging trace messages (despite of the :only and/or :exclude options)
+
 == Version 0.1.5 (August 28, 2012)
 
 * Being able to add trace messages for recognition of executed code (use +String.tracy+)

data/README.md

@@ -80,9 +80,9 @@ A couple of examples:
 * `:only => "Foo* Kernel"` records `Foo`, `Foo::Bar`, `Foo::CandyBar` and `Kernel`
 * `:exclude => :core` records everything except for Ruby core classes and modules (see [stack_tracy.rb](https://github.com/archan937/stack_tracy/blob/master/lib/stack_tracy.rb#L16) for more details)
 
-### Add trace messages
+### Adding trace messages
 
-Sometimes you want to add marks to the stack tree in order to recognize certain events. You can do this by adding trace messages by using the `String#tracy` method:
+Sometimes you want to add marks to the stack tree in order to recognize certain events. You can do this by adding trace messages with the `String#tracy` method:
 
     [1] pry(main)> stack_tracy(:print) do
     [1] pry(main)*   "Putting string".tracy
@@ -139,7 +139,7 @@ When the amount of calls within the stack trace exceeds the specified `:limit`,
 
 When applying the `:threshold`, calls with a duration **below** the `:threshold` will be folded at default within the stack tree which saves **a lot** of heavy browser rendering on page load as the 'child calls' will be rendered as comment. See [this commit](https://github.com/archan937/stack_tracy/commit/0bb49669015b44cd24715988bf9f7e4cf03a5dad) for more information.
 
-As of version v0.1.5, `StackTracy.open` (and thus the CLI) is provided with the options `:messages_only` and `:slows_only`. When having set `:messages_only` to `true`, the display stack tree will only include trace messages. If you have set `:slows_only` to `true`, then the stack tree will only include slow calls (duration > threshold) **and** trace messages.
+As of version v0.1.5, `StackTracy.open` (and thus the CLI) is provided with the options `:messages_only` and `:slows_only`. When having set `:messages_only` to `true`, the stack tree will only include trace messages. If you have set `:slows_only` to `true`, then the stack tree will only include slow calls (duration > threshold) **and** trace messages.
 
 ### Using recorded stack events
 
@@ -399,7 +399,7 @@ The StackTracy repo is provided with `script/console` which you can use for deve
 Run the following command in your console:
 
     $ script/console
-    Loading development environment (StackTracy 0.1.5)
+    Loading development environment (StackTracy 0.1.6)
     [1] pry(main)> stack_tracy :print do
     [1] pry(main)*   puts "testing"
     [1] pry(main)* end

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/ext/stack_tracy/stack_tracy.c

@@ -68,7 +68,7 @@ static void stack_tracy_trap(rb_event_flag_t event, NODE *node, VALUE self, ID i
 #endif
 {
   int i;
-  bool singleton = false, match = false;
+  bool singleton = false, trace_message = false, match = false;
   EventInfo info;
 
   if (event == RUBY_EVENT_CALL || event == RUBY_EVENT_C_CALL) {
@@ -101,22 +101,25 @@ static void stack_tracy_trap(rb_event_flag_t event, NODE *node, VALUE self, ID i
   info.method = (ID *) id;
 
   if (info.method != NULL) {
-    info.object = (VALUE *)(singleton || (klass == rbString && id == rbTracy) ? self : klass);
+    trace_message = klass == rbString && id == rbTracy;
+    info.object = (VALUE *)(singleton || trace_message ? self : klass);
 
     if (info.object) {
-      for (i = 0; i < exclude_size; i++) {
-        if (((VALUE) exclude[i].klass) == (VALUE) info.object) {
-          return;
+      if (!trace_message) {
+        for (i = 0; i < exclude_size; i++) {
+          if (((VALUE) exclude[i].klass) == (VALUE) info.object) {
+            return;
+          }
         }
-      }
 
-      if (only_size > 0) {
-        match = false;
-        for (i = 0; i < only_size; i++) {
-          match = match || (((VALUE) only[i].klass) == (VALUE) info.object);
-        }
-        if (!match) {
-          return;
+        if (only_size > 0) {
+          match = false;
+          for (i = 0; i < only_size; i++) {
+            match = match || (((VALUE) only[i].klass) == (VALUE) info.object);
+          }
+          if (!match) {
+            return;
+          }
         }
       }
 

data/lib/stack_tracy/version.rb

@@ -1,7 +1,7 @@
 module StackTracy #:nodoc:
   MAJOR = 0
   MINOR = 1
-  TINY  = 5
+  TINY  = 6
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/stack_tracy.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "stack_tracy"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.5"
+  gem.version       = "0.1.6"
 
   gem.add_dependency "rich_support", "~> 0.1.2"
   gem.add_dependency "launchy", "2.1.0"

data/test/unit/test_tracy.rb

@@ -187,6 +187,24 @@ module Unit
             hash.delete(:time)
           end
         }
+
+        stack_tracy :only => "Kernel" do
+          "Doing something".tracy do
+            puts "testing"
+          end
+        end
+        file, line = __FILE__, __LINE__ - 3
+
+        assert_equal [
+          {:event => "call", :file => string_file, :line => 2, :singleton => false, :object => "Doing something", :method => "tracy", :call => "\"Doing something\"", :depth => 0},
+          {:event => "c-call", :file => file, :line => line, :singleton => false, :object => Kernel, :method => "puts" , :call => "Kernel#puts", :depth => 1}
+        ], StackTracy.select.collect{ |event_info|
+          event_info.to_hash.tap do |hash|
+            assert hash.delete(:nsec)
+            assert hash.delete(:duration)
+            hash.delete(:time)
+          end
+        }
       end
 
       it "should filter methods as expected" do

data/ui/assets/stack_tracy.js

@@ -22,7 +22,7 @@ StackTracy = (function() {
   });
 
   return {
-    version: "0.1.5",
+    version: "0.1.6",
     sort: function(column) {
       sortation[column] = sortation[column] == "asc" ? "desc" : "asc";
       $("#cumulatives>.body>div").tsort("span:eq(" + column + ")[abbr]", {

metadata

@@ -2,7 +2,7 @@
 name: stack_tracy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Paul Engel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-27 00:00:00 Z
+date: 2012-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rich_support