fastlane-plugin-fastci 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf1e468abfff98b16e2557cddb145dabe01b80b28c241b1aab2acb5327fb1f4
-  data.tar.gz: 4617a95f8a655b293a04908f5b85647a59933b880187e15811c31b421b8086dc
+  metadata.gz: beca80c5ed38df0f56430ea53056399285eaf4eb465c7918cca00dc6a0e65d75
+  data.tar.gz: b22ec9b71c62abc98c57860e140781f5cf3753d86498e696b68c3a6e0a131fe6
 SHA512:
-  metadata.gz: 0a01937a687c7510fe23e32ab1eb7532d2db9e506d3cde271815f177621bb1d96aa6977a015c1318ce1ef181a11d2cd2c6d7b20914e197215adbd94e9e9ee886
-  data.tar.gz: d3c8f80cf8bd6331d84e2ed15d9d84cebaf8bbca9e363a73afd48397418699f6b38810c67182758de490a0f0c83d1627d32b15e7d593f3cb342eb3f7b289c434
+  metadata.gz: 81c9c0f0ff28e37828515264276656128d3e14c8eb4c4b99add923a55e95e8876c59a1376ed4fde9951b4cf680aeff73ba4a25c51226c0208aa7e8c92904068a
+  data.tar.gz: 468dfc9af7d196b7c3d5360881aefae651a58ec2f240d9233c0063c20d2b91c60e04ef39e6a42d66cfdb2ea3e494f44690ace64239558eb60223fec53f4ff3d6

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

@@ -36,9 +36,13 @@ module Fastlane
         log_file = sh("ls -t #{log_dir}/*.log | head -n 1").strip
         index_store_path = CommonHelper.extract_index_store_path(log_file)
 
-        schemes = Environment.schemes
+        schemes = Environment.extra_schemes
+        scheme = params[:scheme] || Environment.scheme
+
         if schemes.empty?
-          schemes = Environment.scheme
+          schemes = [scheme]
+        else
+          schemes = schemes + [scheme]
         end
 
         # 运行 Periphery 扫描
@@ -70,6 +74,13 @@ module Fastlane
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(
+            key: :scheme,
+            description: "不采取默认配置，自定义 `scheme` 名称",
+            optional: true,
+            default_value: nil,
+            type: String
+          ),
           FastlaneCore::ConfigItem.new(
             key: :is_from_package,
             description: "是否从打包流程调用",

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

@@ -44,7 +44,7 @@ module Fastlane
           build: build
         )
         time = Time.new.strftime("%Y%m%d%H%M")
-        version = Actions::GetVersionNumberAction.run(target: Environment.target)
+        version = Actions::GetVersionNumberAction.run(target: scheme)
         build = Actions::GetBuildNumberAction.run({})
         # 生成ipa包的名字格式
         ipaName = "#{scheme}_#{export_method}_#{version}_#{build}.ipa"
@@ -124,7 +124,7 @@ module Fastlane
 
         ipa_path = "#{Constants.IPA_OUTPUT_DIR}/#{ipaName}"
 
-        if export_method == "app-store" || export_method == "testFlight"
+        if gym_method == "app-store"
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-打包完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
           DingdingHelper.sendMarkdown(notiText)
 
@@ -170,7 +170,10 @@ module Fastlane
 
         # 代码分析
         if is_analyze_swiftlint && gym_method != "app-store"
-          analyze_swiftlint(is_from_package: true, configuration: configuration)
+          other_action.analyze_swiftlint(
+            is_from_package: true,
+            configuration: configuration
+          )
           # 结果复制到桌面
           FileUtils.cp(SWIFTLINT_HTML_FILE, target_path)
           FileUtils.cp(SWIFTLINT_ANALYZE_HTML_FILE, target_path)
@@ -181,7 +184,9 @@ module Fastlane
 
         # 重复代码检查
         if is_detect_duplicity_code && gym_method != "app-store"
-          detect_code_duplicity(is_all: true)
+          other_action.detect_code_duplicity(
+            is_all: true
+          )
           # 结果复制到桌面
           FileUtils.cp(DUPLICITY_CODE_HTML_FILE, target_path)
           UI.message("*************| 重复代码检查完成 |*************")
@@ -191,7 +196,8 @@ module Fastlane
 
         # 无用代码检查
         if is_detect_unused_code && gym_method != "app-store"
-          DetectUnusedCodeAction.run(
+          other_action.detect_unused_code(
+            scheme: scheme,
             is_from_package: true,
             configuration: configuration
           )
@@ -204,7 +210,7 @@ module Fastlane
 
         # 无用图片检查
         if is_detect_unused_image && gym_method != "app-store"
-          DetectUnusedImageAction.run({})
+          other_action.detect_unused_image()
           # 结果复制到桌面
           FileUtils.cp(Constants.UNUSED_IMAGE_HTML_FILE, target_path)
           UI.message("*************| 无用图片检查完成 |*************")

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

@@ -6,6 +6,13 @@ module Fastlane
     class DingdingHelper
 
       def self.sendMarkdown(text)
+
+        # 检查钉钉 Token 是否存在
+        unless CommonHelper.is_validate_string(Environment.dingdingToken)
+          UI.message("*************| 跳过钉钉消息通知（未配置 Token）|*************")
+          return
+        end
+        
         UI.message("*************| 开始钉钉消息通知 |*************")
 
         curl = %Q{

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

@@ -13,9 +13,6 @@ module Fastlane
       def self.scheme
         ENV['SCHEME_NAME']
       end
-      def self.target
-        ENV['TARGET_NAME']
-      end
       def self.workspace
         ENV['WORKSPACE_NAME']
       end
@@ -25,8 +22,8 @@ module Fastlane
       def self.extension_bundle_ids
         ENV['EXTENSION_BUNDLE_IDS']&.split(",") || []
       end
-      def self.schemes
-        ENV['SCHEMES_NAME']&.split(",") || []
+      def self.extra_schemes
+        ENV['EXTRA_SCHEMES_NAME']&.split(",") || []
       end
 
       # 证书描述文件等放置的文件夹名称

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Fastci
-    VERSION = "0.0.10"
+    VERSION = "0.0.12"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-fastci
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - watermelon