fastlane-plugin-fastci 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76aa3571beeba986621e0cbff3eb16daf5235d7b080708624acd53d3e6afa560
-  data.tar.gz: 74743848cbf6bfc3919199ec90bc92b1f5b181c8203b51c734f1149e474151f3
+  metadata.gz: d1c8c592c87f4597919d8a5534434ed422a94d0560be2ddb2a82353aefe43648
+  data.tar.gz: c17fd86d0c3084917668534196fe01053078952f6cdf30e81cf14c50b34dcd2f
 SHA512:
-  metadata.gz: 77ba058b10ad7811ba9c78f4d48eaee44bebab88f7709bd8f79186d2fa180a68df438b0bbe2238a8910875a758c2d26af43af41e071f3c8655e629b6cc64e418
-  data.tar.gz: d834627d814264375a73285bd9e9c23f92e77bded00f1158a9843f5a3216ce1c7f643b55f84460c004c43a3915d8a67a09121f979402f79995a95470adfc081e
+  metadata.gz: 6cee5ced946a258e71e30e8c7c7a445e6182ecc61aee1e1cf8a524486ec64a96c8b71eec99f259d58502296c4813c03ad915b6e8ae8b69519e85840306793f77
+  data.tar.gz: ef562edaf613408355e8752fe5104948c5f39b2ea156ce241fd57cacefa36503e5199c6dd21b7afeac2edd8202531c9998bd00f05328ac0b766f02a25228a0ae

data/README.md

@@ -71,7 +71,8 @@ package(
 	is_detect_unused_code: false, # 是否检测未使用代码
 	is_detect_unused_image: false, # 是否检测未使用图片
 	changelog: options[:changelog], # fir 更新日志
-    release_notes: options[:release_notes] # 配合 jenkins 传参上传 appstore 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串 
+    release_notes: options[:release_notes], # 配合 jenkins 传参上传 appstore 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串 
+	is_notice_dingding: options[:is_notice_dingding] # 配置钉钉token了，通过该参数控制是否发送通知
 )
 ```
 

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

@@ -8,38 +8,43 @@ module Fastlane
     # 打包
     class PackageAction < Action
       def self.run(params)
-
         # 入参配置
-        configuration = params[:configuration] || "Debug"
-        export_method = params[:export_method] || "development"
+        configuration = params[:configuration] || 'Debug'
+        export_method = params[:export_method] || 'development'
         build = params[:build] || nil
         version = params[:version] || nil
         is_analyze_swiftlint = params[:is_analyze_swiftlint] || false
         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" || export_method == "testFlight"
-          configuration = "Release"
+        release_notes = params[:release_notes] || ''
+        configuration = 'Release' if %w[app-store testFlight].include?(export_method)
+        is_notice_dingding = params[:is_notice_dingding].nil? ? true : params[:is_notice_dingding]
+        # 统一发送钉钉消息匿名函数
+        send_dingding_notice = lambda do |text|
+          if is_notice_dingding
+            DingdingHelper.sendMarkdown(text)
+          else
+            UI.message('*************| 跳过钉钉消息通知（is_notice_dingding=false）|*************')
+          end
         end
-
+        send_dingding_notice.call('测试一下')
         # 清理上一次的打包缓存
         FileUtils.rm_rf(Dir.glob("#{Constants.BUILD_LOG_DIR}/*"))
         FileUtils.rm_rf(Dir.glob("#{Constants.IPA_OUTPUT_DIR}/*"))
-        
-        # 安装证书
-        other_action.install_certificate()
-        # 安装 provisioningProfile
-        other_action.install_profile()
+
+        # 非自动更新模式下，安装证书和 provisioningProfile
+        unless Environment.is_auto_update_provisioning
+          other_action.install_certificate
+          other_action.install_profile
+        end
 
         scheme = params[:scheme] || Environment.scheme
 
         # 更改项目version
         if CommonHelper.is_validate_string(version)
           increment_options = { version_number: version }
-          if CommonHelper.is_validate_string(Environment.project)
-            increment_options[:xcodeproj] = Environment.project
-          end
+          increment_options[:xcodeproj] = Environment.project if CommonHelper.is_validate_string(Environment.project)
           other_action.increment_version_number(increment_options)
         end
 
@@ -47,45 +52,43 @@ module Fastlane
         other_action.update_build_number(
           build: build
         )
-        time = Time.new.strftime("%Y%m%d%H%M")
-        
+        time = Time.new.strftime('%Y%m%d%H%M')
+
         # 获取版本号
         version_options = { target: scheme }
-        if CommonHelper.is_validate_string(Environment.project)
-          version_options[:xcodeproj] = Environment.project
-        end
+        version_options[:xcodeproj] = Environment.project if CommonHelper.is_validate_string(Environment.project)
         version = other_action.get_version_number(version_options)
-        
+
         # 获取 build 号
         build_options = {}
-        if CommonHelper.is_validate_string(Environment.project)
-          build_options[:xcodeproj] = Environment.project
-        end
+        build_options[:xcodeproj] = Environment.project if CommonHelper.is_validate_string(Environment.project)
         build = other_action.get_build_number(build_options)
         # 生成ipa包的名字格式
         ipaName = "#{scheme}_#{export_method}_#{version}_#{build}.ipa"
-        
+
         # 获取 Extension 的 Bundle ID（可能有多个，用逗号分隔）
         extension_bundle_ids = Environment.extension_bundle_ids
         extension_profile_names = []
         # profile 名字
-        profile_name = ""
+        profile_name = ''
 
         case export_method
-        when "development"
+        when 'development'
           profile_name = Environment.provisioningProfiles_development
           extension_profile_names = Environment.extension_profiles_development
-        when "ad-hoc"
+        when 'ad-hoc'
           profile_name = Environment.provisioningProfiles_adhoc
           extension_profile_names = Environment.extension_profiles_adhoc
-        when "app-store", "testFlight"
+        when 'app-store', 'testFlight'
           profile_name = Environment.provisioningProfiles_appstore
           extension_profile_names = Environment.extension_profiles_appstore
         else
           raise "Unsupported export method: #{export_method}"
         end
 
-        # 组装 provisioningProfiles 
+        UI.message('*************| 开始打包 |*************')
+
+        # 组装 provisioningProfiles
         provisioningProfiles_map = {
           "#{Environment.bundleID}" => "#{profile_name}"
         }
@@ -93,11 +96,9 @@ module Fastlane
           provisioningProfiles_map[ext_bundle_id.strip] = extension_profile_names[idx]&.strip
         end
 
-        UI.message("*************| 开始打包 |*************")
-
         # 对于 testFlight，使用 app-store 方法
-        gym_method = export_method == "testFlight" ? "app-store" : export_method
-        
+        gym_method = export_method == 'testFlight' ? 'app-store' : export_method
+
         gym_options = {
           clean: true,
           silent: true,
@@ -120,11 +121,11 @@ module Fastlane
 
         other_action.gym(gym_options)
 
-        UI.message("*************| 打包完成 |*************")
+        UI.message('*************| 打包完成 |*************')
 
-        UI.message("*************| 复制打包产物 |*************")
+        UI.message('*************| 复制打包产物 |*************')
         # 定义桌面路径
-        desktop_path = File.expand_path("~/Desktop")
+        desktop_path = File.expand_path('~/Desktop')
         output_path = File.join(desktop_path, "BuildOutput_#{scheme}")
         target_path = File.join(output_path, "#{build}")
         FileUtils.mkdir_p(target_path)
@@ -140,20 +141,20 @@ module Fastlane
 
         ipa_path = "#{Constants.IPA_OUTPUT_DIR}/#{ipaName}"
 
-        if gym_method == "app-store"
+        if gym_method == 'app-store'
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-打包完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
-          DingdingHelper.sendMarkdown(notiText)
+          send_dingding_notice.call(notiText)
 
           if CommonHelper.is_validate_string(Environment.connect_key_id) && CommonHelper.is_validate_string(Environment.connect_issuer_id)
             # 根据 export_method 决定是否为 TestFlight
-            is_test_flight = export_method == "testFlight"
-            
+            is_test_flight = export_method == 'testFlight'
+
             other_action.upload_store(
               release_notes: release_notes,
               isTestFlight: is_test_flight
             )
             notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-上传完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
-            DingdingHelper.sendMarkdown(notiText)
+            send_dingding_notice.call(notiText)
           end
         else
           # 钉钉通知
@@ -161,8 +162,8 @@ module Fastlane
 
           # 上传蒲公英
           if CommonHelper.is_validate_string(Environment.pgy_api_key)
-            pgy_upload_info = other_action.upload_pgy()
-            qrCode = pgy_upload_info["buildQRCodeURL"]
+            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})"
@@ -181,43 +182,43 @@ module Fastlane
             end
           end
 
-          DingdingHelper.sendMarkdown(notiText)
+          send_dingding_notice.call(notiText)
         end
 
         # Sentry 上传 dSYM
-        if CommonHelper.is_validate_string(Environment.sentry_auth_token) 
-          other_action.sentry_upload_dsym()
+        if CommonHelper.is_validate_string(Environment.sentry_auth_token)
+          other_action.sentry_upload_dsym
         else
-          UI.message("*************| 未配置 Sentry 跳过 dSYM 上传 |*************")
+          UI.message('*************| 未配置 Sentry 跳过 dSYM 上传 |*************')
         end
 
         # 代码分析
-        if is_analyze_swiftlint && gym_method != "app-store"
+        if is_analyze_swiftlint && gym_method != 'app-store'
           other_action.analyze_swiftlint(
             is_from_package: true,
             configuration: configuration
           )
           # 结果复制到桌面
           FileUtils.cp(SWIFTLINT_ANALYZE_HTML_FILE, target_path)
-          UI.message("*************| 代码分析完成 |*************")
+          UI.message('*************| 代码分析完成 |*************')
         else
-          UI.message("*************| 跳过代码分析 |*************")
+          UI.message('*************| 跳过代码分析 |*************')
         end
 
         # 重复代码检查
-        if is_detect_duplicity_code && gym_method != "app-store"
+        if is_detect_duplicity_code && gym_method != 'app-store'
           other_action.detect_duplicity_code(
             is_all: true
           )
           # 结果复制到桌面
           FileUtils.cp(DUPLICITY_CODE_HTML_FILE, target_path)
-          UI.message("*************| 重复代码检查完成 |*************")
+          UI.message('*************| 重复代码检查完成 |*************')
         else
-          UI.message("*************| 跳过重复代码检查 |*************")
+          UI.message('*************| 跳过重复代码检查 |*************')
         end
 
         # 无用代码检查
-        if is_detect_unused_code && gym_method != "app-store"
+        if is_detect_unused_code && gym_method != 'app-store'
           other_action.detect_unused_code(
             scheme: scheme,
             is_from_package: true,
@@ -225,127 +226,130 @@ module Fastlane
           )
           # 结果复制到桌面
           FileUtils.cp(Constants.UNUSED_CODE_HTML_FILE, target_path)
-          UI.message("*************| 无用代码检查完成 |*************")
+          UI.message('*************| 无用代码检查完成 |*************')
         else
-          UI.message("*************| 跳过无用代码检查 |*************")
+          UI.message('*************| 跳过无用代码检查 |*************')
         end
 
         # 无用图片检查
-        if is_detect_unused_image && gym_method != "app-store"
-          other_action.detect_unused_image()
+        if is_detect_unused_image && gym_method != 'app-store'
+          other_action.detect_unused_image
           # 结果复制到桌面
           FileUtils.cp(Constants.UNUSED_IMAGE_HTML_FILE, target_path)
-          UI.message("*************| 无用图片检查完成 |*************")
+          UI.message('*************| 无用图片检查完成 |*************')
         else
-          UI.message("*************| 跳过未使用图片检查 |*************")
+          UI.message('*************| 跳过未使用图片检查 |*************')
         end
 
         if is_analyze_swiftlint ||
-          is_detect_duplicity_code ||
-          is_detect_unused_code ||
-          is_detect_unused_image
+           is_detect_duplicity_code ||
+           is_detect_unused_code ||
+           is_detect_unused_image
           # 钉钉通知
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-代码检查完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
-          DingdingHelper.sendMarkdown(notiText)
+          send_dingding_notice.call(notiText)
         else
-          UI.message("*************| 跳过代码检查 |*************")
+          UI.message('*************| 跳过代码检查 |*************')
         end
 
-        UI.message("*************| 脚本完成 |*************")
+        UI.message('*************| 脚本完成 |*************')
       end
 
       def self.description
-        "打包"
+        '打包'
       end
 
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(
             key: :scheme,
-            description: "不采取默认配置，自定义 `scheme` 名称",
+            description: '不采取默认配置，自定义 `scheme` 名称',
             optional: true,
             default_value: nil,
             type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :configuration,
-            description: "编译环境 Release or Debug",
+            description: '编译环境 Release or Debug',
             optional: true,
-            default_value: "Debug",
+            default_value: 'Debug',
             type: String,
             verify_block: proc do |value|
-              valid_params = ["Release", "Debug"]
-              unless valid_params.include?(value)
-                UI.user_error!("无效的编译环境: #{value}。支持的环境: #{valid_params.join(', ')}")
-              end
+              valid_params = %w[Release Debug]
+              UI.user_error!("无效的编译环境: #{value}。支持的环境: #{valid_params.join(', ')}") unless valid_params.include?(value)
             end
           ),
           FastlaneCore::ConfigItem.new(
             key: :export_method,
-            description: "打包方式 ad-hoc, enterprise, app-store, development, testFlight",
+            description: '打包方式 ad-hoc, enterprise, app-store, development, testFlight',
             optional: true,
-            default_value: "development",
+            default_value: 'development',
             type: String,
             verify_block: proc do |value|
-              valid_params = ["ad-hoc", "enterprise", "app-store", "development", "testFlight"]
-              unless valid_params.include?(value)
-                UI.user_error!("无效的打包方式: #{value}。支持的方式: #{valid_params.join(', ')}")
-              end
+              valid_params = %w[ad-hoc enterprise app-store development testFlight]
+              UI.user_error!("无效的打包方式: #{value}。支持的方式: #{valid_params.join(', ')}") unless valid_params.include?(value)
             end
           ),
           FastlaneCore::ConfigItem.new(
             key: :version,
-            description: "自定义 `version`。在 Xcode13 之后创建的项目，不再支持脚本修改。需要兼容请在 Build settings 中将 GENERATE_INFOPLIST_FILE 设置为 NO",
+            description: '自定义 `version`。在 Xcode13 之后创建的项目，不再支持脚本修改。需要兼容请在 Build settings 中将 GENERATE_INFOPLIST_FILE 设置为 NO',
             optional: true,
             default_value: nil,
             type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :build,
-            description: "不采取自动更新，自定义 `build` 号",
+            description: '不采取自动更新，自定义 `build` 号',
             optional: true,
             default_value: nil,
             type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :is_analyze_swiftlint,
-            description: "是否代码分析",
+            description: '是否代码分析',
             optional: true,
             default_value: false,
             type: Boolean
           ),
           FastlaneCore::ConfigItem.new(
             key: :is_detect_duplicity_code,
-            description: "是否检查重复代码",
+            description: '是否检查重复代码',
             optional: true,
             default_value: false,
             type: Boolean
           ),
           FastlaneCore::ConfigItem.new(
             key: :is_detect_unused_code,
-            description: "是否检查无用代码",
+            description: '是否检查无用代码',
             optional: true,
             default_value: false,
             type: Boolean
           ),
           FastlaneCore::ConfigItem.new(
             key: :is_detect_unused_image,
-            description: "是否检查无用图片",
+            description: '是否检查无用图片',
             optional: true,
             default_value: false,
             type: Boolean
           ),
           FastlaneCore::ConfigItem.new(
             key: :changelog,
-            description: "更新日志",
+            description: '更新日志',
             optional: true,
             type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :release_notes,
-            description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",
+            description: '更新文案, 格式为 { "zh-Hans": "修复问题", "en-US": "bugfix"} JSON 字符串',
             optional: true,
             type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :is_notice_dingding,
+            description: '是否通知钉钉(默认true, 优先级高于DINGDING_TOKEN)',
+            optional: true,
+            default_value: true,
+            type: Boolean
           )
         ]
       end
@@ -357,7 +361,6 @@ module Fastlane
       def self.category
         :building
       end
-
     end
   end
-end
+end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Fastci
-    VERSION = "0.0.19"
+    VERSION = "0.0.20"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-fastci
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - watermelon
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 2.5.1
 email: watermelon_lp@163.com
 executables: []
 extensions: []