fast_pack 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7b0a77c7befa512b6223027c2ccbd046577e7fe6ac97a39ce52e2d53faa84c6
-  data.tar.gz: 80db60c6f161a6fc5e22eff3ea7037d95a7ebf054a0f3018ac7c2a89ea13e39d
+  metadata.gz: 3f61059915433f7cdd932e3916d3da1d9f01d259771699441d388b9e792b053f
+  data.tar.gz: 840006a4627926c91c42209d9c6ee0e6e9dbc5a01d8c308b907a03e63f86bf96
 SHA512:
-  metadata.gz: c30508eebbabf4b55a207342731923179f78e38325e69419a165fed7a17ad7eaf234ff85e65b9648eb9d59d39ac913bd2d374c4d3de84f76a40e53785fa246a2
-  data.tar.gz: 363eace92843091bd8611844128c665590755939c15f04ed9855e9c7bbc71e00b52375fd3a31b1f96ee77d447c22a93c39d701993318d2a955f7901dc78d53f3
+  metadata.gz: 3a4b61a93f913d6ee42ed7789396a41694de5587ae28c3672a40648e76a8aadbfa88c4477ee9d1044ee0aaee2c6f9fe1617015f3dd0beb9cbc0518b534ee7ae6
+  data.tar.gz: a51d1c6cb321ddae69c91e2d5c70c8f30103c4b121a5f1c513696a4e999e1f7636165b99bf7d914fa1a5ddbd52506484ec525f877b21a7419fc271eaa9e0f113

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

@@ -1,5 +1,7 @@
-url = "http://appsmanager.neoclub.cn/p/code/2c94808382abb5a801830d4825fd0243"
 
-dir = Dir.new(url)
+a = 1
+b = 2
 
-p dir.path
+print(a + b)
+
+sleep(1)

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

@@ -12,8 +12,8 @@ module Pod
             include Uki_config::Mixin
             include Shell_Command::Mixin
 
-            self.summary = 'Uki 打包工具'
-            self.description = '支持国内 海外打包'
+            self.summary = '砥翼 打包工具'
+            self.description = '一键打包就是爽'
 
             def self.options 
                 [

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

@@ -4,6 +4,7 @@ require 'net/https'
 require 'uri'
 require 'json'
 require 'socket'
+require 'cli/ui'
 
 
 class Shell_Command
@@ -15,8 +16,10 @@ class Shell_Command
 
       log = %x{
         rootPath=`pwd`
-        fireName="xcode_env.json"
-        full_path="${rootPath}/${fireName}"
+        fileName="xcode_env.json"
+        work_path="${rootPath}/huxue"
+        full_path="${work_path}/${fileName}"
+        cd $work_path
         if [ -f "$full_path" ]
           then
               echo "存在xcode_env.json"
@@ -111,7 +114,7 @@ class Shell_Command
             echo -e "包体积=${sizeM}m\n"  
         }
 
-
+     
         if !File.exist?(uki_config.ipa_path)
           puts("*********************************************************导出失败")
           exit
@@ -126,38 +129,61 @@ class Shell_Command
             puts(log)
         end
 
-        upload_ipa
+        getCOSToken
         
     end
 
-    def upload_ipa
+    def ding_notifi(par)
+      
+      uki_config.upload_time = Time.now.to_i - uki_config.s_time
 
-      puts("*********************************************************  开始上传")
+      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.configuration
+    project_dsym = uki_config.dsym ? "已上传": "无符号表"
+    qrUrl = par["buildQRCodeURL"]
+
+      message = {
+        "msgtype": "actionCard",
+        "actionCard": {
+            "title": "打包成功", 
+            "text": " ![](#{qrUrl}) # 沪学习iOS打包成功 \n\n #### 打包分支: #{branch} \n\n #### 打包环境: #{project_env} \n\n #### 打包机器: #{hostname}  \n\n #### dsym: #{project_dsym} \n\n #### App版本: #{uki_config.app_version} \n\n #### build版本: #{uki_config.build_version}  \n\n #### 包体积: #{uki_config.ipa_size} \n\n #### 编译耗时: #{uki_config.build_time}s \n\n #### 上传耗时: #{uki_config.upload_time}s", 
+            "btnOrientation": "0", 
+            "btns": [
+                {
+                    "title": "去下载", 
+                    "actionURL": "#{uki_config.fir_url}"
+                }
+            ]
+        }
+    }
 
-      # 开始上传时间
-      s_time = Time.now.to_i
+      log = %x{
+        curl -X POST -H 'Content-Type: application/json' -d '#{message.to_json}' "https://oapi.dingtalk.com/robot/send?access_token=878146b6cef93f214feef79879fa4fb1d1c643a36cf314822aaea7eeac4298fe"
+    }
 
-      myshort = if uki_config.scheme == "miaohong"
-        "lZ2S" # 国内
-      else
-        "6WCf" # 海外
-      end
+    if uki_config.verbose?
+        puts(log)
+    end
 
-      log = %x{
-        ipa_dir=#{uki_config.ipa_path}
-        myshort=#{myshort}
-        appsmanager_token="11797fc88f1a8f943a68ab90666f0452"
-        result=$(curl -F "file=@${ipa_dir}" -F "token=$appsmanager_token" https://appsmanager.neoclub.cn/app/upload)
-        echo $result
-      }
+    local_notfi = %x{
+      notification="Did uploaded to fir caost time:#{uki_config.upload_time}s"
+      osascript -e 'display notification "size:'#{uki_config.ipa_size}'m\ncaost:'#{uki_config.upload_time}'s" with title "Uploaded Success" sound name "default" '
+    }
+
+    puts("********************************************************* 打包结束已通知钉钉请下载")
 
-      data =  JSON.parse(log)
-      url = data["data"]
-      url_code = url.split('code/').last.to_s
-      uki_config.fir_url = "https://appsmanager.neoclub.cn/s/#{myshort}?id=#{url_code}"
-      uki_config.upload_time = Time.now.to_i - s_time
+    exit
 
-      send_notifi
     end
 
     def send_notifi
@@ -290,6 +316,97 @@ class Shell_Command
 
     end
 
+
+    def getCOSToken
+      # 开始上传时间
+      uki_config.s_time = Time.now.to_i
+      puts("********************************************************* 获取蒲公英上传地址")
+      #application/json
+      url = URI('https://www.pgyer.com/apiv2/app/getCOSToken')
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      # 设置请求参数
+      data = URI.encode_www_form({'_api_key': uki_config.pgyer_apiKey, 'buildType':'ios', 'buildInstallType': 2, 'buildPassword': '1234'})
+      # 设置请求头
+      header = {'content-type':'application/x-www-form-urlencoded'}
+      response = http.post(url, data, header)
+      resbody = JSON.parse(response.body)
+
+      upload_ipa(resbody["data"])
+    
+    end
+
+    def upload_ipa(par) 
+      puts("********************************************************* 开始上传")
+      CLI::UI::StdoutRouter.enable
+      spinner = CLI::UI::Spinner::Async.start('')
+
+       # multipart/form-data
+      url = URI(par["endpoint"])
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      file = File.open(uki_config.ipa_path, 'rb')
+      
+      # 设置请求参数
+      data = par["params"]
+      data["file"] = file.read
+
+      request = Net::HTTP::Post.new(par["endpoint"])
+      request.set_form(data, 'multipart/form-data')
+      response = http.request(request)
+
+      file.close
+      spinner.stop()
+
+      if response.code.to_i == 204 
+        puts("********************************************************* 上传成功正在获取包处理信息，请稍等...")
+        getBuildInfo(par["params"])
+      else
+        puts("*********************************************************上传失败 code = #{response.code} message = #{response.message}")
+        exit
+      end
+    end
+
+    def getBuildInfo(par)
+      puts("********************************************************* 别着急大兄弟 官方建议睡3秒，等待蒲公英构建发布")
+      sleep(3)
+      puts("********************************************************* 帅的人已醒来")
+
+      buildKey = par["key"]
+
+      url = URI('https://www.pgyer.com/apiv2/app/buildInfo')
+      # 设置请求参数
+      params = {"_api_key": uki_config.pgyer_apiKey, "buildKey": buildKey}
+      url.query = URI.encode_www_form(params)
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response = http.get(url, params)
+      resbody = JSON.parse(response.body)
+      code = resbody["code"]
+
+      if uki_config.verbose?
+        puts("打印#{resbody}")
+      end
+
+      if code.to_i == 1247 || code.to_i == 1246 # 正在解析中
+        getBuildInfo(par)
+      end
+
+      if code.to_i == 0
+        uki_config.fir_url = "https://www.pgyer.com/#{resbody["data"]["buildShortcutUrl"]}"
+      else
+        puts("*********************************************************上传失败 code = #{resbody["code"]} message = #{resbody["message"]}")
+        exit
+      end
+
+      ding_notifi(resbody["data"])
+
+    end
+
     def self.instance
         @instance ||= new
     end

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

@@ -1,10 +1,6 @@
 
 class Uki_config
 
-    # scheme info
-    PROJECT_SCHEME = ['UkiOverseas', 'miaohong'].freeze
-
-
     # 是否展示详细信息
     attr_accessor :verbose
     # 是否海外
@@ -21,6 +17,8 @@ class Uki_config
     attr_accessor :build_time
     # 上传耗时
     attr_accessor :upload_time 
+    # 开始上传时间
+    attr_accessor :s_time 
     # 上传Url 
     attr_accessor :fir_url
     # xcode环境变量
@@ -62,11 +60,11 @@ class Uki_config
     end
 
     def dsym_path
-        return File.join(@installation_root.to_s, "dsym")
+        return Pathname.new(huxue_target).join("dsym")
     end
 
     def ipa_path 
-        return  File.join(build_exe_path, "#{scheme}.ipa")
+        return File.join(build_exe_path.to_s, "#{self.xcode_envs["target"]}.ipa")
     end
 
     def verbose(v)
@@ -85,15 +83,18 @@ class Uki_config
     
     def auto_work_space_name
         installation_root
-
         Dir.foreach(@installation_root) do |entry|
-            if entry.end_with?('xcworkspace')
+            if entry.end_with?('ios.xcworkspace')
                 @workspace_name = entry
                 next
             end
         end
     end
 
+    def huxue_target
+       return File.join(@installation_root, "huxue")
+    end
+
     def app_version
         buildSettings = self.xcode_envs["buildSettings"]
         return buildSettings["MARKETING_VERSION"]
@@ -106,7 +107,7 @@ class Uki_config
 
     # 读取产物记录文件
     def app_file_path
-        return File.join(@installation_root, "app_path")
+        return Pathname.new(huxue_target).join("app_path")
     end
 
      # 产物路径
@@ -115,21 +116,21 @@ class Uki_config
     end
 
     def group_name
-        unless @workspace_name == "miaohong.xcworkspace"
-            return "iOS海外极速打包已完成"
-        end
-
-        return "iOS国内极速打包已完成"
+        return "沪学习打包已完成"
     end
 
     def xcode_env_path
-        return File.join(@installation_root, "xcode_env.json")
+        return  Pathname.new(huxue_target).join("xcode_env.json")
     end
 
     def self.instance
         @instance ||= new
     end
 
+    def pgyer_apiKey 
+        "12c406fb60a9b3f83f65b349ab48771e"
+    end
+
     class << self
         attr_writer :instance
     end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_pack
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - 耿磊
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2023-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -24,36 +24,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fir-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.14
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.14
-description: 支持国内海外一键快速出包
+description: 支持一键快速出包
 email:
 - glworkfine@gmail.com
 executables:
-- uki
+- dy
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- bin/uki
+- bin/dy
 - lib/cocoapods-uki-packager/Test.rb
 - lib/cocoapods-uki-packager/command/pack.rb
 - lib/cocoapods-uki-packager/shell.rb
@@ -79,8 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: TT-Uki快速打包工具
+summary: 砥翼快速打包工具
 test_files: []