active-profiling 0.1.2 → 2.0

data/lib/active-profiling/ruby_profiler/output.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveProfiling
   module RubyProfiler
@@ -6,16 +7,13 @@ module ActiveProfiling
         @options = Rails.application.config.active_profiling.profiler.merge(args.extract_options!)
         @path = args.first
 
-        @output = if @options[:output]
-          @options[:output]
-        else
+        @output = @options[:output] ||
           case @options[:printer]
             when :call_tree, :call_stack, :graph_html, :dot
               :file
             else
               :log
           end
-        end
       end
 
       def run
@@ -27,11 +25,9 @@ module ActiveProfiling
         result = nil
         exception = nil
         @profiler_result = RubyProf.profile do
-          begin
-            result = yield
-          rescue
-            exception = $!
-          end
+          result = yield
+        rescue StandardError
+          exception = $ERROR_INFO
         end
 
         case @output
@@ -43,129 +39,127 @@ module ActiveProfiling
             write_to_file_or_path
         end
 
-        if exception
-          raise exception
-        else
-          result
-        end
+        raise exception if exception
+
+        result
       ensure
         GC.enable if @options[:disable_gc]
       end
 
       private
 
-      def printer_class
-        @printer_class ||= case @options[:printer]
-          when :flat_with_line_numbers
-            RubyProf::FlatPrinterWithLineNumbers
-          else
-            RubyProf.const_get("#{@options[:printer].to_s.camelize}Printer")
-        end
-      end
-
-      def path_and_file_name
-        return @path_and_file_name if defined?(@path_and_file_name)
-
-        if @path.present?
-          { path: File.dirname(@path), file_name: @path }
-        elsif @options[:file_name]
-          { path: File.dirname(@options[:file_name]), file_name: @options[:file_name] }
-        else
-          time = Time.now.strftime('%Y-%m-%d-%H:%M:%S')
-          hash = Digest::MD5.hexdigest(rand.to_s)[0..6]
-          path = Rails.root.join('log/profiling')
-          ext = case @options[:printer]
-            when :graph_html, :call_stack
-              'html'
-            when :dot
-              'dot'
+        def printer_class
+          @printer_class ||= case @options[:printer]
+            when :flat_with_line_numbers
+              RubyProf::FlatPrinterWithLineNumbers
             else
-              'log'
+              RubyProf.const_get("#{@options[:printer].to_s.camelize}Printer")
           end
+        end
+
+        def path_and_file_name
+          return @path_and_file_name if defined?(@path_and_file_name)
 
-          file_name = [
-            @options[:name],
-            @options[:measure_mode],
-            @options[:printer],
-            time,
-            hash,
-            ext
-          ].join('.')
-
-          @path_and_file_name = {
-            path: path.to_s,
-            file_name: path.join(file_name)
-          }
+          if @path.present?
+            { path: File.dirname(@path), file_name: @path }
+          elsif @options[:file_name]
+            { path: File.dirname(@options[:file_name]), file_name: @options[:file_name] }
+          else
+            time = Time.zone.now.strftime('%Y-%m-%d-%H:%M:%S')
+            hash = Digest::MD5.hexdigest(rand.to_s)[0..6]
+            path = Rails.root.join('log/profiling')
+            ext = case @options[:printer]
+              when :graph_html, :call_stack
+                'html'
+              when :dot
+                'dot'
+              else
+                'log'
+            end
+
+            file_name = [
+              @options[:name],
+              @options[:measure_mode],
+              @options[:printer],
+              time,
+              hash,
+              ext
+            ].join('.')
+
+            @path_and_file_name = {
+              path: path.to_s,
+              file_name: path.join(file_name)
+            }
+          end
         end
-      end
 
-      def write_to_stdout
-        printer_class.new(@profiler_result).print($stdout, @options)
-      end
+        def write_to_stdout
+          printer_class.new(@profiler_result).print($stdout, @options)
+        end
 
-      def write_to_log
-        str = StringIO.new
-        printer_class.new(@profiler_result).print(str, @options[:printer_options])
-        str.rewind
+        def write_to_log
+          str = StringIO.new
+          printer_class.new(@profiler_result).print(str, @options[:printer_options])
+          str.rewind
 
-        ActiveSupport::Notifications.instrument('profiler_output.active_profiling', {
-          :profiler_output => str.read,
-          :title => @options[:title] || @path
-        })
-      end
+          ActiveSupport::Notifications.instrument('profiler_output.active_profiling', {
+            profiler_output: str.read,
+            title: @options[:title] || @path
+          })
+        end
 
-      def write_to_file_or_path
-        if call_tree_printer_file_output?
-          write_to_path
-        else
-          write_to_file
+        def write_to_file_or_path
+          if call_tree_printer_file_output?
+            write_to_path
+          else
+            write_to_file
+          end
         end
-      end
 
-      def write_to_file
-        ActiveSupport::Notifications.instrument('profiler_output_to_file.active_profiling', {
-          :file_name => path_and_file_name[:file_name]
-        })
+        def write_to_file
+          ActiveSupport::Notifications.instrument('profiler_output_to_file.active_profiling', {
+            file_name: path_and_file_name[:file_name]
+          })
 
-        FileUtils.mkdir_p(path_and_file_name[:path])
-        printer_class.new(@profiler_result).print(File.open(path_and_file_name[:file_name], 'w'), @options[:printer_options])
-      end
+          FileUtils.mkdir_p(path_and_file_name[:path])
+          printer_class.new(@profiler_result).print(File.open(path_and_file_name[:file_name], 'w'), @options[:printer_options])
+        end
 
-      def write_to_path
-        ActiveSupport::Notifications.instrument('profiler_output_to_file.active_profiling', {
-          :file_name => path_and_file_name[:path]
-        })
+        def write_to_path
+          ActiveSupport::Notifications.instrument('profiler_output_to_file.active_profiling', {
+            file_name: path_and_file_name[:path]
+          })
 
-        FileUtils.mkdir_p(path_and_file_name[:path])
-        printer_class.new(@profiler_result).print(merged_printer_options(path_and_file_name))
-      end
+          FileUtils.mkdir_p(path_and_file_name[:path])
+          printer_class.new(@profiler_result).print(merged_printer_options(path_and_file_name))
+        end
 
-      def call_tree_prefix_option
-        # XXX - Bit of a hack here -- newer versions of RubyProf have changed
-        # the method signature of CallTreePrinter#print and changed how the
-        # generated files are prefixed. To accomodate call tree viewers like
-        # [KQ]CacheGrind, we need to hack in an appropriate file prefix.
-        if call_tree_printer_file_output?
-          @options[:call_tree_prefix].try(:gsub, /\.$/, '')
-        else
-          @options[:call_tree_prefix]
+        def call_tree_prefix_option
+          # XXX - Bit of a hack here -- newer versions of RubyProf have changed
+          # the method signature of CallTreePrinter#print and changed how the
+          # generated files are prefixed. To accomodate call tree viewers like
+          # [KQ]CacheGrind, we need to hack in an appropriate file prefix.
+          if call_tree_printer_file_output?
+            @options[:call_tree_prefix].try(:gsub, /\.$/, '')
+          else
+            @options[:call_tree_prefix]
+          end
         end
-      end
 
-      def merged_printer_options(path_and_file_name)
-        if @options[:printer] == :call_tree && @output == :file
-          @options[:printer_options].merge(
-            profile: call_tree_prefix_option,
-            path: path_and_file_name[:path]
-          )
-        else
-          @options[:printer_options]
+        def merged_printer_options(path_and_file_name)
+          if @options[:printer] == :call_tree && @output == :file
+            @options[:printer_options].merge(
+              profile: call_tree_prefix_option,
+              path: path_and_file_name[:path]
+            )
+          else
+            @options[:printer_options]
+          end
         end
-      end
 
-      def call_tree_printer_file_output?
-        printer_class.instance_method(:print).arity == -1 && printer_class == RubyProf::CallTreePrinter
-      end
+        def call_tree_printer_file_output?
+          printer_class.instance_method(:print).arity == -1 && printer_class == RubyProf::CallTreePrinter
+        end
     end
   end
 end

data/lib/active-profiling/ruby_profiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'active-profiling/ruby_profiler/output'
 
@@ -16,5 +17,5 @@ module ActiveProfiling
     end
   end
 
-  self.extend(RubyProfiler)
+  extend(RubyProfiler)
 end

data/lib/active-profiling/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 
 module ActiveProfiling
-  VERSION = '0.1.2'.freeze
+  VERSION = '2.0'
 end

data/lib/active-profiling.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveProfiling
   class << self
@@ -24,4 +25,3 @@ require 'active-profiling/gc_statistics'
 require 'active-profiling/ruby_profiler'
 require 'active-profiling/action_controller'
 require 'active-profiling/active_record'
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-profiling
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '2.0'
 platform: ruby
 authors:
 - J Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
 description: A Rails profiling suite.
 email: dark.panda@gmail.com
 executables: []
@@ -32,7 +32,10 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".sonarcloud.properties"
+- FUNDING.yml
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -49,11 +52,12 @@ files:
 - lib/active-profiling/ruby_profiler.rb
 - lib/active-profiling/ruby_profiler/output.rb
 - lib/active-profiling/version.rb
-homepage: http://github.com/dark-panda/active-profiling
+homepage: https://github.com/dark-panda/active-profiling
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -61,15 +65,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: A Rails profiling suite.
 test_files: []