app-info 2.0.0.beta1 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09c53a666307caf08ffdb39369ad9f888cdeff01cbbcf2c4e63eff5f396bfd5
-  data.tar.gz: aff28d8f4b7356f11edd6793a13270f8eac843d3c02c79bf14aaad92218aca9c
+  metadata.gz: 70d4913abdb1ced1404730f117fda0fb82ed91d19e291659749d6cb8c50da8e7
+  data.tar.gz: 5a9f1b8d786a08e552ae334679639575c1d7fd462d0f2ad6f970b0988b70e028
 SHA512:
-  metadata.gz: a89ee897a4b5a3efa228ad73632cd01b6977465ffdc48c13900a4c8cbdb254ff413ce6a27ae96563661d5d9809a1adbdeed7b641254764bd288c875f17de1c7d
-  data.tar.gz: 939cbe074276c8e708fdfbe3db8cf02bb42933041cf77e2e1b40850e8f77aad6eca5d211d26ff635cde276a9cc6874d945444188922be2589e90d6aff6308e0a
+  metadata.gz: 825bb3d01e2e05ac8dce27a343d4329673ee358bcd1dada568c72bf21b1469bfeb66d7cec31de3d2407634e64af1ad6bcc2b2d2bc5ddd314b17d61592e683380
+  data.tar.gz: 12a2f90a839ee938b29832272ca1410e0071d852f381353bff3e14f753f2946a108b6e90c04070f89e8966fe5e0cf75b80e42aa44ba735816c8c79ce8c04e55e

data/CHANGELOG.md

@@ -13,10 +13,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Added .dSYM.zip format support
 - Added parse mobileprovision in Linux
+- Added `AppInfo.file_type` to detect file type
 
 ### Changed
 
-- Parse macho-o header to detect file type instead of file extension name. (Maby be not fully support)
+- Use parse Macho-O header and contents to detect file type instead of file extension name.
 - Dropped Ruby 2.2 and below versions support
 
 ## [1.1.2] (2019-09-19)

data/app_info.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pngdefry', '~> 0.1.2'
   spec.add_dependency 'ruby-macho', '~> 2.2.0'
   spec.add_dependency 'ruby_android', '~> 0.7.7'
+  spec.add_dependency 'rubyzip', '>= 1.2', '< 3.0'
 
   spec.add_development_dependency 'bundler', '>= 1.12'
   spec.add_development_dependency 'rake', '>= 10.0'

data/lib/app_info.rb

@@ -2,36 +2,35 @@
 
 require 'app_info/version'
 require 'app_info/parser'
+require 'zip'
 
-#
 # AppInfo Module
 module AppInfo
   class NotFoundError < StandardError; end
-  class NotAppError < StandardError; end
+  class UnkownFileTypeError < StandardError; end
 
   # Get a new parser for automatic
   def self.parse(file)
     raise NotFoundError, file unless File.exist?(file)
 
-    case detect_file_type(file)
+    case file_type(file)
     when :ipa then Parser::IPA.new(file)
     when :apk then Parser::APK.new(file)
     when :mobileprovision then Parser::MobileProvision.new(file)
     when :dsym then Parser::DSYM.new(file)
     else
-      raise NotAppError, file
+      raise UnkownFileTypeError, "Sorry, AppInfo can not detect file type: #{file}"
     end
   end
   singleton_class.send(:alias_method, :dump, :parse)
 
-
   # Detect file type by read file header
   #
   # TODO: This can be better way to solvt, if anyone knows, tell me please.
-  def self.detect_file_type(file)
+  def self.file_type(file)
     header_hex = IO.read(file, 100)
     type = if header_hex =~ /^\x50\x4b\x03\x04/
-             detect_zip_format(header_hex)
+             detect_zip_file(file)
            else
              detect_mobileprovision(header_hex)
            end
@@ -40,16 +39,17 @@ module AppInfo
   end
 
   # :nodoc:
-  def self.detect_zip_format(hex)
-    if hex =~ /\x63\x6C\x61\x73\x73\x65/ ||
-       hex =~ /\x41\x6E\x64\x72\x6F\x69\x64\x4D\x61\x6E\x69\x66\x65\x73\x74/ ||
-       hex =~ /\x4D\x45\x54\x41\x2D\x49\x4E\x46/
-      :apk
-    elsif hex.slice(13, 1) == "\x48" ||
-          hex =~ /\x50\x61\x79\x6C\x6F\x61\x64/
-      :ipa
-    elsif hex.slice(12, 2) == "\x30\x4f"
-      :dsym
+  def self.detect_zip_file(file)
+    Zip.warn_invalid_date = false
+    Zip::File.open(file) do |zip_file|
+      zip_file.each do |f|
+        path = f.name
+        name = File.basename(path)
+
+        return :apk if name == 'AndroidManifest.xml'
+        return :ipa if path.include?('Payload/') && name.end_with?('Info.plist')
+        return :dsym if path.include?('/DWARF/')
+      end
     end
   end
 

data/lib/app_info/parser/dsym.rb

@@ -1,3 +1,4 @@
+require 'zip'
 require 'macho'
 require 'app_info/core_ext/object/try'
 
@@ -16,24 +17,24 @@ module AppInfo
       end
 
       def machos
-        @machos ||= case macho
+        @machos ||= case macho_type
                     when ::MachO::MachOFile
-                      [MachO.new(macho, File.size(app_path))]
+                      [MachO.new(macho_type, File.size(app_path))]
                     else
-                      size = macho.fat_archs.each_with_object([]) do |arch, obj|
+                      size = macho_type.fat_archs.each_with_object([]) do |arch, obj|
                         obj << arch.size
                       end
 
                       machos = []
-                      macho.machos.each_with_index do |file, i|
+                      macho_type.machos.each_with_index do |file, i|
                         machos << MachO.new(file, size[i])
                       end
                       machos
                     end
       end
 
-      def macho
-        @macho ||= ::MachO.open(app_path)
+      def macho_type
+        @macho_type ||= ::MachO.open(app_path)
       end
 
       def object
@@ -41,7 +42,13 @@ module AppInfo
       end
 
       def app_path
-        @app_path ||= Dir.glob(File.join(contents, 'Contents', 'Resources', 'DWARF', '*')).first
+        unless @app_path
+          path = File.join(contents, 'Contents', 'Resources', 'DWARF')
+          name = Dir.entries(path).last
+          @app_path = File.join(path, name)
+        end
+
+        @app_path
       end
 
       private
@@ -56,8 +63,8 @@ module AppInfo
             Zip::File.open(@file) do |zip_file|
               zip_file.each do |f|
                 dsym_dir ||= f.name
+
                 f_path = File.join(@contents, f.name)
-                FileUtils.mkdir_p(File.dirname(f_path))
                 zip_file.extract(f, f_path) unless File.exist?(f_path)
               end
             end

data/lib/app_info/parser/ipa.rb

@@ -1,3 +1,4 @@
+require 'zip'
 require 'pngdefry'
 require 'fileutils'
 require 'securerandom'
@@ -202,7 +203,6 @@ module AppInfo
           Zip::File.open(@file) do |zip_file|
             zip_file.each do |f|
               f_path = File.join(@contents, f.name)
-              FileUtils.mkdir_p(File.dirname(f_path))
               zip_file.extract(f, f_path) unless File.exist?(f_path)
             end
           end

data/lib/app_info/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-info
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -92,6 +92,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +182,6 @@ files:
 - lib/app_info/parser/ipa/info_plist.rb
 - lib/app_info/parser/ipa/mobile_provision.rb
 - lib/app_info/version.rb
-- plist.mobileprovision
 homepage: http://github.com/icyleaf/app-info
 licenses:
 - MIT