app-info 2.8.2 → 3.0.0

data/lib/app_info/protobuf/models/Resources.proto

@@ -132,6 +132,11 @@ message Visibility {
 
   // The comment associated with the <public> tag.
   string comment = 3;
+
+  // Indicates that the resource id may change across builds and that the public R.java identifier
+  // for this resource should not be final. This is set to `true` for resources in `staging-group`
+  // tags.
+  bool staged_api = 4;
 }
 
 // Whether a resource comes from a compile-time overlay and is explicitly allowed to not overlay an
@@ -185,6 +190,12 @@ message OverlayableItem {
   uint32 overlayable_idx = 4;
 }
 
+// The staged resource ID definition of a finalized resource.
+message StagedId {
+  Source source = 1;
+  uint32 staged_id = 2;
+}
+
 // An entry ID in the range [0x0000, 0xffff].
 message EntryId {
   uint32 id = 1;
@@ -217,6 +228,9 @@ message Entry {
   // The set of values defined for this entry, each corresponding to a different
   // configuration/variant.
   repeated ConfigValue config_value = 6;
+
+  // The staged resource ID of this finalized resource.
+  StagedId staged_id = 7;
 }
 
 // A Configuration/Value pair.
@@ -268,6 +282,7 @@ message CompoundValue {
     Styleable styleable = 3;
     Array array = 4;
     Plural plural = 5;
+    MacroBody macro = 6;
   }
 }
 
@@ -299,6 +314,13 @@ message Reference {
 
   // Whether this reference is dynamic.
   Boolean is_dynamic = 5;
+
+  // The type flags used when compiling the reference. Used for substituting the contents of macros.
+  uint32 type_flags = 6;
+
+  // Whether raw string values would have been accepted in place of this reference definition. Used
+  // for substituting the contents of macros.
+  bool allow_raw = 7;
 }
 
 // A value that represents an ID. This is just a placeholder, as ID values are used to occupy a
@@ -586,3 +608,32 @@ message XmlAttribute {
   // The optional interpreted/compiled version of the `value` string.
   Item compiled_item = 6;
 }
+
+message MacroBody {
+  string raw_string = 1;
+  StyleString style_string = 2;
+  repeated UntranslatableSection untranslatable_sections = 3;
+  repeated NamespaceAlias namespace_stack = 4;
+  SourcePosition source = 5;
+}
+
+message NamespaceAlias {
+  string prefix = 1;
+  string package_name = 2;
+  bool is_private = 3;
+}
+
+message StyleString {
+  message Span {
+    string name = 1;
+    uint32 start_index = 2;
+    uint32 end_index = 3;
+  }
+  string str = 1;
+  repeated Span spans = 2;
+}
+
+message UntranslatableSection {
+  uint64 start_index = 1;
+  uint64 end_index = 2;
+}

data/lib/app_info/protobuf/models/Resources_pb.rb

@@ -47,6 +47,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :level, :enum, 1, "aapt.pb.Visibility.Level"
       optional :source, :message, 2, "aapt.pb.Source"
       optional :comment, :string, 3
+      optional :staged_api, :bool, 4
     end
     add_enum "aapt.pb.Visibility.Level" do
       value :UNKNOWN, 0
@@ -80,6 +81,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :ACTOR, 8
       value :CONFIG_SIGNATURE, 9
     end
+    add_message "aapt.pb.StagedId" do
+      optional :source, :message, 1, "aapt.pb.Source"
+      optional :staged_id, :uint32, 2
+    end
     add_message "aapt.pb.EntryId" do
       optional :id, :uint32, 1
     end
@@ -90,6 +95,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :allow_new, :message, 4, "aapt.pb.AllowNew"
       optional :overlayable_item, :message, 5, "aapt.pb.OverlayableItem"
       repeated :config_value, :message, 6, "aapt.pb.ConfigValue"
+      optional :staged_id, :message, 7, "aapt.pb.StagedId"
     end
     add_message "aapt.pb.ConfigValue" do
       optional :config, :message, 1, "aapt.pb.Configuration"
@@ -122,6 +128,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
         optional :styleable, :message, 3, "aapt.pb.Styleable"
         optional :array, :message, 4, "aapt.pb.Array"
         optional :plural, :message, 5, "aapt.pb.Plural"
+        optional :macro, :message, 6, "aapt.pb.MacroBody"
       end
     end
     add_message "aapt.pb.Boolean" do
@@ -133,6 +140,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :name, :string, 3
       optional :private, :bool, 4
       optional :is_dynamic, :message, 5, "aapt.pb.Boolean"
+      optional :type_flags, :uint32, 6
+      optional :allow_raw, :bool, 7
     end
     add_enum "aapt.pb.Reference.Type" do
       value :REFERENCE, 0
@@ -285,10 +294,37 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :resource_id, :uint32, 5
       optional :compiled_item, :message, 6, "aapt.pb.Item"
     end
+    add_message "aapt.pb.MacroBody" do
+      optional :raw_string, :string, 1
+      optional :style_string, :message, 2, "aapt.pb.StyleString"
+      repeated :untranslatable_sections, :message, 3, "aapt.pb.UntranslatableSection"
+      repeated :namespace_stack, :message, 4, "aapt.pb.NamespaceAlias"
+      optional :source, :message, 5, "aapt.pb.SourcePosition"
+    end
+    add_message "aapt.pb.NamespaceAlias" do
+      optional :prefix, :string, 1
+      optional :package_name, :string, 2
+      optional :is_private, :bool, 3
+    end
+    add_message "aapt.pb.StyleString" do
+      optional :str, :string, 1
+      repeated :spans, :message, 2, "aapt.pb.StyleString.Span"
+    end
+    add_message "aapt.pb.StyleString.Span" do
+      optional :name, :string, 1
+      optional :start_index, :uint32, 2
+      optional :end_index, :uint32, 3
+    end
+    add_message "aapt.pb.UntranslatableSection" do
+      optional :start_index, :uint64, 1
+      optional :end_index, :uint64, 2
+    end
   end
 end
 
+# @!visibility private
 module Aapt
+
   module Pb
     StringPool = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.StringPool").msgclass
     SourcePosition = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.SourcePosition").msgclass
@@ -305,6 +341,7 @@ module Aapt
     Overlayable = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.Overlayable").msgclass
     OverlayableItem = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.OverlayableItem").msgclass
     OverlayableItem::Policy = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.OverlayableItem.Policy").enummodule
+    StagedId = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.StagedId").msgclass
     EntryId = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.EntryId").msgclass
     Entry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.Entry").msgclass
     ConfigValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.ConfigValue").msgclass
@@ -340,5 +377,10 @@ module Aapt
     XmlElement = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.XmlElement").msgclass
     XmlNamespace = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.XmlNamespace").msgclass
     XmlAttribute = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.XmlAttribute").msgclass
+    MacroBody = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.MacroBody").msgclass
+    NamespaceAlias = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.NamespaceAlias").msgclass
+    StyleString = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.StyleString").msgclass
+    StyleString::Span = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.StyleString.Span").msgclass
+    UntranslatableSection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("aapt.pb.UntranslatableSection").msgclass
   end
 end

data/lib/app_info/protobuf/resources.rb

@@ -12,7 +12,7 @@ module AppInfo
         new(doc)
       end
 
-      include Helper::ReferenceParser
+      include Helper::Protobuf
 
       attr_reader :packages, :tool_fingerprint
 
@@ -53,7 +53,7 @@ module AppInfo
       end
 
       class Package
-        include Helper::Defines
+        include Helper::GenerateClass
 
         attr_reader :name, :types
 
@@ -113,14 +113,14 @@ module AppInfo
       end
 
       class Entry
+        include Helper::GenerateClass
+
         def self.parse_from(type, package)
           type.entry.each_with_object([]) do |entry, obj|
             obj << Entry.new(entry, package)
           end
         end
 
-        include Helper::Defines
-
         attr_reader :name, :values
 
         def initialize(doc, package)
@@ -155,7 +155,7 @@ module AppInfo
       end
 
       class Value
-        include Helper::ReferenceParser
+        include Helper::Protobuf
         extend Forwardable
 
         attr_reader :locale, :config, :original_value, :value, :type

data/lib/app_info/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppInfo
-  VERSION = '2.8.2'
+  VERSION = '3.0.0'
 end

data/lib/app_info.rb

@@ -1,24 +1,30 @@
 # frozen_string_literal: true
 
 require 'app_info/version'
-require 'app_info/error'
 require 'app_info/core_ext'
+require 'app_info/const'
+require 'app_info/certificate'
 require 'app_info/helper'
+require 'app_info/error'
 
+require 'app_info/file'
 require 'app_info/info_plist'
 require 'app_info/mobile_provision'
 
+require 'app_info/apple'
+require 'app_info/macos'
 require 'app_info/ipa'
 require 'app_info/ipa/plugin'
 require 'app_info/ipa/framework'
 
+require 'app_info/android'
 require 'app_info/apk'
 require 'app_info/aab'
 
 require 'app_info/proguard'
 require 'app_info/dsym'
 
-require 'app_info/macos'
+require 'app_info/pe'
 
 # fix invaild date format warnings
 Zip.warn_invalid_date = false
@@ -28,36 +34,56 @@ module AppInfo
   class << self
     # Get a new parser for automatic
     def parse(file)
-      raise NotFoundError, file unless File.exist?(file)
-
-      case file_type(file)
-      when :ipa then IPA.new(file)
-      when :apk then APK.new(file)
-      when :aab then AAB.new(file)
-      when :mobileprovision then MobileProvision.new(file)
-      when :dsym then DSYM.new(file)
-      when :proguard then Proguard.new(file)
-      when :macos then Macos.new(file)
-      else
-        raise UnkownFileTypeError, "Do not detect file type: #{file}"
-      end
+      raise NotFoundError, file unless ::File.exist?(file)
+
+      parser = case file_type(file)
+               when Format::IPA then IPA.new(file)
+               when Format::APK then APK.new(file)
+               when Format::AAB then AAB.new(file)
+               when Format::MOBILEPROVISION then MobileProvision.new(file)
+               when Format::DSYM then DSYM.new(file)
+               when Format::PROGUARD then Proguard.new(file)
+               when Format::MACOS then Macos.new(file)
+               when Format::PE then PE.new(file)
+               else
+                 raise UnknownFormatError, "Do not detect file format: #{file}"
+               end
+
+      return parser unless block_given?
+
+      # call block and clear!
+      yield parser
+      parser.clear!
     end
     alias dump parse
 
+    def parse?(file)
+      file_type(file) != Format::UNKNOWN
+    end
+
     # Detect file type by read file header
     #
     # TODO: This can be better solution, if anyone knows, tell me please.
     def file_type(file)
-      header_hex = File.read(file, 100)
-      type = if header_hex =~ /^\x50\x4b\x03\x04/
-               detect_zip_file(file)
-             else
-               detect_mobileprovision(header_hex)
-             end
-
-      type || :unkown
+      header_hex = ::File.read(file, 100)
+      case header_hex
+      when ZIP_RETGEX
+        detect_zip_file(file)
+      when PE_REGEX
+        Format::PE
+      when PLIST_REGEX, BPLIST_REGEX
+        Format::MOBILEPROVISION
+      else
+        Format::UNKNOWN
+      end
+    end
+
+    def logger
+      @logger ||= Logger.new($stdout, level: :warn)
     end
 
+    attr_writer :logger
+
     private
 
     # :nodoc:
@@ -65,35 +91,59 @@ module AppInfo
       Zip.warn_invalid_date = false
       zip_file = Zip::File.open(file)
 
-      return :proguard unless zip_file.glob('*mapping*.txt').empty?
-      return :apk if !zip_file.find_entry('AndroidManifest.xml').nil? &&
-                     !zip_file.find_entry('classes.dex').nil?
+      return Format::PROGUARD if proguard_clues?(zip_file)
+      return Format::APK if apk_clues?(zip_file)
+      return Format::AAB if aab_clues?(zip_file)
+      return Format::MACOS if macos_clues?(zip_file)
+      return Format::PE if pe_clues?(zip_file)
+      return Format::UNKNOWN unless clue = other_clues?(zip_file)
 
-      return :aab if !zip_file.find_entry('base/manifest/AndroidManifest.xml').nil? &&
-                     !zip_file.find_entry('BundleConfig.pb').nil?
+      clue
+    ensure
+      zip_file.close
+    end
 
-      return :macos if !zip_file.glob('*/Contents/MacOS/*').empty? &&
-                       !zip_file.glob('*/Contents/Info.plist').empty?
+    # :nodoc:
+    def proguard_clues?(zip_file)
+      !zip_file.glob('*mapping*.txt').empty?
+    end
 
-      zip_file.each do |f|
-        path = f.name
+    # :nodoc:
+    def apk_clues?(zip_file)
+      !zip_file.find_entry('AndroidManifest.xml').nil? &&
+        !zip_file.find_entry('classes.dex').nil?
+    end
 
-        return :ipa if path.include?('Payload/') && path.end_with?('Info.plist')
-        return :dsym if path.include?('Contents/Resources/DWARF/')
-      end
-    ensure
-      zip_file.close
+    # :nodoc:
+    def aab_clues?(zip_file)
+      !zip_file.find_entry('base/manifest/AndroidManifest.xml').nil? &&
+        !zip_file.find_entry('BundleConfig.pb').nil?
+    end
+
+    # :nodoc:
+    def macos_clues?(zip_file)
+      !zip_file.glob('*/Contents/MacOS/*').empty? &&
+        !zip_file.glob('*/Contents/Info.plist').empty?
     end
 
-    PLIST_REGEX = /\x3C\x3F\x78\x6D\x6C/.freeze
-    BPLIST_REGEX = /^\x62\x70\x6C\x69\x73\x74/.freeze
+    # :nodoc:
+    def pe_clues?(zip_file)
+      !zip_file.glob('*.exe').empty?
+    end
 
     # :nodoc:
-    def detect_mobileprovision(hex)
-      case hex
-      when PLIST_REGEX, BPLIST_REGEX
-        :mobileprovision
+    def other_clues?(zip_file)
+      zip_file.each do |f|
+        path = f.name
+
+        return Format::IPA if path.include?('Payload/') && path.end_with?('Info.plist')
+        return Format::DSYM if path.include?('Contents/Resources/DWARF/')
       end
     end
   end
+
+  ZIP_RETGEX = /^\x50\x4b\x03\x04/.freeze
+  PE_REGEX = /^MZ/.freeze
+  PLIST_REGEX = /\x3C\x3F\x78\x6D\x6C/.freeze
+  BPLIST_REGEX = /^\x62\x70\x6C\x69\x73\x74/.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-info
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 3.0.0
 platform: ruby
 authors:
 - icyleaf
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -39,7 +39,7 @@ dependencies:
         version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: ruby-macho
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -139,75 +139,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: google-protobuf
+  name: pedump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.19.4
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.19.4
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
+        version: 3.19.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.23.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 3.19.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.23.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '10.0'
 description: Teardown tool for ipa/apk files and dSYM file, even support for info.plist
   and .mobileprovision files
 email:
@@ -219,6 +211,7 @@ extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/create_release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -233,19 +226,39 @@ files:
 - lib/app-info.rb
 - lib/app_info.rb
 - lib/app_info/aab.rb
+- lib/app_info/android.rb
+- lib/app_info/android/signature.rb
+- lib/app_info/android/signatures/base.rb
+- lib/app_info/android/signatures/info.rb
+- lib/app_info/android/signatures/v1.rb
+- lib/app_info/android/signatures/v2.rb
+- lib/app_info/android/signatures/v3.rb
+- lib/app_info/android/signatures/v4.rb
 - lib/app_info/apk.rb
+- lib/app_info/apple.rb
+- lib/app_info/certificate.rb
+- lib/app_info/const.rb
 - lib/app_info/core_ext.rb
 - lib/app_info/core_ext/object/try.rb
 - lib/app_info/core_ext/string/inflector.rb
 - lib/app_info/dsym.rb
+- lib/app_info/dsym/debug_info.rb
+- lib/app_info/dsym/macho.rb
 - lib/app_info/error.rb
+- lib/app_info/file.rb
 - lib/app_info/helper.rb
+- lib/app_info/helper/archive.rb
+- lib/app_info/helper/file_size.rb
+- lib/app_info/helper/generate_class.rb
+- lib/app_info/helper/protobuf.rb
+- lib/app_info/helper/signatures.rb
 - lib/app_info/info_plist.rb
 - lib/app_info/ipa.rb
 - lib/app_info/ipa/framework.rb
 - lib/app_info/ipa/plugin.rb
 - lib/app_info/macos.rb
 - lib/app_info/mobile_provision.rb
+- lib/app_info/pe.rb
 - lib/app_info/png_uncrush.rb
 - lib/app_info/proguard.rb
 - lib/app_info/protobuf/manifest.rb
@@ -261,7 +274,14 @@ homepage: http://github.com/icyleaf/app-info
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: |
+  AppInfo 3.0 is coming!
+  **********************
+  The public API of some AppInfo classes has been changed.
+
+  Please ensure that your Gemfiles and .gemspecs are suitably restrictive
+  to avoid an unexpected breakage when 3.0 is released (e.g. ~> 2.8.5).
+  See https://github.com/icyleaf/app_info for details.
 rdoc_options: []
 require_paths:
 - lib
@@ -276,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Teardown tool for mobile app(ipa/apk) and dSYM file, analysis metedata like