cutter 0.8.7 → 0.8.8

data/README.md

@@ -4,15 +4,15 @@ Two-methods-gem I use a lot for simple debugging & performance measuring purpose
 
 ```#inspect``` method shines when doing reverse engineering, it is especially useful, when it is needed to quickly hack on someone else's code. Also, it is very easy to become 'someone else' for self, when dealing with own code, if it was written very long time ago.
 
-Besides that ```#stamper``` allows doing some performance measuments in a handy manner, it can be used to create quick and neat demonstrations of how particular pieces of Ruby code perform. 
+Besides that ```#stamper``` allows doing performance measuments in a handy manner, it can be used to create quick and neat demonstrations of how particular pieces of Ruby code perform. 
 
-The one interesting possible usage of ```#stamper``` is to optimize performance of templates on Rails View layer, because it often takes a large (compared to M and C layers) load impact because of Rails lazy-evaluation mechanisms.
+The one interesting possible usage of ```#stamper``` is performance optimization of templates on Rails View Layer, because it often takes a large load impact (compared to M and C layers) because of Rails lazy-evaluation mechanisms.
 
 [![Build Status](https://secure.travis-ci.org/stanislaw/cutter.png)](http://travis-ci.org/stanislaw/cutter)
 
 ## Prerequisites
 
-It works on 1.8.7, 1.9.3, JRuby and Rubinius
+It works on 1.8.7, 1.9.3, JRuby and Rubinius.
 
 ## Installiation
 
@@ -25,6 +25,7 @@ end
 ```
 
 ## Cutter::Inspection
+
 ### I) #inspect!
 
 Insert ```#inspect!``` method into any of your methods:
@@ -167,24 +168,26 @@ end
 
 ### #iii
 
-Instead of ```#inspect!``` you can use ```#iii``` - just an alias more convenient for typing. Finally, you have a group of 4 three-letters methods in your every day debugging workflow.
+Instead of ```#inspect!``` you can use ```#iii``` - just an alias more convenient for typing. 
+
+Finally, you have a group of 4 three-letters methods in your every day debugging workflow.
 
 ## II) Cutter::Stamper
 
-Acts as ```benchmark {}``` in Rails or ```Benchmark.measure {}``` (common Ruby) but with stamps in any position in block executed.
+Acts as ```benchmark {}``` in Rails or ```Benchmark.measure {}``` in common Ruby, but with stamps in any position in block executed.
 
 It is much simpler to write Stamper with Stamps than all these Measure-dos.
 
 ### Minimal stamper
 
-```stamp!``` method is just an alias for ```stamp```, use whatever you like.
+```stamp!``` method is just an alias for ```stamp```, use whatever you like:
 
 ```ruby
 puts "Minimal stamper"
-stamper do |s|
+stamper do
   stamp
   sleep 0.2
-  stamp!
+  stamp! 
   sleep 0.2
   stamp!
 end
@@ -220,7 +223,8 @@ end
 
 stamper :testing_method do |tm|
   sleep 0.3
-  tm.stamp! :_1
+  tm.stamp! :_1 # The old form of calling #stamp! on yielded scope
+  variable
   sleep 0.3
   stamper :inner_scope do |i|
     sleep 0.2
@@ -255,7 +259,7 @@ Demonstration of named stamping
 
 ## Notes
 
-* Both ```#inspect! {}``` and ```#stamper``` method colorize their output. You can see ```lib/cutter/colored_output.rb``` file to understand how it is done. I will really appreciate any suggestions of how current color scheme can be improved.
+* Both ```#inspect! {}``` and ```#stamper``` methods colorize their output. You can see ```lib/cutter/colored_output.rb``` file to understand how it is done. I will really appreciate any suggestions of how current color scheme can be improved.
 
 ## Specs and demos
 

data/lib/cutter.rb

@@ -4,3 +4,5 @@ require 'cutter/colored_outputs'
 require 'cutter/stamper'
 require 'cutter/inspection'
 
+require 'cutter/kernel'
+require 'cutter/array'

data/lib/cutter/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def extract_options!
+    last.is_a?(::Hash) ? pop : {}
+  end unless [].respond_to? :extract_options!
+end

data/lib/cutter/kernel.rb

@@ -0,0 +1,15 @@
+require 'stringio'
+
+# http://thinkingdigitally.com/archive/capturing-output-from-puts-in-ruby/
+module Kernel
+  def capture_stdout
+    out = StringIO.new
+    $stdout = out
+
+    yield
+
+    out
+  ensure
+    $stdout = STDOUT
+  end
+end

data/lib/cutter/stamper.rb

@@ -1,11 +1,20 @@
-class Object
-  def time_now
-    Time.now.strftime("%s%L").to_i
+class Time
+  def ms_since time
+    ((Time.now - time) * 1000).to_i
   end
+end
 
-  def stamper name = nil, &block
-
+class Object
+  def stamper *args, &block
     return if stamper_class.off?
+
+    options = args.extract_options!
+
+    name = args.first
+
+    capture = options.delete :capture
+
+
     scope = stamper_class[name] || stamper_class[:default]
     scope.indent = stamper_class.last ? stamper_class.last.indent + 1 : 0
     stamper_class.push scope
@@ -14,35 +23,42 @@ class Object
     if scope
       message = scope.label.values.first
     end
+
+    print "\n"
+
     spaces = "    " * scope.indent
-    puts "\n"
+
     log_coloured spaces, "#{message}", __color__(:message_name)
     log_coloured spaces, "#{'-'*message.length}", __color__(:message_line)
 
-    scope.time_initial = time_now
+    scope.time_initial = Time.now
 
-    self.class.send :define_method, :stamp do |*args|
+    (class << self; self end).send :define_method, :stamp do |*args|
       scope.stamp args.first
     end
-    self.class.send :alias_method, :stamp!, :stamp
-    
-    yield scope
 
-    instance_eval do
-      undef :stamp if respond_to? :stamp
-      undef :stamp! if respond_to? :stamp!
+    (class << self; self end).send :define_method, :stamp! do |*args|
+      scope.stamp args.first
     end
 
+    capture ? capture_stdout { yield scope } : yield(scope)
+
+    (class << self; self end).send :remove_method, :stamp if respond_to? :stamp
+    (class << self; self end).send :remove_method, :stamp! if respond_to? :stamp!
+
     scope.indent -= 1 if scope.indent > 0
     stamper_class.pop
-    time_passed = time_now - scope.time_initial
+
+    time_passed = Time.now.ms_since scope.time_initial
 
     tps = "#{time_passed}ms"
     offset = message.length - tps.length
     offset = 0 if offset < 0
     log_coloured spaces, "#{'-'*message.length}", __color__(:total_line)
     log_coloured spaces + "#{' ' * (offset)}", tps, __color__(:total_count)
-    puts "\n"
+    print "\n"
+
+    tps
   end
 
   private
@@ -115,9 +131,9 @@ module Cutter
     def stamp lbl = nil
       return if Stamper.off?
       message = messages[lbl] || lbl.to_s
-      time_passed = time_now - time_initial
+      time_passed = Time.now.ms_since time_initial
       print "  " * nindent
-      printf("stamp: %7d ms   #{message}\n", time_passed)
+      printf("stamp: %7dms   #{message}\n", time_passed)
     end
     alias_method :stamp!, :stamp
 

data/lib/cutter/version.rb

@@ -1,3 +1,3 @@
 module Cutter
-  VERSION="0.8.7"
+  VERSION="0.8.8"
 end

metadata

@@ -1,128 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cutter
-version: !ruby/object:Gem::Version 
-  hash: 49
+version: !ruby/object:Gem::Version
+  version: 0.8.8
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 7
-  version: 0.8.7
 platform: ruby
-authors: 
+authors:
 - stanislaw
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
-  version_requirements: *id001
+date: 2012-07-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby tracing gem
 email: s.pankevich@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - lib/cutter.rb
+- lib/cutter/array.rb
 - lib/cutter/colored_outputs.rb
 - lib/cutter/inspection.rb
+- lib/cutter/kernel.rb
 - lib/cutter/stamper.rb
 - lib/cutter/version.rb
 - LICENSE.txt
 - README.md
 homepage: http://github.com/stanislaw/cutter
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 678323535
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Ruby tracing gem
 test_files: []
-