hyper-trace 1.0.alpha1.2 → 1.0.alpha1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f92731a61b2c0b5d7c08d5e49f43e1e6cb25c194584f9e462fad1587e58dfc2
-  data.tar.gz: b1b4cd221498d4d21c2eb411322d20822b02024a8cc683dc220ecd96ec665118
+  metadata.gz: 3bded2eb39b56cc22c0ccc9cb3a6d2266e06df2dc3bf3cc6abc92fd13ba2e810
+  data.tar.gz: 9a5e453bffe2f43a266fb5d63357389d5ff9fc273762aed5239e6be8e7b0d54d
 SHA512:
-  metadata.gz: f815653052ac48813673231070ceeb2c517ef2f773c20d8a3953e9929454d20175d4d223d498d9e3295419dea5a813339b59cd11fa427e5450d116f756465611
-  data.tar.gz: 24c4012407372842dcdf6d3988ce338d9c784a84cdb9f38d9bdb2a9b0c78ba1e42c780f1662de072ec3ce0656141de829f1222f0622ae9998f4117450323a4d4
+  metadata.gz: 490e185537790509c9d071b55d0ba838269ccad8a9086689519b36a1b3d2aa402ff3891ccb485658462f58bd396c69b1f0a80f5aa94915abd8860f8aaa1042f7
+  data.tar.gz: 366d20b1a60b41e1ec46fd7e4b24e640c45e5fdc6d2d075a904557d2b44ab499aca1b25bb10962a08241b0b788727b263b7c74335000b4b79613f564d4489633

data/.gitignore

@@ -6,3 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+# ignore Gemfile.locks https://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
+/spec/test_app/Gemfile.lock
+/Gemfile.lock

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 gem 'hyperstack-config', path: '../hyperstack-config'
+gem 'hyper-spec',   path: '../hyper-spec'
 # Specify your gem's dependencies in hyper-trace.gemspec
 gemspec

data/hyper-trace.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'hyperstack-config', HyperTrace::VERSION
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency 'hyper-spec', HyperTrace::VERSION
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency 'chromedriver-helper'
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
 end

data/lib/hyper_trace/hyper_trace.rb

@@ -6,17 +6,7 @@ class Class
   alias hypertrace hyper_trace
 end
 
-class Method
-  def parameters
-    /.*function[^(]*\(([^)]*)\)/
-      .match(`#{@method}.toString()`)[1]
-      .split(',')
-      .collect { |param| [:req, param.strip.to_sym] }
-  end
-end
-
 module HyperTrace
-
   class Config
     def initialize(klass, instrument_class, opts, &block)
       @klass = klass
@@ -116,15 +106,11 @@ module HyperTrace
     def instrumentation_off(config)
       if config.instrument_class?
         config.klass.methods.grep(/^__hyper_trace_pre_.+$/).each do |method|
-          config.klass.class_eval do
-            class << self
-              alias_method method.gsub(/^__hyper_trace_pre_/, ''), method
-            end
-          end
+          config.klass.singleton_class.alias_method method.gsub(/^__hyper_trace_pre_/, ''), method
         end
       else
         config.klass.instance_methods.grep(/^__hyper_trace_pre_.+$/).each do |method|
-          config.klass.class_eval { alias_method method.gsub(/^__hyper_trace_pre_/, ''), method }
+          config.klass.alias_method method.gsub(/^__hyper_trace_pre_/, ''), method
         end
       end
     end
@@ -145,17 +131,12 @@ module HyperTrace
 
     def instrument_method(method, config)
       if config.instrument_class?
-        config.klass.class_eval do
-          class << self
-            alias_method "__hyper_trace_pre_#{method}", method unless method_defined? "__pre_hyper_trace_#{method}"
-          end
+        unless config.klass.singleton_class.method_defined? "__pre_hyper_trace_#{method}"  # is this right?
+          config.klass.singleton_class.alias_method "__hyper_trace_pre_#{method}", method
         end
-        add_hyper_trace_method(method, config)
       else
         unless config.klass.method_defined? "__pre_hyper_trace_#{method}"
-          config.klass.class_eval do
-            alias_method "__hyper_trace_pre_#{method}", method
-          end
+          config.klass.alias_method "__hyper_trace_pre_#{method}", method
         end
       end
       add_hyper_trace_method(method, config)
@@ -194,28 +175,77 @@ module HyperTrace
       end
     end
 
+    def required(arity, actual_length)
+      if arity.negative?
+        req_count = - arity - 1
+        raise ArgumentError, "missing required arguments: #{actual_length} for #{req_count}" if req_count > actual_length
+      else
+        req_count = arity
+        raise ArgumentError, "incorrect number of arguments, expected #{req_count} got #{actual_length}" if req_count != actual_length
+      end
+      req_count
+    end
+
+    # [["req", "x"], ["opt", "y"], ["rest"], ["keyreq", "z"], ["key", "opt"], ["block", "flop"]]
+
+    def map_parameters(instance, name, actual, format = true)
+      method = instance.method("__hyper_trace_pre_#{name}")
+      map_with_specs(method, actual.dup, format) || map_without_specs(actual, format)
+    end
+
+    def key?(actual, key)
+      actual&.last&.respond_to?(:key?) && actual.last.key?(key)
+    end
+
+    def map_with_specs(method, actual, show_blank_rest)
+      specs = method.parameters
+      req_count = required(method.arity, actual.length)
+      args = {}
+
+      specs.each do |type, key|
+        case type
+        when :req
+          args[key] = actual.shift
+          req_count -= 1
+        when :opt
+          args[key] = actual.shift if actual.length > req_count
+        when (key || show_blank_rest) && :rest
+          args[key || '*'] = [*actual[0..-req_count - 1]]
+        when :keyreq
+          raise ArgumentError, "missing keyword argument: #{key}" unless key?(actual, key)
+
+          args[key] = actual.last[key]
+        when key?(actual, key) && :key
+          args[key] = actual.last[key]
+        end
+      end
+      args
+    rescue ArgumentError, Interrupt, SignalException => e
+      raise e
+    rescue Exception => e
+      nil
+    end
+
+    def map_without_specs(actual, format)
+      args = {}
+      prefix = 'p' unless format
+      actual.each_with_index { |value, i| args["#{prefix}#{i + 1}"] = value }
+      args
+    end
+
     def format_head(instance, name, args, &block)
       @formatting = true
-      method = instance.method("__hyper_trace_pre_#{name}")
       if args.any?
         group(" #{name}(...)#{instance_tag(instance)}") do
-          params = method.parameters
-          group("args:", collapsed: true) do
-            params.each_with_index do |param_spec, i|
-              arg_name = param_spec[1]
-              if arg_name == '$a_rest'
-                arg_name = '*'
-                arg = args[i..-1]
-              else
-                arg = args[i]
-              end
-              if safe_i(arg).length > 30 || show_js_object(arg)
-                group "#{arg_name}: #{safe_s(arg)}"[0..29], collapsed: true do
-                  puts safe_i(arg)
-                  log arg if show_js_object(arg)
+          group("args: (#{args.length})", collapsed: true) do
+            map_parameters(instance, name, args).each do |arg, value|
+              if safe_i(value).length > 30 || show_js_object(value)
+                group "#{arg}: #{safe_s(value)}"[0..29], collapsed: true do
+                  puts safe_i(value)
+                  log value if show_js_object(value)
                 end
               else
-                group "#{arg_name}: #{safe_i(arg)}"
+                group "#{arg}: #{safe_i(value)}"
               end
             end
           end
@@ -286,7 +316,10 @@ module HyperTrace
       @formatting = true
       if safe_i(result).length > 40
         group "raised: #{safe_s(result)}"[0..40], collapsed: true do
-          puts safe_i(result)
+          puts result.backtrace[0]
+          result.backtrace[1..-1].each do |line|
+            log line
+          end
         end
       else
         group "raised: #{safe_i(result)}"
@@ -305,24 +338,23 @@ module HyperTrace
 
     def breakpoint(location, config, name, args, instance, result = nil)
       if should_break? location, config, name, args, instance, result
-        method = instance.method("__hyper_trace_pre_#{name}")
+        params = map_parameters(instance, name, args, false)
         fn_def = ['RESULT']
-        fn_def += method.parameters.collect { |p| p[1] }
+        fn_def += params.keys
         fn_def += ["//break on #{location} of #{name}\nvar self = this;\ndebugger;\n;"]
         puts "break on #{location} of #{name}"
         fn = `Function.apply(#{self}, #{fn_def}).bind(#{instance})`
-        fn.call(result, *args)
+        fn.call(result, *params.values)
       end
     end
 
-    def call_original(instance, method, *args, &block)
+    def call_original(instance, method, args, &block)
       @formatting = false
       instance.send "__hyper_trace_pre_#{method}", *args, &block
     ensure
       @formatting = true
     end
 
-
     def add_hyper_trace_method(method, config)
       def_method = config.instrument_class? ? :define_singleton_method : :define_method
       config.klass.send(def_method, method) do |*args, &block|
@@ -330,7 +362,7 @@ module HyperTrace
         if HyperTrace.formatting?
           begin
             send "__hyper_trace_pre_#{method}", *args, &block
-          rescue Exception
+          rescue StandardError
             "???"
           end
         else
@@ -338,11 +370,13 @@ module HyperTrace
             HyperTrace.format_head(self, method, args) do
               HyperTrace.format_instance_internal(self)
               HyperTrace.breakpoint(:enter, config, method, args, self)
-              result = HyperTrace.call_original self, method, *args, &block
+              result = HyperTrace.call_original self, method, args, &block
               HyperTrace.format_result(result)
               HyperTrace.breakpoint(:exit, config, method, args, self, result)
               result
             end
+          rescue Interrupt, SignalException => e
+            raise e
           rescue Exception => e
             HyperTrace.format_exception(e)
             debugger unless HyperTrace.exclusions[self.class][:rescue].include? :method

data/lib/hyper_trace/version.rb

@@ -1,3 +1,3 @@
 module HyperTrace
-  VERSION = '1.0.alpha1.2'
+  VERSION = '1.0.alpha1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyper-trace
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.2
+  version: 1.0.alpha1.7
 platform: ruby
 authors:
 - catmando
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperstack-config
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.2
+        version: 1.0.alpha1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.2
+        version: 1.0.alpha1.7
+- !ruby/object:Gem::Dependency
+  name: hyper-spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.alpha1.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.alpha1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: 
 email:
 - mitch@catprint.com
@@ -77,7 +91,6 @@ files:
 - CODE_OF_CONDUCT.md
 - DOCS.md
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - hyper-trace.gemspec
 - lib/hyper-trace.rb
@@ -103,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Method tracing and conditional breakpoints for Opal Ruby

data/Gemfile.lock

@@ -1,74 +0,0 @@
-PATH
-  remote: ../hyperstack-config
-  specs:
-    hyperstack-config (0.1)
-      libv8 (~> 6.3.0)
-      listen (~> 3.0)
-      mini_racer (~> 0.1.15)
-      opal (>= 0.11.0, < 0.12.0)
-      opal-browser (~> 0.2.0)
-      uglifier
-      websocket
-
-PATH
-  remote: .
-  specs:
-    hyper-trace (0.1.0)
-      hyperstack-config (= 0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    archive-zip (0.11.0)
-      io-like (~> 0.3.0)
-    ast (2.4.0)
-    chromedriver-helper (2.1.0)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
-    execjs (2.7.0)
-    ffi (1.9.25)
-    hike (1.2.3)
-    io-like (0.3.0)
-    libv8 (6.3.292.48.1-x86_64-darwin-15)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mini_portile2 (2.3.0)
-    mini_racer (0.1.15)
-      libv8 (~> 6.3)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    opal (0.11.3)
-      ast (>= 2.3.0)
-      hike (~> 1.2)
-      parser (= 2.3.3.1)
-      sourcemap (~> 0.1.0)
-    opal-browser (0.2.0)
-      opal
-      paggio
-    paggio (0.2.6)
-    parser (2.3.3.1)
-      ast (~> 2.2)
-    rake (10.5.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    ruby_dep (1.5.0)
-    sourcemap (0.1.1)
-    uglifier (4.1.19)
-      execjs (>= 0.3.0, < 3)
-    websocket (1.2.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.12)
-  chromedriver-helper
-  hyper-trace!
-  hyperstack-config!
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.16.1