tracing 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ef811dadb9ee19941f4848e9ba99ae47f705c1
-  data.tar.gz: a6f2ee9abc71081e56b8f1a1c6d85e526952d284
+  metadata.gz: 36f3224f033fafe706d1f03dde9e2760e6f0795a
+  data.tar.gz: 0bb8418875f386516d22ef3163bd84540362a442
 SHA512:
-  metadata.gz: b7f5e1d033b5d162496945ba150ebb692f89766bd902e5629a2bd8dac33f1aecacbf17d6bc60988d8d3e91771bd21fab82b42a3e58e5610723be1e2b01ad4915
-  data.tar.gz: d68c6e4611334cb883756fefeeeb36cb4768461aaffdc4fdaf34f51ee87cb5f247b2d655b16164c708f5eb674ef0bff6ccf42a4c975255b093f5893a2d40ae15
+  metadata.gz: cf79beb12168c343f4c8f99f6852eca891abc5489b73873a1822644e16524f16977884954eaed7dd5163a6a209fb1afbe5943be1696c61673df10794ad08cab8
+  data.tar.gz: a48974a3ec56cd41677730af6acc310bdd02acd5e91a0fe2581736875906884ad159cba44a8190f43a10e8ab6261003b07477b52e112289cc0b76f1c12faee50

data/Rakefile

@@ -8,7 +8,7 @@ task :default => :spec
 
 desc "Bump gem version patch number"
 task :bump do
-  path = File.expand_path('../lib/activefacts/api/version.rb', __FILE__)
+  path = File.expand_path('../lib/tracing/version.rb', __FILE__)
   lines = File.open(path) do |fp| fp.readlines; end
   File.open(path, "w") do |fp|
     fp.write(
@@ -22,68 +22,3 @@ task :bump do
     )
   end
 end
-
-desc "Run Rspec tests"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w{-f d}
-end
-
-namespace :spec do
-  namespace :rubies do
-    SUPPORTED_RUBIES = %w{ 1.9.2 1.9.3 2.0.0 jruby-1.7.0 }
-
-    desc "Run Rspec tests on all supported rubies"
-    task :all_tasks => [:install_gems, :exec]
-
-    desc "Run `bundle install` on all rubies"
-    task :install_gems do
-      sh %{ rvm #{SUPPORTED_RUBIES.join(',')} exec bundle install }
-    end
-
-    desc "Run `bundle exec rake` on all rubies"
-    task :exec do
-      sh %{ rvm #{SUPPORTED_RUBIES.join(',')} exec bundle exec rake spec }
-    end
-
-    SUPPORTED_RUBIES.each do |ruby|
-      desc "Run `bundle install` on #{ruby}"
-      task :"install_gems_#{ruby}" do
-	sh %{ rvm #{ruby} exec bundle install }
-      end
-
-      desc "Run `bundle exec rake` on #{ruby}"
-      task :"exec_#{ruby}" do
-	sh %{ rvm #{ruby} exec bundle exec rake spec }
-      end
-    end
-
-  end
-end
-
-desc "Run RSpec tests and produce coverage files (results viewable in coverage/index.html)"
-RSpec::Core::RakeTask.new(:coverage) do |spec|
-  if RUBY_VERSION < '1.9'
-    spec.rcov_opts = %{ --exclude spec --exclude lib/activefacts/tracer.rb --exclude gem/* }
-    spec.rcov = true
-  else
-    spec.rspec_opts = %w{ --require simplecov_helper }
-  end
-end
-
-task :cov => :coverage
-task :rcov => :coverage
-task :simplecov => :coverage
-
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "activefacts-api #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-task :wait do
-  print "Waiting for you to hit Enter"
-  $stdin.gets
-end

data/lib/tracing.rb

@@ -67,11 +67,11 @@ module Tracing
 
     def trace(*args, &block)
       begin
-	old_indent, old_nested, old_delayed, enabled = @indent, @nested, @delayed, show(*args)
+	old_indent, old_nested, enabled = @indent, @nested, 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 = old_indent, old_nested
       end
     end
 
@@ -215,13 +215,15 @@ module Tracing
 	    map{|a| a.respond_to?(:call) ? a.call : a}.
 	    join(' ')
 
-	if @delayed == true
-	  @delayed = message	# Arrange to display this message later, if necessary
-	elsif @delayed
-	  display key, @delayed		# Display a delayed message, then the current one
-	  @delayed = nil
-	  display key, message
+	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
@@ -239,7 +241,7 @@ module Tracing
 	    nested = true
 	    s.sub(/!\Z/, '').to_sym
 	  when /\?\Z/		# Delay this message until a nested active trace
-	    @delayed = true
+	    @delay = true
 	    s.sub(/\?\Z/, '').to_sym
 	  else
 	    control

data/lib/tracing/version.rb

@@ -1,3 +1,3 @@
 module Tracing
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracing
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Clifford Heath