fastlane-plugin-alioss 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7a43784953093e2e3c2d236ed68708419d87535fb298cafb59c4b8c9acb0ba2
-  data.tar.gz: ddefb9c0b4e914e9cf60929c3d11a725fb0ed3287cb1db72ef7d35c1957a6cd8
+  metadata.gz: 3407ac577c77dbc5a4cd56051df9c1362e8828ce38c2e47ae2d72fc343b2a069
+  data.tar.gz: 4c4b89f30f4d088588bebab53502cd4e26b1eef64d9e29e5fa2f27a660c11962
 SHA512:
-  metadata.gz: 82dc006553d7303996364c6deba35470908405400e4729078740b6a4198569bd65f20f13d07bc796bf3b9757b7765d75ba392aa3e1df833de94c3acc590624d1
-  data.tar.gz: 7cdd5c71ff797b1f17aed526152b06a6d8489d4bb75466766c4166135bddfaa523c88109e4f9270870912cfd207fe5d70f95d446b432dc590e6779ec6786e4a6
+  metadata.gz: c3d6c45fe4f62dff19937917010aba10cdb66eb02fdc1ebb18cd38f7ea563231314e03607a21f663e2bc68e21e519422e63e3d5c04f0eef906d047683a169dfb
+  data.tar.gz: 5c79db5cdd586d4c7952e1b282d1293df429b78007b380db3e935894b68fd76eaaf33a0149c4361f88f920cf52c475df439b3e6a88a63d98f085ac6b01b0ca47

data/lib/fastlane/plugin/alioss.rb

@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 require 'fastlane/plugin/alioss/version'
 
 module Fastlane

data/lib/fastlane/plugin/alioss/actions/alioss_action.rb

@@ -6,6 +6,14 @@ require 'json'
 
 module Fastlane
   module Actions
+    module SharedValues
+      ALIOSS_BUILD_NUMBER = :ALIOSS_BUILD_NUMBER
+      ALIOSS_VERSION_NUMBER = :ALIOSS_VERSION_NUMBER
+      ALIOSS_PUBLISH_TIMESTAMP = :ALIOSS_PUBLISH_TIMESTAMP
+      ALIOSS_FILE_SIZE = :ALIOSS_FILE_SIZE
+      ALIOSS_DOWNLOAD_URL = :ALIOSS_DOWNLOAD_URL
+    end
+
     class AliossAction < Action
       def self.run(params)
         UI.message("The alioss plugin is working!")
@@ -16,6 +24,7 @@ module Fastlane
         access_key_secret = params[:access_key_secret]
         path_for_app_name = params[:app_name]
         html_header_title = params[:html_header_title]
+        list_buckets = params[:list_buckets]
 
         build_file = [
             params[:ipa],
@@ -51,14 +60,27 @@ module Fastlane
         bucket = client.get_bucket(bucket_name)
 
         # list all buckets
-        UI.message "========== list all buckets =========="
-        bucket_objects = []
-        bucket.list_objects.each do |o|
-          UI.message o.key
-          bucket_objects.push(o.key)
+        unless list_buckets.nil? || %w(NO no false FALSE).include?(list_buckets) || list_buckets == false
+          UI.message "========== list all buckets =========="
+          bucket_objects = []
+          bucket.list_objects.each do |o|
+            UI.message o.key
+            bucket_objects.push(o.key)
+          end
         end
         UI.message "======================================"
 
+        # 配置logo
+        unless bucket.object_exists?("#{path_for_app_name}/icon.png")
+          input = File.expand_path(UI.input("icon.png不存在，请上传您App的logo（120*120 <= 尺寸 <= 480*480），请输入文件路径（例如：~/Desktop/icon.png）："))
+          # 判断是一个普通文件 && 可读 && 扩展名是png
+          if File.readable_real?(input) && File.extname(input) == ".png"
+            bucket.put_object("#{path_for_app_name}/icon.png", :file => input)
+            UI.message "#{path_for_app_name}/icon.png 配置完成"
+          else
+            UI.important "文件不存在或无权限读写，请确认icon.png的文件路径"
+          end
+        end
 
         # 必须包含的文件，没有就引导去下载
         # must_bucket_file = ["app/config.json", "app/index.html"]
@@ -120,10 +142,12 @@ module Fastlane
           # versionName、versionCode先从output.json文件里取
           apk_output_json_path = File.join(File.dirname(build_file), "output.json")
           if File.readable?(apk_output_json_path)
-            apk_output_json = JSON.parse(File.read(apk_output_json_path))
-            if !apk_output_json.first.nil? && !apk_output_json.first["apkInfo"].nil?
-              build_number = apk_output_json.first["apkInfo"]["versionCode"]
-              version_number = apk_output_json.first["apkInfo"]["versionName"]
+            apk_output_content = File.read(apk_output_json_path)
+            version_number_regex = /"versionName":"(\d+\.\d+\.\d+)"/.match(apk_output_content)
+            build_number_regex = /"versionCode":(\d+)/.match(apk_output_content)
+            if !version_number_regex.nil? && !build_number_regex.nil?
+              version_number = version_number_regex.captures.first
+              build_number = build_number_regex.captures.first
             end
           end
           # 如果output.json文件里取不到则从Actions.lane_context中取
@@ -169,6 +193,12 @@ module Fastlane
             "build" => build_number,
             "time" => timestamp.to_i
         }
