haplo 2.5.2-java → 2.5.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f505d46f7f3766ebd5d2504fd378696ff474a7548c92aec99e1e7f9203fb10ff
-  data.tar.gz: ff8150dcb45f36c3063aa2dada681143400a35b4394ced5d3538d17fa216515a
+  metadata.gz: 9a85d1c5d29a836c427c9a6045622e964b626746ca6e6d14b1db57d8488e6a4d
+  data.tar.gz: 50ed9669ca59195140d415eddd50d559815e320d81bcb8b0cfddf87ff3244c87
 SHA512:
-  metadata.gz: 1fd5e45d04bd5b63c3fdd3edeb1f7bec265bdd8b1d17ef33588baa6d58d8bac58e19689f1f448f76d8f977bd2399d0aff592da49f81f785e5c8d97ba3b4f6a8d
-  data.tar.gz: 0aaa4154cea48097385dfd9e93f229284fd62736ccd35f9220e54b8f6eb944c5d27f6535bc508df86fb4fb5b9ed272f9c1bfd0730ca7956d82f7270fe43ace6b
+  metadata.gz: 5763f67233ec3bb7ad05bd016608cc211b6d339db362fb266d37a49486b73389367ab6f8717f3caa9bcb53f8a4714878c1699b4fa6c9c54a915c5955d577c9b0
+  data.tar.gz: '0278435b6a89f641b30fc80619604f7be2d56cb155f8496ef0e3969a645a61c35b1cd04cdec98d31e6d2421943aaf97c3bb16e6fce554924b8adadd9f9c93f45'

data/haplo.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   files = Dir.glob("#{root_dir}/**/*.*").map { |x| x[root_dir.length + 1, x.length]}
 
   s.name        = 'haplo'
-  s.version     = '2.5.2'
-  s.date        = '2021-05-14'
+  s.version     = '2.5.3'
+  s.date        = '2021-07-13'
   s.summary     = "Haplo Plugin Tool"
   s.description = "Development tools for developing Haplo plugins, see https://haplo.org"
   s.licenses    = ["MPL-2.0"]

data/lib/debuggers.rb

@@ -0,0 +1,109 @@
+# Haplo Plugin Tool             http://docs.haplo.org/dev/tool/plugin
+# (c) Haplo Services Ltd 2006 - 2016    http://www.haplo-services.com
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+module PluginTool
+
+  @@profile_output = nil
+
+  def self.request_profile(options)
+    output_file = $stdout
+    close_output_file = false
+    if options.profile_file
+      output_file = File.open(options.profile_file, "a")
+      close_output_file = true
+    end
+
+    formatter = nil
+    case options.profile_format || 'tree'
+    when 'tree'
+      @@profile_output = ProfilerFormatterTree.new(output_file)
+    when 'raw'
+      @@profile_output = ProfilerFormatterRaw.new(output_file)
+    else
+      puts "Unknown profiler format: #{options.profile_format}"
+      exit 1
+    end
+
+    if 'OK' == PluginTool.post("/api/development-plugin-loader/debugger-profile-start", {:min => options.profile})
+      puts "JavaScript profiler started."
+    else
+      puts "Error starting JavaScript profiler."
+      exit 1
+    end
+    at_exit do
+      puts
+      puts "Disabling JavaScript profiler..."
+      PluginTool.post("/api/development-plugin-loader/debugger-profile-stop")
+      puts "JavaScript profiler disabled."
+      output_file.close if close_output_file
+    end
+  end
+
+  class ProfilerFormatter
+    def initialize(output_file)
+      @output_file = output_file
+    end
+    def format(report)
+      _format(report, @output_file)
+      @output_file.flush
+    end
+  end
+
+  class ProfilerFormatterRaw < ProfilerFormatter
+    def _format(report, output_file)
+      output_file.write(report)
+    end
+  end
+
+  class ProfilerFormatterTree < ProfilerFormatter
+    def _format(report, output_file)
+      report.split("\n").each do |line|
+        depth, time, percent, count, position = line.split("\t")
+        if depth == 'REPORT'
+          output_file.write("PROFILE -- #{Time.new(time)}\n")
+        elsif depth == 'OMIT'
+          output_file.write(("  "*time.to_i)+"... children omitted\n")
+        else
+          output_file.write(("  "*depth.to_i)+"#{percent} #{count} #{time.to_i / 1000000} #{position}\n")
+        end
+      end
+    end
+  end
+
+  def self.profiler_handle_report(report)
+    if @@profile_output
+      @@profile_output.format(report)
+    end
+  end
+
+  # -------------------------------------------------------------------------
+
+  def self.request_coverage(options)
+
+    format = options.coverage_format || 'raw'
+    if format != 'raw'
+      puts "Unknown coverage format: #{format}"
+      exit 1
+    end
+
+    if 'OK' == PluginTool.post("/api/development-plugin-loader/debugger-coverage-start")
+      puts "Coverage capture started."
+    else
+      puts "Error starting coverage capture."
+      exit 1
+    end
+
+    at_exit do
+      coverage = PluginTool.post("/api/development-plugin-loader/debugger-coverage-stop")
+      # TODO: Check errors
+      File.open(options.coverage_file, "w") { |f| f.write coverage }
+    end
+
+  end
+
+end
+

data/lib/notifications.rb

@@ -69,6 +69,9 @@ module PluginTool
     when 'log '
       # Output from console.log()
       puts "LOG:#{data}"
+    when 'prof'
+      # Profiler report
+      PluginTool.profiler_handle_report(data)
     when 'audt'
       decoded = JSON.parse(data)
       kind = decoded.find { |name,value| name == 'auditEntryType' }.last

data/lib/plugin_tool.rb

@@ -23,7 +23,7 @@ NO_DEPENDENCY_COMMANDS.delete('list')
 PLUGIN_SEARCH_PATH = ['.']
 
 # Options for passing to plugin objects
-options = Struct.new(:output, :minimiser, :no_dependency, :with_dependency, :exclude_with_prefix, :no_console, :show_system_audit, :args, :force, :turbo, :server_substring, :restrict_to_app_id).new
+options = Struct.new(:output, :minimiser, :no_dependency, :with_dependency, :exclude_with_prefix, :no_console, :show_system_audit, :args, :force, :turbo, :profile, :profile_file, :profile_format, :coverage_file, :coverage_format, :server_substring, :restrict_to_app_id).new
 
 # Parse arguments
 show_help = false
@@ -37,6 +37,11 @@ opts = GetoptLong.new(
   ['--server', '-s', GetoptLong::REQUIRED_ARGUMENT],
   ['--force', GetoptLong::NO_ARGUMENT],
   ['--turbo', GetoptLong::NO_ARGUMENT],
+  ['--profile', GetoptLong::REQUIRED_ARGUMENT],
+  ['--profile-file', GetoptLong::REQUIRED_ARGUMENT],
+  ['--profile-format', GetoptLong::REQUIRED_ARGUMENT],
+  ['--coverage-file', GetoptLong::REQUIRED_ARGUMENT],
+  ['--coverage-format', GetoptLong::REQUIRED_ARGUMENT],
   ['--output', GetoptLong::REQUIRED_ARGUMENT],
   ['--pack-restrict-to-app-id', GetoptLong::REQUIRED_ARGUMENT],
   ['--no-console', '-n', GetoptLong::NO_ARGUMENT],
@@ -72,6 +77,16 @@ opts.each do |opt, argument|
     options.force = true
   when '--turbo'
     options.turbo = true
+  when '--profile'
+    options.profile = argument.to_f
+  when '--profile-file'
+    options.profile_file = argument
+  when '--profile-format'
+    options.profile_format = argument
+  when '--coverage-file'
+    options.coverage_file = argument
+  when '--coverage-format'
+    options.coverage_format = argument
   end
 end
 # Handle rest of command line -- first arg is the command, the rest are passed on
@@ -325,6 +340,13 @@ end
 unless LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND]
   PluginTool.custom_behaviour.server_ready(plugins, PLUGIN_TOOL_COMMAND, options)
   plugins.each { |p| p.setup_for_server }
+
+  if options.profile
+    PluginTool.request_profile(options)
+  end
+  if options.coverage_file
+    PluginTool.request_coverage(options)
+  end
 end
 
 # Run the command

data/lib/run.rb

@@ -65,6 +65,7 @@ require "#{PLUGIN_TOOL_ROOT_DIR}/lib/syntax_checking.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/notifications.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/plugin.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/new_plugin.rb"
+require "#{PLUGIN_TOOL_ROOT_DIR}/lib/debuggers.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/misc.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/watchers.rb"
 require "#{PLUGIN_TOOL_ROOT_DIR}/lib/minimise.rb"

data/lib/version.txt

@@ -1 +1 @@
-8864920
+a60e0f9

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haplo
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: java
 authors:
 - Haplo Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies: []
 description: Development tools for developing Haplo plugins, see https://haplo.org
 email: client.services@haplo-services.com
@@ -24,6 +24,7 @@ files:
 - lib/auth.rb
 - lib/check.rb
 - lib/custom.rb
+- lib/debuggers.rb
 - lib/haplo-templates.jar
 - lib/hmac.rb
 - lib/hsvt_parser_config.rb
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 2.7.9
 signing_key:
 specification_version: 4
 summary: Haplo Plugin Tool