ztk 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbbba71c8a07c8110549bfcee7445288c8ed3172
-  data.tar.gz: 8c725fa5f1de381ce76f668e52c7735d87a1429f
+  metadata.gz: 445fbcb89579b4066b00b22ea2c5a2c1663be79c
+  data.tar.gz: 9f53bd0cc361e7ac08c430554cfdb97e5848885e
 SHA512:
-  metadata.gz: 4ebd5505c5e8607536a054788d545432011aae08f3243cf9614e9c87c17567009784f014d6dbbc0141e0f117dab5ea3fa0b88dc93f0ed6163a5b280cb81d4de1
-  data.tar.gz: 96e9aa8493a4336e5723df3f3f6aed28856108cef55f16c76208cea07cff583895e92ed122d3125c3bc50276806678a957c3250a03747516b301d3507c71ce6f
+  metadata.gz: 1bfd737eff5c8c0b51346e8bb928483735e733d4bb3042605464fbe7d16bc3eef7fc41fc95962263eda49f67751de225a546d133af85f3ccdc99d70f8740c2a0
+  data.tar.gz: 0a447e77357723be1652721c88d0319663d40ba5688e252ede7d7a18dc61f6ef13f9b41957729e33a4fabf32bedb694cde51ba5968a00bfacf62995970aa1799

data/lib/ztk/profiler/core.rb

@@ -35,15 +35,21 @@ module ZTK
 
         @@start_time ||= Time.now.utc
 
-        result = nil
-        timer  = Timer.new(method_name, @@timer_stack.last)
+        result    = nil
+        exception = nil
+        timer     = Timer.new(method_name, @@timer_stack.last)
 
         @@timer_stack.push(timer)
         timer.benchmark = ::Benchmark.realtime do
-          result = yield
+          begin
+            result = yield
+          rescue Exception => exception
+          end
         end
         @@timer_stack.pop
 
+        exception.nil? or raise exception
+
         result
       end
 
@@ -53,17 +59,20 @@ module ZTK
       end
 
       def report(options={})
+        results = Array.new
         options = Base.build_config({}, options)
 
         stop
 
-        results = Array.new
-
-        report_timers(options)
-        options.ui.stdout.puts
-        results << report_timer_totals(options)
-        options.ui.stdout.puts
-        results << report_totals(options)
+        if (Timer.count > 0)
+          report_timers(options) and options.ui.stdout.puts
+          results << report_timer_totals(options)
+          results.last and options.ui.stdout.puts
+          results << report_totals(options)
+        else
+          options.ui.stderr.puts("Nothing was profiled!")
+          results = [ nil, nil ]
+        end
 
         results
       end

data/lib/ztk/profiler/private.rb

@@ -5,6 +5,8 @@ module ZTK
     module Private
 
       def report_timers(options={}, parent=nil, depth=0)
+        return false if (Timer.count == 0)
+
         child_timers = Timer.timers_by_parent[parent]
         child_timers.each do |timer|
           prefix = ('  |' * (depth))
@@ -18,6 +20,8 @@ module ZTK
       end
 
       def report_timer_totals(options={})
+        return false if (Timer.count == 0)
+
         result                = Hash.new
         timer_names           = Timer.timers_by_name.keys.compact
         timer_names_camelize  = timer_names.map(&:to_s).map(&:camelize)
@@ -32,6 +36,8 @@ module ZTK
       end
 
       def report_totals(options={})
+        return false if (Timer.count == 0)
+
         times = {
           'Nested Time'   => Timer.benchmark_nested_total,
           'Actual Time'   => Profiler.total_time,

data/lib/ztk/profiler/timer/class_methods.rb

@@ -54,6 +54,10 @@ module ZTK
           result
         end
 
+        def count
+          @@timers.count
+        end
+
         def benchmark_total
           @@benchmark_total ||= @@timers.map(&:benchmark).reduce(&:+)
           @@benchmark_total

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport