marked 1.1.3 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/lib/marked.rb

@@ -3,7 +3,15 @@ module Marked
 
     Marked.log "\nMARKED #{caller.first.split(':in ').first}"
 
-    returnable = block_given? ? yield : objects.last
+    returnable = if block_given?
+      require 'benchmark'
+      result = nil
+      bench = Benchmark.measure { result = yield }
+      Marked.print_benchmark bench
+      result
+    else
+      objects.last
+    end
 
     if block_given?
       Marked.log Marked.pad returnable
@@ -34,6 +42,10 @@ module Marked
   def self.pad object
     "       " + (object.is_a?(String) ? object : object.inspect)
   end
+
+  def self.print_benchmark measurement
+    log " * Executed in #{'%0.3f' % measurement.real} seconds (#{'%0.3f' % measurement.cutime} cpu)\n"
+  end
 end
 
 class Object

data/marked.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{marked}
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]
-  s.date = %q{2011-09-12}
+  s.date = %q{2011-09-14}
   s.description = %q{Quick Ruby debugger. Easily print any object or string to the console and to your logs while you're working.}
   s.email = %q{rubygems@6brand.com}
   s.extra_rdoc_files = [
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/JackDanger/marked}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Fast debugging for Ruby. Output any objects or blocks to both Rails log and console output simultaneously}
 
   if s.respond_to? :specification_version then

data/test/marked_test.rb

@@ -14,8 +14,8 @@ class MarkedTest < Test::Unit::TestCase
 
   context "logging" do
     setup {
-      Rails.logger.expects(:debug).with "\nMARKED ./test/marked_test.rb:24"
-      Marked.expects(:print).with       "\nMARKED ./test/marked_test.rb:24"
+      Rails.logger.expects(:debug).with "\nMARKED #{__FILE__}:24"
+      Marked.expects(:print).with       "\nMARKED #{__FILE__}:24"
       Rails.logger.expects(:debug).with "       this should be printed"
       Marked.expects(:print).with       "       this should be printed"
       Rails.logger.expects(:debug).with " / FINISHED MARKING"
@@ -26,7 +26,7 @@ class MarkedTest < Test::Unit::TestCase
   end
   context "printing and logging a single argument" do
     setup {
-      expect_unpadded_log "\nMARKED ./test/marked_test.rb:33"
+      expect_unpadded_log "\nMARKED #{__FILE__}:33"
       expect_log "this should be printed"
     }
     should "return its argument" do
@@ -35,7 +35,7 @@ class MarkedTest < Test::Unit::TestCase
   end
   context "printing and logging multiple arguments" do
     setup {
-      expect_unpadded_log "\nMARKED ./test/marked_test.rb:43"
+      expect_unpadded_log "\nMARKED #{__FILE__}:43"
       expect_log "this should be printed"
       expect_log "this too"
     }
@@ -45,7 +45,7 @@ class MarkedTest < Test::Unit::TestCase
   end
   context "printing and logging non-strings" do
     setup {
-      expect_unpadded_log "\nMARKED ./test/marked_test.rb:53"
+      expect_unpadded_log "\nMARKED #{__FILE__}:53"
       expect_log({:a =>'a'})
       expect_log [1, 2, 3]
     }
@@ -57,7 +57,7 @@ class MarkedTest < Test::Unit::TestCase
     setup {
       @obj = {}
       @obj.expects(:called!).returns('returned!').once
-      expect_unpadded_log "\nMARKED ./test/marked_test.rb:65"
+      expect_unpadded_log "\nMARKED #{__FILE__}:65"
       expect_log "first arg"
       expect_log "returned!"
     }
@@ -71,4 +71,8 @@ class MarkedTest < Test::Unit::TestCase
                    Marked.pad('padme')
     end
   end
+  def setup
+    Marked.stubs(:print_benchmark)
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marked
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 -07:00
+date: 2011-09-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Fast debugging for Ruby. Output any objects or blocks to both Rails log and console output simultaneously