tracetool 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebe6ba1b66d5457e530be1544b059cf42da169d948a651766ad57fd3c6dac99e
-  data.tar.gz: 7b1a2cdefc535a9bb851dc212b69eaa34d89720d051936ab7d34442384db150f
+  metadata.gz: 99f263206633ce80bd71c6f8afd593272f91cd7b141b5ae0c2508779068eb13d
+  data.tar.gz: 831e703f383253e1da501115c1a339443ce4a2f06db802f7a2aa2d18de6d8ca3
 SHA512:
-  metadata.gz: d7a9e46d22089eb1b2517edc7664e3bf26ae04e6f82e4b55aaad3e87d9119b293a9d1fdde0a8d072ebadf2ac619487c24ddf099a0184a968e638b90ba34008b3
-  data.tar.gz: 4a187b23b271f395919265da64dc8d328b7a1b4fa4bcaf8383d33ed8e07d6c8c5dd5253e044db2d70a3efa6e6c604271b49439f7f4d01f163a5fab04761b8c9c
+  metadata.gz: a14938e59e1a386382905dec8dd40273c892fa59e1d54afd3bd74a634968bd94dd5af87d3fca7b5429814364e124a13f73f5b0f3bd917d5d5f0a2806194f6017
+  data.tar.gz: a7ae18593b8cf4d1dc918fb7fd5cb07483dfd80c28686925fa4e817e2bbd1076497b732d482f8ce7d42ce28b391d30e65f9dfcf6d8a3f353ce409a8d500dfac0

data/lib/tracetool/android/native.rb

@@ -5,9 +5,10 @@ module Tracetool
     # Android traces scanner and mapper
     class NativeTraceParser < Tracetool::BaseTraceParser
       # Describes android stack entry
+      # rubocop:disable Metrics/LineLength
       STACK_ENTRY_PATTERN =
-        %r{Stack frame #(?<frame>\d+)  (?<address>\w+ [a-f\d]+)  (?<lib>[/\w\d\.=-]+)( )?(:? (?<call_description>.+))?$}
-        .freeze
+        %r{Stack frame #(?<frame>\d+)  (?<address>\w+ [a-f\d]+)  (?<lib>[/\w\d\._!=-]+)( )?(:? (?<call_description>.+))?$}.freeze
+      # rubocop:enable Metrics/LineLength
       # Describes android native method call (class::method and source file with line number)
       CALL_PATTERN = [
         /((Routine )?(?<method>.+) ((in)|(at)) (?<file>.+):(?<line>\d+))/,
@@ -92,7 +93,7 @@ module Tracetool
       # ** symbol offset `/\d+/`
       #
       # Last two entries can be missing.
-      RX_PACKED_FORMAT = /^(<<<([-\d]+ [^ ]+ (.+)?;)+>>>)+$/.freeze
+      RX_PACKED_FORMAT = /^(<<<([-?\d]+ [^ ]+ (.+)?;)+>>>)+$/.freeze
 
       # @param [String] string well formed native android stack trace
       # @see https://developer.android.com/ndk/guides/ndk-stack.html
@@ -104,13 +105,7 @@ module Tracetool
       #   path to symbols dir
       # @return [String] desymbolicated stack trace
       def process(ctx)
-        symbols = File.join(ctx.symbols, 'local')
-        symbols = if ctx.arch
-                    File.join(symbols, ctx.arch)
-                  else
-                    Dir[File.join(symbols, '*')].first || symbols
-                  end
-        Pipe['ndk-stack', '-sym', symbols] << @trace
+        Pipe['ndk-stack', '-sym', ctx.symbols] << @trace
       end
 
       # Create parser for current trace format

data/lib/tracetool/ios.rb

@@ -1,3 +1,4 @@
+require_relative 'ios/atos_context'
 require_relative 'ios/scanner'
 require_relative 'ios/parser'
 

data/lib/tracetool/ios/atos_context.rb

@@ -0,0 +1,35 @@
+module Tracetool
+  module IOS
+    # Converts context to atos arguments
+    class AtosContext
+      # If no arch specified will use `arm64`
+      DEFAULT_ARCH = 'arm64'.freeze
+
+      # List of required argument names
+      REQUIRED_ARGUMENTS = %i[load_address xarchive module_name].freeze
+
+      def initialize(ctx)
+        check_arguments(ctx)
+        @load_address = ctx.load_address
+        @binary_path = module_binary(ctx.xarchive, ctx.module_name)
+        @arch = ctx.arch || 'arm64'
+      end
+
+      def to_args
+        %w[-o -l -arch].zip([@binary_path, @load_address, @arch]).flatten
+      end
+
+      private
+
+      def module_binary(xarchive, module_name)
+        File.join(xarchive, 'dSYMs', "#{module_name}.app.dSYM", 'Contents', 'Resources', 'DWARF', module_name)
+      end
+
+      def check_arguments(ctx)
+        REQUIRED_ARGUMENTS.each do |a|
+          ctx[a] || raise(ArgumentError, "Missing `#{a}` value")
+        end
+      end
+    end
+  end
+end

data/lib/tracetool/ios/parser.rb

@@ -5,7 +5,7 @@ module Tracetool
     # IOS traces scanner and source mapper
     class IOSTraceParser < Tracetool::BaseTraceParser
       # Describes IOS stack entry
-      STACK_ENTRY_PATTERN = /^(?<frame>\d+) (?<binary>[^ ]+) (?<call_description>.+)$/.freeze
+      STACK_ENTRY_PATTERN = /^(?<frame>\d+)\t(?<binary>.+)\t(?<call_description>.+)$/.freeze
       # Describes source block
       SOURCE_PATTERN =
         /^((-?\[(?<class>[^ ]+) (?<method>.+)\])|(?<method>.+)) \(in (?<module>.+)\) \((?<file>.+):(?<line>\d+)\)$/

data/lib/tracetool/ios/scanner.rb

@@ -1,37 +1,5 @@
 module Tracetool
   module IOS
-    # Converts context to atos arguments
-    class AtosContext
-      # If no arch specified will use `arm64`
-      DEFAULT_ARCH = 'arm64'.freeze
-
-      # List of required argument names
-      REQUIRED_ARGUMENTS = %i[load_address xarchive module_name].freeze
-
-      def initialize(ctx)
-        check_arguments(ctx)
-        @load_address = ctx.load_address
-        @binary_path = module_binary(ctx.xarchive, ctx.module_name)
-        @arch = ctx.arch || 'arm64'
-      end
-
-      def to_args
-        %w[-o -l -arch].zip([@binary_path, @load_address, @arch]).flatten
-      end
-
-      private
-
-      def module_binary(xarchive, module_name)
-        File.join(xarchive, 'dSYMs', "#{module_name}.app.dSYM", 'Contents', 'Resources', 'DWARF', module_name)
-      end
-
-      def check_arguments(ctx)
-        REQUIRED_ARGUMENTS.each do |a|
-          ctx[a] || raise(ArgumentError, "Missing `#{a}` value")
-        end
-      end
-    end
-
     # launches atos
     class IOSTraceScanner
       # Stack trace line consists of numerous whitespace separated
@@ -44,10 +12,29 @@ module Tracetool
       # @return [Array] containing (%binary_name%, %address%) pairs
       def parse(trace)
         trace.split("\n").map do |line|
-          line.split(' ')[1..2] # Fetch binary name and address
+          parse_line(line)
         end
       end
 
+      # Parse trace line from trace. Which usualy looks like this:
+      #   3   My Module Name      0x0000000102d6e9f4 My Module Name + 5859828
+      # We need to fetch two values: 'My Module Name' and '0x0000000102d6e9f4'.
+      def parse_line(line)
+        parts = line.split(' ')
+        parts.shift # Frame number, not needed
+
+        module_name = ''
+
+        until parts.first.start_with?('0x')
+          module_name += parts.shift
+          module_name += ' '
+        end
+
+        address = parts.shift
+
+        [module_name.chop, address]
+      end
+
       def process(trace, context)
         trace = parse(trace)
         desym = run_atos(context, trace.map(&:last))
@@ -72,12 +59,7 @@ module Tracetool
       def mix(trace, symbolicated)
         trace.zip(symbolicated).map.with_index do |pair, i|
           t, desym = pair
-          line = []
-          line << i
-          line << t.first
-          line << desym
-
-          line.join(' ')
+          "#{i}\t#{t.first}\t#{desym}"
         end
       end
     end

data/lib/tracetool/utils/cli.rb

@@ -6,8 +6,8 @@ require_relative '../../version'
 module Tracetool
   # Tracetool cli args parser
   class ParseArgs
-    # List of supported abis
-    ARCH_LIST = %i[armeabi-v7a armeabi x86 arm64 x86_64].freeze
+    # List of supported abis. Only needed for iOS unpacking
+    ARCH_LIST = %i[arm arm64].freeze
     #
     # Return a structure describing the options.
     #
@@ -19,10 +19,10 @@ module Tracetool
       check(options)
       check_ios(options)
       options
-    rescue OptionParser::MissingArgument => x
-      io.write ["Error occurred: #{x.message}", '', opt_parser.help].join("\n")
+    rescue OptionParser::MissingArgument => e
+      io.write ["Error occurred: #{e.message}", '', opt_parser.help].join("\n")
       io.write "\n"
-      raise(x)
+      raise(e)
     end
 
     def self.check_ios(options)
@@ -30,14 +30,14 @@ module Tracetool
 
       {
         'address' => options.address,
-        'module' => options.modulename
+        'module' => options.modulename,
+        'arch' => options.arch
       }.each { |arg, check| raise(OptionParser::MissingArgument, arg) unless check }
     end
 
     def self.check(options)
       {
-        'platform' => options.platform,
-        'arch' => options.arch
+        'platform' => options.platform
       }.each { |arg, check| raise(OptionParser::MissingArgument, arg) unless check }
     end
 

data/lib/tracetool/utils/pipe.rb

@@ -1,6 +1,7 @@
 require 'open3'
+
 module Tracetool
-  # helper module for launching commands
+  # Helper module for launching commands
   module Pipe
     # Executes shell command
     class Executor
@@ -14,12 +15,10 @@ module Tracetool
       end
 
       def <<(args)
-        args = args.join("\n") if args.is_a? Array
-        IO.popen(cmd, 'r+') do |io|
-          io.write(args)
-          io.close_write
-          io.read.chomp
-        end
+        out, err, status = Open3.capture3({}, *cmd, stdin_data: args)
+        raise "#{cmd.join(' ')} (exit: #{status.exitstatus}) #{err.chomp}" unless status.success?
+
+        out.chomp
       end
     end
 

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Tracetool
   # Version constant
   module Version
-    VERSION = [0, 4, 1].freeze
+    VERSION = [0, 5, 3].freeze
 
     class << self
       # @return [String] version string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracetool
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - ilya.arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: powerpack
@@ -37,6 +37,7 @@ files:
 - lib/tracetool/android/java.rb
 - lib/tracetool/android/native.rb
 - lib/tracetool/ios.rb
+- lib/tracetool/ios/atos_context.rb
 - lib/tracetool/ios/parser.rb
 - lib/tracetool/ios/scanner.rb
 - lib/tracetool/utils/cli.rb
@@ -65,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Tracetool