ocean_package 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5db61be1518b5da4f3ef4c45e633dd297b100e764f727b6383dab1184d7785f
-  data.tar.gz: e6033bd98e8e7c77040f6d718a0276d110621fee1c5761ac8bf977e6818b95cd
+  metadata.gz: 278a62419d25e625a28732bf86bf529dc840f3720733f550e1bc135e260c5289
+  data.tar.gz: a7852fbf63ee4f5b54e3ba8406f8e30618690e5c60e97f189bbc57b54e8dcf08
 SHA512:
-  metadata.gz: 5c0a50632aff577c7afd3a1de8526a0a71e91c24e0401bb9f443a1fd1b8a24911dde8dff71f5dc82b5a9e939bfbc65119a81c22545a0a2faa61e4b121a40b76c
-  data.tar.gz: 2831507550cb19d8778094f0a035ff7d230f3f9775874824f349ccb689c4bf044c889acdaf52cfc06826aec291a46ef4b497c246ac4509c5c7ca09ba278ffe91
+  metadata.gz: e4cd1de69f766edfae7040fc5c2e3f4536e07987efafc5ec4d7e78228ae58283a3fe4b2df306777518aebd5edd10aa7f4b1cab61a74079137d1742675e9fdf6a
+  data.tar.gz: 2f1d0110f5a0ba8fa7f0de52ea2c4b64eda35c42803ffa21f8a3f7e90f15ef260aa38042c42da3088765da8586bc21b03599214a8d748fa5ebe16287d47931f3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ocean_package (0.1.0)
+    ocean_package (0.6.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -19,10 +19,38 @@ And then execute:
 Or install it yourself as:
 
     $ gem install ocean_package
+    
+or
+
+    $ sudo gem install ocean_package
+
+其他需要安装的依赖
+
+- `fir-cli`, [链接](https://github.com/FIRHQ/fir-cli)
+- `ossutil`, [链接](https://help.aliyun.com/document_detail/120075.html?spm=a2c4g.11186623.2.45.6e491c7akyZ5HE)
+
+
 
 ## Usage
 
-TODO: Write usage instructions here
+```
+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 --change-log=测试一下 --oss-bucket-name=bucket名称 --oss-bucket-path=bucket路径 --oss-endpoint=oss的endpoint --ding-token=钉钉群机器人token --at-mobiles=需要@的人手机号
+```
+
+- `--workspace-path`: `.xcworkspace` 文件路径
+- `--scheme`: `scheme` 
+- `--configuration`: `Debug` 和 `Release`
+- `--archive-path`: 生成的 `.xcarchive` 文件目录
+- `--export-options-plist`: 打包用到的 `export-options` plist 文件路径
+- `--company-name`: 公司名称，可以不填
+- `--fir-token`: fir 平台的 token
+- `--change-log`: 更新描述
+- `--oss-bucket-name`: `oss bucket` 名称
+- `--oss-bucket-path`: `oss bucket` 路径
+- `--oss-endpoint`: `oss` 的 `endpoint`
+- `--ding-token`: 钉钉群机器人的`token`
+- `--at-mobiles`: 钉钉群需要 @ 的人手机号，多个用 `,` 拼接
+
 
 ## Development
 

data/lib/ocean_package/command.rb

@@ -91,6 +91,7 @@ module OceanPackage
       package.run
       upload
       send_ding_talk_msg
+      finished
     end
 
     # 上传 ipa 文件
@@ -106,6 +107,7 @@ module OceanPackage
     end
 
     # 上传 二维码 QRCode 图片到 oss
+    # 后续其他平台，比如蒲公英也是需要类似的逻辑
     def upload_qr_code(path, name)
       @qr_code_url = oss.upload(path, name)
     end
@@ -136,10 +138,10 @@ module OceanPackage
       content += "当前平台: iOS \n\n"
       content += "APP名称: " + ipa.display_name + "\n\n"
       content += "当前版本: " + ipa.version + "(#{ipa.build_version})" + "\n\n"
-      content += "打包耗时: " + "#{compute_total_time}" + "\n\n"
+      content += "打包耗时: " + "#{compute_total_time}" + "s" + "\n\n"
       content += "发布环境: " + "#{package.configuration}" + "\n\n"
       content += "更新描述: " + final_change_log + "\n\n"
-      content += "发布时间: " + Time.new.strftime("%Y-%m-%d_%H-%M-%S") + "\n\n"
+      content += "发布时间: " + Time.new.strftime("%Y年%m月%d日 %H时%M分%S秒") + "\n\n"
       content += "下载链接: [点我](#{@ipa_download_link})" + "\n\n"
       content += "![二维码](#{@qr_code_url})"
 
@@ -148,6 +150,7 @@ module OceanPackage
       content
     end
 
+    # 发送打包信息到钉钉
     def send_ding_talk_msg
       # 消息卡片，富文本
       title = make_web_hook_message_title
@@ -157,6 +160,13 @@ module OceanPackage
       ding.send_text_message(title, @at_mobiles)
     end
 
+    # 打包完成
+    def finished
+      Log.divider
+      Log.info("package finished")
+      Log.divider
+    end
+
   end
 
 end

data/lib/ocean_package/constants.rb

@@ -5,9 +5,9 @@ module OceanPackage
 
     # 有效的 CONFIGURATION 值
     AVAILABLE_CONFIGURATIONS = %w(Debug Release)
-    DEFAULT_CONFIGURATION = 'Debug'
-    DEFAULT_COMPANY_NAME = 'YourCompanyName'
-    DEFAULT_ARCHIVE_PATH = '$HOME/Documents/Ipas/'
+    DEFAULT_CONFIGURATION = "Debug"
+    DEFAULT_COMPANY_NAME = "YourCompanyName"
+    DEFAULT_ARCHIVE_PATH = "#{Dir.home}/Documents/Ipas/"
 
   end
 

data/lib/ocean_package/fir.rb

@@ -28,20 +28,25 @@ module OceanPackage
       cmd = 'fir login'
       cmd += ' -T ' + @token
 
+      Log.divider
       Log.info("fir login command: #{cmd}")
+      Log.divider
 
       cmd
     end
 
     # 命令：上传ipa文件到fir平台
     def publish_cmd
-      cmd = 'fir publish'
-      cmd += ' ' + @ipa_file_path
-      cmd += ' -c ' + @change_log
-      cmd += ' -Q'
-      cmd += ' | tee ' + @log_path
-
+      # @ipa_file_path @change_log @log_path 需要是字符串值！！！！！
+      cmd = "fir publish"
+      cmd += " "  + "'#{@ipa_file_path}'"
+      cmd += " -c " + "'#{@change_log}'"
+      cmd += " -Q"
+      cmd += " | tee " + "'#{@log_path}'"
+
+      Log.divider
       Log.info("fir publish command: #{cmd}")
+      Log.divider
 
       cmd
     end
@@ -49,6 +54,7 @@ module OceanPackage
     # 运行
     def run
       unless check
+        # 后续会接入蒲公英分发平台，这里不退出程序 exit
         return
       end
       login
@@ -104,14 +110,18 @@ module OceanPackage
       # 正则表达式匹配
       pattern = /.*Release id is.*/
       release_id = ''
-      File.open(@log_path, "r") do |f|
-        f.each_line do |line|
-          line_s = "#{line}"
-          if line_s =~ pattern
-            release_id = line_s.split(' ').last
-            break
+      if File.exist?("#{@log_path}")
+        File.open(@log_path, "r") do |f|
+          f.each_line do |line|
+            line_s = "#{line}"
+            if line_s =~ pattern
+              release_id = line_s.split(' ').last
+              break
+            end
           end
         end
+      else
+        Log.info("fir log path not exist !!!")
       end
       Log.info("fir release id value: #{release_id}")
       release_id
@@ -122,14 +132,18 @@ module OceanPackage
       # 正则表达式匹配
       pattern = /.*Published succeed:.*/
       link = ''
-      File.open(@log_path, "r") do |f|
-        f.each_line do |line|
-          line_s = "#{line}"
-          if line_s =~ pattern
-            link = line_s.split(' ').last
-            break
+      if File.exist?("#{@log_path}")
+        File.open(@log_path, "r") do |f|
+          f.each_line do |line|
+            line_s = "#{line}"
+            if line_s =~ pattern
+              link = line_s.split(' ').last
+              break
+            end
           end
         end
+      else
+        Log.info("fir log path not exist !!!")
       end
       Log.info("fir link value: #{link}")
       link
@@ -151,14 +165,18 @@ module OceanPackage
       # 正则表达式匹配
       pattern = /.*Local qrcode file:.*/
       path = ''
-      File.open(@log_path, "r") do |f|
-        f.each_line do |line|
-          line_s = "#{line}"
-          if line_s =~ pattern
-            path = line_s.split(' ').last
-            break
+      if File.exist?("#{@log_path}")
+        File.open(@log_path, "r") do |f|
+          f.each_line do |line|
+            line_s = "#{line}"
+            if line_s =~ pattern
+              release_id = line_s.split(' ').last
+              break
+            end
           end
         end
+      else
+        Log.info("fir log path not exist !!!")
       end
       Log.info("fir qr code path value: #{path}")
       path

data/lib/ocean_package/oss.rb

@@ -47,7 +47,9 @@ module OceanPackage
       cmd += ' '
       cmd += 'oss://' + @oss_bucket_name + oss_file_path(name)
 
+      Log.divider
       Log.info("oss upload_cmd: #{cmd}")
+      Log.divider
 
       cmd
     end

data/lib/ocean_package/package.rb

@@ -123,7 +123,7 @@ module OceanPackage
       Log.info("clean result: #{res}")
 
       unless res == true
-        Log.error("clean fail, please check!!!")
+        Log.error("clean fail, please check !!!")
         exit(1)
       end
     end
@@ -235,6 +235,8 @@ module OceanPackage
       Log.info("ipa file path: #{path}")
 
       path
+
+      # 也可以在该目录下查找 ipa 后缀的文件
     end
 
   end

data/lib/ocean_package/version.rb

@@ -1,3 +1,3 @@
 module OceanPackage
-  VERSION = "0.1.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean_package
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.0
 platform: ruby
 authors:
 - ocean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler