ocean_package 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceca75b90d4c107d40b58abb14172f059a4edf39575973dd49ca17cdb71d2774
-  data.tar.gz: 7aebc168f950e635c47bd41c69434ddded358b012a4cf5fc93ba756786a38289
+  metadata.gz: 65d0074f1b3760d6b4012238dcf78594b486f5c542f08715a05823a31fbe1287
+  data.tar.gz: 75d9b7e786ab83e4543f0605a5742c5651f79e620b1996e941d8a541d687fc03
 SHA512:
-  metadata.gz: ff1e88a0b70f2728f6994d81a1c9d92939ab852d8081ff40da436129e7d84f3c63c639474a7c8b4c0bec113bfdb79aa5a4dddeb9e5d4131de600a73eee7da1be
-  data.tar.gz: 66504e35c19e08d23d9bd2a34dbac17afd1566cc22b4fe57ae1542cba2d6f7a24be8acb696a3607d6a935617f924771ee4835007c07ef1ef4d028f25c25e4f9d
+  metadata.gz: 7c5504cac2244dac99129a5aa61c84cbdba90a5502af1b4d5ce6b804f7c8a1566de3a6f767ce38232d8371bddc36fbb5cbc8a3f531998409fcfbdfd712d50570
+  data.tar.gz: 2d193b4b39545aa82f16fcf9bee364e98e1dfbf7d2eb6262687dcec41875c37885d252db866cac66ef72075d71eb016e23a3c08b0925e9b4db778d08ad882dd1

data/.idea/ocean_package.iml

@@ -20,10 +20,38 @@
     <orderEntry type="library" scope="PROVIDED" name="httparty (v0.18.1, ruby-2.6.3-p62) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.3.1, ruby-2.6.3-p62) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2020.0512, ruby-2.6.3-p62) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.4, ruby-2.6.3-p62) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.11.3, ruby-2.6.3-p62) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multi_xml (v0.6.0, ruby-2.6.3-p62) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.1.1, ruby-2.6.3-p62) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.5.0, ruby-2.6.3-p62) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="semantic_logger (v4.7.1, ruby-2.6.3-p62) [gem]" level="application" />
   </component>
+  <component name="RakeTasksCache">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build ocean_package-0.14.0.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install ocean_package-0.14.0.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install ocean_package-0.14.0.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.14.0 and build and push ocean_package-0.14.0.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run tests" fullCommand="test" id="test" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
+    </option>
+  </component>
 </module>

data/Gemfile.lock

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

data/lib/ocean_package/command.rb

@@ -1,6 +1,7 @@
 
 module OceanPackage
   class Command
+    include OceanPackage::TimeFlow::Mixin
 
     # xcodebuild 打包相关
     attr_accessor :package
@@ -25,6 +26,7 @@ module OceanPackage
     # 自定义的ipa文件路径
     attr_accessor :custom_ipa_file_path
 
+
     def initialize(params = [])
       argv = CLAide::ARGV.new(params)
 
@@ -124,6 +126,7 @@ module OceanPackage
 
     # 运行
     def run
+      time_flow.point_start_time
       # 没有自定义ipa文件，需要执行打包命令
       unless has_custom_ipa_file
         package.run
@@ -135,6 +138,8 @@ module OceanPackage
 
     # 上传 ipa 文件
     def upload
+      time_flow.point_upload_ipa_time
+
       can_fir = fir.check
       can_pgy = pgy.check
       if can_fir
@@ -213,6 +218,8 @@ module OceanPackage
 
     # 发送打包信息到钉钉
     def send_ding_talk_msg
+      time_flow.point_notify_group_time
+
       # 消息卡片，富文本
       title = make_web_hook_message_title
       content = make_web_hook_message
@@ -223,11 +230,33 @@ module OceanPackage
 
     # 打包完成
     def finished
+      time_flow.point_end_time
+      write_time_flow_data
+
       Log.divider
       Log.info("package finished")
       Log.divider
     end
 
+    def write_time_flow_data
+      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)
+        FileUtils.touch(time_flow_file_path)
+      end
+      a_file = File.new(time_flow_file_path, "r+")
+      if a_file
+        a_file.syswrite(json)
+        Log.info("write time flow to path(success): #{time_flow_file_path}")
+      else
+        Log.error("write time flow to path(fail): #{time_flow_file_path}")
+      end
+    end
+
   end
 
 end

data/lib/ocean_package/package.rb

@@ -2,6 +2,7 @@
 module OceanPackage
 
   class Package
+    include OceanPackage::TimeFlow::Mixin
 
     # .xcworkspace 文件路径
     attr_accessor :workspace_path
@@ -186,6 +187,8 @@ module OceanPackage
 
     # clean
     def clean
+      time_flow.point_clean_time
+
       res = system(clean_cmd)
       Log.info("clean result: #{res}")
 
@@ -264,6 +267,8 @@ module OceanPackage
 
     # archive
     def archive
+      time_flow.point_archive_time
+
       res = system(archive_cmd)
 
       Log.info("archive result: #{res}")
@@ -305,6 +310,8 @@ module OceanPackage
     end
 
     def export
+      time_flow.point_export_time
+
       res = system(export_cmd)
 
       Log.info("export result: #{res}")

data/lib/ocean_package/time_flow.rb

@@ -0,0 +1,123 @@
+module OceanPackage
+  class TimeFlow
+
+    # 开始时间
+    attr_accessor :start_time
+    # git拉取仓库时间
+    attr_accessor :pull_git_time
+    # 安装相关依赖时间
+    attr_accessor :pull_dependency_time
+    # clean 项目时间
+    attr_accessor :clean_time
+    # archive 项目时间
+    attr_accessor :archive_time
+    # 加固 项目时间
+    attr_accessor :reinforce_time
+    # 导出ipa包时间
+    attr_accessor :export_time
+    # 上传ipa到分发平台时间
+    attr_accessor :upload_ipa_time
+    # 上传dsym符号表时间
+    attr_accessor :upload_dsym_time
+    # 群通知时间(钉钉群)
+    attr_accessor :notify_group_time
+    # 整个流程完成时间
+    attr_accessor :end_time
+
+    public
+
+    def self.instance
+      @instance ||= new
+    end
+
+    class << self
+      attr_writer :instance
+    end
+
+    def initialize()
+      @start_time = get_seconds
+      @pull_git_time = 0
+      @pull_dependency_time = 0
+      @clean_time = 0
+      @archive_time = 0
+      @reinforce_time = 0
+      @export_time = 0
+      @upload_ipa_time = 0
+      @upload_dsym_time = 0
+      @notify_group_time = 0
+    end
+
+    def get_seconds
+      Time.now.to_i
+    end
+
+    def point_pull_git_time
+      @pull_git_time = get_seconds
+    end
+
+    def point_pull_dependency_time
+      @pull_dependency_time = get_seconds
+    end
+
+    def point_clean_time
+      @clean_time = get_seconds
+    end
+
+    def point_archive_time
+      @archive_time = get_seconds
+    end
+
+    def point_reinforce_time
+      @reinforce_time = get_seconds
+    end
+
+    def point_export_time
+      @export_time = get_seconds
+    end
+
+    def point_upload_ipa_time
+      @upload_ipa_time = get_seconds
+    end
+
+    def point_upload_dsym_time
+      @upload_dsym_time = get_seconds
+    end
+
+    def point_notify_group_time
+      @notify_group_time = get_seconds
+    end
+
+    def point_start_time
+      @start_time = get_seconds
+    end
+
+    def point_end_time
+      @end_time = get_seconds
+    end
+
+    def make_all_points
+      params = {
+        "startTime" => @start_time,
+        "pullGitTime" => @pull_git_time,
+        "pullDependencyTime" => @pull_dependency_time,
+        "cleanTime" => @clean_time,
+        "archiveTime" => @archive_time,
+        "reinforceTime" => @reinforce_time,
+        "exportTime" => @export_time,
+        "uploadIpaTime" => @upload_ipa_time,
+        "uploadDsymTime" => @upload_dsym_time,
+        "notifyGroupTime" => @notify_group_time,
+        "endTime" => @end_time
+      }
+      json = JSON.dump(params)
+      json
+    end
+
+    module Mixin
+      def time_flow
+        TimeFlow.instance
+      end
+    end
+
+  end
+end

data/lib/ocean_package/version.rb

@@ -1,3 +1,3 @@
 module OceanPackage
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/lib/ocean_package.rb

@@ -10,6 +10,8 @@ require 'find'
 # 注意：这里使用 require_relative 来引用文件
 require_relative 'ocean_package/version'
 require_relative 'ocean_package/config'
+# 放在前面
+require_relative 'ocean_package/time_flow'
 require_relative 'ocean_package/command'
 require_relative 'ocean_package/constants'
 require_relative 'ocean_package/fir'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean_package
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - ocean
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dingbot
@@ -160,13 +160,14 @@ files:
 - lib/ocean_package/oss.rb
 - lib/ocean_package/package.rb
 - lib/ocean_package/pgy.rb
+- lib/ocean_package/time_flow.rb
 - lib/ocean_package/version.rb
 - ocean_package.gemspec
 homepage: https://github.com/oceanfive/ocean_package
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: ocean package
 test_files: []