time_bandits 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c02c0496a8f416f2a02bd4ca1c95d45c5f16d72
-  data.tar.gz: fae74e56ca2de98be7cd3baffea5e55c960d795e
+  metadata.gz: 2e78610739a238c4fdd8996c6d04233f55da3b2d
+  data.tar.gz: 4759fe23caee371f1a33ec748f2955f9377740f1
 SHA512:
-  metadata.gz: 8667e3d1e7469130c909bdd62b6e28cda05ff499eef7c94cef32967e689405e5e7e4021151c8afb690d1e401886aae58df3d08624eed42f2abea4fc7f9379ee1
-  data.tar.gz: 4e44865ab865d5406190c7437323ec2f0f3bd957ccd8296c7293cfe27bca26e5d39bdc5cdf8b017c5fd11f4115846cf62c963674187dd4692c64b7d35cdf35b6
+  metadata.gz: 9e29f720c97c525431418c57d1551c6064b247afa12de33225c85564baa0c48ac506239b703c026cc65ccd849c61579a4b25bc92862546ef12eaaa0279cf26bf
+  data.tar.gz: db03cdbae7ad22d4c36fd637b75705c3ddcb32447a4de60ac2d90117268198fcd394b4bd8529d8c3cba733d3d04083f67c08a79adc953e58859c31650e94b3dd

data/Gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 gemspec
 
 # gem "activesupport", "3.2.13"
-gem "activesupport", "4.0.0"
+gem "activesupport", "4.1.8"
 
 gem "byebug"

data/lib/time_bandits/time_consumers/base_consumer.rb

@@ -2,8 +2,12 @@ module TimeBandits::TimeConsumers
   class BaseConsumer
     class << self
       def instance
-        Thread.current.thread_variable_get(name) ||
-          Thread.current.thread_variable_set(name, new)
+        Thread.current.thread_variable_get(key) ||
+          Thread.current.thread_variable_set(key, new)
+      end
+
+      def key
+        @key ||= name.to_sym
       end
 
       def prefix(sym)

data/lib/time_bandits/time_consumers/garbage_collection.rb

@@ -43,6 +43,8 @@ module TimeBandits
 
       if ObjectSpace.respond_to?(:allocated_objects)
         def _get_allocated_objects; ObjectSpace.allocated_objects; end
+      elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.2.0"
+        def _get_allocated_objects; GC.stat(:total_allocated_objects); end
       elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.1.0"
         def _get_allocated_objects; GC.stat(:total_allocated_object); end
       else
@@ -59,6 +61,8 @@ module TimeBandits
 
       if GC.respond_to?(:heap_slots)
         def _get_heap_slots; GC.heap_slots; end
+      elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.2.0"
+        def _get_heap_slots; GC.stat(:heap_live_slots) + GC.stat(:heap_free_slots) + GC.stat(:heap_final_slots); end
       elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.1.0"
         def _get_heap_slots; GC.stat(:heap_live_slot) + GC.stat(:heap_free_slot) + GC.stat(:heap_final_slot); end
       else
@@ -67,6 +71,8 @@ module TimeBandits
 
       if GC.respond_to?(:heap_slots_live_after_last_gc)
         def live_data_set_size; GC.heap_slots_live_after_last_gc; end
+      elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.2.0"
+        def live_data_set_size; GC.stat(:heap_live_slots); end
       elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.1.0"
         def live_data_set_size; GC.stat(:heap_live_slot); end
       else

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/test/test_helper.rb

@@ -1,14 +1,24 @@
-require 'test/unit'
+require 'minitest'
 require 'mocha/setup'
-require 'active_support/testing/declarative'
-
 require 'minitest/pride'
+require 'minitest/autorun'
 
-class Test::Unit::TestCase
-  extend ActiveSupport::Testing::Declarative
+require 'active_support/testing/declarative'
+module Test
+  module Unit
+    class TestCase < Minitest::Test
+      extend ActiveSupport::Testing::Declarative
+      def assert_nothing_raised(*)
+        yield
+      end
+    end
+  end
 end
 
+Minitest::Test.i_suck_and_my_tests_are_order_dependent!
+
 require_relative '../lib/time_bandits'
+require "byebug"
 
 ActiveSupport::LogSubscriber.class_eval do
   # need a logger, otherwise no data will be collected
@@ -21,7 +31,7 @@ end
 module Rails
   extend self
   module VERSION
-    STRING = "4.0.0"
+    STRING = "4.1.8"
   end
   def cache
     @cache ||= ActiveSupport::Cache.lookup_store(:mem_cache_store)

data/test/unit/active_support_notifications_test.rb

@@ -31,6 +31,7 @@ class ActiveSupportNotificationsTest < Test::Unit::TestCase
   end
 
   test "formatting" do
+    assert_same @bandit, TimeBandits.time_bandits.first.instance
     @bandit.calls = 1
     assert_equal "Simple: 0.0ms(1 calls)", TimeBandits.runtime
   end

data/test/unit/gc_consumer_test.rb

@@ -48,21 +48,21 @@ class GCConsumerTest < Test::Unit::TestCase
     GC.start
     m = TimeBandits.metrics
     if GC.respond_to?(:time)
-      assert 0 <  m[:gc_calls]
-      assert 0 <  m[:gc_time]
-      assert 0 <= m[:heap_growth]
-      assert 0 <  m[:heap_size]
-      assert 0 <  m[:allocated_objects]
-      assert 0 <  m[:allocated_bytes]
-      assert 0 <= m[:live_data_set_size]
+      assert_operator 0, :<,  m[:gc_calls]
+      assert_operator 0, :<,  m[:gc_time]
+      assert_instance_of Fixnum, m[:heap_growth]
+      assert_operator 0, :<,  m[:heap_size]
+      assert_operator 0, :<,  m[:allocated_objects]
+      assert_operator 0, :<,  m[:allocated_bytes]
+      assert_operator 0, :<=, m[:live_data_set_size]
     else
-      assert 0 <  m[:gc_calls]
-      assert 0 <= m[:gc_time]
-      assert 0 <= m[:heap_growth]
-      assert 0 <  m[:heap_size]
-      assert 0 <  m[:allocated_objects]
-      assert 0 <= m[:allocated_bytes]
-      assert 0 <  m[:live_data_set_size]
+      assert_operator 0, :<,  m[:gc_calls]
+      assert_operator 0, :<=, m[:gc_time]
+      assert_instance_of Fixnum, m[:heap_growth]
+      assert_operator 0, :<,  m[:heap_size]
+      assert_operator 0, :<,  m[:allocated_objects]
+      assert_operator 0, :<=, m[:allocated_bytes]
+      assert_operator 0, :<,  m[:live_data_set_size]
     end
   end
 end

data/time_bandits.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("memcached")
   s.add_development_dependency("sequel")
   s.add_development_dependency("mysql2")
-  s.add_development_dependency("minitest", '~> 4.7.5')
+  s.add_development_dependency("minitest", "~> 5.5")
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '5.5'
 description: Rails Completed Line on Steroids
 email:
 - skaes@railsexpress.de
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Custom performance logging for Rails