cutter 0.8.1 → 0.8.2

data/lib/cutter/colored_outputs.rb

@@ -5,7 +5,6 @@ class Object
     log_coloured sp, "------------------------------", color(:line)
   end
 
-
   def log_coloured sp, msg, color = :default
     message = sp + msg
     message = color != :default ? message.send(color) : message
@@ -33,6 +32,10 @@ module Cutter
         @colors ||= {:line => :blue, 
                      :time => :light_blue,
 
+                     :message_name => :cyan,
+                     :message_line => :cyan,
+                     :total_line => :yellow,
+                     :total_count => :yellow
                      # Colors for #inspect!
                      #:called_from => :light_magenta,
                      #:class_name => :red,

data/lib/cutter/inspection.rb

@@ -24,26 +24,17 @@ class Object
   def inspect! *options, &block
     return true if Cutter::Inspection.quiet?
 
-    def __colors
-      Cutter::ColoredOutputs.colors_config
-    end
-
-    def to_cs obj
-      color = __colors[obj] || :default
-      color != :default ? to_s.send(color) : to_s
-    end
-
     # Getting binding
     _binding = options.first if options.first.class == Binding
     raise ArgumentError, "Try inspect(binding) or inspect! {}", caller if (!block_given? && !_binding)
     _binding ||= block.binding
     
-    # Want caller methods chain to be traced? - pass option :level to inspect!
     options = options.extract_options! 
     
     max = options[:max]
     options.maximize_options! if max 
-   
+
+    # Want caller methods chain to be traced? - pass option :level to inspect!
     level = options[:level]
     _caller = caller
    
@@ -53,42 +44,43 @@ class Object
     method_name = eval('__method__', _binding)
     class_name = eval('self.class', _binding)
     
-    puts "\n%s `%s' %s" % ['method:'.to_cs(:method), method_name.to_cs(:method_name), ('(maximal tracing)' if max)]
-    puts "  %s %s" % ['called from class:'.to_cs(:called_from), class_name.to_cs(:class_name)]
+    puts "\n%s `%s' %s" % ['method:'.__cs(:method), method_name.__cs(:method_name), ('(maximal tracing)' if max)]
+    puts "  %s %s" % ['called from class:'.__cs(:called_from), class_name.__cs(:class_name)]
 
     # Local Variables
     lvb = eval('local_variables',_binding)
-    puts "  %s %s" % ['local_variables:'.to_cs(:lv), ("[]" if lvb.empty?)]
+    puts "  %s %s" % ['local_variables:'.__cs(:lv), ("[]" if lvb.empty?)]
 
     lvb.map do |lv|
       local_variable = eval(lv.to_s, _binding)
-      local_variable = (max ? local_variable.inspect : local_variable.to_real_string)
+      local_variable = (max ? local_variable.inspect : local_variable.__rs)
 
-      puts "    %s: %s" % [lv.to_cs(:lv_names), local_variable.to_cs(:lv_values)] 
+      puts "    %s: %s" % [lv.__cs(:lv_names), local_variable.__cs(:lv_values)] 
     end if lvb
 
+    # Instance Variables
     ivb = eval('instance_variables',_binding)
     
-    puts "  %s %s" % ["instance_variables:".to_cs(:iv), ("[]" if ivb.empty?)]
+    puts "  %s %s" % ["instance_variables:".__cs(:iv), ("[]" if ivb.empty?)]
     
     ivb.map do |iv|
       instance_variable = eval(iv.to_s, _binding)
-      instance_variable = (max ? instance_variable.inspect : instance_variable.to_real_string)
+      instance_variable = (max ? instance_variable.inspect : instance_variable.__rs)
      
-      puts "    %s: %s" % [iv.to_cs(:iv_names), instance_variable.to_cs(:iv_values)] 
+      puts "    %s: %s" % [iv.__cs(:iv_names), instance_variable.__cs(:iv_values)] 
     end if ivb
 
     # Self inspection 
     begin
-      puts "  self inspection:".to_cs(:self_inspection)
-      puts "    %s" % self_inspection.to_cs(:self_inspection_trace)
+      puts "  self inspection:".__cs(:self_inspection)
+      puts "    %s" % self_inspection.__cs(:self_inspection_trace)
     end if self_inspection
 
     # Caller methods chain
     begin
-    puts "  caller methods: ".to_cs(:caller_methods)
+    puts "  caller methods: ".__cs(:caller_methods)
     0.upto(level).each {|index|
-      puts "    %s" % _caller[index].to_cs(:caller_method)
+      puts "    %s" % _caller[index].__cs(:caller_method)
     }
     end if level
    
@@ -97,19 +89,32 @@ class Object
     yield if block_given? 
   end
 
+  protected
+
   def caller_method_name(level = 1)
     caller[level][/`([^']*)'/,1].to_sym
   end
 
-  protected
-
   def maximize_options!
     self.merge!({:max => true, :inspect => true, :level => 2})
   end
 
-  def to_real_string
+  # ("real string") Now used to print Symbols with colons
+  def __rs
     return ":#{self.to_s}" if self.class == Symbol
     self
   end
+
+  def __cs obj
+    color = __colors[obj] || :default
+    color != :default ? to_s.send(color) : to_s
+  end
+
+  private
+
+  def __colors
+    Cutter::ColoredOutputs.colors_config
+  end
+
 end
 

data/lib/cutter/stamper.rb

@@ -8,10 +8,6 @@ class Object
 
   def stamper name = nil, &block
 
-    def log_time sp, msg
-      log_coloured sp, msg, color(:time)
-    end
-
     return if stamper_class.off?
     scope = stamper_class[name] || stamper_class[:default]
     scope.indent = stamper_class.last ? stamper_class.last.indent + 1 : 0
@@ -21,17 +17,23 @@ class Object
     if scope
       message = scope.label.values.first
     end
-    spaces = "  " * scope.indent
-    line spaces
-    log_coloured spaces, "~ START " << "#{message}"
+    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
     yield scope
     scope.indent -= 1 if scope.indent > 0
     stamper_class.pop
     time_passed = time_now - scope.time_initial
-    log_coloured spaces, "~ END " << "#{message}"
-    log_time spaces, "[#{time_passed}ms]"
-    line spaces
+   
+    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"
   end
 
   private
@@ -106,7 +108,7 @@ module Cutter
       message = messages[lbl] || lbl.to_s.humanize
       time_passed = time_now - time_initial
       print "  " * nindent
-      printf("~ stamp: %7d ms   #{message}\n", time_passed)
+      printf("stamp: %7d ms   #{message}\n", time_passed)
     end
 
     module ClassMethods
@@ -151,5 +153,5 @@ module Cutter
   end
 end
 
-Cutter::Stamper.scope :default => nil do |default|
+Cutter::Stamper.scope :default => "no name" do |default|
 end

metadata

@@ -2,7 +2,7 @@
 name: cutter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - stanislaw
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 +03:00
+date: 2011-08-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -666484749
+      hash: -202257491
       segments: 
       - 0
       version: "0"