ocean_package 0.15.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15b8eb8f1ae6c0de3a7775dce9348e041ffe488527b0cd5712d8cca849c8167
-  data.tar.gz: 6f84dacc6a354ce0fc3348d87b58c40d42bf2fdf29f260d83d7a28ea21006856
+  metadata.gz: 8fdeaa9f9c0ec67459f5383a4ee8b93ab9d4ba23c1ab6824deafb6016871a6df
+  data.tar.gz: ff1af0e34f1334cdb203093f11043699b5e118b2ea867e26df40a51e12c09c1c
 SHA512:
-  metadata.gz: 42919ac94d8d2eaf38bb7392f6d3bef685d75cf8c6a9a344b174a707dd0aed93238c677235ada9ad2ee65ad26bb489bc8e25fad21e1f6fc058fafa00fb97d9fe
-  data.tar.gz: fb4aa28a87cac101e7a42b858ff31d17549b3d2ac8afbccef06db7e8daa3bbdd2aa287dd3464616f914f922a9d333ccf4599e247041e09091324eb50bdeee395
+  metadata.gz: abb4364e4cea33d8768dfaf0ed616ea4a31280b1c2cf3f5e0b7d28d12068c5dbfde477835d6ad16588b5d7ecbe2f8a2d60704cd51c22bdc82670418810d30d96
+  data.tar.gz: 40a35d23d5f527c2983f9a6b91276044ff094cf20048317336c95deb1b52c5288ffea22e5f5a63b9da9f222a28036aab5b77d1b1399188daa0c994d32cc8e024

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ocean_package (0.14.0)
+    ocean_package (0.17.0)
       CFPropertyList
       dingbot
       faraday

data/lib/ocean_package/command.rb

@@ -2,6 +2,8 @@
 module OceanPackage
   class Command
     include OceanPackage::TimeFlow::Mixin
+    require 'net/http'
+    require 'uri'
 
     # xcodebuild 打包相关
     attr_accessor :package
@@ -26,6 +28,11 @@ module OceanPackage
     # 自定义的ipa文件路径
     attr_accessor :custom_ipa_file_path
 
+    # 整个流程时间记录上报url
+    attr_accessor :time_flow_url
+
+    # 整个流程时间记录上报url，额外的参数
+    attr_accessor :time_flow_extra_req
 
     def initialize(params = [])
       argv = CLAide::ARGV.new(params)
@@ -63,6 +70,14 @@ module OceanPackage
       open_finder = argv.flag?("open-finder", false )
       Log.info("open-finder: #{open_finder}")
 
+      time_flow_url = argv.option("time-flow-url", "")
+      Log.info("time_flow_url: #{time_flow_url}")
+      @time_flow_url = time_flow_url
+
+      time_flow_extra_req = argv.option("time-flow-extra-req", "")
+      Log.info("time_flow_extra_req: #{time_flow_extra_req}")
+      @time_flow_extra_req = time_flow_extra_req
+
       # 自定义ipa文件，使用该文件作为 archive path
       tmp_archive_path = has_custom_ipa_file ? File.dirname("#{ipa_file_path}") : archive_path
       Log.info("tmp_archive_path: #{tmp_archive_path}")
@@ -187,6 +202,17 @@ module OceanPackage
       seconds
     end
 
+    # 总共时间，单位 分
+    def compute_total_time_minute
+      time1 = package.start_time
+      time2 = Time.now
+      minutes = (time2 - time1) / 60
+
+      Log.info("total time: #{minutes} minute")
+
+      minutes
+    end
+
     # web hook 消息标题
     def make_web_hook_message_title
       "iOS 来新包啦~"
@@ -202,7 +228,7 @@ module OceanPackage
       content += "当前平台: iOS \n\n"
       content += "APP名称: " + ipa.display_name + "\n\n"
       content += "当前版本: " + ipa.version + "(#{ipa.build_version})" + "\n\n"
-      content += "打包耗时: " + "#{compute_total_time}" + "s" + "\n\n"
+      content += "打包耗时: " + "#{compute_total_time_minute}" + " 分钟" + "\n\n"
       content += "发布环境: " + "#{package.configuration}" + "\n\n"
       content += "更新描述: " + final_change_log + "\n\n"
       content += "发布时间: " + Time.new.strftime("%Y年%m月%d日 %H时%M分%S秒") + "\n\n"
@@ -242,7 +268,6 @@ module OceanPackage
       time_flow_dir = @package.final_archive_path
       time_flow_file_path = "#{time_flow_dir}timeflow.json"
       params = time_flow.make_all_points
-      params['timeFlowPath'] = time_flow_file_path
       json = JSON.dump(params)
 
       unless File.exist?(time_flow_file_path)
@@ -255,6 +280,38 @@ module OceanPackage
       else
         Log.error("write time flow to path(fail): #{time_flow_file_path}")
       end
+
+      upload_time_flow_data(params)
+    end
+
+    def upload_time_flow_data(data)
+      time_flow_url_value = "#{@time_flow_url}"
+      unless time_flow_url_value.empty?
+        Log.info("upload time flow data")
+
+        uri = URI(time_flow_url_value)
+        params = data
+
+        # 分割
+        extra_params = "#{@time_flow_extra_req}".split(",")
+        # 再拼接
+        extra_params.each do |p|
+          extra_key_values = "#{p}".split("=")
+          if extra_key_values.length == 2
+            extra_key = "#{extra_key_values[0]}"
+            extra_value = "#{extra_key_values[1]}"
+            if extra_key.length > 0 && extra_value.length > 0
+              params[extra_key] = extra_value
+            end
+          end
+        end
+
+        Log.info("url: #{uri}")
+        Log.info("body: #{params}")
+
+        res = Net::HTTP.post_form(uri, params)
+        Log.info("upload time flow data result: #{res.body}")
+      end
     end
 
   end

data/lib/ocean_package/time_flow.rb

@@ -109,7 +109,7 @@ module OceanPackage
         "notifyGroupTime" => @notify_group_time,
         "endTime" => @end_time
       }
-      json
+      params
     end
 
     module Mixin

data/lib/ocean_package/version.rb

@@ -1,3 +1,3 @@
 module OceanPackage
-  VERSION = "0.15.0"
+  VERSION = "0.18.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean_package
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.18.0
 platform: ruby
 authors:
 - ocean