tracetool 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b271eb9816bfe2c8c9cf44af633851dfd06497
-  data.tar.gz: f1c65ec08ac3aeedc355ec8160d8507cf1e1b73e
+  metadata.gz: 28053aff3e16e9baee1198e08bdbeffdefeef2f0
+  data.tar.gz: 894ac01ee7333ee6b02dc5fb422114f6269a0a72
 SHA512:
-  metadata.gz: a2008ddb93477871d23e215cd4b7771e15b51942782f3e0a05b292d73e2c3e8b169f95fb4d2b3ce4a1c3c8bf7f007aeda8d68cf529a171999cb21ad9fdb187a2
-  data.tar.gz: 4509d9dd674ef506f88930e178a851da1af1167fe2985d490ecf0a5c3c083bc64d1c3b3f9699753b9492054875dda78a073b1600adc1040790aac82ff353b0ed
+  metadata.gz: 3fa1e1578d5c6802e508cea8b7c1af90ff2ef4f83f3574b7cf0b218afbcc48c47783706bec06273a1a6887470ebddd0ccbd15fb0448d921296033ce174b064d1
+  data.tar.gz: 338ed267bce0c0d91ecdb47cdfe6d1f8eeed36179717bc16a6c5362c84fb15d5f3099906e35ad0eaa90af7368c7e8fd2bd1c5bcb1d66b69bcb00265c4330874d

data/bin/tracetool

@@ -1,2 +1,2 @@
 #!/usr/bin/env ruby
-require_relative '../lib/tracetool'
+require_relative '../lib/tracetool_cli'

data/lib/tracetool.rb

@@ -1,29 +1,7 @@
 require 'ostruct'
 require 'powerpack/string'
 
-require_relative 'version'
-
 require_relative 'tracetool/android'
 require_relative 'tracetool/ios'
-require_relative 'tracetool/utils/cli'
 require_relative 'tracetool/utils/env'
 require_relative 'tracetool/utils/pipe'
-
-opts = Tracetool::ParseArgs.parse(ARGV)
-
-case opts.platform
-when :android
-  stack = ARGF.read
-  puts Tracetool::Android.scan(stack,
-                               symbols: opts.sym_dir,
-                               arch: opts.arch.to_s)
-when :ios
-  stack = ARGF.read
-  puts Tracetool::IOS.scan(stack,
-                           arch: opts.arch.to_s,
-                           xarchive: opts.sym_dir,
-                           module_name: opts.modulename,
-                           load_address: opts.address)
-else
-  raise "Unknown(#{opts.platform})"
-end

data/lib/tracetool/android.rb

@@ -13,17 +13,26 @@ module Tracetool
       # Launches process of trace desymbolication
       # @param [String] trace trace body
       def process(trace, context)
-        # Find scanner which maches trace format
-        scanner = SCANNERS.map { |s| s[trace] }.compact.first
-        raise(ArgumentError, "#{trace}\n not android trace?") unless scanner
-        scanner.process(context)
+        # Find scanner which matches trace format
+        @scanner = SCANNERS.map { |s| s[trace] }.compact.first
+        raise(ArgumentError, "#{trace}\n not android trace?") unless @scanner
+        @scanner.process(context)
+      end
+
+      # Creates parser for last unpacked trace
+      # @param [Array] files list of source files used in build
+      # @return [Tracetool::BaseTraceParser] parser that matches trace format.
+      #   Or `nil`. If there was no scanning.
+      def parser(files)
+        return unless @scanner
+        @scanner.parser(files)
       end
     end
 
     class << self
       # Desymbolicate android stack trace
       def scan(string, opts = {})
-        AndroidTraceScanner.new .process(string, OpenStruct.new(opts))
+        AndroidTraceScanner.new.process(string, OpenStruct.new(opts))
       end
     end
   end

data/lib/tracetool/android/java.rb

@@ -26,6 +26,14 @@ module Tracetool
         @trace
       end
 
+      # Create parser for current trace format
+      # @param [Array] files list of files used in build. This files are
+      #   used to match file entries from stack trace to real files
+      # @return [Tracetool::BaseTraceParser] parser that matches trace format
+      def parser(files)
+        JavaTraceParser.new(files)
+      end
+
       class << self
         def match(string)
           # Split into lines

data/lib/tracetool/android/native.rb

@@ -105,16 +105,17 @@ module Tracetool
         Pipe['ndk-stack', '-sym', symbols] << @trace
       end
 
+      # Create parser for current trace format
+      # @param [Array] files list of files used in build. This files are
+      #   used to match file entries from stack trace to real files
+      # @return [Tracetool::BaseTraceParser] parser that matches trace format
+      def parser(files)
+        NativeTraceParser.new(files)
+      end
+
       class << self
         # Add methods for trace normalization
         include Tracetool::Android::NativeTraceEnhancer
-        # Tells if provided string is a ndk trace
-        # @return truthy or falsey value
-        def match(string)
-          return false if string.empty?
-          packed?(string) || with_header?(string) || without_header?(string)
-        end
-
         def packed?(string)
           RX_PACKED_FORMAT.match(string)
         end

data/lib/tracetool/ios/scanner.rb

@@ -60,6 +60,14 @@ module Tracetool
         Pipe['atos', *AtosContext.new(context).to_args] << trace
       end
 
+      # Create parser for current trace format
+      # @param [Array] files list of files used in build. This files are
+      #   used to match file entries from stack trace to real files
+      # @return [Tracetool::BaseTraceParser] parser that matches trace format
+      def parser(files)
+        IOSTraceParser.new(files)
+      end
+
       private
 
       def mix(trace, symbolicated)

data/lib/tracetool/utils/cli.rb

@@ -1,7 +1,8 @@
 require 'optparse'
-require 'optparse/time'
 require 'ostruct'
 
+require_relative '../../version'
+
 module Tracetool
   # Tracetool cli args parser
   class ParseArgs
@@ -10,24 +11,25 @@ module Tracetool
     #
     # Return a structure describing the options.
     #
-    def self.parse(args)
+    def self.parse(args, io = $stdout)
       # The options specified on the command line will be collected in *options*.
       # We set default values here.
-      opt_parser = ParseArgs.new(OpenStruct.new(sym_dir: Dir.pwd))
+      opt_parser = ParseArgs.new(OpenStruct.new(sym_dir: Dir.pwd), io)
       options = opt_parser.parse(args)
       check(options)
       check_ios(options)
       options
     rescue OptionParser::MissingArgument => x
-      puts ["Error occurred: #{x.message}", '', opt_parser.help].join("\n")
-      exit 2
+      io.write ["Error occurred: #{x.message}", '', opt_parser.help].join("\n")
+      io.write "\n"
+      raise(x)
     end
 
     def self.check_ios(options)
       return unless options.platform == :ios
       {
         'address' => options.address,
-        'modulename' =>  options.modulename
+        'module' =>  options.modulename
       }.each { |arg, check| raise(OptionParser::MissingArgument, arg) unless check }
     end
 
@@ -38,17 +40,10 @@ module Tracetool
       }.each { |arg, check| raise(OptionParser::MissingArgument, arg) unless check }
     end
 
-    def initialize(defaults)
+    def initialize(defaults, io)
+      @io = io
       @options = defaults
-      @opt_parser = OptionParser.new do |opts|
-        opt_banner(opts)
-        opts.separator ''
-        opt_common(opts)
-        opts.separator ''
-        opt_ios(opts)
-        opts.separator ''
-        opt_default(opts)
-      end
+      @opt_parser = gen_opt_parser
     end
 
     def parse(args)
@@ -60,6 +55,20 @@ module Tracetool
       @opt_parser.help
     end
 
+    private
+
+    def gen_opt_parser
+      OptionParser.new do |opts|
+        opt_banner(opts)
+        opts.separator ''
+        opt_common(opts)
+        opts.separator ''
+        opt_ios(opts)
+        opts.separator ''
+        opt_default(opts)
+      end
+    end
+
     def opt_banner(opts)
       opts.banner = 'Usage: tracetool OPTION... [FILE]...'
       opts.separator ''
@@ -104,13 +113,14 @@ module Tracetool
       # No argument, shows at tail.  This will print an options summary.
       # Try it and see!
       opts.on_tail('-h', '--help', 'Show this message') do
-        puts opts
+        @io.write opts
+        @io.write "\n"
         exit
       end
 
       # Another typical switch to print the version.
       opts.on_tail('--version', 'Show version') do
-        puts 'tracetool ' + Tracetool::Version.to_s
+        @io.write 'tracetool ' + Tracetool::Version.to_s
         exit
       end
     end

data/lib/tracetool_cli.rb

@@ -0,0 +1,20 @@
+require_relative 'tracetool'
+require_relative 'tracetool/utils/cli'
+
+opts = Tracetool::ParseArgs.parse(ARGV)
+case opts.platform
+when :android
+  stack = ARGF.read
+  puts Tracetool::Android.scan(stack,
+                               symbols: opts.sym_dir,
+                               arch: opts.arch.to_s)
+when :ios
+  stack = ARGF.read
+  puts Tracetool::IOS.scan(stack,
+                           arch: opts.arch.to_s,
+                           xarchive: opts.sym_dir,
+                           module_name: opts.modulename,
+                           load_address: opts.address)
+else
+  raise "Unknown(#{opts.platform})"
+end

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Tracetool
   # Version constant
   module Version
-    VERSION = [0, 3, 0].freeze
+    VERSION = [0, 4, 0].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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ilya.arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: powerpack
@@ -43,6 +43,7 @@ files:
 - lib/tracetool/utils/env.rb
 - lib/tracetool/utils/parser.rb
 - lib/tracetool/utils/pipe.rb
+- lib/tracetool_cli.rb
 - lib/version.rb
 homepage: https://github.com/vizor-games/tracetool
 licenses: