app-info 2.4.1 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa6b8e87ba8dc7e9e7717d1e3c4885c5748c3aac3079780ff1262ab9ab62ea1d
-  data.tar.gz: 1d4b0f573c2b875b7347ceb5a161560e1453db0b891cc2b7c28cddea9ba6fdbf
+  metadata.gz: db2a658da1cd03d7129e25b303508ba909275033afefdad334051df0cf3ef28d
+  data.tar.gz: a8756a88ca2039d14debca872ab586d774f9efe19ecb296cedd87a9cf65ac038
 SHA512:
-  metadata.gz: 300a98a543b36cee225ca5252f9f2883b5641f778f287c76e964a0a6c4c08054597e6de01e6ad023859f852d952d714c29d7ba47689f93355bd6c688bbf43102
-  data.tar.gz: e21a5002f708006fc0233034ecb5cecb40139ca7d9aefdc92e9004b9bd0b1e3ad10f94278959b1a4c5bd42d24ec416a1cf7e0f76736f777603f94431f4201ded
+  metadata.gz: a69147119d7201d1c4e4a584ec53cbb158d94350a28886529439a6e156ff6c3d107914a23a3d89f386228b34fcc947af93364cd84125413375719f20d994481c
+  data.tar.gz: 5e7f59d142fbfb5b29b3bad6c97224a091a88207ec8de502a8655456dda81550a3a2698b21893f5e6b6398d86fcc387de5502594c2d66a8f632d087fdf5e6f79

data/CHANGELOG.md

@@ -9,6 +9,40 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 > List all changes before release a new version.
 
+## [2.5.3] (2021-06-16)
+
+### Fixed
+
+- Fix decompress png error (mostly because of it is a normal png file) [#32](https://github.com/icyleaf/app_info/pull/32) thanks @[莫小七](https://github.com/mxq0923)
+
+## [2.5.2] (2021-04-15)
+
+### Fixed
+
+- Fix handle get Android application name from manifest first [#29](https://github.com/icyleaf/app_info/issues/29) thanks @[DreamPWJ](https://github.com/DreamPWJ)
+
+## [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
@@ -102,8 +136,13 @@ 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.2..HEAD
+[2.5.2]: https://github.com/icyleaf/app-info/compare/v2.5.1...v2.5.2
+[2.5.1]: 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/README.md

@@ -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

@@ -48,7 +48,7 @@ module AppInfo
     alias build_version version_code
 
     def name
-      resource.find('@string/app_name')
+      manifest.label || resource.find('@string/app_name')
     end
 
     def device_type

data/lib/app_info/ipa.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'macho'
-require 'pngdefry'
 require 'fileutils'
 require 'forwardable'
 require 'cfpropertylist'

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,25 @@ 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)
+        uncrushed_file = nil unless File.exists?(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,181 @@
+# 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)
+    rescue Zlib::DataError
+      # perhops thi is a normal png image file
+      return false
+    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/util.rb

@@ -7,7 +7,7 @@ require 'securerandom'
 module AppInfo
   # AppInfo Util
   module Util
-    FILE_SIZE_UNITS = %w[B KB MB GB TB].freeze
+    FILE_SIZE_UNITS = %w[B KB MB GB TB]
 
     def self.format_key(key)
       key = key.to_s

data/lib/app_info/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-info
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.3
 platform: ruby
 authors:
 - icyleaf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-06-16 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