fast_pack 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961562f8d95682a46c2f9ad8b8fb086898fd854dc0f54b4a485b12a60c082d0f
-  data.tar.gz: e1047b517bef568796d2d0b231d2e1d03efccdbacfef316cdf40b320ee92d60b
+  metadata.gz: 6f1d465cf6282eb85d5c89f7bd38fe35a312a645b80db13f52e4e0c8082d0f90
+  data.tar.gz: 8ec99d3632959d380921ce009ac87fdcb3e39bc18a8f553c9b98488fdefb52ed
 SHA512:
-  metadata.gz: 5501a5de9d3f5ba309a3f11d5230f573e9546b59d85094c9ec0bbe95e41c15c14dfae7854e8e96710823ba401d5287e3601f229f91e78ced68ac001b604af873
-  data.tar.gz: c998a9d1a4299be0ea0d7ede83873a5cc8449825608c838a58be26ca84aeae708f01b1b0d39fc739cc34bd9811ca07dfd9796ea0bc85d97c312fd34443c56865
+  metadata.gz: 053e7d08cc9af8814d8eed3f42848c65cc0a9fcee229263c85b2b834bca65f73197778c4eebecce608d987015b2bb62c38ef32b2b3cab3d7bf4aefe688cbbc5c
+  data.tar.gz: '095654f7f64e94dcdda62be7de6f0c0604bbb2dba360806a764b16cd3ad0c17dce2c6e32601e270cbc3812fa67be4f3cd1c896b274b3537c9b62b0f95cc99416'

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

@@ -41,6 +41,8 @@ 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
         

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

@@ -1,5 +1,10 @@
 require 'cocoapods-uki-packager/uki_config.rb' 
 require 'cocoapods'
+require 'net/https'
+require 'uri'
+require 'json'
+require 'socket'
+
 
 class Shell_Command
 
@@ -34,7 +39,6 @@ class Shell_Command
     # 需安装Fir  不太友好
     # 安装命令 sudo gem install fir-cli
     def export
-
         unless uki_config.build_exe_path
             puts "未生成目标文件目录"
             return
@@ -55,9 +59,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,11 +71,13 @@ 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 }')
 
@@ -83,9 +86,11 @@ class Shell_Command
             echo -e "===size=${sizeM}m==="
 
             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}"
         }
 
         puts("恭喜打包完成")
@@ -93,6 +98,118 @@ class Shell_Command
         if uki_config.verbose?
             puts(log)
         end
+
+        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
+
+        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.project_sea ? "iOS海外极速打包已完成": "iOS国内极速打包已完成"
+        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": "**编译耗时**\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
     end
 
     def self.instance

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

@@ -17,8 +17,14 @@ 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
 
     alias_method :verbose?, :verbose
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Packager
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 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.2
 platform: ruby
 authors:
 - 耿磊
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-31 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods