tracing 2.0.6 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9739a647135bf8bcc92c1409cea96320adb82ac2
-  data.tar.gz: 7937518cbb1c5d0ca60e6e0c4c88d62389d4cca8
+SHA256:
+  metadata.gz: 1d9bee81e1e7dfdc4d5fd0631a608f7755d5d41354ac769d43608c4f32a1229c
+  data.tar.gz: f53406967209b0b91f15400bfb9a044159ed5049662c824c06171371156830b7
 SHA512:
-  metadata.gz: 23f0502f771d20479eb25621b4a5570a9566a5a9b80a8a7ea4fda8f628d87d1f9b9831ff81b17e909af8781f582c774ebfe2cd80c7011d2fd06baa67a5b54bf3
-  data.tar.gz: 151a604da4a65877a69f895b23856f06a5a1ae384101a28f02c1853fb95661dea9275e29ba735eb3ad3502570eadf86817e3a4aa1fd02ae57d4b074eef653f59
+  metadata.gz: a6998f8a70dc488d6d4463cd071ca23b642e1c9716fa44fd286fd2fb99484392702fb1a026afaca8a13d70be4c24de2c2b5b56a583db754a3705b127529c9d46
+  data.tar.gz: 53e69bb7fbf5ebc75e30b4fbd478567e786862fef7b6922c624c178cf4cf5b6e89a53a133f77d0f6e75534a860abfc1d3f113ca1a29dbcc47bd851de7ea9af7f

data/lib/tracing/version.rb

@@ -1,3 +1,3 @@
 module Tracing
-  VERSION = "2.0.6"
+  VERSION = "2.0.9"
 end

data/lib/tracing.rb

@@ -56,24 +56,24 @@ module Tracing
     end
 
     def reinitialize
-      @indent = 0	# Current nesting level of enabled trace blocks
+      @indent = 0       # Current nesting level of enabled trace blocks
       @nested = false   # Set when a block enables all enclosed tracing
-      @available = {}	# Hash of available trace keys, accumulated during the run
-      @delayed = nil	# A delayed message, emitted only if the enclosed block emits tracing
+      @available = {}   # Hash of available trace keys, accumulated during the run
+      @delayed = nil    # A delayed message, emitted only if the enclosed block emits tracing
 
       @keys = {}
       if (e = ENV["TRACE"])
-	e.split(/[^_a-zA-Z0-9]/).each{|k| enable(k) }
+        e.split(/[^_a-zA-Z0-9]/).each{|k| enable(k) }
       end
     end
 
     def trace(*args, &block)
       begin
-	old_indent, old_nested, old_delayed, enabled = @indent, @nested, @delayed, show(*args)
-	# This monstrosity reduces the steps when single-stepping:
-	block ? yield : (args.size == 0 ? self : enabled)
+        old_indent, old_nested, old_delayed, enabled = @indent, @nested, @delayed, show(*args)
+        # This monstrosity reduces the steps when single-stepping:
+        block ? yield : (args.size == 0 ? self : enabled)
       ensure
-	@indent, @nested, @delayed = old_indent, old_nested, old_delayed
+        @indent, @nested, @delayed = old_indent, old_nested, old_delayed
       end
     end
 
@@ -91,11 +91,11 @@ module Tracing
 
     def enable key
       if !key.empty? && !@keys[s = key.to_sym]
-	@keys[s] = true
-	setup_help if s == :help
-	setup_flame if s == :flame
+        @keys[s] = true
+        setup_help if s == :help
+        setup_flame if s == :flame
       else
-	true
+        true
       end
     end
 
@@ -105,19 +105,19 @@ module Tracing
 
     def toggle key
       if !key.empty?
-	if enabled?(key)
-	  disable(key)
-	  false
-	else
-	  enable(key)
-	  true
-	end
+        if enabled?(key)
+          disable(key)
+          false
+        else
+          enable(key)
+          true
+        end
       end
     end
 
     def setup_help
       at_exit {
-	$stderr.puts "---\nTracing keys available: #{@available.keys.map{|s| s.to_s}.sort*", "}"
+        $stderr.puts "---\nTracing keys available: #{@available.keys.map{|s| s.to_s}.sort*", "}"
       }
     end
 
@@ -126,85 +126,87 @@ module Tracing
       require 'ruby-prof-flamegraph'
       profile_result = RubyProf.start
       at_exit {
-	profile_result2 = RubyProf.stop
-	printer = RubyProf::FlameGraphPrinter.new(profile_result2)
-	data_file = "/tmp/flamedata_#{Process.pid}.txt"
-	svg_file = "/tmp/flamedata_#{Process.pid}.svg"
-	flamegraph = File.dirname(__FILE__)+"/flamegraph.pl"
-	File.popen("tee #{data_file} | perl #{flamegraph} --countname=ms --width=4800 > #{svg_file}", "w") { |f|
-	  printer.print(f, {})
-	}
-	STDERR.puts("Flame graph dumped to file:///#{svg_file}")
+        profile_result2 = RubyProf.stop
+        printer = RubyProf::FlameGraphPrinter.new(profile_result2)
+        data_file = "/tmp/flamedata_#{Process.pid}.txt"
+        svg_file = "/tmp/flamedata_#{Process.pid}.svg"
+        flamegraph = File.dirname(__FILE__)+"/flamegraph.pl"
+        File.popen("tee #{data_file} | perl #{flamegraph} --countname=ms --width=4800 > #{svg_file}", "w") { |f|
+          printer.print(f, {})
+        }
+        STDERR.puts("Flame graph dumped to file:///#{svg_file}")
       }
     end
 
     def setup_debugger
       begin
-	require 'ruby-trace '
-	Debugger.start # (:post_mortem => true)  # Some Ruby versions crash on post-mortem debugging
+        require 'ruby-trace '
+        Debugger.start # (:post_mortem => true)  # Some Ruby versions crash on post-mortem debugging
       rescue LoadError
-	# Ok, no debugger, tough luck.
+        # Ok, no debugger, tough luck.
       end
 
       if trace :trap
-	trap('SIGINT') do
-	  puts "Stopped at:\n\t"+caller*"\n\t"
-	  debugger
-	  true	# Stopped on SIGINT
-	end
+        trap('SIGINT') do
+          puts "Stopped at:\n\t"+caller*"\n\t"
+          debugger
+          true  # Stopped on SIGINT
+        end
       end
 
       errors = []
       (
-	[ENV["DEBUG_PREFERENCE"]].compact +
-	[
-	  'byebug',
-	  'pry',
-	  'debugger',
-	  'ruby-trace '
-	]
+        [ENV["DEBUG_PREFERENCE"]].compact +
+        [
+          'debug',
+          'byebug',
+          'pry',
+          'debugger',
+          'ruby-trace '
+        ]
       ).each do |debugger|
-	begin
-	  require debugger
-	  if debugger == 'byebug'
-	    Kernel.class_eval do
-	      alias_method :debugger, :byebug
-	    end
-	  end
-	  ::Debugger.start if (const_get(::Debugger) rescue nil)
-	  return
-	rescue LoadError => e
-	  errors << e
-	end
+        begin
+          require debugger
+          if debugger == 'byebug'
+            Kernel.class_eval do
+              alias_method :debugger, :byebug
+            end
+          end
+          ::Debugger.start if (const_get(::Debugger) rescue nil)
+          return
+        rescue LoadError => e
+          errors << e
+        end
       end
 
       # Report when we couldn't load any debugger
-      $stderr.p errors
+      $stderr.puts(errors.inspect)
     end
 
     def setup_firstaid
       if trace :firstaid
-	puts "Preparing first aid kit"
-	::Exception.class_eval do
-	  alias_method :firstaid_initialize, :initialize
-
-	  def initialize *args, &b
-	    send(:firstaid_initialize, *args, &b)
-	    # Array#flatten calls to_ary, ignore it when it comes from Gem Specifications:
-	    return if NoMethodError === self && message =~ /^undefined method `to_ary' for \#<Gem::Specification/
-
-	    # LoadErrors are not hard to diagnose, and polyglot uses them
-	    return if LoadError === self
-
-	    # The Array() method calls to_ary and/or to_a before making a new array, ignore that:
-	    clr = caller
-	    return if NoMethodError === self && clr.detect{|frame| frame =~ /in `Array'/}
-
-	    puts "Stopped due to #{self.class}: #{message} at "+clr*"\n\t"
-	    debugger
-	    true # Stopped in Exception constructor
-	  end
-	end
+        puts "Preparing first aid kit"
+        ::Exception.class_eval do
+          alias_method :firstaid_initialize, :initialize
+
+          def initialize *args, &b
+            send(:firstaid_initialize, *args, &b)
+            # Array#flatten calls to_ary, ignore it when it comes from Gem Specifications:
+            return if NoMethodError === self && message =~ /^undefined method `to_ary' for \#<Gem::Specification/
+
+            # LoadErrors are not hard to diagnose, and polyglot uses them
+            return if LoadError === self
+            return if self.message =~ /uninitialized constant Mini[Tt]est/  # From RSpec usually
+
+            # The Array() method calls to_ary and/or to_a before making a new array, ignore that:
+            clr = caller
+            return if NoMethodError === self && clr.detect{|frame| frame =~ /in `Array'/}
+
+            puts "Stopped due to #{self.class}: #{message} at "+clr*"\n\t"
+            debugger
+            true # Stopped in Exception constructor
+          end
+        end
       end
     end
 
@@ -217,24 +219,24 @@ module Tracing
 
       # Emit the message if enabled or a parent is:
       if enabled_prefix && args.size > 0
