fast_pack 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961562f8d95682a46c2f9ad8b8fb086898fd854dc0f54b4a485b12a60c082d0f
-  data.tar.gz: e1047b517bef568796d2d0b231d2e1d03efccdbacfef316cdf40b320ee92d60b
+  metadata.gz: 56b76321cbc99b6332e24ff16d35aa00200a23bccea0288640e97929c9bc4733
+  data.tar.gz: 990894a1d13a216970560cef95f4c240552d25b7ed3bf270f3b252862512f915
 SHA512:
-  metadata.gz: 5501a5de9d3f5ba309a3f11d5230f573e9546b59d85094c9ec0bbe95e41c15c14dfae7854e8e96710823ba401d5287e3601f229f91e78ced68ac001b604af873
-  data.tar.gz: c998a9d1a4299be0ea0d7ede83873a5cc8449825608c838a58be26ca84aeae708f01b1b0d39fc739cc34bd9811ca07dfd9796ea0bc85d97c312fd34443c56865
+  metadata.gz: f6c15ba3e8418a94201d88bd419e406531e1ff5d8c9df4c7baf7f8472ff6f486df13ecfdf8145ebbb0f86f82a70711cec11c743ef5fa92088ca92cad037b59d9
+  data.tar.gz: b068e5065c2122006903ebbd0f427e020f30fa6552bf4a30b7398bba5f222450194edf1145b16654ac694164c7570d19888bc2115d5b81ea031b678814f5eaea

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

@@ -41,11 +41,15 @@ module Pod
                 uki_config.dsym = @dsym
                 uki_config.release = @release
                 uki_config.no_build = @no_build
+                uki_config.build_time = Time.now.to_i 
+                uki_config.upload_time = 0
 
               end
         
               def run
                 if verify_workspace_exists?
+                    shell.export_xcode_env
+
                  if uki_config.no_build
                     #直接导出
                     shell.export
@@ -62,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

@@ -1,33 +1,70 @@
 require 'cocoapods-uki-packager/uki_config.rb' 
 require 'cocoapods'
+require 'net/https'
+require 'uri'
+require 'json'
+require 'socket'
+
 
 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提交代码时提交上去
@@ -37,7 +74,7 @@ class Shell_Command
 
         unless uki_config.build_exe_path
             puts "未生成目标文件目录"
-            return
+            exit
         end
 
         puts %x{echo "*********************************************************  开始导出ipa"}
@@ -55,9 +92,6 @@ class Shell_Command
 
             fir_log="fir auto release"
 
-            #计时
-            SECONDS=0
-
             APP=$(find $product_path -type d | grep ".app$" | head -n 1)
             APP=${APP%.*}
 
@@ -70,29 +104,171 @@ class Shell_Command
             zip -r -q "$APP.ipa" ./Payload;
             rm -rf ./Payload;
 
-            echo "===生成ipa开始上传 time: ${SECONDS}s==="
+            # echo "===生成ipa开始上传 ==="
 
+            #计时
+            SECONDS=0
 
             fir_token="207c7aad886da8009a73486d5154a7a6"
-            fir publish "$APP.ipa" -T $fir_token -c "$fir_log" -Q -q
+            fir publish "$APP.ipa" -T $fir_token -c "$fir_log" -R
 
             size=$(ls -l $APP.ipa | awk '{ print $5 }')
 
             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==="
+            echo "===$notification===%" 
 
             osascript -e 'display notification "size:'$sizeM'm\ncaost:'$SECONDS's" with title "Uploaded to fir!" sound name "default" '
+
+            echo "upload_time=${SECONDS}"
         }
 
+        ipa_size = log[/包体积.*$/].split('=').last
+
+        url = log[/http:.*$/]
+        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
+
+    def send_notifi
+
+        branch = %x{
+            if branch=$(git symbolic-ref --short -q HEAD)
+                then
+                  echo  $branch
+                else
+                  echo "未知分支"
+            fi
+        }
+        
+        hostname = Socket.gethostname
+        project_name = uki_config.group_name
+        project_env = uki_config.release ? "Release": "Debug"
+        project_dsym = uki_config.dsym ? "已上传": "无符号表"
+
+        message = {
+            "msg_type": "interactive",
+            "card": {
+                "elements": [
+                  {
+                    "fields": [
+                      {
+                        "is_short": true,
+                        "text": {
+                          "content": "**打包分支**\n#{branch}",
+                          "tag": "lark_md"
+                        }
+                      },
+                      {
+                        "is_short": true,
+                        "text": {
+                          "content": "**打包环境**\n#{project_env}",
+                          "tag": "lark_md"
+                        }
+                      },
+                      {
+                        "is_short": true,
+                        "text": {
+                          "content": "**打包机器**\n#{hostname}",
+                          "tag": "lark_md"
+                        }
+                      },
+                      {
+                        "is_short": true,
+                        "text": {
+                          "content": "**dsym**\n#{project_dsym}",
+                          "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": {
+                          "content": "**编译耗时**\n#{uki_config.build_time}s",
+                          "tag": "lark_md"
+                        }
+                      },
+                      {
+                        "is_short": true,
+                        "text": {
+                          "content": "**上传耗时**\n#{uki_config.upload_time}s",
+                          "tag": "lark_md"
+                        }
+                      }
+                    ],
+                    "tag": "div"
+                  },
+                  {
+                    "tag": "hr"
+                  },
+                  {
+                      "tag": "action",
+                      "actions": [
+                          {
+                            "tag": "button",
+                            "text": {
+                              "tag": "lark_md",
+                              "content": "点击下载"
+                            },
+                            "type": "default",
+                            "url": "#{uki_config.fir_url}"
+                          }
+                      ]
+                  }
+                ],
+                "header": {
+                  "template": "green",
+                  "title": {
+                    "content": "#{project_name}",
+                    "tag": "plain_text"
+                  }
+                }
+              }
+        }
+
+        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"
+        }
+
+        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
@@ -17,24 +15,27 @@ class Uki_config
     attr_accessor :release
     # 是否产生dsym
     attr_accessor :dsym
-     # 自动workspace名称
-     attr_accessor :workspace_name
+    # 自动workspace名称
+    attr_accessor :workspace_name
+    # 编译耗时
+    attr_accessor :build_time
+    # 上传耗时
+    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
@@ -83,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.1"
+  VERSION = "0.3.4"
 end

data/lib/packager.rb

@@ -0,0 +1,12 @@
+
+
+
+
+{"msg_type":"interactive","card":{"elements":[{"fields":[{"is_short":true,"text":{"content":"**打包分支**\nRelease","tag":"lark_md"}},{"is_short":true,"text":{"content":"**打包环境**\nDebug","tag":"lark_md"}},{"is_short":true,"text":{"content":"**打包机器**\nxx的Mac","tag":"lark_md"}},{"is_short":true,"text":{"content":"**dsym**\n无","tag":"lark_md"}},{"is_short":true,"text":{"content":"**编译耗时**\n12s","tag":"lark_md"}},{"is_short":true,"text":{"content":"**上传耗时**\n60s","tag":"lark_md"}}],"tag":"div"},{"tag":"hr"},{"tag":"action","actions":[{"tag":"button","text":{"tag":"lark_md","content":"点击下载"},"type":"default","url":"https://www.baidu.com/"}]}],"header":{"template":"green","title":{"content":"打包已完成","tag":"plain_text"}}}}
+{:msg_type=>"interactive", :card=>{:elements=>[{:fields=>[{:is_short=>true, :text=>{:content=>"**打包分支**\nRelease", :tag=>"lark_md"}}, {:is_short=>true, :text=>{:content=>"**打包环境**\nDebug", :tag=>"lark_md"}}, {:is_short=>true, :text=>{:content=>"**打包机器**\nxx的Mac", :tag=>"lark_md"}}, {:is_short=>true, :text=>{:content=>"**dsym**\n无", :tag=>"lark_md"}}, {:is_short=>true, :text=>{:content=>"**编译耗时**\n12s", :tag=>"lark_md"}}, {:is_short=>true, :text=>{:content=>"**上传耗时**\n60s", :tag=>"lark_md"}}], :tag=>"div"}, {:tag=>"hr"}, {:tag=>"action", :actions=>[{:tag=>"button", :text=>{:tag=>"lark_md", :content=>"点击下载"}, :type=>"default", :url=>"https://www.baidu.com/"}]}], :header=>{:template=>"green", :title=>{:content=>"打包已完成", :tag=>"plain_text"}}}}
+
+
+
+  curl -X POST -H "Content-Type: application/json" \
+  -d '{"msg_type":"interactive","card":{"elements":[{"fields":[{"is_short":true,"text":{"content":"**打包分支**\nRelease","tag":"lark_md"}},{"is_short":true,"text":{"content":"**打包环境**\nDebug","tag":"lark_md"}},{"is_short":true,"text":{"content":"**打包机器**\nxx的Mac","tag":"lark_md"}},{"is_short":true,"text":{"content":"**dsym**\n无","tag":"lark_md"}},{"is_short":true,"text":{"content":"**编译耗时**\n12s","tag":"lark_md"}},{"is_short":true,"text":{"content":"**上传耗时**\n60s","tag":"lark_md"}}],"tag":"div"},{"tag":"hr"},{"tag":"action","actions":[{"tag":"button","text":{"tag":"lark_md","content":"点击下载"},"type":"default","url":"https://www.baidu.com/"}]}],"header":{"template":"green","title":{"content":"打包已完成","tag":"plain_text"}}}}' \
+  https://open.feishu.cn/open-apis/bot/v2/hook/be340a71-08b3-4541-8cc6-2f733dd6f257

metadata

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