ocean_package 0.3.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0513762be25cfd12f72be764f9eeac5d76c7f66e8e0371de8f643c7f746f8405
-  data.tar.gz: 57f555ba908531bee7df9392fe1bbd2b335b85179218d08a37b3569d880e8dbf
+  metadata.gz: 1a4bc23aa666b52c1c5721d116d66b4b5d8e45e271546c4a1b40c9f293d86048
+  data.tar.gz: bb5a19d0acc1d8c61bf213d39942733ed53d3b3680d124c8c92bfee1a5fa5c38
 SHA512:
-  metadata.gz: 9851bacd967eabc5068df8d24aab69f04697beae75594c2fe496ff635dc4c088e5fef22631701ec87f1f2ac2b4494c7332c949850d0bba4abc9a6f2a953105aa
-  data.tar.gz: 5d0cad8908bcc6b1fee174efc797e94569d396d6c7ee61a82b52e0ff067ba3241aca9673a875f9cbce0c5cea37b95f2301fb04bff4a4cc62e03be758651770fa
+  metadata.gz: d9322243e7b67e171b0d65f8b4b6ccdb7fb0ee4e3f977eae87941a7749934b1280e64fe222449bde23c1e756f14bace4314ee11775de285992f8079156fb5859
+  data.tar.gz: cd19248c665e3b5856870aa583bc6f28fb0b034d5e8b4b6324073923501df3b5d3fcaf4dff318a64c9cbbdcda69179dbe418ea35b10a9069076d52cbb1548665

data/.idea/ocean_package.iml

@@ -16,11 +16,13 @@
     <orderEntry type="library" scope="PROVIDED" name="claide (v1.0.3, ruby-2.6.3-p62) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.6, ruby-2.6.3-p62) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="dingbot (v0.2.3, ruby-2.6.3-p62) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v1.0.1, ruby-2.6.3-p62) [gem]" level="application" />
     <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="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" />
     <orderEntry type="library" scope="PROVIDED" name="semantic_logger (v4.7.1, ruby-2.6.3-p62) [gem]" level="application" />
   </component>

data/Gemfile

@@ -9,3 +9,4 @@ gem 'claide', '~> 1.0', '>= 1.0.3'
 gem 'dingbot'
 gem 'CFPropertyList'
 gem 'semantic_logger'
+gem 'faraday'

data/Gemfile.lock

@@ -1,7 +1,12 @@
 PATH
   remote: .
   specs:
-    ocean_package (0.3.0)
+    ocean_package (0.8.0)
+      CFPropertyList
+      dingbot
+      faraday
+      multipart-post
+      semantic_logger
 
 GEM
   remote: https://rubygems.org/
@@ -11,6 +16,8 @@ GEM
     concurrent-ruby (1.1.6)
     dingbot (0.2.3)
       httparty
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -19,6 +26,7 @@ GEM
     mime-types-data (3.2020.0512)
     minitest (5.11.3)
     multi_xml (0.6.0)
+    multipart-post (2.1.1)
     rake (10.5.0)
     semantic_logger (4.7.1)
       concurrent-ruby (~> 1.0)
@@ -31,6 +39,7 @@ DEPENDENCIES
   bundler (~> 1.17.2)
   claide (~> 1.0, >= 1.0.3)
   dingbot
+  faraday
   minitest (~> 5.0)
   ocean_package!
   rake (~> 10.0)

data/README.md

@@ -24,24 +24,37 @@ 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)
+
+
+```
+sudo gem install dingbot
+sudo gem install semantic_logger
+```
+
+
 ## Usage
 
 ```
-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=需要@的人手机号
+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=需要@的人手机号
 ```
 
 - `--workspace-path`: `.xcworkspace` 文件路径
 - `--scheme`: `scheme` 
-- `--configuration`: Debug 和 Release
+- `--configuration`: `Debug` 和 `Release`
 - `--archive-path`: 生成的 `.xcarchive` 文件目录
 - `--export-options-plist`: 打包用到的 `export-options` plist 文件路径
 - `--company-name`: 公司名称，可以不填
 - `--fir-token`: fir 平台的 token
+- `--pgy-api-key`: 蒲公英平台的 api key
 - `--change-log`: 更新描述
-- `--oss-bucket-name`: oss bucket 名称
-- `--oss-bucket-path`: oss bucket 路径
-- `--oss-endpoint`: oss 的 endpoint
-- `--ding-token`: 钉钉群机器人的token
+- `--oss-bucket-name`: `oss bucket` 名称
+- `--oss-bucket-path`: `oss bucket` 路径
+- `--oss-endpoint`: `oss` 的 `endpoint`
+- `--ding-token`: 钉钉群机器人的`token`
 - `--at-mobiles`: 钉钉群需要 @ 的人手机号，多个用 `,` 拼接
 
 

data/lib/ocean_package.rb

@@ -2,6 +2,9 @@ require 'fileutils'
 require 'dingbot'
 require 'cfpropertylist'
 require 'semantic_logger'
+require 'multipart_post'
+require 'net/http/post/multipart'
+require 'json'
 
 # 注意：这里使用 require_relative 来引用文件
 require_relative 'ocean_package/version'
@@ -14,6 +17,7 @@ require_relative 'ocean_package/dingtalk'
 require_relative 'ocean_package/ipa'
 require_relative 'ocean_package/logger'
 require_relative 'ocean_package/package'
+require_relative 'ocean_package/pgy'
 
 module OceanPackage
   require 'claide'
@@ -26,16 +30,6 @@ module OceanPackage
     command = OceanPackage::Command.new(argvs)
     command.run
 
-
-    # # command = OceanPackage::Command.new(config)
-    #
-    # argv = CLAide::ARGV.new(ARGV)
-    # if !argv.arguments.include?("oceanpackage")
-    #   puts "不包含命令 oceanpackage"
-    #   exit 1
-    # end
-    #
-    # puts "包含命令 oceanpackage"
   end
 
 end

data/lib/ocean_package/command.rb

@@ -6,6 +6,8 @@ module OceanPackage
     attr_accessor :package
     # fir 平台
     attr_accessor :fir
+    # 蒲公英平台
+    attr_accessor :pgy
     # oss 对象
     attr_accessor :oss
     # ding ding
@@ -56,6 +58,11 @@ module OceanPackage
       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)
 
+      ##### 蒲公英 #####
+      pgy_api_key = argv.option("pgy-api-key", "")
+      @pgy = OceanPackage::Pgy.new(pgy_api_key, final_change_log, @package.ipa_file_path)
+      Log.info("pgy_api_key: #{pgy_api_key}")
+
       ##### oss #####
       oss_bucket_name = argv.option("oss-bucket-name", "")
       Log.info("oss_bucket_name: #{oss_bucket_name}")
@@ -96,9 +103,22 @@ module OceanPackage
 
     # 上传 ipa 文件
     def upload
-      upload_to_fir
+      can_fir = fir.check
+      can_pgy = pgy.check
+      if can_fir
+        Log.info("publish platform: fir")
+        upload_to_fir
+      elsif can_pgy
+        Log.info("publish platform: pgy")
+        upload_to_pgy
+      else
+        Log.info("publish platform: none, exit")
+        exit(1)
+      end
     end
 
+    # ------ fir 平台 -------
+
     # 上传到 fir 平台
     def upload_to_fir
       fir.run
@@ -112,6 +132,13 @@ module OceanPackage
       @qr_code_url = oss.upload(path, name)
     end
 
+    # ------ pgy 平台 -------
+    def upload_to_pgy
+      pgy.run
+      @qr_code_url = pgy.get_qr_code_url
+      @ipa_download_link = pgy.get_download_url
+    end
+
     # 总共时间，单位 秒 s
     def compute_total_time
       time1 = package.start_time
@@ -145,7 +172,9 @@ module OceanPackage
       content += "下载链接: [点我](#{@ipa_download_link})" + "\n\n"
       content += "![二维码](#{@qr_code_url})"
 
+      Log.divider
       Log.info("web hook message: \n#{content}")
+      Log.divider
 
       content
     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

@@ -37,11 +37,12 @@ module OceanPackage
 
     # 命令：上传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}")
@@ -109,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
@@ -127,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
@@ -156,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
+              path = 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/logger.rb

@@ -17,6 +17,12 @@ module OceanPackage
       logger = Logger.new(STDOUT)
       logger.info("=========")
     end
+
+    # 换行
+    def Log.new_line
+      logger = Logger.new(STDOUT)
+      logger.info("\n")
+    end
   end
 end
 

data/lib/ocean_package/package.rb

@@ -60,6 +60,7 @@ module OceanPackage
       @end_time = Time.now
       # 返回打包成功的 ipa 文件路径
       ipa_file_path
+      open_ipa_file_path
     end
 
     # 一些校验
@@ -239,6 +240,13 @@ module OceanPackage
       # 也可以在该目录下查找 ipa 后缀的文件
     end
 
+    # 打开所在目录
+    def open_ipa_file_path
+      path = final_archive_path
+      open_cmd = "open #{path}"
+      system(open_cmd)
+    end
+
   end
 
 end

data/lib/ocean_package/pgy.rb

@@ -0,0 +1,148 @@
+
+module OceanPackage
+  class Pgy
+    require 'multipart_post'
+    require 'net/http/post/multipart'
+    require 'json'
+
+    # # 用户Key，用来标识当前用户的身份
+    # attr_accessor :user_key
+    # API Key，用来识别API调用者的身份，如不特别说明，每个接口中都需要含有此参数。
+    attr_accessor :api_key
+    # # 表示一个App组的唯一Key。
+    # attr_accessor :app_key
+    # 更新日志
+    attr_accessor :change_log
+    # ipa文件包路径
+    attr_accessor :ipa_file_path
+
+    # 短链接
+    attr_accessor :short_url
+    # 二维码链接
+    attr_accessor :qr_code_url
+
+    # 初始化
+    def initialize(api_key, change_log, ipa_file_path)
+      @api_key = api_key
+      @change_log = change_log
+      @ipa_file_path = ipa_file_path
+      @short_url = ""
+      @qr_code_url = ""
+    end
+
+    # 校验
+    def check
+
+      # user_key_value = "#{@user_key}"
+      # if user_key_value.empty?
+      #   Log.error("pgy user key is empty, please check !!!")
+      #   return false
+      # end
+
+      api_key_value = "#{@api_key}"
+      if api_key_value.empty?
+        Log.error("pgy api key is empty, please check !!!")
+        return false
+      end
+
+      # app_key_value = "#{@app_key}"
+      # if app_key_value.empty?
+      #   Log.error("pgy app key is empty, please check !!!")
+      #   return false
+      # end
+
+      ipa_file_path_value = "#{@ipa_file_path}"
+      if ipa_file_path_value.empty?
+        Log.error("ipa file path is empty, please check !!!")
+        return false
+      end
+
+      return true
+    end
+
+    # 运行
+    def run
+      unless check
+        return
+      end
+      publish
+    end
+
+    # 上传
+    def publish
+      url = URI.parse('https://www.pgyer.com/apiv2/app/upload')
+      File.open("#{@ipa_file_path}") do |ipa|
+
+        # 构建必要的参数
+        ipa_file_name = Time.new.strftime("%Y-%m-%d_%H-%M-%S") + ".ipa"
+        require_params = {
+            "file" => UploadIO.new(ipa, "multipart/form-data", ipa_file_name),
+            "_api_key" => "#{@api_key}",
+            "buildUpdateDescription" => "#{@change_log}",
+        }
+
+        # 构造请求
+        req = Net::HTTP::Post::Multipart.new(url.path, require_params)
+
+        # 网络http
+        net = Net::HTTP.new(url.host, url.port)
+        # 这里需要设置，否则会有 EPIPE: Broken pipe 错误
+        net.use_ssl = true
+        net.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        net.set_debug_output($stdout)
+
+        # 发起请求
+        res = net.start do |http|
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          http.request(req)
+        end
+
+        Log.divider
+        Log.info(res)
+
+        # 具体参考 https://www.pgyer.com/doc/view/api#paramInfo
+        case res
+        when Net::HTTPSuccess
+          # 响应是字符串类型，需要转为json进行处理
+          json_value = JSON.parse(res.body)
+          Log.divider
+          Log.info(json_value)
+          # 成功
+          data = json_value["data"]
+          short_url = data["buildShortcutUrl"]
+          qr_code_url = data["buildQRCodeURL"]
+          @short_url = short_url
+          @qr_code_url = qr_code_url
+          Log.error(@short_url)
+          Log.error(@qr_code_url)
+        else
+          # 失败
+          Log.error("pgy publish fail, please check !!!")
+          exit(1)
+        end
+      end
+    end
+
+    # 获取下载链接
+    def get_download_url
+      # 需要有固定的前缀
+      url = "https://www.pgyer.com/" + @short_url
+
+      Log.divider
+      Log.info(url)
+
+      url
+    end
+
+    # 获取二维码链接
+    def get_qr_code_url
+      url = "#{@qr_code_url}"
+
+      Log.divider
+      Log.info(url)
+
+      url
+    end
+  end
+end

data/lib/ocean_package/version.rb

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

data/ocean_package.gemspec

@@ -37,6 +37,12 @@ Gem::Specification.new do |spec|
   spec.executables << 'oceanpackage'
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'dingbot'
+  spec.add_dependency 'CFPropertyList'
+  spec.add_dependency 'semantic_logger'
+  spec.add_dependency 'faraday'
+  spec.add_dependency 'multipart-post'
+
   spec.add_development_dependency "bundler", "~> 1.17.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,15 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ocean_package
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.9.0
 platform: ruby
 authors:
 - ocean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dingbot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: semantic_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +159,7 @@ files:
 - lib/ocean_package/logger.rb
 - lib/ocean_package/oss.rb
 - lib/ocean_package/package.rb
+- lib/ocean_package/pgy.rb
 - lib/ocean_package/version.rb
 - ocean_package.gemspec
 homepage: https://github.com/oceanfive/ocean_package