fir-cli 2.0.23 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c011300ea4b44b86f962e17518370f57d514d1808122ffccad155d53ad14428
-  data.tar.gz: 62a7644a395535ab0191981bb209c729c1feb52f0b9e687c7a87c8c362331369
+  metadata.gz: ac9ebd4d15eba52e807875a875e4d56b0b814303937a5faa3a708dccebb9267f
+  data.tar.gz: be3231c934be27664cc3ed7e7f63fc82eef71350e429df9b3033d8116373ad7f
 SHA512:
-  metadata.gz: 5d51764f556d550244c97859a1b9812ac249dfec5cba7eeee163fff8e77c6c2712d88d584f2262c7a05c1abe3a8d4245e5381db2c3843d4390ced37433cd8e4d
-  data.tar.gz: afe62117b421d338f0c7e5f048026e633f64a9b9841f1df8352a7ee27c94e423cedcc860d4b0f8747d7c6e0d885b40fc73b89249a6d3ccedfc7d8326d913fe30
+  metadata.gz: 52401a32d81393c5eebb3cf587ad69cb5760d17b9b6dbfe51a41e5e38b73bd54b372b85256d5ebce3778e3c0d519a71e055b7d7ef4cd8814bc57aa6678984e18
+  data.tar.gz: 1ee68d93cada9a8a6cb3c727acc65a852f2061a9361df0e56643af04922281571bfad5e0bf54b2987a58e45a04755b5ee8d4d9e2373727c6544a7e06280d6654

data/.github/workflows/docker-image.yml

@@ -5,31 +5,45 @@ on:
     branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