-	message =
-	  "\##{enabled_prefix} " +
-	  '  '*@indent +
-	  args.
-	    map{|a| a.respond_to?(:call) ? a.call : a}.
-	    join(' ')
-
-	if @delay
-	  @delayed = [@delayed, message].compact*"\n"	# Arrange to display this message later, if necessary
-	  @delay = false
-	else
-	  if @delayed
-	    display key, @delayed		# Display a delayed message, then the current one
-	    @delayed = nil
-	    @delay = false
-	  end
-	  display key, message
-	end
+        message =
+          "\##{enabled_prefix} " +
+          '  '*@indent +
+          args.
+            map{|a| a.respond_to?(:call) ? a.call : a}.
+            join(' ')
+
+        if @delay
+          @delayed = [@delayed, message].compact*"\n"   # Arrange to display this message later, if necessary
+          @delay = false
+        else
+          if @delayed
+            display key, @delayed               # Display a delayed message, then the current one
+            @delayed = nil
+            @delay = false
+          end
+          display key, message
+        end
       end
       @indent += (enabled_prefix ? 1 : 0)
       !!enabled_prefix
@@ -245,33 +247,33 @@ module Tracing
       # Figure out whether this trace is enabled (itself or by :all), if it nests, and if we should print the key:
       @delay = false
       key =
-	if Symbol === args[0]
-	  control = args.shift
-	  case s = control.to_s
-	  when /!\Z/		# Enable all nested trace calls
-	    nested = true
-	    s.sub(/!\Z/, '').to_sym
-	  when /\?\Z/		# Delay this message until a nested active trace
-	    @delay = true
-	    s.sub(/\?\Z/, '').to_sym
-	  else
-	    control
-	  end
-	else
-	  :all
-	end
-
-      @available[key] ||= key		# Remember that this trace was requested, for help
-      if @nested ||			# This trace is enabled because it's in a nested block
-	  @keys[key] ||			# This trace is enabled in its own right
-	  @keys[:all]			# This trace is enabled because all are
-	if @keys[:keys] || @keys[:all]	# Use a formatting prefix?
-	  enabled_prefix = " %-15s"%key
-	  @keys[key] = enabled_prefix if @keys[key] == true # Save the formatting prefix
-	else
-	  enabled_prefix = ''
-	end
-	@nested ||= nested		# Activate nesting, if requested
+        if Symbol === args[0]
+          control = args.shift
+          case s = control.to_s
+          when /!\Z/            # Enable all nested trace calls
+            nested = true
+            s.sub(/!\Z/, '').to_sym
+          when /\?\Z/           # Delay this message until a nested active trace
+            @delay = true
+            s.sub(/\?\Z/, '').to_sym
+          else
+            control
+          end
+        else
+          :all
+        end
+
+      @available[key] ||= key           # Remember that this trace was requested, for help
+      if @nested ||                     # This trace is enabled because it's in a nested block
+          @keys[key] ||                 # This trace is enabled in its own right
+          @keys[:all]                   # This trace is enabled because all are
+        if @keys[:keys] || @keys[:all]  # Use a formatting prefix?
+          enabled_prefix = " %-15s"%key
+          @keys[key] = enabled_prefix if @keys[key] == true # Save the formatting prefix
+        else
+          enabled_prefix = ''
+        end
+        @nested ||= nested              # Activate nesting, if requested
       end
 
       [key, enabled_prefix]
@@ -286,7 +288,7 @@ class Object
     begin
       # This monstrosity reduces the steps when single-stepping:
       tracer = (Tracing.tracer ||= Tracing::Tracer.new) and
-	(old_indent, old_nested, old_delayed, enabled = tracer.indent, tracer.nested, tracer.delayed, tracer.show(*args))
+        (old_indent, old_nested, old_delayed, enabled = tracer.indent, tracer.nested, tracer.delayed, tracer.show(*args))
 
       block ? yield : (args.size == 0 ? tracer : enabled)
     ensure

data/tracing.gemspec

@@ -30,13 +30,12 @@ debugging.
   ]
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
-  spec.add_development_dependency "bundler", ">= 1.10", "~> 1.10.6"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "rspec", ">= 3.3"
 
-  spec.add_runtime_dependency(%q<ruby-debug>, ["~> 0"]) if RUBY_VERSION < "1.9"
-  spec.add_runtime_dependency(%q<debugger>, ["~> 1"]) if RUBY_VERSION =~ /^1\.9/ or RUBY_VERSION =~ /^2\.0/
-  spec.add_runtime_dependency(%q<byebug>, ["~> 1"]) if RUBY_VERSION =~ /^2\.1/
+  # spec.add_runtime_dependency(%q<ruby-debug>, ["~> 0"]) if RUBY_VERSION < "1.9"
+  # spec.add_runtime_dependency(%q<debugger>, ["~> 1"]) if RUBY_VERSION =~ /^1\.9/ or RUBY_VERSION =~ /^2\.0/
+  # spec.add_runtime_dependency(%q<byebug>) if RUBY_VERSION =~ /^2\.[1-9]/
   # spec.add_development_dependency(%q<pry>, ["~> 0"]) # rbx, jruby
 end
 

metadata

@@ -1,77 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tracing
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.9
 platform: ruby
 authors:
 - Clifford Heath
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 description: |2
 
   Enable tracing by setting the TRACE environment variable to a list of the
@@ -98,7 +64,7 @@ homepage: https://github.com/cjheath/tracing
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A nested tracing API for user defined trace classes
 test_files: []