ocean_package 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df5f1fd000b7d02b3625d23d9c84b75bde227f1675739c743cd8c1147905ce4f
-  data.tar.gz: e59dfeff667bb1d68c95f3cd2c03da8f9d5a10a2b3894b763c8c41763460d820
+  metadata.gz: 9b372a1a30d54bb10b757aecbf207cea5f235f7144e0a7e020f8b24f73ba48fc
+  data.tar.gz: b95ed7d2ba0abeb4aa9f6c02f2e39e60270526e631ee24a536f2ce6f4520bd0f
 SHA512:
-  metadata.gz: 2e3db7f612b4b0639f58caa093769306c43a3b99874d735948dd192b98578f64816c6768d620cc2f6d08ff9af24c6b9e7fe7e124b3ccbc3c8c2cea1b4eeb8675
-  data.tar.gz: 727f0b9332fff05106eff0d660646408b74f2ceea3d905f93344921897e50e42ce3a5f239229c1a9bac1e8e084db3c5740d2695257ec4e36397d340e0366e592
+  metadata.gz: 6dfc40afd770778ea67c6424e63b549a43240b843b4d738c186cff7730852f64af6baa7e5fdb726e7add2993f4e86ec058e1d9e39747155007c38fc418441cdd
+  data.tar.gz: dddfa48f512062b1f6ed3e331a9f9da28fad466bb4d7af4a687a84199f69eb471ec60e9dbea45293a1b3ac262da3a245d17280c1b04e9dd3a9909086d5810dc3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ocean_package (0.10.0)
+    ocean_package (0.11.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.rb

@@ -5,6 +5,7 @@ require 'semantic_logger'
 require 'multipart_post'
 require 'net/http/post/multipart'
 require 'json'
+require 'find'
 
 # 注意：这里使用 require_relative 来引用文件
 require_relative 'ocean_package/version'

data/lib/ocean_package/command.rb

@@ -58,10 +58,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}")

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

@@ -27,7 +27,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 +42,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 +68,8 @@ module OceanPackage
       @start_time = Time.now
       # 检查必须参数
       check
+      # 清理历史的ipa
+      clean_history_ipa
       # clean 项目
       clean
       # 打包项目
@@ -70,7 +79,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 +120,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
     # **************************************
@@ -152,8 +208,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 +217,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}")

data/lib/ocean_package/version.rb

@@ -1,3 +1,3 @@
 module OceanPackage
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean_package
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - ocean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dingbot