fast_pack 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f1d465cf6282eb85d5c89f7bd38fe35a312a645b80db13f52e4e0c8082d0f90
-  data.tar.gz: 8ec99d3632959d380921ce009ac87fdcb3e39bc18a8f553c9b98488fdefb52ed
+  metadata.gz: 67dc8ee35cc30708896e0e1281bed29496fe587043dcd74fab145d13e75cc381
+  data.tar.gz: 842747c3508824971d1fdd512c07f627c2a0e69c9f90d950d03682342af9dff3
 SHA512:
-  metadata.gz: 053e7d08cc9af8814d8eed3f42848c65cc0a9fcee229263c85b2b834bca65f73197778c4eebecce608d987015b2bb62c38ef32b2b3cab3d7bf4aefe688cbbc5c
-  data.tar.gz: '095654f7f64e94dcdda62be7de6f0c0604bbb2dba360806a764b16cd3ad0c17dce2c6e32601e270cbc3812fa67be4f3cd1c896b274b3537c9b62b0f95cc99416'
+  metadata.gz: c651e6cf66be5bd555c76d286605daa40a36bbf5c56997cbf130e4c8d412c4250d46e421218c1b2ac8bb6f1c502aa6b859838595aa2087670b570c646e0e338e
+  data.tar.gz: fe7bf395dfa1bca11e4174d194f7d15db23085606a790230f34fcc309f09bb6d844f706628a0e27d34fb1192aa6dca909117ff6a46c0dc119f077af871ebc8e6

data/lib/cocoapods-uki-packager/command/pack.rb

@@ -48,6 +48,8 @@ module Pod
         
               def run
                 if verify_workspace_exists?
+                    shell.export_xcode_env
+
                  if uki_config.no_build
                     #直接导出
                     shell.export
@@ -64,7 +66,7 @@ module Pod
                 uki_config.auto_work_space_name
                 unless uki_config.workspace_name
                     puts("大兄弟，请前往xxxx.workspace同级目录执行哦")
-                    return false
+                    exit
                 end
 
                 return true

data/lib/cocoapods-uki-packager/shell.rb

@@ -10,38 +10,71 @@ class Shell_Command
 
     include Uki_config::Mixin
 
-    def build
-
-        puts %x{echo "*********************************************************  开始编译"}
-        
-        log = %x{
+    def export_xcode_env
+      puts("*********************************************************  开始导出Xcode环境变量")
+
+      log = %x{
+        rootPath=`pwd`
+        fireName="xcode_env.json"
+        full_path="${rootPath}/${fireName}"
+        if [ -f "$full_path" ]
+          then
+              echo "存在xcode_env.json"
+          else
+              echo "不存在xcode_env.json 创建一个"
+              touch ${full_path}
+          fi
+
+          if [ -f "$full_path" ]
+            then
+            echo `xcodebuild -showBuildSettings -json` > "$full_path"
+          fi  
+      }
+
+      if !File.exist?(uki_config.xcode_env_path)
+        puts("当前目录未查找到xcode_env.json文件， 请检查执行目录")
+        exit
+      end
+
+      json_from_file = File.read(uki_config.xcode_env_path)
+      uki_config.xcode_envs = JSON.parse(json_from_file).first
+
+      if uki_config.verbose?
+        puts(log)
+      end
 
-            xcodebuild build -workspace #{uki_config.workspace} -scheme #{uki_config.scheme} -destination generic/platform=iOS -configuration #{uki_config.configuration} DEBUG_INFORMATION_FORMAT=#{uki_config.dsym_config} DWARF_DSYM_FOLDER_PATH=#{uki_config.dsym_path}
+    end
 
-            if [[ $? -ne 0 ]]; then
-                echo "************************************* 编译失败 *************************************"
-                exit 1
-            fi
-        }
+    def build
 
-        puts %x{echo "*********************************************************  编译完成"}
+        puts("*********************************************************  开始编译")
 
         if uki_config.verbose?
-            # puts(log)
+          puts("xcodebuild build -workspace #{uki_config.workspace} -scheme #{uki_config.scheme} -destination generic/platform=iOS -configuration #{uki_config.configuration} DEBUG_INFORMATION_FORMAT=#{uki_config.dsym_config} DWARF_DSYM_FOLDER_PATH=#{uki_config.dsym_path}")
         end
+        
+        log = %x{
+            xcodebuild build -workspace #{uki_config.workspace} -scheme #{uki_config.scheme} -destination generic/platform=iOS -configuration #{uki_config.configuration} DEBUG_INFORMATION_FORMAT=#{uki_config.dsym_config} DWARF_DSYM_FOLDER_PATH=#{uki_config.dsym_path}
+        }
 
-        # 直接开始导出
-        self.export
-
+       if log[/BUILD SUCCEEDED/]
+         puts("*********************************************************  编译完成")
+         # 直接开始导出
+         self.export
+       elsif 
+         puts("*********************************************************  编译失败")
+         exit
+       end 
     end
 
     # 暂时先不copy到跟目录， 防止Git提交代码时提交上去
     # 需安装Fir  不太友好
     # 安装命令 sudo gem install fir-cli
     def export
+
         unless uki_config.build_exe_path
-            puts "未生成目标文件目录"
-            return
+            puts "未找到目标文件目录"
+            exit
         end
 
         puts %x{echo "*********************************************************  开始导出ipa"}
@@ -83,7 +116,8 @@ class Shell_Command
 
             sizeM=`echo "scale=2; ${size}/1024.0/1024" | bc`
             #sizeM="$((${size}/1000.0))
-            echo -e "===size=${sizeM}m==="
+
+            echo -e "包体积=${sizeM}m\n"
 
             notification="Did uploaded to fir caost time:${SECONDS}s"
             echo "===$notification===%" 
@@ -93,18 +127,25 @@ class Shell_Command
             echo "upload_time=${SECONDS}"
         }
 
-        puts("恭喜打包完成")
-
-        if uki_config.verbose?
-            puts(log)
-        end
-
-        url = log[/http:.*$/]
+        ipa_size = log[/包体积.*$/].split('=').last
+        url = log[/http:.*$/].to_s
         array = log.split('%')
         uki_config.upload_time = array.last.split("=").last.to_i
         uki_config.build_time = Time.now.to_i - uki_config.build_time - uki_config.upload_time
         uki_config.fir_url = url
+        uki_config.ipa_size = ipa_size
 
+        unless !url.empty?
+            puts("导出失败")
+            exit
+        end
+
+        puts("恭喜打包完成")
+
+        if uki_config.verbose?
+            puts(log)
+        end
+        
         send_notifi
     end
 
@@ -120,7 +161,7 @@ class Shell_Command
         }
         
         hostname = Socket.gethostname
-        project_name = uki_config.project_sea ? "iOS海外极速打包已完成": "iOS国内极速打包已完成"
+        project_name = uki_config.group_name
         project_env = uki_config.release ? "Release": "Debug"
         project_dsym = uki_config.dsym ? "已上传": "无符号表"
 
@@ -158,6 +199,20 @@ class Shell_Command
                           "tag": "lark_md"
                         }
                       },
+                      {
+                        "is_short": true,
+                        "text": {
+                          "content": "**App版本**\n#{uki_config.app_version}.#{uki_config.build_version}",
+                          "tag": "lark_md"
+                        }
+                      },
+                      {
+                        "is_short": true,
+                        "text": {
+                          "content": "**包体积**\n#{uki_config.ipa_size}",
+                          "tag": "lark_md"
+                        }
+                      },
                       {
                         "is_short": true,
                         "text": {
@@ -204,12 +259,15 @@ class Shell_Command
         }
 
         log = %x{
-            curl -X POST -H "Content-Type: application/json" -d '#{message.to_json}' "https://open.feishu.cn/open-apis/bot/v2/hook/68c47d38-fc65-4cc5-a386-885a1fbff11b"
+            curl -X POST -H "Content-Type: application/json" -d '#{message.to_json}' "https://open.feishu.cn/open-apis/bot/v2/hook/71ee99db-27fa-45ee-8cba-3004037f34ea"
         }
 
         if uki_config.verbose?
             puts(log)
         end
+
+        exit
+
     end
 
     def self.instance

data/lib/cocoapods-uki-packager/uki_config.rb

@@ -4,8 +4,6 @@ class Uki_config
     # scheme info
     PROJECT_SCHEME = ['UkiOverseas', 'miaohong'].freeze
 
-    # workspace name
-    PROJECT_WORKSPACENAME = ['UkiOverseas.xcworkspace', 'miaohong.xcworkspace']
 
     # 是否展示详细信息
     attr_accessor :verbose
@@ -25,22 +23,19 @@ class Uki_config
     attr_accessor :upload_time 
     # 上传Url 
     attr_accessor :fir_url
+    # xcode环境变量
+    attr_accessor :xcode_envs
+    # 包体积
+    attr_accessor :ipa_size
 
     alias_method :verbose?, :verbose
 
     def scheme
-        unless project_sea
-            return PROJECT_SCHEME.last
-        end
-        return PROJECT_SCHEME.first
+        return self.xcode_envs["target"]
     end
 
     def workspace
-        unless project_sea
-            return PROJECT_WORKSPACENAME.last
-        end
-
-        return PROJECT_WORKSPACENAME.first
+        return self.workspace_name
     end
 
     def configuration
@@ -89,22 +84,44 @@ class Uki_config
 
         Dir.foreach(@installation_root) do |entry|
             if entry.end_with?('xcworkspace')
-                @workspace_name = entry.split('.').first
+                @workspace_name = entry
                 next
             end
         end
     end
 
+    def app_version
+        buildSettings = self.xcode_envs["buildSettings"]
+        return buildSettings["MARKETING_VERSION"]
+    end
+
+    def build_version
+        buildSettings = self.xcode_envs["buildSettings"]
+        return buildSettings["CURRENT_PROJECT_VERSION"]
+    end
+
     # 读取产物记录文件
     def app_file_path
         return File.join(@installation_root, "app_path")
     end
 
-    # 产物路径
-    def build_exe_path
+     # 产物路径
+     def build_exe_path
         return IO.readlines(app_file_path).first      
     end
 
+    def group_name
+        unless @workspace_name == "miaohong.xcworkspace"
+            return "iOS海外极速打包已完成"
+        end
+
+        return "iOS国内极速打包已完成"
+    end
+
+    def xcode_env_path
+        return File.join(@installation_root, "xcode_env.json")
+    end
+
     def self.instance
         @instance ||= new
     end

data/lib/cocoapods-uki-packager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Packager
-  VERSION = "0.3.2"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_pack
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - 耿磊
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods