ocean_package 0.11.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df5f1fd000b7d02b3625d23d9c84b75bde227f1675739c743cd8c1147905ce4f
-  data.tar.gz: e59dfeff667bb1d68c95f3cd2c03da8f9d5a10a2b3894b763c8c41763460d820
+  metadata.gz: 65d0074f1b3760d6b4012238dcf78594b486f5c542f08715a05823a31fbe1287
+  data.tar.gz: 75d9b7e786ab83e4543f0605a5742c5651f79e620b1996e941d8a541d687fc03
 SHA512:
-  metadata.gz: 2e3db7f612b4b0639f58caa093769306c43a3b99874d735948dd192b98578f64816c6768d620cc2f6d08ff9af24c6b9e7fe7e124b3ccbc3c8c2cea1b4eeb8675
-  data.tar.gz: 727f0b9332fff05106eff0d660646408b74f2ceea3d905f93344921897e50e42ce3a5f239229c1a9bac1e8e084db3c5740d2695257ec4e36397d340e0366e592
+  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.12.0, 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.10.0)
+    ocean_package (0.14.0)
       CFPropertyList
       dingbot
       faraday

data/README.md

@@ -39,8 +39,11 @@ sudo gem install multipart-post
 
 ## Usage
 
+> 打包 - 上传到 fir 或 蒲公英平台 - 发送消息到钉钉群
+
+
 ```
-oceanpackage --workspace-path=/Users/ocean/Desktop/code/iOS/MyApp.xcworkspace --scheme=MyApp --configuration=Debug --archive-path=/Users/ocean/Documents/myipas --export-options-plist=/Users/ocean/Desktop/code/iOS/Company/MyApp/AdHocExportOptions.plist --company-name=MyCompany --fir-token=fir平台的token --pgy-api-key=蒲公英平台的apikey --change-log=测试一下 --oss-bucket-name=bucket名称 --oss-bucket-path=bucket路径 --oss-endpoint=oss的endpoint --ding-token=钉钉群机器人token --at-mobiles=需要@的人手机号
+oceanpackage --workspace-path=/Users/ocean/Desktop/code/iOS/MyApp.xcworkspace --scheme=MyApp --configuration=Debug --archive-path=/Users/ocean/Documents/myipas --export-options-plist=/Users/ocean/Desktop/code/iOS/Company/MyApp/AdHocExportOptions.plist --company-name=MyCompany --fir-token=fir平台的token --pgy-api-key=蒲公英平台的apikey --change-log=测试一下 --oss-bucket-name=bucket名称 --oss-bucket-path=bucket路径 --oss-endpoint=oss的endpoint --ding-token=钉钉群机器人token --at-mobiles=需要@的人手机号 --extra-export-params="-allowProvisioningUpdates,IPHONEOS_DEPLOYMENT_TARGET=11.0"
 ```
 
 - `--workspace-path`: `.xcworkspace` 文件路径
@@ -57,7 +60,25 @@ oceanpackage --workspace-path=/Users/ocean/Desktop/code/iOS/MyApp.xcworkspace --
 - `--oss-endpoint`: `oss` 的 `endpoint`
 - `--ding-token`: 钉钉群机器人的`token`
 - `--at-mobiles`: 钉钉群需要 @ 的人手机号，多个用 `,` 拼接
+- `--extra-export-params`: 打包的额外参数，多个用 `,` 拼接，例如 `"-allowProvisioningUpdates,IPHONEOS_DEPLOYMENT_TARGET=11.0"`
+- `--open-finder`: 打包完成是否打开对应的文件目录，`--no-open-finder`表示`false`， `--open-finder` 表示 `true`
+
 
+> 指定 ipa 文件
+
+- 上传到蒲公英平台命令格式如下：
+
+```
+oceanpackage --configuration=Debug --ipa-file-path=/Users/ocean/Documents/myipas/test.ipa --company-name=company2 --pgy-api-key=蒲公英平台apikey --change-log=测试一下 --oss-bucket-name=bucket名称 --oss-bucket-path=bucket路径 --oss-endpoint=oss的endpoint --ding-token=钉钉群机器人token --at-mobiles=需要@的人手机号
+```
+
+> 只用到上传ipa
+
+```
+oceanpackage --ipa-file-path=${ipa_file_path} \
+--pgy-api-key=${pgy_api_key} \
+--change-log="${update_desc}" \
+```
 
 ## Development
 

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)
 
@@ -58,10 +60,13 @@ module OceanPackage
       extra_export_params = argv.option("extra-export-params", "")
       Log.info("extra-export-params: #{extra_export_params}")
 
+      open_finder = argv.flag?("open-finder", false )
+      Log.info("open-finder: #{open_finder}")
+
       # 自定义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}")
-      @package = OceanPackage::Package.new(workspace_path, scheme, configuration, tmp_archive_path, company_name, export_options_plist, extra_export_params)
+      @package = OceanPackage::Package.new(workspace_path, scheme, configuration, tmp_archive_path, company_name, export_options_plist, extra_export_params, open_finder)
 
       fir_token = argv.option("fir-token", "")
       Log.info("fir_token: #{fir_token}")
@@ -121,6 +126,7 @@ module OceanPackage
 
     # 运行
     def run
+      time_flow.point_start_time
       # 没有自定义ipa文件，需要执行打包命令
       unless has_custom_ipa_file
         package.run
@@ -132,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
@@ -210,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
@@ -220,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/constants.rb

@@ -8,7 +8,6 @@ module OceanPackage
     DEFAULT_CONFIGURATION = "Debug"
     DEFAULT_COMPANY_NAME = "YourCompanyName"
     DEFAULT_ARCHIVE_PATH = "#{Dir.home}/Documents/Ipas/"
-
   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
@@ -27,7 +28,12 @@ module OceanPackage
     # 结束时间
     attr_accessor :end_time
 
-    def initialize(workspace_path, scheme, configuration, archive_path, company_name, export_options_plist, extra_export_params)
+    # ipa 最大保存的数目
+    attr_accessor :ipa_max_retain_number
+    # 打包完成是否打开文件夹
+    attr_accessor :open_finder
+
+    def initialize(workspace_path, scheme, configuration, archive_path, company_name, export_options_plist, extra_export_params, open_finder)
       @workspace_path = workspace_path
       @scheme = scheme
       @configuration = configuration
@@ -37,6 +43,8 @@ module OceanPackage
       @export_options_plist = export_options_plist
       @extra_export_params = extra_export_params
 
+      @ipa_max_retain_number = 3
+      @open_finder = open_finder
       # 预设置开始时间
       @start_time = Time.now
     end
@@ -61,6 +69,8 @@ module OceanPackage
       @start_time = Time.now
       # 检查必须参数
       check
+      # 清理历史的ipa
+      clean_history_ipa
       # clean 项目
       clean
       # 打包项目
@@ -70,7 +80,9 @@ module OceanPackage
       @end_time = Time.now
       # 返回打包成功的 ipa 文件路径
       ipa_file_path
-      open_ipa_file_path
+      if @open_finder
+        open_ipa_file_path
+      end
     end
 
     # 一些校验
@@ -109,6 +121,51 @@ module OceanPackage
 
     end
 
+    # **************************************
+    # clean history
+    # **************************************
+
+    def clean_history_ipa
+      path = final_archive_path_company_pro
+
+      sub_paths = Array.new
+      Dir.each_child(path) do |x|
+        unless "#{x}".eql?(".DS_Store")
+          sub_paths.push("#{x}")
+        end
+      end
+
+      if sub_paths.length > @ipa_max_retain_number
+        Log.divider
+        Log.info("clean history ipas: begin =======")
+
+        count = sub_paths.length - @ipa_max_retain_number
+        deleted_paths = sub_paths.first(count)
+
+        deleted_paths.each do |p|
+          new_path = path + p
+          Log.info(new_path)
+          delete_directory(new_path)
+        end
+
+        Log.info("clean history ipas: end =======")
+        Log.divider
+      end
+    end
+
+    def delete_directory(dirPath)
+      if File.directory?(dirPath)
+        Dir.foreach(dirPath) do |subFile|
+          if subFile != '.' and subFile != '..'
+            delete_directory(File.join(dirPath, subFile));
+          end
+        end
+        Dir.rmdir(dirPath)
+      else
+        File.delete(dirPath)
+      end
+    end
+
     # **************************************
     # clean
     # **************************************
@@ -130,6 +187,8 @@ module OceanPackage
 
     # clean
     def clean
+      time_flow.point_clean_time
+
       res = system(clean_cmd)
       Log.info("clean result: #{res}")
 
@@ -152,8 +211,8 @@ module OceanPackage
       end
     end
 
-    # 最终的打包路径
-    def final_archive_path
+    # 最终的打包路径，包含了公司，项目名称
+    def final_archive_path_company_pro
       path = processed_archive_path
       unless "#{@company_name}".empty?
         path += @company_name + '/'
@@ -161,6 +220,13 @@ module OceanPackage
       unless "#{project_name}".empty?
         path += project_name + '/'
       end
+
+      path
+    end
+
+    # 最终的打包路径
+    def final_archive_path
+      path = final_archive_path_company_pro
       path += @date_time + '/'
 
       Log.info("final archive path: #{path}")
@@ -190,6 +256,7 @@ module OceanPackage
       cmd += ' -configuration ' + @configuration
       cmd += ' -archivePath ' + archive_file_path
       cmd += ' archive'
+      cmd += ' -allowProvisioningUpdates'
 
       Log.divider
       Log.info("archive command: #{cmd}")
@@ -200,6 +267,8 @@ module OceanPackage
 
     # archive
     def archive
+      time_flow.point_archive_time
+
       res = system(archive_cmd)
 
       Log.info("archive result: #{res}")
@@ -241,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.11.0"
+  VERSION = "0.14.0"
 end

data/lib/ocean_package.rb

@@ -5,10 +5,13 @@ require 'semantic_logger'
 require 'multipart_post'
 require 'net/http/post/multipart'
 require 'json'
+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.11.0
+  version: 0.14.0
 platform: ruby
 authors:
 - ocean
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 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: []