ocean_package 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a4bc23aa666b52c1c5721d116d66b4b5d8e45e271546c4a1b40c9f293d86048
-  data.tar.gz: bb5a19d0acc1d8c61bf213d39942733ed53d3b3680d124c8c92bfee1a5fa5c38
+  metadata.gz: b1cc955eed6aa74ce48c6a3cc59c5bda438162073b8e86f04ec75261badf3e10
+  data.tar.gz: 5bfbf7f168a9436e6c07245c9ec2455ab66e3e4b5df4e517d52202a599afb778
 SHA512:
-  metadata.gz: d9322243e7b67e171b0d65f8b4b6ccdb7fb0ee4e3f977eae87941a7749934b1280e64fe222449bde23c1e756f14bace4314ee11775de285992f8079156fb5859
-  data.tar.gz: cd19248c665e3b5856870aa583bc6f28fb0b034d5e8b4b6324073923501df3b5d3fcaf4dff318a64c9cbbdcda69179dbe418ea35b10a9069076d52cbb1548665
+  metadata.gz: 10f73f3b8c22d9551656918c397475cc82ddc2bedaac49bb6b57164b38033166a65d4e81cb7815ab589ecb3b2a38ca1fe52d84da41084cd66b7364a1f420fa74
+  data.tar.gz: c6af45c8b814831a267e29a43c6f89ba328b6bc7d0784a11e676328bc74c631152cea7b693438bf4124e06514eafae39761b362e758a019f8d545ffc3b321aa4

data/Gemfile.lock

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

data/README.md

@@ -33,6 +33,7 @@ or
 ```
 sudo gem install dingbot
 sudo gem install semantic_logger
+sudo gem install multipart-post
 ```
 
 

data/lib/ocean_package/command.rb

@@ -22,6 +22,9 @@ module OceanPackage
     # @ 的手机号
     attr_accessor :at_mobiles
 
+    # 自定义的ipa文件路径
+    attr_accessor :custom_ipa_file_path
+
     def initialize(params = [])
       argv = CLAide::ARGV.new(params)
 
@@ -46,7 +49,15 @@ module OceanPackage
       export_options_plist = argv.option("export-options-plist", "")
       Log.info("export_options_plist: #{export_options_plist}")
 
-      @package = OceanPackage::Package.new(workspace_path, scheme, configuration, archive_path, company_name, export_options_plist)
+      ##### 自定义的 ipa 文件 #####
+      ipa_file_path = argv.option("ipa-file-path", "")
+      Log.info("ipa_file_path: #{ipa_file_path}")
+      @custom_ipa_file_path = ipa_file_path
+
+      # 自定义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)
 
       fir_token = argv.option("fir-token", "")
       Log.info("fir_token: #{fir_token}")
@@ -56,11 +67,11 @@ module OceanPackage
       Log.info("change_log: #{change_log}")
 
       fir_log_path = @package.final_archive_path + 'fir.log'
-      @fir = OceanPackage::Fir.new(fir_token, final_change_log, @package.ipa_file_path, fir_log_path)
+      @fir = OceanPackage::Fir.new(fir_token, final_change_log, final_ipa_file_path, fir_log_path)
 
       ##### 蒲公英 #####
       pgy_api_key = argv.option("pgy-api-key", "")
-      @pgy = OceanPackage::Pgy.new(pgy_api_key, final_change_log, @package.ipa_file_path)
+      @pgy = OceanPackage::Pgy.new(pgy_api_key, final_change_log, final_ipa_file_path)
       Log.info("pgy_api_key: #{pgy_api_key}")
 
       ##### oss #####
@@ -94,8 +105,22 @@ module OceanPackage
       end
     end
 
+    # 是否设置了自定义的ipa文件
+    def has_custom_ipa_file
+      "#{@custom_ipa_file_path}".empty? ? false : true
+    end
+
+    # 最终的ipa文件路径
+    def final_ipa_file_path
+      has_custom_ipa_file ? "#{@custom_ipa_file_path}" : @package.ipa_file_path
+    end
+
+    # 运行
     def run
-      package.run
+      # 没有自定义ipa文件，需要执行打包命令
+      unless has_custom_ipa_file
+        package.run
+      end
       upload
       send_ding_talk_msg
       finished
@@ -157,7 +182,7 @@ module OceanPackage
 
     # web hook 消息内容
     def make_web_hook_message
-      ipa = OceanPackage::Ipa.new(package.ipa_file_path)
+      ipa = OceanPackage::Ipa.new(final_ipa_file_path)
       ipa.run
 
       # markdown 格式

data/lib/ocean_package/package.rb

@@ -33,6 +33,9 @@ module OceanPackage
       @company_name = company_name
       @date_time = Time.new.strftime("%Y-%m-%d_%H-%M-%S")
       @export_options_plist = export_options_plist
+
+      # 预设置开始时间
+      @start_time = Time.now
     end
 
     # workspace 的路径
@@ -145,12 +148,19 @@ module OceanPackage
     # 最终的打包路径
     def final_archive_path
       path = processed_archive_path
-      path += @company_name + '/'
-      path += project_name + '/'
+      unless "#{@company_name}".empty?
+        path += @company_name + '/'
+      end
+      unless "#{project_name}".empty?
+        path += project_name + '/'
+      end
       path += @date_time + '/'
 
       Log.info("final archive path: #{path}")
 
+      # 不存在，需要进行创建，外部传入了 ipa 文件的情况
+      FileUtils.mkdir_p(path)
+
       path
     end
 

data/lib/ocean_package/version.rb

@@ -1,3 +1,3 @@
 module OceanPackage
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

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