fastlane-plugin-alioss 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 519638f4674f39271bf610d7ba4804580c098beac4cf61514b5a8b3895d9c0ef
-  data.tar.gz: fa8137a4f8955c8afc8b820fd4791fc16c5be9a1f31a6a9211d730ae5d887f4f
+  metadata.gz: 5bd1331922554cde2867fc8cdb95e6b11af69e7ceced2c29cdebece53e159760
+  data.tar.gz: 1fe39ac6b0a7e41cde31d8f8b5eaefa5d6ec586f34bd9bd1971637d748ce214b
 SHA512:
-  metadata.gz: ce2b4d1885cf40b43a71310eed93bfec54b6ff5e3f94ccfdb9720dfe7502d3f23b0381d3ee9f772a3eb5571221a6c145bfdef1276af496a7e3dc7b002f7f583f
-  data.tar.gz: 7a82176eff7a8b6a5e28e3f309a3c16f8d77de0985310f333d2c99102115f76da364a68a8de68a960056db0a038a0a14b56ff4b1e00687e68d268f98929655de
+  metadata.gz: a1d45063a823616df6e8247eb8a4fc1af4eb1e68655f1c9651c9fd00a3801da7ff278027db7a3aba9da88a1aa8ca6fe6446a768e9c7f273640e13bd1d3cf23bc
+  data.tar.gz: 861959a9cbd289ce65fbdca462354ceb68726afcd146e4dc0d3dc196bea556861f5ecfc702cedd2f4725c0884540f91c390acc068a4e95b0f2fd9a3ef9cc1249

data/README.md

@@ -16,6 +16,56 @@ upload ipa/apk to aliyun oos server, and scan QRcode to install app on mobile ph
 
 **Note to author:** Add a more detailed description about this plugin here. If your plugin contains multiple actions, make sure to mention them here.
 
+
+支持Mac和Windows <br>
+
+---
+MacOS平台：<br>
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew cask install fastlane`
+
+Windows平台：<br>
+1、Install ruby on your windows machine. ([不知道如何安装ruby？](https://www.runoob.com/ruby/ruby-installation-windows.html)) <br>
+2、Go to your command line and type `gem install fastlane -NV`. <br>
+3、You have fastlane on your windows machine ready. <br>
+参考：https://stackoverflow.com/questions/43797206/fastlane-windows-cannot-installing <br>
+
+
+MacOS & Windows环境配置好后，需要安装fastlane插件以支持iOS、Android个性化定制功能 <br>
+* `gem 'fastlane-plugin-versioning'`
+* `gem 'fastlane-plugin-appicon'`
+* `gem 'fastlane-plugin-changelog'`
+* `gem 'fastlane-plugin-pgyer'`
+* `gem 'fastlane-plugin-alioss'`
+* `gem 'fastlane-plugin-versioning_android'`  
+<br>
+不安装这些，首次使用命令时会自动安装 <br>
+
+---
+
+`Gemfile`文件需要添加阿里云ruby SDK `gem 'aliyun-sdk', '~> 0.3.0'` <br>
+
+关于阿里云OSS文件服务器最终目录结构介绍：<br>
+![阿里云OSS目录结构图01](doc/001.png)<br>
+![阿里云OSS目录结构图01](doc/002.png)<br>
+![阿里云OSS目录结构图01](doc/003.png)<br>
+![阿里云OSS目录结构图01](doc/004.png)<br>
+![阿里云OSS目录结构图01](doc/005.png)<br>
+
+参考文档：[react-native fastlane自动化构建分发应用管理工具for iOS and Android（去掉RN即可移植到自己的项目）](https://www.cnblogs.com/wood-life/p/10649619.html) <br>
+
+[完整的fastlane配置for iOS/Android](doc/fastlane配置.zip) <br>
+
+
 ## Example
 
 Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane test`.

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

@@ -93,19 +93,26 @@ module Fastlane
         case File.extname(filename)
         when ".ipa"
           bucket_path = "#{path_for_app_name}/iOS"
+          # 如果无法从lane_context中获取则从实际的ipa文件中读取
+          if build_number.nil? || version_number.nil?
+            build_number = GetIpaInfoPlistValueAction.run(ipa: build_file, key: 'CFBundleVersion')
+            version_number = GetIpaInfoPlistValueAction.run(ipa: build_file, key: 'CFBundleShortVersionString')
+          end
         when ".apk"
           bucket_path = "#{path_for_app_name}/Android"
           # 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))
-            build_number = apk_output_json.first["apkInfo"]["versionCode"]
-            version_number = apk_output_json.first["apkInfo"]["versionName"]
+            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"]
+            end
           end
           # 如果output.json文件里取不到则从Actions.lane_context中取
           if build_number.nil? || version_number.nil?
             if Actions.lane_context[:ANDROID_VERSION_NAME].nil? || Actions.lane_context[:ANDROID_VERSION_CODE].nil?
-              UI.important "Actions.lane_context 不包含[ANDROID_VERSION_NAME, ANDROID_VERSION_CODE]，请配置fastlane env。"
+              UI.important "Actions.lane_context 不包含[ANDROID_VERSION_NAME, ANDROID_VERSION_CODE]，请配置fastlane env（推荐在Fastlane文件中使用fastlane-plugin-versioning_android获取versionCode/versionName）。"
             else
               build_number = Actions.lane_context[SharedValues::ANDROID_VERSION_CODE]
               version_number = Actions.lane_context[SharedValues::ANDROID_VERSION_NAME]
@@ -152,7 +159,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')
-          version_number = GetIpaInfoPlistValueAction.run(ipa: build_file, key: 'CFBundleShortVersionString')
           download_url = download_url
           UI.message "app_name: #{app_name}"
           UI.message "app_identifier: #{app_identifier}"

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Alioss
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-alioss
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - woodwu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry