app-info 2.3.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e60db88b8b1bc77db8a80623e1f5f52f47114e04f7941486ca8e21ee9ca19f2
-  data.tar.gz: 78c45e538580d4c1c48807b77f38f650a09f4d1610581efb1c423d870c14425f
+  metadata.gz: 927106ea47092b85df2f8e1c88321d8949da8d7c9e7bc712d907e89932cd4072
+  data.tar.gz: f2d5acb9cd901f7af25307ed385d8d276e19d04e5e02644e3ea15e9698d5363a
 SHA512:
-  metadata.gz: bfba684fb8bcf015c46f5457b2f4ea1e3bcbaac670a921f2b748a208d1069efff449e22ffb373754622d55927e4f65554aaa5e33c3576dbd55eb3437d3084ee0
-  data.tar.gz: 470dedd66f3bbd04a328e36a125599ca53c0ba9cc7c6778dea6cf74d61f348661080a0f4b801b8b02557c7e842a68e1ecbc7c585f0271e15e5625566ac7a1763
+  metadata.gz: af27de4ad9737a4d87bad27f910b010f42338586ed02ecfd16414997ff8a07e78a1a3b681ca9ccdba6944d6f306cd47cd9730f3bd73a453ce43fe1d280085030
+  data.tar.gz: 8d11fac42b959acc59e9abd71db8c204866ad11e5bd6a3fb746883284f9d1032e959e5636411d6ef4c3e69d020eb42f99c8df04c381c8d295bd063f9bc447f56

data/CHANGELOG.md

@@ -9,6 +9,39 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 > List all changes before release a new version.
 
+## [2.5.1] (2021-04-14)
+
+### Add
+
+- Restore `dimensions` key from icons method and icon pnguncrush back.
+
+## [2.4.3] (2021-04-12)
+
+### Fixed
+
+- Fix throws an exception 'IHDR not in place for PNG' during parse ipa file.
+
+### Changed
+
+- Temporary remove `dimensions` key from icons method (Only ipa file)
+
+## [2.4.2] (2021-04-06)
+
+### Changed
+
+- Remove [pngdefry](https://github.com/soffes/pngdefry) gem, install it to decode iOS png file if needs.
+
+## [2.4.1] (2021-03-08)
+
+### Changed
+
+- Rename `cleanup!` to `clear!` method in ipa.
+
+### Added
+
+- Add `clear!` method to ipa,apk, dsym and proguard.
+- Make `contents` to be a public method.
+
 ## [2.3.0] (2021-01-15)
 
 ### Changed
@@ -91,8 +124,12 @@ 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/v2.3.0..HEAD
-[2.2.0]: https://github.com/icyleaf/app-info/compare/v2.2.0...v2.3.0
+[Unreleased]: https://github.com/icyleaf/app-info/compare/v2.5.1..HEAD
+[2.5.0]: https://github.com/icyleaf/app-info/compare/v2.4.3...v2.5.1
+[2.4.3]: https://github.com/icyleaf/app-info/compare/v2.4.2...v2.4.3
+[2.4.2]: https://github.com/icyleaf/app-info/compare/v2.4.1...v2.4.2
+[2.4.1]: https://github.com/icyleaf/app-info/compare/v2.3.0...v2.4.1
+[2.3.0]: https://github.com/icyleaf/app-info/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/icyleaf/app-info/compare/v2.1.4...v2.2.0
 [2.1.4]: https://github.com/icyleaf/app-info/compare/v2.1.3...v2.1.4
 [2.1.3]: https://github.com/icyleaf/app-info/compare/v2.1.2...v2.1.3

data/Gemfile

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-# source 'https://gems.ruby-china.com'
 
 # Specify your gem's dependencies in app-info.gemspec
 gemspec

data/README.md

@@ -51,7 +51,7 @@ parser = AppInfo.parse('App.dSYm.zip')
 
 # If detect file type failed, you can parse in other way
 parser = AppInfo::IPA.new('iphone.ipa')
-parser = AppInfo::IPA.new('android.apk')
+parser = AppInfo::APK.new('android.apk')
 parser = AppInfo::InfoPlist.new('App/Info.plist')
 parser = AppInfo::MobileProvision.new('provisioning_profile/uuid.mobileprovision')
 parser = AppInfo::DSYM.new('App.dSYm.zip')
@@ -82,7 +82,7 @@ ipa.bundle_id
 
 # get app icons
 ipa.icons
-# => [{:name=>"AppIcon29x29@2x~ipad.png", :file=>"/var/folders/mb/8cm0fz4d499968yss9y1j8bc0000gp/T/d20160728-69669-1xnub30/AppInfo-ios-a5369339399e62046d7d59c52254dac6/Payload/bundle.app/AppIcon29x29@2x~ipad.png", :dimensions=>[58, 58]}, ...]
+# => [{:name=>"AppIcon29x29@2x~ipad.png", :file=>"/var/folders/mb/8cm0fz4d499968yss9y1j8bc0000gp/T/d20160728-69669-1xnub30/AppInfo-ios-a5369339399e62046d7d59c52254dac6/Payload/bundle.app/AppIcon29x29@2x~ipad.png"}, :dimensions=>[29, 29], :uncrushed_file=>"..." ...]
 
 # get provisioning profile devices
 ipa.devices
@@ -239,6 +239,11 @@ apk.tv?
 apk.wear?
 ```
 
+## Best Practice
+
+- [fastlane-plugin-app_info](https://github.com/icyleaf/fastlane-plugin-app_info): fastlane plugin
+- [zealot](https://github.com/tryzealot/zealot/): Over The Air Server for deployment of Android and iOS apps
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -247,7 +252,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/app-info. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/icyleaf/app-info. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/app_info.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'CFPropertyList', ['< 3.1.0', '>= 2.3.4']
   spec.add_dependency 'image_size', '>= 1.5', '< 2.2'
-  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'

data/lib/app_info/apk.rb

@@ -10,7 +10,7 @@ module AppInfo
   class APK
     extend Forwardable
 
-    attr_reader :file, :apk
+    attr_reader :file
 
     # APK Devices
     module Device
@@ -22,9 +22,6 @@ module AppInfo
 
     def initialize(file)
       @file = file
-
-      Zip.warn_invalid_date = false # fix invaild date format warnings
-      @apk = ::Android::Apk.new(file)
     end
 
     def size(humanable = false)
@@ -36,7 +33,7 @@ module AppInfo
     end
     alias file_type os
 
-    def_delegators :@apk, :manifest, :resource, :dex
+    def_delegators :apk, :manifest, :resource, :dex
 
     def_delegators :manifest, :version_name, :package_name,
                    :use_permissions, :components
@@ -93,13 +90,13 @@ module AppInfo
     end
 
     def signs
-      @apk.signs.each_with_object([]) do |(path, sign), obj|
+      apk.signs.each_with_object([]) do |(path, sign), obj|
         obj << Sign.new(path, sign)
       end
     end
 
     def certificates
-      @apk.certificates.each_with_object([]) do |(path, certificate), obj|
+      apk.certificates.each_with_object([]) do |(path, certificate), obj|
         obj << Certificate.new(path, certificate)
       end
     end
@@ -112,13 +109,17 @@ module AppInfo
       components.select { |c| c.type == 'service' }
     end
 
+    def apk
+      Zip.warn_invalid_date = false # fix invaild date format warnings
+
+      @apk ||= ::Android::Apk.new(@file)
+    end
+
     def icons
       unless @icons
-        tmp_path = File.join(Dir.mktmpdir, "AppInfo-android-#{SecureRandom.hex}")
-
-        @icons = @apk.icon.each_with_object([]) do |(path, data), obj|
+        @icons = apk.icon.each_with_object([]) do |(path, data), obj|
           icon_name = File.basename(path)
-          icon_path = File.join(tmp_path, File.dirname(path))
+          icon_path = File.join(contents, File.dirname(path))
           icon_file = File.join(icon_path, icon_name)
           FileUtils.mkdir_p icon_path
           File.open(icon_file, 'wb') { |f| f.write(data) }
@@ -134,6 +135,22 @@ module AppInfo
       @icons
     end
 
+    def clear!
+      return unless @contents
+
+      FileUtils.rm_rf(@contents)
+
+      @apk = nil
+      @contents = nil
+      @icons = nil
+      @app_path = nil
+      @info = nil
+    end
+
+    def contents
+      @contents ||= File.join(Dir.mktmpdir, "AppInfo-android-#{SecureRandom.hex}")
+    end
+
     private
 
     def manifest_values(path, key = 'name')

data/lib/app_info/dsym.rb

@@ -74,7 +74,17 @@ module AppInfo
       @app_path
     end
 
-    private
+    def clear!
+      return unless @contents
+
+      FileUtils.rm_rf(@contents)
+
+      @contents = nil
+      @app_path = nil
+      @info = nil
+      @object = nil
+      @macho_type = nil
+    end
 
     def contents
       unless @contents

data/lib/app_info/ipa.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'macho'
-require 'pngdefry'
 require 'fileutils'
 require 'forwardable'
 require 'cfpropertylist'
@@ -147,7 +146,7 @@ module AppInfo
       @app_path ||= Dir.glob(File.join(contents, 'Payload', '*.app')).first
     end
 
-    def cleanup!
+    def clear!
       return unless @contents
 
       FileUtils.rm_rf(@contents)
@@ -160,12 +159,12 @@ module AppInfo
       @info = nil
     end
 
-    private
-
     def contents
       @contents ||= Util.unarchive(@file, path: 'ios')
     end
 
+    private
+
     def icons_root_path
       iphone = 'CFBundleIcons'
       ipad = 'CFBundleIcons~ipad'

data/lib/app_info/ipa/info_plist.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'cfpropertylist'
+require 'app_info/png_uncrush'
 require 'app_info/util'
 
 module AppInfo
@@ -42,7 +43,7 @@ module AppInfo
       info.try(:[], 'MinimumOSVersion')
     end
 
-    def icons
+    def icons(uncrush = true)
       return @icons if @icons
 
       @icons = []
@@ -55,13 +56,7 @@ module AppInfo
 
         icon_array.each do |items|
           Dir.glob(File.join(@app_path, "#{items}*")).find_all.each do |file|
-            dict = {
-              name: File.basename(file),
-              file: file,
-              dimensions: Pngdefry.dimensions(file)
-            }
-
-            @icons.push(dict)
+            @icons << icon_info(file, uncrush)
           end
         end
       end
@@ -121,6 +116,24 @@ module AppInfo
 
     private
 
+    def icon_info(file, uncrush = true)
+      uncrushed_file = nil
+      if uncrush
+        path = File.join(File.dirname(file), 'uncrushed')
+        Dir.mkdir(path, 0700) unless Dir.exist?(path)
+
+        uncrushed_file = File.join(path, File.basename(file))
+        PngUncrush.decompress(file, uncrushed_file)
+      end
+
+      {
+        name: File.basename(file),
+        file: file,
+        uncrushed_file: uncrushed_file,
+        dimensions: PngUncrush.dimensions(file)
+      }
+    end
+
     def info
       return unless File.file?(info_path)
 

data/lib/app_info/png_uncrush.rb

@@ -0,0 +1,178 @@
+# frozen_string_literal: true
+
+# Copyright @ Wenwei Cai on 26 Aug 2012.
+# https://github.com/swcai/iphone-png-normalizer
+
+require 'zlib'
+require 'stringio'
+
+module AppInfo
+  class PngUncrush
+    class Error < StandardError; end
+    class FormatError < Error; end
+
+    class PngReader # :nodoc:
+      PNG_HEADER = "\x89PNG\r\n\x1a\n".bytes
+      CHUNK = 1024
+
+      attr_reader :data
+
+      def initialize(raw)
+        @io = if raw.is_a?(String)
+          StringIO.new(raw)
+        elsif raw.respond_to?(:read) && raw.respond_to?(:eof?)
+          raw
+        else
+          raise ArgumentError, "expected data as String or an object responding to read, got #{raw.class}"
+        end
+
+        @data = String.new
+      end
+
+      def size
+        @io.size
+      end
+
+      def unpack(a)
+        @io.unpack(a)
+      end
+
+      def header
+        @header ||= self[0, 8]
+      end
+
+      def png?
+        PNG_HEADER == header.bytes
+      end
+
+      def [](offset, length)
+        while !@io.eof? && @data.length < offset + length
+          data = @io.read(CHUNK)
+          break unless data
+
+          data.force_encoding(@data.encoding) if data.respond_to?(:encoding)
+          @data << data
+        end
+
+        @data[offset, length]
+      end
+    end
+
+    def self.decompress(input, output)
+      new(input).decompress(output)
+    end
+
+    def self.dimensions(input)
+      new(input).dimensions
+    end
+
+    def initialize(filename)
+      @io = PngReader.new(File.open(filename))
+      raise FormatError, 'not a png file' unless @io.png?
+    end
+
+    def dimensions
+      _dump_sections(dimensions: true)
+    end
+
+    def decompress(output)
+      content = _remap(_dump_sections)
+      return false unless content
+
+      write_file(output, content)
+    end
+
+    private
+
+    def _dump_sections(dimensions: false)
+      pos = @io.header.size
+      optimized = false
+      [].tap do |sections|
+        while pos < @io.size
+          type = @io[pos + 4, 4]
+          length = @io[pos, 4].unpack('N')[0]
+          data = @io[pos + 8, length]
+          crc = @io[pos + 8 + length, 4].unpack('N')[0]
+          pos += length + 12
+
+          if type == 'CgBI'
+            optimized = true
+            next
+          end
+
+          if type == 'IHDR'
+            width = data[0, 4].unpack("N")[0]
+            height = data[4, 4].unpack("N")[0]
+            return [width, height] if dimensions
+          end
+
+          break if type == 'IEND'
+
+          if type == 'IDAT' && sections.size > 0 && sections.last.first == 'IDAT'
+            # Append to the previous IDAT
+            sections.last[1] += length
+            sections.last[2] += data
+          else
+            sections << [type, length, data, crc, width, height]
+          end
+        end
+      end
+    end
+
+    def write_file(path, content)
+      File.open(path, 'wb') do |file|
+        file.puts content
+      end
+
+      true
+    end
+
+    def _remap(sections)
+      newPNG = String.new(@io.header)
+      sections.map do |(type, length, data, crc, width, height)|
+        if type == 'IDAT'
+          bufSize = width * height * 4 + height
+          data = inflate(data[0, bufSize])
+          # duplicate the content of old data at first to avoid creating too many string objects
+          newdata = String.new(data)
+          pos = 0
+
+          (0...height).each do |y|
+            newdata[pos] = data[pos, 1]
+            pos += 1
+            (0...width).each do |x|
+              newdata[pos+0] = data[pos+2, 1]
+              newdata[pos+1] = data[pos+1, 1]
+              newdata[pos+2] = data[pos+0, 1]
+              newdata[pos+3] = data[pos+3, 1]
+              pos += 4
+            end
+          end
+
+          data = deflate(newdata)
+          length = data.length
+          crc = Zlib::crc32(type)
+          crc = Zlib::crc32(data, crc)
+          crc = (crc + 0x100000000) % 0x100000000
+        end
+
+        newPNG += [length].pack("N") + type + (data if length > 0) + [crc].pack("N")
+      end
+
+      newPNG
+    end
+
+    def inflate(data)
+      # make zlib not check the header
+      zstream = Zlib::Inflate.new(-Zlib::MAX_WBITS)
+      buf = zstream.inflate(data)
+      zstream.finish
+      zstream.close
+      buf
+    end
+
+    def deflate(data)
+      Zlib::Deflate.deflate(data)
+    end
+  end
+end

data/lib/app_info/proguard.rb

@@ -86,5 +86,18 @@ module AppInfo
     def contents
       @contents ||= Util.unarchive(@file, path: 'proguard')
     end
+
+    def clear!
+      return unless @contents
+
+      FileUtils.rm_rf(@contents)
+
+      @contents = nil
+      @manifest = nil
+      @mapping_path = nil
+      @metadata_path = nil
+      @manifest_path = nil
+      @symbol_path = nil
+    end
   end
 end

data/lib/app_info/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-info
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.5.1
 platform: ruby
 authors:
 - icyleaf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -50,20 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: pngdefry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: ruby-macho
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +189,7 @@ files:
 - lib/app_info/ipa/info_plist.rb
 - lib/app_info/ipa/mobile_provision.rb
 - lib/app_info/ipa/plugin.rb
+- lib/app_info/png_uncrush.rb
 - lib/app_info/proguard.rb
 - lib/app_info/util.rb
 - lib/app_info/version.rb