tracetool 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afbd4e779196959227fce1f14d17eb630f614ac8d8381917ce6856d20afe8965
-  data.tar.gz: 83631e87b47888b320a67e4a7b565426f6ed9f00ce577eef769ee4b7809baa29
+  metadata.gz: 7b0baff5d5f633d2474acf70b639fad429dd09b5b4cc4f80333ef55f72c1e5d8
+  data.tar.gz: 2851ab0c1b575429400937ad889b0a06fdce6f9ebaf550b05956b7879166d6f6
 SHA512:
-  metadata.gz: b32f99eff59b5365612ddb8ffe245d915a6b38867b7a933199b227ad6fb456f2a9fa00d25b4c13fb935dc5e167fdac63a4ecb395be9ac44af0740e7bae4026c5
-  data.tar.gz: 4a1e752a9e5f9a0eb3ad3b00c2dc62fe7af0640e1de9ec7a9de817180fb0c976159f3da3ee8d962e99b648a1a55294e925114320871037bfd9d23ed4afd97d43
+  metadata.gz: ba21b749c8875fec7e26c70da2899dfb89ea5c0fcfed2a7fc1233b34ee222d5de43cf630fc13998cf3e95335eee152e75e7fdfea8e998867ccfbd3c581eb3a1b
+  data.tar.gz: 7f0236c1c234fa42c8fc68874cbc63e0271c773078c64cf50a5bea4e1d6951757affb02064360590c5668e559633e85b6a237d6dff7d901edfe23fbf7a522888

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/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,8 +12,27 @@ 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)

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Tracetool
   # Version constant
   module Version
-    VERSION = [0, 5, 1].freeze
+    VERSION = [0, 5, 2].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.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - ilya.arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 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,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Tracetool