app-info 3.0.0.beta2 → 3.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91afee9fd86b49fa4f788f4316df7c689178c6fdfbc0cf3f4743ae5cb7713dde
-  data.tar.gz: 056f2a2416a1a68ca2f2dcbbc404e9f6c768a5e8a742d942f04177c7044f5ff9
+  metadata.gz: f8ca25ba9f5e54dc762996f1b7393593393b29adcbe0622131a905aa2f494141
+  data.tar.gz: c2839b1ac586397d1f76833fd9b4947722892ae584d8942ccb8e0d706f207210
 SHA512:
-  metadata.gz: 2294ae1a6e8d220c46bd21e4c1062783f2ce7b94ad5b5dffdfe8c62edd6e519a57b326913339f090f62bf955d3103a6bf665227865bceb9f45bb7c78478b04f0
-  data.tar.gz: ec84bbc24190227bedd91818bdefad90cb1472e1b7ca1db312aca651843315ab037e7b70f2322085eca70bf3ab0319af3af20270da2a006437f76cf4a4ca3f11
+  metadata.gz: cb08a20e764b4c8c35c7c03f43c3472b89cf0ebf34889080ef28c52e97c51b8700c91d09acd073cf21ece653c19beab34ecfc4b0477a5c534d23314bb503ff83
+  data.tar.gz: c7aa998b3224be94bbb20589fe57906356e93788739383d89703fafd1856f0eca948c33d046561460400590bf727fcd633f98edcfb321f11d740bbe00aa48aa2

data/CHANGELOG.md

@@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 > List all changes before release a new version.
 
+## [3.0.0.beta3] (2023-04-05)
+
+### Added
+
+- Android parser `.icons` method add exclude param to filter icons.
+
+### Changed
+
+- Rename `.platform` to `.manufacturer`, rename `.opera_sytem` to `.platform` for all parsers.
+
+### Fixed
+
+- Minor fixes.
+
 ## [3.0.0.beta2] (2023-04-04)
 
 ### Changed
@@ -278,7 +292,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Updated dependency of CFPropertly list be a range between 2.3.4. (thanks @[cschroed](https://github.com/cschroed))
 
-[Unreleased]: https://github.com/icyleaf/app-info/compare/v3.0.0.beta2..HEAD
+[Unreleased]: https://github.com/icyleaf/app-info/compare/v3.0.0.beta3..HEAD
+[3.0.0.beta3]: https://github.com/icyleaf/app-info/compare/v3.0.0.beta2...v3.0.0.beta3
 [3.0.0.beta2]: https://github.com/icyleaf/app-info/compare/v3.0.0.beta1...v3.0.0.beta2
 [3.0.0.beta1]: https://github.com/icyleaf/app-info/compare/v2.8.5...v3.0.0.beta1
 [2.8.5]: https://github.com/icyleaf/app-info/compare/v2.8.4...v2.8.5

data/lib/app_info/aab.rb

@@ -115,28 +115,48 @@ module AppInfo
     end
 
     # Full icons metadata
-    # @example
+    # @example full icons
     #   aab.icons
     #   # => [
     #   #   {
-    #   #     name: 'icon.png',
-    #   #     file: '/path/to/icon.png',
+    #   #     name: 'ic_launcher.png',
+    #   #     file: '/path/to/ic_launcher.webp',
     #   #     dimensions: [29, 29]
     #   #   },
     #   #   {
-    #   #     name: 'icon1.png',
-    #   #     file: '/path/to/icon1.png',
+    #   #     name: 'ic_launcher.png',
+    #   #     file: '/path/to/ic_launcher.png',
+    #   #     dimensions: [120, 120]
+    #   #   },
+    #   #   {
+    #   #     name: 'ic_launcher.xml',
+    #   #     file: '/path/to/ic_launcher.xml',
+    #   #     dimensions: [nil, nil]
+    #   #   },
+    #   # ]
+    # @example exclude xml icons
+    #   aab.icons(filter: :xml)
+    #   # => [
+    #   #   {
+    #   #     name: 'ic_launcher.png',
+    #   #     file: '/path/to/ic_launcher.webp',
+    #   #     dimensions: [29, 29]
+    #   #   },
+    #   #   {
+    #   #     name: 'ic_launcher.png',
+    #   #     file: '/path/to/ic_launcher.png',
     #   #     dimensions: [120, 120]
     #   #   }
     #   # ]
+    # @param [String, Symbol, Array<Symbol, Array>] filter filter file extension name
     # @return [Array<Hash{Symbol => String, Array<Integer>}>] icons paths of icons
-    def icons
+    def icons(exclude: nil)
       @icons ||= manifest.icons.each_with_object([]) do |res, obj|
         path = res.value
         filename = ::File.basename(path)
         filepath = ::File.join(contents, ::File.dirname(path))
         file = ::File.join(filepath, filename)
-        FileUtils.mkdir_p filepath
+        FileUtils.mkdir_p(filepath)
 
         binary_data = read_file(path)
         ::File.write(file, binary_data, encoding: Encoding::BINARY)
@@ -147,6 +167,8 @@ module AppInfo
           dimensions: ImageSize.path(file).size
         }
       end
+
+      extract_icon(@icons, exclude: exclude)
     end
 
     def clear!

data/lib/app_info/android.rb

@@ -23,14 +23,14 @@ module AppInfo
       file_to_human_size(@file, human_size: human_size)
     end
 
-    # @return [Symbol] {Platform}
-    def platform
-      Platform::GOOGLE
+    # @return [Symbol] {Manufacturer}
+    def manufacturer
+      Manufacturer::GOOGLE
     end
 
-    # @return [Symbol] {OperaSystem}
-    def opera_system
-      OperaSystem::ANDROID
+    # @return [Symbol] {Platform}
+    def platform
+      Platform::ANDROID
     end
 
     # @return [Symbol] {Device}
@@ -153,6 +153,25 @@ module AppInfo
 
     protected
 
+    def extract_icon(icons, exclude: nil)
+      excludes = exclude_icon_exts(exclude: exclude)
+      icons.reject { |icon| icon_ext_match?(icon[:name], excludes) }
+    end
+
+    def exclude_icon_exts(exclude:)
+      case exclude
+      when String then [exclude]
+      when Array then exclude.map(&:to_s)
+      when Symbol then [exclude.to_s]
+      end
+    end
+
+    def icon_ext_match?(file, excludes)
+      return false if file.nil? || excludes.nil?
+
+      excludes.include?(::File.extname(file)[1..-1])
+    end
+
     def v1sign
       @v1sign ||= Android::Signature::V1.verify(self)
     rescue Android::Signature::NotFoundError

data/lib/app_info/apk.rb

@@ -70,22 +70,42 @@ module AppInfo
     end
 
     # Full icons metadata
-    # @example
+    # @example full icons
     #   apk.icons
     #   # => [
     #   #   {
-    #   #     name: 'icon.png',
-    #   #     file: '/path/to/icon.png',
+    #   #     name: 'ic_launcher.png',
+    #   #     file: '/path/to/ic_launcher.png',
     #   #     dimensions: [29, 29]
     #   #   },
     #   #   {
-    #   #     name: 'icon1.png',
-    #   #     file: '/path/to/icon1.png',
+    #   #     name: 'ic_launcher.png',
+    #   #     file: '/path/to/ic_launcher.png',
+    #   #     dimensions: [120, 120]
+    #   #   },
+    #   #   {
+    #   #     name: 'ic_launcher.xml',
+    #   #     file: '/path/to/ic_launcher.xml',
+    #   #     dimensions: [nil, nil]
+    #   #   },
+    #   # ]
+    # @example exclude xml icons
+    #   apk.icons(exclude: :xml)
+    #   # => [
+    #   #   {
+    #   #     name: 'ic_launcher.png',
+    #   #     file: '/path/to/ic_launcher.png',
+    #   #     dimensions: [29, 29]
+    #   #   },
+    #   #   {
+    #   #     name: 'ic_launcher.png',
+    #   #     file: '/path/to/ic_launcher.png',
     #   #     dimensions: [120, 120]
     #   #   }
     #   # ]
+    # @param [Boolean] xml return xml icons
     # @return [Array<Hash{Symbol => String, Array<Integer>}>] icons paths of icons
-    def icons
+    def icons(exclude: nil)
       @icons ||= apk.icon.each_with_object([]) do |(path, data), obj|
         icon_name = ::File.basename(path)
         icon_path = ::File.join(contents, ::File.dirname(path))
@@ -99,6 +119,8 @@ module AppInfo
           dimensions: ImageSize.path(icon_file).size
         }
       end
+
+      extract_icon(@icons, exclude: exclude)
     end
 
     def clear!

data/lib/app_info/apple.rb

@@ -26,9 +26,9 @@ module AppInfo
       APPSTORE = :appstore
     end
 
-    # @return [Symbol] {Platform}
-    def platform
-      Platform::APPLE
+    # @return [Symbol] {Manufacturer}
+    def manufacturer
+      Manufacturer::APPLE
     end
 
     # return file size
@@ -46,8 +46,8 @@ module AppInfo
 
     # @!method device
     #   @see InfoPlist#device
-    # @!method opera_system
-    #   @see InfoPlist#opera_system
+    # @!method platform
+    #   @see InfoPlist#platform
     # @!method iphone?
     #   @see InfoPlist#iphone?
     # @!method ipad?
@@ -72,7 +72,7 @@ module AppInfo
     #   @see InfoPlist#min_sdk_version
     # @!method min_os_version
     #   @see InfoPlist#min_os_version
-    def_delegators :info, :device, :opera_system, :iphone?, :ipad?, :universal?, :macos?,
+    def_delegators :info, :device, :platform, :iphone?, :ipad?, :universal?, :macos?,
                    :build_version, :name, :release_version, :identifier, :bundle_id,
                    :display_name, :bundle_name, :min_sdk_version, :min_os_version
 

data/lib/app_info/certificate.rb

@@ -6,6 +6,7 @@ module AppInfo
   class Certificate
     # Parse Raw data into X509 cerificate wrapper
     # @param [String] certificate raw data
+    # @return [AppInfo::Certificate]
     def self.parse(data)
       cert = OpenSSL::X509::Certificate.new(data)
       new(cert)
@@ -117,18 +118,20 @@ module AppInfo
       end
     end
 
-    # return size of public key
+    # return length of public key
     # @return [Integer]
-    def size
+    # @raise NotImplementedError
+    def length
       case public_key
       when OpenSSL::PKey::RSA
         public_key.n.num_bits
       when OpenSSL::PKey::DSA, OpenSSL::PKey::DH
         public_key.p.num_bits
       when OpenSSL::PKey::EC
-        raise NotImplementedError, "key size for #{public_key.inspect} not implemented"
+        raise NotImplementedError, "key length for #{public_key.inspect} not implemented"
       end
     end
+    alias size length
 
     # return fingerprint of certificate
     # @return [String]
@@ -166,10 +169,8 @@ module AppInfo
       @cert.send(method.to_sym, *args, &block) || super
     end
 
-    def respond_to_missing?(method_name, *args)
-      @cert.key?(method_name.to_sym) ||
-        @cert.respond_to?(method_name) ||
-        super
+    def respond_to_missing?(method, *args)
+      @cert.respond_to?(method.to_sym) || super
     end
   end
 end

data/lib/app_info/const.rb

@@ -30,14 +30,15 @@ module AppInfo
     UNKNOWN = :unknown
   end
 
-  # Platform
-  module Platform
+  # Manufacturer
+  module Manufacturer
     APPLE = :apple
     GOOGLE = :google
-    WINDOWS = :windows
+    MICROSOFT = :microsoft
   end
 
-  module OperaSystem
+  # Platform
+  module Platform
     MACOS = :macos
     IOS = :ios
     ANDROID = :android

data/lib/app_info/dsym.rb

@@ -7,9 +7,9 @@ module AppInfo
   class DSYM < File
     include Helper::Archive
 
-    # @return [Symbol] {Platform}
-    def platform
-      Platform::APPLE
+    # @return [Symbol] {Manufacturer}
+    def manufacturer
+      Manufacturer::APPLE
     end
 
     def each_file(&block)

data/lib/app_info/file.rb

@@ -22,13 +22,13 @@ module AppInfo
       }.call
     end
 
-    # @abstract Subclass and override {#opera_system} to implement.
-    def opera_system
+    # @abstract Subclass and override {#platform} to implement.
+    def platform
       not_implemented_error!(__method__)
     end
 
-    # @abstract Subclass and override {#platform} to implement.
-    def platform
+    # @abstract Subclass and override {#manufacturer} to implement.
+    def manufacturer
       not_implemented_error!(__method__)
     end
 

data/lib/app_info/info_plist.rb

@@ -17,18 +17,18 @@ module AppInfo
       Device::MACOS => %w[CFBundleIconFile CFBundleIconName]
     }.freeze
 
-    # @return [Symbol] {Platform}
-    def platform
-      Platform::APPLE
+    # @return [Symbol] {Manufacturer}
+    def manufacturer
+      Manufacturer::APPLE
     end
 
-    # @return [Symbol] {OperaSystem}
-    def opera_system
+    # @return [Symbol] {Platform}
+    def platform
       case device
       when Device::MACOS
-        OperaSystem::MACOS
+        Platform::MACOS
       when Device::IPHONE, Device::IPAD, Device::UNIVERSAL
-        OperaSystem::IOS
+        Platform::IOS
       end
     end
 
@@ -40,7 +40,7 @@ module AppInfo
         Device::IPAD
       elsif device_family == [1, 2]
         Device::UNIVERSAL
-      elsif !info.try(:[], 'DTSDKName').nil? || !info.try(:[], 'DTPlatformName').nil?
+      elsif !info.try(:[], 'DTSDKName').nil? || !info.try(:[], 'DTManufacturerName').nil?
         Device::MACOS
       else
         raise NotImplementedError, "Unkonwn device: #{device_family}"

data/lib/app_info/mobile_provision.rb

@@ -7,20 +7,20 @@ module AppInfo
   # Apple code signing: provisioning profile parser
   # @see https://developer.apple.com/documentation/technotes/tn3125-inside-code-signing-provisioning-profiles
   class MobileProvision < File
-    # @return [Symbol] {Platform}
-    def platform
-      Platform::APPLE
+    # @return [Symbol] {Manufacturer}
+    def manufacturer
+      Manufacturer::APPLE
     end
 
-    # @return [Symbol] {OperaSystem}
-    def opera_system
-      case opera_systems[0]
+    # @return [Symbol] {Platform}
+    def platform
+      case platforms[0]
       when :macos
-        OperaSystem::MACOS
+        Platform::MACOS
       when :ios
-        OperaSystem::IOS
+        Platform::IOS
       else
-        raise NotImplementedError, "Unkonwn opera_system: #{opera_systems[0]}"
+        raise NotImplementedError, "Unkonwn platform: #{platforms[0]}"
       end
     end
 
@@ -43,7 +43,7 @@ module AppInfo
     end
 
     # @return [Array<Symbol>]
-    def opera_systems
+    def platforms
       return unless platforms = mobileprovision.try(:[], 'Platform')
 
       platforms.map do |v|
@@ -111,13 +111,13 @@ module AppInfo
     # @see https://stackoverflow.com/questions/1003066/what-does-get-task-allow-do-in-xcode
     # @return [Boolea]
     def development?
-      case opera_system
-      when OperaSystem::IOS
+      case platform
+      when Platform::IOS
         entitlements['get-task-allow'] == true
-      when OperaSystem::MACOS
+      when Platform::MACOS
         !devices.nil?
       else
-        raise NotImplementedError, "Unknown opera_system: #{opera_system}"
+        raise NotImplementedError, "Unknown platform: #{platform}"
       end
     end
 
@@ -126,26 +126,26 @@ module AppInfo
     # @see https://developer.apple.com/library/archive/qa/qa1830/_index.html
     # @return [Boolea]
     def appstore?
-      case opera_system
-      when OperaSystem::IOS
+      case platform
+      when Platform::IOS
         !development? && entitlements.key?('beta-reports-active')
-      when OperaSystem::MACOS
+      when Platform::MACOS
         !development?
       else
-        raise NotImplementedError, "Unknown opera_system: #{opera_system}"
+        raise NotImplementedError, "Unknown platform: #{platform}"
       end
     end
 
     # @return [Boolea]
     def adhoc?
-      return false if opera_system == OperaSystem::MACOS # macOS no need adhoc
+      return false if platform == Platform::MACOS # macOS no need adhoc
 
       !development? && !devices.nil?
     end
 
     # @return [Boolea]
     def enterprise?
-      return false if opera_system == OperaSystem::MACOS # macOS no need adhoc
+      return false if platform == Platform::MACOS # macOS no need adhoc
 
       !development? && !adhoc? && !appstore?
     end

data/lib/app_info/pe.rb

@@ -24,16 +24,16 @@ module AppInfo
       0x5128 => 'RISC-v 128'
     }.freeze
 
+    # @return [Symbol] {Manufacturer}
+    def manufacturer
+      Manufacturer::MICROSOFT
+    end
+
     # @return [Symbol] {Platform}
     def platform
       Platform::WINDOWS
     end
 
-    # @return [Symbol] {OperaSystem}
-    def opera_system
-      OperaSystem::WINDOWS
-    end
-
     # @return [Symbol] {Device}
     def device
       Device::WINDOWS
@@ -68,11 +68,48 @@ module AppInfo
     # @!method assembly_version
     #   @see VersionInfo#assembly_version
     #   @return [String]
-    def_delegators :version_info, :product_name, :product_version, :company_name, :assembly_version
+    # @!method file_version
+    #   @see VersionInfo#file_version
+    #   @return [String]
+    # @!method file_description
+    #   @see VersionInfo#file_description
+    #   @return [String]
+    # @!method copyright
+    #   @see VersionInfo#copyright
+    #   @return [String]
+    #   @return [String]
+    # @!method special_build
+    #   @see VersionInfo#special_build
+    #   @return [String]
+    # @!method private_build
+    #   @see VersionInfo#private_build
+    #   @return [String]
+    # @!method original_filename
+    #   @see VersionInfo#original_filename
+    #   @return [String]
+    # @!method internal_name
+    #   @see VersionInfo#internal_name
+    #   @return [String]
+    # @!method legal_trademarks
+    #   @see VersionInfo#legal_trademarks
+    #   @return [String]
+    def_delegators :version_info, :product_name, :product_version, :company_name, :assembly_version,
+                   :file_version, :file_description, :copyright, :special_build, :private_build,
+                   :original_filename, :internal_name, :legal_trademarks
 
     alias name product_name
-    alias release_version product_version
-    alias build_version assembly_version
+
+    # Find {#product_version} then fallback to {#file_version}
+    # @return [String, nil]
+    def release_version
+      product_version || file_version
+    end
+
+    # Find {#special_build}, {#private_build} then fallback to {#assembly_version}
+    # @return [String, nil]
+    def build_version
+      special_build || private_build || assembly_version
+    end
 
     # @return [String]
     def archs
@@ -189,7 +226,7 @@ module AppInfo
 
     # VersionInfo class
     #
-    # Ref: https://learn.microsoft.com/zh-cn/windows/win32/menurc/versioninfo-resource
+    # @see https://learn.microsoft.com/zh-cn/windows/win32/menurc/versioninfo-resource
     class VersionInfo
       def initialize(raw)
         @raw = raw
@@ -220,11 +257,36 @@ module AppInfo
         @file_version ||= value_of('FileVersion')
       end
 
-      # @return [String]
+      # @return [String, nil]
       def file_description
         @file_description ||= value_of('FileDescription')
       end
 
+      # @return [String, nil]
+      def special_build
+        @special_build ||= value_of('SpecialBuild')
+      end
+
+      # @return [String, nil]
+      def private_build
+        @private_build ||= value_of('PrivateBuild')
+      end
+
+      # @return [String]
+      def original_filename
+        @original_filename ||= value_of('OriginalFilename')
+      end
+
+      # @return [String]
+      def internal_name
+        @internal_name ||= value_of('InternalName')
+      end
+
+      # @return [String]
+      def legal_trademarks
+        @legal_trademarks ||= value_of('LegalTrademarks')
+      end
+
       # @return [String]
       def copyright
         @copyright ||= value_of('LegalCopyright')

data/lib/app_info/proguard.rb

@@ -10,14 +10,14 @@ module AppInfo
 
     NAMESPACE = UUIDTools::UUID.sha1_create(UUIDTools::UUID_DNS_NAMESPACE, 'icyleaf.com')
 
-    # @return [Symbol] {Platform}
-    def platform
-      Platform::GOOGLE
+    # @return [Symbol] {Manufacturer}
+    def manufacturer
+      Manufacturer::GOOGLE
     end
 
-    # @return [Symbol] {OperaSystem}
-    def opera_system
-      OperaSystem::ANDROID
+    # @return [Symbol] {Platform}
+    def platform
+      Platform::ANDROID
     end
 
     # @return [String]

data/lib/app_info/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-info
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.beta3
 platform: ruby
 authors:
 - icyleaf
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList