ocean_package 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05b74d8479d857de4835fa2ac408ac568252d1301f7167dfa104548b4f0a0358
-  data.tar.gz: e8108d6392ae665c9d48e61d9d77c22b66c7a441239e68538cf3ecf72716d685
+  metadata.gz: 0513762be25cfd12f72be764f9eeac5d76c7f66e8e0371de8f643c7f746f8405
+  data.tar.gz: 57f555ba908531bee7df9392fe1bbd2b335b85179218d08a37b3569d880e8dbf
 SHA512:
-  metadata.gz: 9c9d602cf960e3d6e33e8092b71b5a45b398121b5882e445c87b652522a4d3ef46cab3654b02000a548aa45f370743d0787aa4d3a3f19b7273f2dd03924c65dc
-  data.tar.gz: 447d78d6e62b2fb70fac83bd3918c550bf8b2c42e11d9ce985863e5c2b6e6d9e6424f606ec38348d70d8921333d2ac4c2d6e4b42833600b4a1327da0019923f5
+  metadata.gz: 9851bacd967eabc5068df8d24aab69f04697beae75594c2fe496ff635dc4c088e5fef22631701ec87f1f2ac2b4494c7332c949850d0bba4abc9a6f2a953105aa
+  data.tar.gz: 5d0cad8908bcc6b1fee174efc797e94569d396d6c7ee61a82b52e0ff067ba3241aca9673a875f9cbce0c5cea37b95f2301fb04bff4a4cc62e03be758651770fa

data/Gemfile.lock

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

data/README.md

@@ -19,10 +19,31 @@ And then execute:
 Or install it yourself as:
 
     $ gem install ocean_package
+    
+or
+
+    $ sudo gem install ocean_package
 
 ## 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/fir.rb

@@ -28,7 +28,9 @@ module OceanPackage
       cmd = 'fir login'
       cmd += ' -T ' + @token
 
+      Log.divider
       Log.info("fir login command: #{cmd}")
+      Log.divider
 
       cmd
     end
@@ -41,7 +43,9 @@ module OceanPackage
       cmd += ' -Q'
       cmd += ' | tee ' + @log_path
 
+      Log.divider
       Log.info("fir publish command: #{cmd}")
+      Log.divider
 
       cmd
     end
@@ -49,6 +53,7 @@ module OceanPackage
     # 运行
     def run
       unless check
+        # 后续会接入蒲公英分发平台，这里不退出程序 exit
         return
       end
       login

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.2.0"
+  VERSION = "0.3.0"
 end

metadata

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