fastlane-plugin-fastci 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 412038fd44bc6d55aa20d9be09dd4501bef38e2050066ab808e8d88dc60994e7
-  data.tar.gz: d6535653192f7f5b4aa0ef9a6126b6df85fb50fb1036daa686920b168f070652
+  metadata.gz: 1ec73525d2fc7e5ec78f87ea1636db7114910582cb44eda3408bc3bde430751b
+  data.tar.gz: 2b70526a319ba2919c7e88dbe44efd0b36a34a4f31be9e7f4112d897f422c635
 SHA512:
-  metadata.gz: 3cb86329414a976f10e924e55f1961462e1e2342b904ecaad5a1ac60ea09b3bd285c81689f0babcbab24a0ce82eaad09f65cf4d7b0247ff0f7a1d3648e2f5b43
-  data.tar.gz: 0fc6b479c8b969597e8354a3a20360150935a53581668e72cc34db2311567fec50f0ec86e4664bb41e449c6dbcb1599fce34a044d6caf7e32bf5142a69463fee
+  metadata.gz: db85d8ef2ace70c0354e1bf7807e656e02cef23d8a99f8cf5dd2b9340decd746880370651057a75e3484abd3116fe5fc393ef93ad0a220dccca72242a8ce13c4
+  data.tar.gz: 4c265130006c89b34266d34adaf983ef0c0d4b00bb49d17de1430958a818465bb0e8c1aa7ad1fb64ddbf73526ed54b2bb5c249a3f4fd307e1d73640ed2ff5e38

data/README.md

@@ -48,7 +48,7 @@ fastlane_cache/ # 插件缓存文件夹
 
 ### 1. 自动打包
 功能：自动编译并导出 ipa 包，支持多种打包方式和集成多项检查。
-生成完的 ipa 会放在桌面上，非 ` app-store ` 配置了蒲公英参数会自动上传蒲公英，` app-store ` 配置了商店参数会自动上传商店。
+生成完的 ipa 会放在桌面上，非 ` app-store ` 配置了蒲公英或 fir 参数会自动上传蒲公英或 fir` app-store ` 配置了商店参数会自动上传商店。
 
 ` build `: 不指定的话内部有递增逻辑，格式为 ` 20250905.15（日期+当天包的次数） `
 
