ocean_package 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1cc955eed6aa74ce48c6a3cc59c5bda438162073b8e86f04ec75261badf3e10
-  data.tar.gz: 5bfbf7f168a9436e6c07245c9ec2455ab66e3e4b5df4e517d52202a599afb778
+  metadata.gz: df5f1fd000b7d02b3625d23d9c84b75bde227f1675739c743cd8c1147905ce4f
+  data.tar.gz: e59dfeff667bb1d68c95f3cd2c03da8f9d5a10a2b3894b763c8c41763460d820
 SHA512:
-  metadata.gz: 10f73f3b8c22d9551656918c397475cc82ddc2bedaac49bb6b57164b38033166a65d4e81cb7815ab589ecb3b2a38ca1fe52d84da41084cd66b7364a1f420fa74
-  data.tar.gz: c6af45c8b814831a267e29a43c6f89ba328b6bc7d0784a11e676328bc74c631152cea7b693438bf4124e06514eafae39761b362e758a019f8d545ffc3b321aa4
+  metadata.gz: 2e3db7f612b4b0639f58caa093769306c43a3b99874d735948dd192b98578f64816c6768d620cc2f6d08ff9af24c6b9e7fe7e124b3ccbc3c8c2cea1b4eeb8675
+  data.tar.gz: 727f0b9332fff05106eff0d660646408b74f2ceea3d905f93344921897e50e42ce3a5f239229c1a9bac1e8e084db3c5740d2695257ec4e36397d340e0366e592

data/.idea/ocean_package.iml

@@ -20,7 +20,7 @@
     <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.11.3, 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="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" />

data/Gemfile.lock

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

data/lib/ocean_package.rb

@@ -23,9 +23,9 @@ module OceanPackage
   require 'claide'
 
   def self.run(argvs)
-    puts "====="
+    puts "=========ARGV========="
     puts ARGV
-    puts "====="
+    puts "=========ARGV========="
 
     command = OceanPackage::Command.new(argvs)
     command.run

data/lib/ocean_package/command.rb

@@ -37,7 +37,8 @@ module OceanPackage
       scheme = argv.option("scheme", "")
       Log.info("scheme: #{scheme}")
 
-      configuration = argv.option("configuration", OceanPackage::Constants::DEFAULT_CONFIGURATION)
+      # 默认配置改为空，防止包环境错误
+      configuration = argv.option("configuration", "")
       Log.info("configuration: #{configuration}")
 
       archive_path = argv.option("archive-path", OceanPackage::Constants::DEFAULT_ARCHIVE_PATH)
@@ -54,10 +55,13 @@ module OceanPackage
       Log.info("ipa_file_path: #{ipa_file_path}")
       @custom_ipa_file_path = ipa_file_path
 
+      extra_export_params = argv.option("extra-export-params", "")
+      Log.info("extra-export-params: #{extra_export_params}")
+
       # 自定义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)
+      @package = OceanPackage::Package.new(workspace_path, scheme, configuration, tmp_archive_path, company_name, export_options_plist, extra_export_params)
 
       fir_token = argv.option("fir-token", "")
       Log.info("fir_token: #{fir_token}")

data/lib/ocean_package/package.rb

@@ -9,6 +9,8 @@ module OceanPackage
     attr_accessor :scheme
     # 配置信息: Debug, Release
     attr_accessor :configuration
+    # 额外的打底参数，比如对buildsettings进行重写
+    attr_accessor :extra_export_params
 
     # archive 归档路径
     attr_accessor :archive_path
@@ -25,7 +27,7 @@ module OceanPackage
     # 结束时间
     attr_accessor :end_time
 
-    def initialize(workspace_path, scheme, configuration, archive_path, company_name, export_options_plist)
+    def initialize(workspace_path, scheme, configuration, archive_path, company_name, export_options_plist, extra_export_params)
       @workspace_path = workspace_path
       @scheme = scheme
       @configuration = configuration
@@ -33,6 +35,7 @@ module OceanPackage
       @company_name = company_name
       @date_time = Time.new.strftime("%Y-%m-%d_%H-%M-%S")
       @export_options_plist = export_options_plist
+      @extra_export_params = extra_export_params
 
       # 预设置开始时间
       @start_time = Time.now
@@ -56,9 +59,13 @@ module OceanPackage
     # 执行打包相关命令
     def run
       @start_time = Time.now
+      # 检查必须参数
       check
+      # clean 项目
       clean
+      # 打包项目
       archive
+      # 导出 ipa 包
       export
       @end_time = Time.now
       # 返回打包成功的 ipa 文件路径
@@ -215,6 +222,17 @@ module OceanPackage
       cmd += ' -exportPath ' + final_archive_path
       cmd += ' -exportOptionsPlist ' + @export_options_plist
 
+      unless "#{@extra_export_params}".empty?
+        # 分割
+        params = "#{@extra_export_params}".split(",")
+        # 再拼接
+        joined_string = params.join(" ")
+
+        unless joined_string.empty?
+          cmd += ' ' + joined_string
+        end
+      end
+
       Log.divider
       Log.info("export command: #{cmd}")
       Log.divider

data/lib/ocean_package/pgy.rb

@@ -107,6 +107,7 @@ module OceanPackage
           # 响应是字符串类型，需要转为json进行处理
           json_value = JSON.parse(res.body)
           Log.divider
+          Log.info('pgy upload response: ')
           Log.info(json_value)
           # 成功
           data = json_value["data"]

data/lib/ocean_package/version.rb

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

metadata

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