+  workflow_dispatch:
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Build the Docker image
-      run: docker buildx create --use && docker buildx build --platform=linux/arm64,linux/amd64 . --file Dockerfile --tag firhq/fir-cli:latest
-      
-    - name: get version Number
-      id: show-version
-      run: echo "::set-output name=result::$(docker run firhq/fir-cli:latest version | awk '{print $3}')"
-    
-    - name: check version number
-      run: echo "the version is ${{ steps.show-version.outputs.result }}"
-    
-    - name: Tag image
-      run: docker tag firhq/fir-cli:latest firhq/fir-cli:${{ steps.show-version.outputs.result }}
-    
-    - name: Login Docker
-      run: docker login -u atpking -p ${{ secrets.DOCKER_ACCESS_TOKEN }}
-      
-    - name: Publish docker
-      run: docker push firhq/fir-cli:latest && docker push firhq/fir-cli:${{ steps.show-version.outputs.result }}
-    
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Extract version
+        id: version
+        run: |
+          v=$(awk -F'"' '/VERSION/{print $2; exit}' lib/fir/version.rb)
+          echo "result=$v" >> "$GITHUB_OUTPUT"
+          echo "fir-cli version: $v"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: atpking
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: |
+            firhq/fir-cli:latest
+            firhq/fir-cli:${{ steps.version.outputs.result }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

data/.gitignore

@@ -27,3 +27,5 @@ lib/.byebug_history
 TAGS
 .vscode
 fir-cli-answer.json
+mise.toml
+.claude/

data/Dockerfile

@@ -1,6 +1,9 @@
-FROM ruby:2.7.1
+FROM ruby:3.2-slim
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends git ca-certificates build-essential \
+ && rm -rf /var/lib/apt/lists/*
 RUN gem install bundler
-ENV LANG=C.UTF-8 
+ENV LANG=C.UTF-8
 ENV WORKDIR=/fir-cli
 ENV HOME=/fir-cli
 RUN mkdir -p $WORKDIR

data/Gemfile

@@ -8,3 +8,7 @@ end
 # Specify your gem's dependencies in fir.gemspec
 gemspec
 gem 'codeclimate-test-reporter', group: :test, require: nil
+
+# Fix compatibility with Ruby 3.2.2
+# mime-types 3.2.2 uses _1, _2, _3 as parameter names which are reserved in Ruby 2.7+
+gem 'mime-types', '>= 3.3.0'

data/README.md

@@ -19,6 +19,8 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 - 我们也提供 docker 版本的 fir-cli, 具体使用方式参见 **Docker 运行 fir-cli** 章节
 
 # 最近更新
+- (2.0.25) 兼容 rubyzip 3.x: 修复 Ruby 3.2+ 环境下解析 ipa 报 `Info.plist not readable!` 的问题
+- (2.0.24) 修复部分 APK 包含非法 XML 控制字符导致解析失败的问题
 - (2.0.23) 增强上传稳定性
 - (2.0.22) 支持自定义下载文件名称 --user_download_file_name=具体文件名称  注意， 此参数无法与switch_to_qiniu 一起使用
 - (2.0.21) 修正 publish 的结果不返回导致 fastlane-plugin-fir_cli 命令执行结果为nil 的问题

data/fir-cli.gemspec

@@ -46,4 +46,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rexml'
   spec.add_dependency 'CFPropertyList'
   spec.add_dependency 'api_tools', '~> 0.1.1'
+  # rubyzip is pulled in transitively by ruby_android_apk (>= 1.1.6, no upper
+  # bound). We support 2.x and 3.x in lib/fir/util/parser/ipa.rb; pin upper to
+  # < 4 so future major bumps don't silently break end users on `gem install`.
+  spec.add_dependency 'rubyzip', '>= 1.1.6', '< 4'
 end

data/lib/fir/patches/rest_client_fix.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Fix for rest-client 2.1.0 compatibility with Ruby 2.6/2.7
+# The bug: In some cases, @response is a String instead of a response object,
+# causing NoMethodError when calling @response.code in http_code method.
+#
+# See: https://github.com/rest-client/rest-client/issues/...
+module RestClient
+  class Exception
+    def http_code
+      # return integer for compatibility
+      if @response
+        # Handle case where @response is a String (e.g., "401 Unauthorized")
+        # or when @response is a proper response object
+        code = if @response.respond_to?(:code)
+                 @response.code
+               else
+                 @response.to_s[/\d{3}/]
+               end
+        code.to_i
+      else
+        @initial_response_code
+      end
+    end
+  end
+end

data/lib/fir/patches.rb

@@ -9,3 +9,4 @@ require_relative './patches/os_patch'
 require_relative './patches/try'
 require_relative './patches/default_headers'
 require_relative './patches/progress'
+require_relative './patches/rest_client_fix'

data/lib/fir/util/parser/apk.rb

@@ -1,6 +1,25 @@
 # frozen_string_literal: true
 
 require_relative './common'
+
+# Monkey patch to fix illegal character issues in AXML parsing
+# Some APKs contain control characters in strings that REXML cannot handle
+module Android
+  class AXMLParser
+    alias_method :original_parse_strings, :parse_strings
+
+    def parse_strings
+      original_parse_strings
+      # Remove illegal XML control characters from strings
+      @strings = @strings.map do |str|
+        next str unless str.is_a?(String)
+        # Keep only valid XML characters: #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+        str.gsub(/[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD]/, '')
+      end
+    end
+  end
+end
+
 module FIR
   module Parser
     class Apk
@@ -18,13 +37,18 @@ module FIR
       end
 
       def basic_info
-        @basic_info ||= {
-          type: 'android',
-          name: fetch_label,
-          identifier: @apk.manifest.package_name,
-          build: @apk.manifest.version_code.to_s,
-          version: @apk.manifest.version_name.to_s
-        }
+        @basic_info ||= begin
+          manifest = @apk.manifest
+          raise 'Failed to parse AndroidManifest.xml. The APK may be corrupted, repacked, or contain unsupported characters.' unless manifest
+
+          {
+            type: 'android',
+            name: fetch_label,
+            identifier: manifest.package_name,
+            build: manifest.version_code.to_s,
+            version: manifest.version_name.to_s
+          }
+        end
         @basic_info.reject! { |_k, v| v.nil? }
         @basic_info
       end

data/lib/fir/util/parser/ipa.rb

@@ -46,11 +46,22 @@ module FIR
         return if @contents
         @contents = "#{Dir.tmpdir}/ipa_files-#{Time.now.to_i}"
 
+        # rubyzip 3.x changed Zip::File#extract: the second positional arg is now
+        # the entry path; the destination dir moved to a keyword arg. Detect by
+        # signature so we don't depend on Zip::VERSION (not auto-loaded in 2.x).
+        zip3 = Zip::File.instance_method(:extract).parameters.any? { |_t, n| n == :destination_directory }
+
         Zip::File.open(@path) do |zip_file|
           zip_file.each do |f|
             f_path = File.join(@contents, f.name)
+            next if File.exist?(f_path)
+
             FileUtils.mkdir_p(File.dirname(f_path))
-            zip_file.extract(f, f_path) unless File.exist?(f_path)
+            if zip3
+              f.extract(File.basename(f.name), destination_directory: File.dirname(f_path))
+            else
+              zip_file.extract(f, f_path)
+            end
           end
         end
 

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = "2.0.23"
+  VERSION = "2.0.25"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.25
 platform: ruby
 authors:
 - NaixSpirit
 - atpking
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-16 00:00:00.000000000 Z
+date: 2026-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +179,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: fir.im command tool, support iOS and Android
 email:
 - atpking@gmail.com
@@ -225,6 +246,7 @@ files:
 - lib/fir/patches/native_patch.rb
 - lib/fir/patches/os_patch.rb
 - lib/fir/patches/progress.rb
+- lib/fir/patches/rest_client_fix.rb
 - lib/fir/patches/try.rb
 - lib/fir/util.rb
 - lib/fir/util/ali_uploader.rb
@@ -289,7 +311,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: fir.im command tool
 test_files: