test-prof 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b61bd0dd4011eb8d77c50a343ba8e582393bd68
-  data.tar.gz: 3a233a89a57d261382dc253cb87156655a7356c6
+  metadata.gz: 5e482ddcaca18180a0606f53fd51871ba132e4a5
+  data.tar.gz: cb321462168846d649df3237117451926a18398a
 SHA512:
-  metadata.gz: 335d1151f7fcf286f9bf0ba01fcadcbe09c042e9712d069c4c85a3acc5e28f548add3580292fbed6ec8d89da796330b81ac66809fd55ab952fef5a20caf4e200
-  data.tar.gz: b2fb7e978bb9247c9d53e082682bb5fae34d0f7179784295457077100abff1365481b564fa4bb62e1bb24f4a3edf9d8fff0ef6be199ddf188ee99813ee369573
+  metadata.gz: a0d9c32fb4241f02f5d6fa3234543fca96abffbc5f968a7e67f9e23da8f41dea1990992e82c8e54cc46feb2af2c0ceac1d1a2ef7055a6784359bef67d97c485d
+  data.tar.gz: ad8a9004ee118da1fc8c9d2d32b290e8632ce0db0ac26803d2372fddf9efc898b28dd432f77ba89043a335724f2cddc9598742bca228486eb85e8ccea835437e

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## master
 
+## 0.2.2
+
+- Fix time calculation when Time class is monkey-patched. ([@palkan][])
+
+Add `TestProf.now` method which is just a copy of original `Time.now` and
+use it everywhere.
+
+Fixes [#10](https://github.com/palkan/test-prof/issues/10).
+
 ## 0.2.1
 
 - Detect `RSpec` by checking the presence of `RSpec::Core`. ([@palkan][])

data/lib/test_prof.rb

@@ -33,6 +33,17 @@ module TestProf
       yield config
     end
 
+    # Avoid issues with wrong time due to monkey-patches (e.g. timecop)
+    # See https://github.com/rspec/rspec-core/blob/v3.6.0/lib/rspec/core.rb#L147
+    #
+    # We also want to handle Timecop specificaly
+    # See https://github.com/travisjeffery/timecop/blob/master/lib/timecop/time_extensions.rb#L11
+    if Time.respond_to?(:now_without_mock_time)
+      define_method(:now, &::Time.method(:now_without_mock_time))
+    else
+      define_method(:now, &::Time.method(:now))
+    end
+
     # Require gem and shows a custom
     # message if it fails to load
     def require(gem_name, msg)
@@ -79,7 +90,7 @@ module TestProf
 
     def with_timestamps(path)
       return path unless config.timestamps?
-      timestamps = "-#{Time.now.to_i}"
+      timestamps = "-#{now.to_i}"
       "#{path.sub(/\.\w+$/, '')}#{timestamps}#{::File.extname(path)}"
     end
   end

data/lib/test_prof/factory_doctor.rb

@@ -82,14 +82,14 @@ module TestProf
         return yield if ignore? || !running? || (strategy != :create)
 
         begin
-          ts = Time.now if @depth.zero?
+          ts = TestProf.now if @depth.zero?
           @depth += 1
           @count += 1
           yield
         ensure
           @depth -= 1
 
-          @time += (Time.now - ts) if @depth.zero?
+          @time += (TestProf.now - ts) if @depth.zero?
         end
       end
 

data/lib/test_prof/rspec_stamp.rb

@@ -88,8 +88,12 @@ module TestProf
 
         tags.each do |t|
           if t.is_a?(Hash)
-            t.keys.each { |k| parsed.add_htag(k, t[k]) }
+            t.keys.each do |k|
+              parsed.remove_tag(k)
+              parsed.add_htag(k, t[k])
+            end
           else
+            parsed.remove_tag(t)
             parsed.add_tag(t)
           end
         end

data/lib/test_prof/rspec_stamp/parser.rb

@@ -22,6 +22,11 @@ module TestProf
           @htags ||= []
           @htags << [k, v]
         end
+
+        def remove_tag(tag)
+          @tags&.delete(tag)
+          @htags&.delete_if { |(k, _v)| k == tag }
+        end
       end
 
       class << self

data/lib/test_prof/tag_prof/rspec.rb

@@ -21,7 +21,7 @@ module TestProf
       end
 
       def example_started(_notification)
-        @ts = Time.now
+        @ts = TestProf.now
       end
 
       def example_finished(notification)
@@ -30,7 +30,7 @@ module TestProf
         tag = notification.example.metadata.fetch(@tag, :__unknown__)
 
         @tags[tag][:count] += 1
-        @tags[tag][:time] += (Time.now - @ts)
+        @tags[tag][:time] += (TestProf.now - @ts)
       end
 
       def print

data/lib/test_prof/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestProf
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,34 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.9'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -122,34 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: "\n    Ruby applications tests profiling tools.\n\n    Contains tools
   to anylyze factories usage, integrate with Ruby profilers,\n    profile your examples
   using ActiveSupport notifications (if any) and\n    statically analyze your code