stack_tracy 0.1.8 → 0.1.9

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - ree
+before_script:
+  - cd ~/builds/archan937/stack_tracy/ext/stack_tracy && ruby extconf.rb && make

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = StackTracy CHANGELOG
 
+== Version 0.1.9 (September 17, 2012)
+
+* Made StackTracy compatible with Ruby 1.8.7 and REE
+
 == Version 0.1.8 (August 30, 2012)
 
 * Corrected index.html.erb regarding a possible nil value error

data/Gemfile

@@ -14,4 +14,5 @@ group :gem_test do
   gem "minitest"
   gem "mocha"
   gem "pry"
+  gem "rake"
 end

data/README.md

@@ -1,4 +1,4 @@
-# StackTracy
+# StackTracy [![Build Status](https://secure.travis-ci.org/archan937/stack_tracy.png)](http://travis-ci.org/archan937/stack_tracy)
 
 Investigate and detect slow methods within the stack trace of your Ruby (optionally Sinatra) application
 
@@ -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.8)
+    Loading development environment (StackTracy 0.1.9)
     [1] pry(main)> stack_tracy :print do
     [1] pry(main)*   puts "testing"
     [1] pry(main)* end

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/ext/stack_tracy/stack_tracy.h

@@ -6,6 +6,13 @@
 #include <time.h>
 #include <string.h>
 
+#ifndef RUBY_VM
+#include <node.h>
+typedef rb_event_t rb_event_flag_t;
+#define rb_sourcefile() (node ? node->nd_file : 0)
+#define rb_sourceline() (node ? nd_line(node) : 0)
+#endif
+
 typedef struct event_info_t {
   rb_event_flag_t event;
   const char *file;

data/lib/stack_tracy.rb

@@ -1,5 +1,5 @@
+require RUBY_VERSION == "1.8.7" ? "fastercsv" : "csv"
 require "erb"
-require "csv"
 require "tmpdir"
 require "securerandom"
 require "rich/support/core/string/colorize"
@@ -14,7 +14,7 @@ module StackTracy
   extend self
 
   PRESETS = {
-    :core => "Array BasicObject Enumerable Fixnum Float Hash IO Integer Kernel Module Mutex Numeric Object Rational String Symbol Thread Time",
+    :core => "Array #{"BasicObject " unless RUBY_VERSION == "1.8.7"}Enumerable Fixnum Float Hash IO Integer Kernel Module #{"Mutex " unless RUBY_VERSION == "1.8.7"}Numeric Object Rational String Symbol Thread Time",
     :active_record => "ActiveRecord::Base",
     :data_mapper => "DataMapper::Resource"
   }
@@ -74,7 +74,7 @@ module StackTracy
     File.expand_path(path).tap do |path|
       bool = dump_source_location.nil? ? @options[:dump_source_location] : dump_source_location
       keys = [:event, (:file if bool), (:line if bool), :singleton, :object, :method, :nsec, :time, :call, :depth, :duration]
-      CSV.open(path, "w", :col_sep => ";") do |file|
+      (RUBY_VERSION == "1.8.7" ? FasterCSV : CSV).open(path, "w", :col_sep => ";") do |file|
         file << keys
         select(only).each do |event|
           file << event.values_at(*keys)

data/lib/stack_tracy/event_info.rb

@@ -7,7 +7,7 @@ module StackTracy
     attr_reader :event, :file, :line, :singleton, :object, :method, :nsec
 
     def self.to_hashes(csv)
-      CSV.parse(csv.force_encoding("ISO-8859-1").encode("utf-8", replace: nil), :headers => true, :col_sep => ";").collect do |row|
+      CSV.parse(csv.force_encoding("ISO-8859-1").encode("utf-8", {:replace => nil}), :headers => true, :col_sep => ";").collect do |row|
         {
           :event => row[0]     , :file => row[1]     , :line => row[2].to_i, :singleton => row[3] == "true", :object   => row[4]      , :method => row[5],
           :nsec  => row[6].to_f, :time => row[7].to_f, :call => row[8]     , :depth     => row[9].to_i     , :duration => row[10].to_f

data/lib/stack_tracy/version.rb

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

data/stack_tracy.gemspec

@@ -13,9 +13,10 @@ 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.8"
+  gem.version       = "0.1.9"
 
   gem.add_dependency "rich_support", "~> 0.1.2"
   gem.add_dependency "launchy", "2.1.0"
   gem.add_dependency "thor"
+  gem.add_dependency "fastercsv"
 end

data/test/unit/test_tracy.rb

@@ -11,6 +11,14 @@ module Unit
         end
       end
 
+      def correct(array)
+        if RUBY_VERSION == "1.8.7"
+          array.delete_if{|x| x[:call] == "IO#puts"}
+          array.each{|x| x[:depth] -= 1 if x[:depth] && x[:call] == "IO#write"}
+        end
+        array
+      end
+
       it "should respond to methods as expected" do
         assert StackTracy.respond_to?(:config)
         assert StackTracy.respond_to?(:start)
@@ -25,7 +33,7 @@ module Unit
       it "should be configurable" do
         StackTracy.config do |c|
           assert_equal true, c.is_a?(Struct)
-          assert_equal [:dump_dir, :dump_source_location, :limit, :threshold, :messages_only, :slows_only, :only, :exclude], c.members
+          assert_equal %w(dump_dir dump_source_location limit threshold messages_only slows_only only exclude), c.members.collect(&:to_s)
           c.only = "Kernel"
           c.exclude = ["IO", "String"]
         end
@@ -36,10 +44,17 @@ module Unit
         assert_equal({:only => "Paul", :exclude => "Foo"}, StackTracy.send(:merge_options, {"only" => "Paul", "exclude" => "Foo"}))
         assert_equal({:only => nil, :exclude => nil}, StackTracy.send(:merge_options, {:only => nil, :exclude => nil}))
 
-        assert_equal(
-          "Array BasicObject Enumerable Fixnum Float Foo Hash IO Integer Kernel Module Mutex Numeric Object Rational String Symbol Thread Time",
-          StackTracy.send(:mod_names, [:core, "Foo"])
-        )
+        if RUBY_VERSION == "1.8.7"
+          assert_equal(
+            "Array Enumerable Fixnum Float Foo Hash IO Integer Kernel Module Numeric Object Rational String Symbol Thread Time",
+            StackTracy.send(:mod_names, [:core, "Foo"]).strip
+          )
+        else
+          assert_equal(
+            "Array BasicObject Enumerable Fixnum Float Foo Hash IO Integer Kernel Module Mutex Numeric Object Rational String Symbol Thread Time",
+            StackTracy.send(:mod_names, [:core, "Foo"])
+          )
+        end
 
         assert_equal(
           "ActiveRecord::Base",
@@ -59,7 +74,7 @@ module Unit
         file, line = __FILE__, __LINE__ - 2
         st = File.expand_path("../../../lib/stack_tracy.rb", __FILE__)
 
-        assert_equal [
+        assert_equal correct([
           {:event => "c-call"  , :file => file, :line => line, :singleton => false, :object => Kernel    , :method => "puts" , :call => "Kernel#puts"     },
           {:event => "c-call"  , :file => file, :line => line, :singleton => false, :object => IO        , :method => "puts" , :call => "IO#puts"         },
           {:event => "c-call"  , :file => file, :line => line, :singleton => false, :object => IO        , :method => "write", :call => "IO#write"        },
@@ -70,7 +85,7 @@ module Unit
           {:event => "c-return", :file => file, :line => line, :singleton => false, :object => Kernel    , :method => "puts" , :call => "Kernel#puts"     },
           {:event => "call"    , :file => st  , :line => 35  , :singleton => false, :object => StackTracy, :method => "stop" , :call => "StackTracy#stop" },
           {:event => "c-call"  , :file => st  , :line => 36  , :singleton => 0    , :object => StackTracy, :method => "_stop", :call => "StackTracy._stop"}
-        ], StackTracy.stack_trace.collect{ |event_info|
+        ]), StackTracy.stack_trace.collect{ |event_info|
           event_info.to_hash.tap do |hash|
             assert hash.delete(:nsec)
             hash.delete(:time)
@@ -116,12 +131,12 @@ module Unit
         end
         file, line = __FILE__, __LINE__ - 2
 
-        assert_equal [
+        assert_equal correct([
           {:event => "c-call"  , :file => file, :line => line, :singleton => false, :object => Kernel, :method => "puts" , :call => "Kernel#puts", :depth => 0},
           {:event => "c-call"  , :file => file, :line => line, :singleton => false, :object => IO    , :method => "puts" , :call => "IO#puts"    , :depth => 1},
           {:event => "c-call"  , :file => file, :line => line, :singleton => false, :object => IO    , :method => "write", :call => "IO#write"   , :depth => 2},
           {:event => "c-call"  , :file => file, :line => line, :singleton => false, :object => IO    , :method => "write", :call => "IO#write"   , :depth => 2}
-        ], StackTracy.select.collect{ |event_info|
+        ]), StackTracy.select.collect{ |event_info|
           event_info.to_hash.tap do |hash|
             assert hash.delete(:nsec)
             assert hash.delete(:duration)
@@ -213,12 +228,12 @@ module Unit
         end
         file, line = __FILE__, __LINE__ - 2
 
-        assert_equal [
+        assert_equal correct([
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => Kernel, :method => "puts" , :call => "Kernel#puts", :depth => 0},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO    , :method => "puts" , :call => "IO#puts"    , :depth => 1},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO    , :method => "write", :call => "IO#write"   , :depth => 2},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO    , :method => "write", :call => "IO#write"   , :depth => 2}
-        ], StackTracy.select("*").collect{ |event_info|
+        ]), StackTracy.select("*").collect{ |event_info|
           event_info.to_hash.tap do |hash|
             assert hash.delete(:nsec)
             assert hash.delete(:duration)
@@ -236,11 +251,11 @@ module Unit
           end
         }
 
-        assert_equal [
+        assert_equal correct([
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "puts" , :call => "IO#puts" , :depth => 0},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "write", :call => "IO#write", :depth => 1},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "write", :call => "IO#write", :depth => 1}
-        ], StackTracy.select("IO").collect{ |event_info|
+        ]), StackTracy.select("IO").collect{ |event_info|
           event_info.to_hash.tap do |hash|
             assert hash.delete(:nsec)
             assert hash.delete(:duration)
@@ -248,11 +263,11 @@ module Unit
           end
         }
 
-        assert_equal [
+        assert_equal correct([
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "puts" , :call => "IO#puts" , :depth => 0},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "write", :call => "IO#write", :depth => 1},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "write", :call => "IO#write", :depth => 1}
-        ], StackTracy.select("IO*").collect{ |event_info|
+        ]), StackTracy.select("IO*").collect{ |event_info|
           event_info.to_hash.tap do |hash|
             assert hash.delete(:nsec)
             assert hash.delete(:duration)
@@ -265,11 +280,11 @@ module Unit
           event_info.to_hash
         }
 
-        assert_equal [
+        assert_equal correct([
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "puts" , :call => "IO#puts" , :depth => 0},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "write", :call => "IO#write", :depth => 1},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO, :method => "write", :call => "IO#write", :depth => 1}
-        ], StackTracy.select("IO#").collect{ |event_info|
+        ]), StackTracy.select("IO#").collect{ |event_info|
           event_info.to_hash.tap do |hash|
             assert hash.delete(:nsec)
             assert hash.delete(:duration)
@@ -299,10 +314,10 @@ module Unit
           end
         }
 
-        assert_equal [
+        assert_equal correct([
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => Kernel, :method => "puts", :call => "Kernel#puts", :depth => 0},
           {:event => "c-call", :file => file, :line => line, :singleton => false, :object => IO    , :method => "puts", :call => "IO#puts"    , :depth => 1}
-        ], StackTracy.select("*#puts").collect{ |event_info|
+        ]), StackTracy.select("*#puts").collect{ |event_info|
           event_info.to_hash.tap do |hash|
             assert hash.delete(:nsec)
             assert hash.delete(:duration)

data/ui/assets/stack_tracy.js

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

metadata

@@ -2,7 +2,7 @@
 name: stack_tracy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Paul Engel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 Z
+date: 2012-09-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rich_support
@@ -45,6 +45,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: fastercsv
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Investigate and detect slow methods within the stack trace of your Ruby (optionally Sinatra) application
 email: 
 - paul.engel@holder.nl
@@ -56,6 +67,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
 - MIT-LICENSE