+        # Store the build_number, version_number, time, size
+        Actions.lane_context[SharedValues::ALIOSS_BUILD_NUMBER] = build_number
+        Actions.lane_context[SharedValues::ALIOSS_VERSION_NUMBER] = version_number
+        Actions.lane_context[SharedValues::ALIOSS_PUBLISH_TIMESTAMP] = timestamp.to_i
+        Actions.lane_context[SharedValues::ALIOSS_FILE_SIZE] = file_size
+        Actions.lane_context[SharedValues::ALIOSS_DOWNLOAD_URL] = "#{download_domain}#{path_for_app_name}/index.html"
 
         # 根据不同的平台，将bucket_path记录到json中
         case File.extname(filename)
@@ -176,7 +206,6 @@ module Fastlane
           UI.message "配置 manifest.plist ..."
           app_name = GetIpaInfoPlistValueAction.run(ipa: build_file, key: 'CFBundleDisplayName')
           app_identifier = GetIpaInfoPlistValueAction.run(ipa: build_file, key: 'CFBundleIdentifier')
-          download_url = download_url
           UI.message "app_name: #{app_name}"
           UI.message "app_identifier: #{app_identifier}"
           UI.message "version_number: #{version_number}"
@@ -243,6 +272,16 @@ module Fastlane
         ["woodwu"]
       end
 
+      def self.output
+        [
+            ['ALIOSS_BUILD_NUMBER', 'Update the new build number(version code) of your iOS/Android project'],
+            ['ALIOSS_VERSION_NUMBER', 'Update the new version number(version name) of your iOS/Android project'],
+            ['ALIOSS_PUBLISH_TIMESTAMP', 'The timestamp of auto-build'],
+            ['ALIOSS_FILE_SIZE', 'The size of your ipa/apk file'],
+            ['ALIOSS_DOWNLOAD_URL', 'The website url that you can download it']
+        ]
+      end
+
       def self.return_value
         # If your method provides a return value, you can describe here what it does
       end
@@ -319,7 +358,12 @@ module Fastlane
                                          env_name: "ALIOSS_UPDATE_DESCRIPTION",
                                          description: "设置app更新日志，描述你修改了哪些内容。",
                                          optional: true,
-                                         type: String)
+                                         type: String),
+            FastlaneCore::ConfigItem.new(key: :list_buckets,
+                                         env_name: "ALIOSS_LIST_BUCKETS",
+                                         description: "是否列出已经上传的所有的buckets",
+                                         default_value: nil,
+                                         optional: true)
         ]
       end
 
@@ -331,6 +375,23 @@ module Fastlane
         true
       end
 
+      def self.example_code
+        [
+            # 上传App到阿里云oss服务器
+            'alioss(
+                endpoint: "oss-cn-shenzhen.aliyuncs.com",
+                access_key_id: "xxxxx",
+                access_key_secret: "xxxxx",
+                bucket_name: "cn-app-test",
+                app_name: "app/appname",
+                download_domain: "https://dl.yourdomain.com/",
+                update_description: "update description",
+                ipa: "valid ipa path", # iOS project required
+                apk: "valid apk path" # Android project required
+            )'
+        ]
+      end
+
       def self.create_manifest_file(params)
         # create manifest.plist file
         manifest_file = File.new("manifest.plist", "w")

data/lib/fastlane/plugin/alioss/helper/alioss_helper.rb

@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 require 'fastlane_core/ui/ui'
 
 module Fastlane

data/lib/fastlane/plugin/alioss/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Alioss
-    VERSION = "0.1.7"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-alioss
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.2
 platform: ruby
 authors:
 - woodwu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.7.0
 description: 
 email: woodwu@dotdotbuy.com
 executables: []
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: upload ipa/apk to aliyun oos server, and scan QRcode to install app on mobile