@@ -64,6 +64,7 @@ package(
 	is_detect_duplicity_code: false, # 是否检测重复代码
 	is_detect_unused_code: false, # 是否检测未使用代码
 	is_detect_unused_image: false # 是否检测未使用图片
+    release_notes: options[:release_notes] # 配合 jenkins 传参上传 appstore 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串 
 )
 ```
 

data/lib/fastlane/plugin/fastci/actions/install_certificate_action.rb

@@ -11,7 +11,7 @@ module Fastlane
         certificate_paths = Dir.glob(File.expand_path("#{Environment.certificate_folder_name}/*.p12"))
         certificate_paths.each do |path|
           other_action.import_certificate(
-            certificate_path: File.expand_path(path),
+            certificate_path: path,
             certificate_password: "#{Environment.certificate_password}",
             keychain_name: "login.keychain",
             keychain_password: "#{Environment.keychain_password}"

data/lib/fastlane/plugin/fastci/actions/install_profile_action.rb

@@ -11,7 +11,7 @@ module Fastlane
         provisioning_profile_paths = Dir.glob(File.expand_path("#{Environment.provisioningProfile_folder_name}/*.mobileprovision"))
         provisioning_profile_paths.each do |path|
           other_action.install_provisioning_profile(
-            path: File.expand_path(path)
+            path: path
           )
         end
       end

data/lib/fastlane/plugin/fastci/actions/package_action.rb

@@ -18,6 +18,7 @@ module Fastlane
         is_detect_duplicity_code = params[:is_detect_duplicity_code] || false
         is_detect_unused_code = params[:is_detect_unused_code] || false
         is_detect_unused_image = params[:is_detect_unused_image] || false
+        release_notes = params[:release_notes] || ""
         if export_method == "app-store"
           configuration = "Release"
         end
@@ -27,9 +28,9 @@ module Fastlane
         FileUtils.rm_rf(Dir.glob("#{Constants.IPA_OUTPUT_DIR}/*"))
         
         # 安装证书
-        InstallCertificateAction.run({})
+        other_action.install_certificate()
         # 安装 provisioningProfile
-        InstallProfileAction.run({})
+        other_action.install_profile()
 
         scheme = Environment.scheme
 
@@ -115,27 +116,39 @@ module Fastlane
 
         if export_method == "app-store"
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-打包完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
-          NotiDingdingAction.run(notiText: notiText)
+          DingdingHelper.sendMarkdown(notiText)
 
           if CommonHelper.is_validate_string(Environment.connect_key_id) && CommonHelper.is_validate_string(Environment.connect_issuer_id)
 
-            UploadStoreAction.run({})
+            other_action.upload_store(release_notes: release_notes)
             notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-上传完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
-            NotiDingdingAction.run(notiText: notiText)
+            DingdingHelper.sendMarkdown(notiText)
           end
         else
-          # 上传蒲公英
-          pgy_upload_info = UploadPgyAction.run(
-            "ipa_path": ipa_path
-          )
-          qrCode = pgy_upload_info["buildQRCodeURL"]
-
           # 钉钉通知
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-打包完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
-          if CommonHelper.is_validate_string(qrCode)
-            notiText << "\n\n⬇️⬇️⬇️ 扫码安装 ⬇️⬇️⬇️\n\n![screenshot](#{qrCode})"
+
+          # 上传蒲公英
+          if CommonHelper.is_validate_string(Environment.pgy_api_key)
+            pgy_upload_info = other_action.upload_pgy()
+            qrCode = pgy_upload_info["buildQRCodeURL"]
+
+            if CommonHelper.is_validate_string(qrCode)
+              notiText << "\n\n⬇️⬇️⬇️ 扫码安装 ⬇️⬇️⬇️\n\n\n密码: #{Environment.pgy_password}\n![screenshot](#{qrCode})"
+            end
+          end
+
+          # 上传 fir
+          if CommonHelper.is_validate_string(Environment.fir_api_token)
+            fir_upload_info = other_action.upload_fir()
+            download_url = fir_upload_info[:download_url]
+
+            if CommonHelper.is_validate_string(download_url)
+              notiText << "\n\n⬇️⬇️⬇️ 点击链接安装 ⬇️⬇️⬇️\n\n\n密码: #{Environment.fir_password}\n[_点击下载_](#{download_url})"
+            end
           end
-          NotiDingdingAction.run(notiText: notiText)
+
+          DingdingHelper.sendMarkdown(notiText)
         end
 
         # 代码分析
@@ -188,7 +201,7 @@ module Fastlane
           is_detect_unused_image
           # 钉钉通知
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-代码检查完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
-          NotiDingdingAction.run(notiText: notiText)
+          DingdingHelper.sendMarkdown(notiText)
         else
           UI.message("*************| 跳过代码检查 |*************")
         end
@@ -270,6 +283,12 @@ module Fastlane
             default_value: false,
             type: Boolean
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :release_notes,
+            description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",
+            optional: true,
+            type: String
+          )
         ]
       end
 

data/lib/fastlane/plugin/fastci/actions/upload_fir_action.rb

@@ -0,0 +1,38 @@
+require 'fastlane/action'
+require 'fastlane/plugin/fir_cli'
+include Fastlane::Helper
+
+module Fastlane
+  module Actions
+    # 上传Fir
+    class UploadFirAction < Action
+      def self.run(params)
+        UI.message("*************| 开始上传Fir |*************")
+
+        firinfo = other_action.fir_cli(
+          api_token: Environment.fir_api_token,
+          password: Environment.fir_password,
+        )
+        
+        return firinfo
+      end
+
+      def self.description
+        "上传Fir"
+      end
+
+      def self.available_options
+        []
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+
+      def self.category
+        :building
+      end
+
+    end
+  end
+end

data/lib/fastlane/plugin/fastci/actions/upload_pgy_action.rb

@@ -9,15 +9,7 @@ module Fastlane
       def self.run(params)
         UI.message("*************| 开始上传蒲公英 |*************")
 
-        unless CommonHelper.is_validate_string(Environment.pgy_api_key)
-          UI.message("*************| 没有配置 pgy_api_key |*************")
-          return
-        end
-
-        ipa_path = params[:ipa_path] || ""
-
-        pgyinfo = PgyerAction.run(
-          ipa: ipa_path,
+        pgyinfo = other_action.pgyer(
           api_key: Environment.pgy_api_key,
           password: Environment.pgy_password,
           install_type: "2"

data/lib/fastlane/plugin/fastci/actions/upload_store_action.rb

@@ -8,6 +8,8 @@ module Fastlane
       def self.run(params)
         UI.message("*************| 开始上传 AppStore |*************")
 
+        release_notes = JSON.parse(params[:release_notes] || "") rescue ""
+
         other_action.app_store_connect_api_key(
           key_id: Environment.connect_key_id,
           issuer_id: Environment.connect_issuer_id,
@@ -21,7 +23,7 @@ module Fastlane
           force: true,
           submit_for_review: false,
           automatic_release: false,
-          release_notes: params[:release_notes]
+          release_notes: release_notes
         )
         
       end
@@ -34,9 +36,9 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(
             key: :release_notes,
-            description: "更新文案, 格式为 { \"zh-Hans\" => \"修复问题\", \"en-US\" => \"bugfix\"} ",
+            description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",
             optional: false,
-            type: Hash
+            type: String
           )
         ]
       end

data/lib/fastlane/plugin/fastci/helper/dingding_helper.rb

@@ -0,0 +1,27 @@
+require 'fastlane_core/ui/ui'
+require 'fileutils'
+
+module Fastlane
+  module Helper
+    class DingdingHelper
+
+      def self.sendMarkdown(text)
+        UI.message("*************| 开始钉钉消息通知 |*************")
+
+        curl = %Q{
+          curl 'https://oapi.dingtalk.com/robot/send?access_token=#{Environment.dingdingToken}' \
+          -H 'Content-Type:application/json' \
+          -d '{
+            "msgtype":"markdown",
+            "markdown":{
+              "title":"#{Environment.scheme} 打包通知",
+              "text":"#{text}"
+            }
+          }'
+        }
+        system curl
+      end
+
+    end
+  end
+end

data/lib/fastlane/plugin/fastci/helper/environment.rb

@@ -77,6 +77,14 @@ module Fastlane
         ENV['PGY_PASSWORD']
       end
 
+      # Fir配置
+      def self.fir_api_token
+        ENV['FIR_API_TOKEN']
+      end
+      def self.fir_password
+        ENV['FIR_PASSWORD']
+      end
+
       # 钉钉配置
       def self.dingdingToken
         ENV['DINGDING_TOKEN']

data/lib/fastlane/plugin/fastci/helper/fir_helper.rb

@@ -0,0 +1,29 @@
+require 'fastlane_core/ui/ui'
+require 'fastlane/plugin/fir_cli'
+require 'fileutils'
+
+module Fastlane
+  module Helper
+    class FirHelper
+
+      # def self.get_download_url(download_domain, short)
+      #   "https://#{download_domain}/#{short}"
+      # end
+
+      # def self.get_qrcode(download_url)
+      #   filePath = File.expand_path(Constants.IPA_OUTPUT_DIR)
+      #   qrcode_path = "#{filePath}/fir-qrcode.png"
+      #   generate_rqrcode(download_url, qrcode_path)
+
+      #   qrcode_path
+      # end
+
+      # def self.generate_rqrcode(string, png_file_path)
+      #   qrcode = ::RQRCode::QRCode.new(string.to_s)
+      #   qrcode.as_png(size: 500, border_modules: 2, file: png_file_path)
+      #   png_file_path
+      # end
+
+    end
+  end
+end

data/lib/fastlane/plugin/fastci/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Fastci
-    VERSION = "0.0.4"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-fastci
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - watermelon
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: fastlane-plugin-versioning
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: fastlane-plugin-fir_cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.21
 email: watermelon_lp@163.com
 executables: []
 extensions: []
@@ -51,14 +65,16 @@ files:
 - lib/fastlane/plugin/fastci/actions/detect_unused_image_action.rb
 - lib/fastlane/plugin/fastci/actions/install_certificate_action.rb
 - lib/fastlane/plugin/fastci/actions/install_profile_action.rb
-- lib/fastlane/plugin/fastci/actions/noti_dingding_action.rb
 - lib/fastlane/plugin/fastci/actions/package_action.rb
 - lib/fastlane/plugin/fastci/actions/update_build_number_action.rb
+- lib/fastlane/plugin/fastci/actions/upload_fir_action.rb
 - lib/fastlane/plugin/fastci/actions/upload_pgy_action.rb
 - lib/fastlane/plugin/fastci/actions/upload_store_action.rb
 - lib/fastlane/plugin/fastci/helper/common_helper.rb
 - lib/fastlane/plugin/fastci/helper/constants.rb
+- lib/fastlane/plugin/fastci/helper/dingding_helper.rb
 - lib/fastlane/plugin/fastci/helper/environment.rb
+- lib/fastlane/plugin/fastci/helper/fir_helper.rb
 - lib/fastlane/plugin/fastci/version.rb
 - lib/fastlane/plugin/python/generate_duplicity_code_html.py
 - lib/fastlane/plugin/python/generate_lint_html.py

data/lib/fastlane/plugin/fastci/actions/noti_dingding_action.rb

@@ -1,51 +0,0 @@
-require 'fastlane/action'
-include Fastlane::Helper
-
-module Fastlane
-  module Actions
-    # 钉钉通知
-    class NotiDingdingAction < Action
-      def self.run(params)
-        UI.message("*************| 开始钉钉消息通知 |*************")
-        notiText = params[:notiText] || ""
-
-        curl = %Q{
-          curl 'https://oapi.dingtalk.com/robot/send?access_token=#{Environment.dingdingToken}' \
-          -H 'Content-Type:application/json' \
-          -d '{
-            "msgtype":"markdown",
-            "markdown":{
-              "title":"#{Environment.scheme} 打包通知",
-              "text":"#{notiText}"
-            }
-          }'
-        }
-        system curl
-      end
-
-      def self.description
-        "钉钉通知"
-      end
-
-      def self.available_options
-        [
-          FastlaneCore::ConfigItem.new(
-            key: :notiText,
-            description: "要发送的钉钉通知内容",
-            optional: false, # 是否可选
-            type: String
-          ),
-        ]
-      end
-
-      def self.is_supported?(platform)
-        platform == :ios
-      end
-
-      def self.category
-        :notifications
-      end
-
-    end
-  end
-end