test-prof 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b330384292e5a4bcb8429d4e2d1e215a320692e526b53cdddfb8714b43538b6
-  data.tar.gz: 0a22281b9a7acc4dde3552be07a143420bd63648a380f6b2e5cd446cdcc36b54
+  metadata.gz: 42dd5bfd5d77f676d37c3cf9ff88d366cf19b459da3736d891d974f31dcaef97
+  data.tar.gz: 7b99baeb4d93f86b11bb34c3a43fe2bb2f2b75487cd66190fcd2decc3d8ed532
 SHA512:
-  metadata.gz: d4d008f6cfe0055fff132d6c31f440bbd9974e0294480498d76a57b1f39a49ea51a1145632d901de54bc3a18f6e4d6c317e565ddfca090ad4d905ec9ec7e7e5a
-  data.tar.gz: 001a18ff90644936cacff9e5a00858671e070ffe4b11a10921f4401ad29fb12b4de2d190fc92c7fbc3bb137e42a2eaa2a55945bf1b7c1fd88bcb87c2ded00f13
+  metadata.gz: 12a11804603dc80ef72ecfae63ec6f33f172c63bd447a9032df131cf33265c02926871d55eaabb08fc74d61de211d6bd78727b44802d6a488b20c9a1fee854cc
+  data.tar.gz: a826158093a4f66433c3b521311f2f3028f526d1864f2106c2294eb97e22b996da3328bebaed0d247b51baf9905fa117a8b75472b81119ffda2c6ebb660566a2

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.7.4 (2019-02-16)
+
+- Add JSON report support for StackProf. ([@palkan][])
+
+- Add ability to specify report/artifact name suffixes. ([@palkan][])
+
 ## 0.7.3 (2018-11-07)
 
 - Add a header with the general information on factories usage [#99](https://github.com/palkan/test-prof/issues/99) ([@szemek][])

data/README.md

@@ -1,3 +1,4 @@
+[![Cult Of Martians](http://cultofmartians.com/assets/badges/badge.svg)](http://cultofmartians.com)
 [![Gem Version](https://badge.fury.io/rb/test-prof.svg)](https://rubygems.org/gems/test-prof) [![Build Status](https://travis-ci.org/palkan/test-prof.svg?branch=master)](https://travis-ci.org/palkan/test-prof) [![Code Triagers Badge](https://www.codetriage.com/palkan/test-prof/badges/users.svg)](https://www.codetriage.com/palkan/test-prof)
 [![Documentation](https://img.shields.io/badge/docs-link-brightgreen.svg)](https://test-prof.evilmartians.io)
 
@@ -47,6 +48,8 @@ Supported Ruby versions:
 
 - Paris.rb, 2018, "99 Problems of Slow Tests" talk [[video](https://www.youtube.com/watch?v=eDMZS_fkRtk), [slides](https://speakerdeck.com/palkan/paris-dot-rb-2018-99-problems-of-slow-tests)]
 
+- BalkanRuby, 2018, "Take your slow tests to the doctor" talk [[video](https://www.youtube.com/watch?v=rOcrme82vC8)], [slides](https://speakerdeck.com/palkan/balkanruby-2018-take-your-slow-tests-to-the-doctor)]
+
 - RailsClub, Moscow, 2017, "Faster Tests" talk [[video](https://www.youtube.com/watch?v=8S7oHjEiVzs) (RU), [slides](https://speakerdeck.com/palkan/railsclub-moscow-2017-faster-tests)]
 
 - RubyConfBy, 2017, "Run Test Run" talk [[video](https://www.youtube.com/watch?v=q52n4p0wkIs), [slides](https://speakerdeck.com/palkan/rubyconfby-minsk-2017-run-test-run)]

data/lib/test_prof.rb

@@ -84,7 +84,9 @@ module TestProf
       with_timestamps(
         ::File.join(
           config.output_dir,
-          filename
+          with_report_suffix(
+            filename
+          )
         )
       )
     end
@@ -105,6 +107,12 @@ module TestProf
       "#{path.sub(/\.\w+$/, '')}#{timestamps}#{::File.extname(path)}"
     end
 
+    def with_report_suffix(path)
+      return path if config.report_suffix.nil?
+
+      "#{path.sub(/\.\w+$/, '')}-#{config.report_suffix}#{::File.extname(path)}"
+    end
+
     def notify_spring_detected
       return if instance_variable_defined?(:@spring_notified)
       log :info, "Spring detected"
@@ -118,16 +126,18 @@ module TestProf
 
   # TestProf configuration
   class Configuration
-    attr_accessor :output,      # IO to write output messages.
-                  :color,       # Whether to colorize output or not
-                  :output_dir,  # Directory to store artifacts
-                  :timestamps   # Whethere to use timestamped names for artifacts
+    attr_accessor :output,       # IO to write output messages.
+                  :color,        # Whether to colorize output or not
+                  :output_dir,   # Directory to store artifacts
+                  :timestamps, # Whethere to use timestamped names for artifacts,
+                  :report_suffix # Custom suffix for reports/artifacts
 
     def initialize
       @output = $stdout
       @color = true
       @output_dir = "tmp/test_prof"
       @timestamps = false
+      @report_suffix = ENV['TEST_PROF_REPORT']
     end
 
     def color?

data/lib/test_prof/before_all/adapters/active_record.rb

@@ -16,6 +16,11 @@ module TestProf
           end
 
           def rollback_transaction
+            if ::ActiveRecord::Base.connection.open_transactions.zero?
+              warn "!!! before_all transaction has been already rollbacked and " \
+                   "could work incorrectly"
+              return
+            end
             ::ActiveRecord::Base.connection.rollback_transaction
           end
         end

data/lib/test_prof/stack_prof.rb

@@ -22,12 +22,20 @@ module TestProf
   module StackProf
     # StackProf configuration
     class Configuration
-      attr_accessor :mode, :interval, :raw, :target
+      FORMATS = %w[html json].freeze
+
+      attr_accessor :mode, :interval, :raw, :target, :format
 
       def initialize
         @mode = ENV.fetch('TEST_STACK_PROF_MODE', :wall).to_sym
         @target = ENV['TEST_STACK_PROF'] == 'boot' ? :boot : :suite
         @raw = ENV['TEST_STACK_PROF_RAW'] != '0'
+        @format =
+          if FORMATS.include?(ENV['TEST_STACK_PROF_FORMAT'])
+            ENV['TEST_STACK_PROF_FORMAT']
+          else
+            'html'
+          end
       end
 
       def raw?
@@ -98,13 +106,7 @@ module TestProf
 
         return unless config.raw
 
-        html_path = path.gsub(/\.dump$/, '.html')
-
-        log :info, <<~MSG
-          Run the following command to generate a flame graph report:
-
-          stackprof --flamegraph #{path} > #{html_path} && stackprof --flamegraph-viewer=#{html_path}
-        MSG
+        send("dump_#{config.format}_report", path)
       end
 
       private
@@ -141,6 +143,28 @@ module TestProf
           false
         end
       end
+
+      def dump_html_report(path)
+        html_path = path.gsub(/\.dump$/, '.html')
+
+        log :info, <<~MSG
+          Run the following command to generate a flame graph report:
+
+          stackprof --flamegraph #{path} > #{html_path} && stackprof --flamegraph-viewer=#{html_path}
+        MSG
+      end
+
+      def dump_json_report(path)
+        report = ::StackProf::Report.new(
+          Marshal.load(IO.binread(path)) # rubocop:disable Security/MarshalLoad
+        )
+        json_path = path.gsub(/\.dump$/, '.json')
+        File.write(json_path, JSON.generate(report.data))
+
+        log :info, <<~MSG
+          StackProf JSON report generated: #{json_path}
+        MSG
+      end
     end
   end
 end

data/lib/test_prof/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby applications tests profiling tools