fastlane-plugin-rustore 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c338f7615dafc8d3b4132943fd3bf7c5ac37c1ba1f6f61932d9484d2915686
-  data.tar.gz: f6111f977c9f137a2040aa0eb92dc402f3168f1334d12efbc01bb250d429086d
+  metadata.gz: fe19afc2cdc9ed6a3c0e2b3aebf8a4b4a5a2b3726e5194ae41acfc98a6d508c2
+  data.tar.gz: 813c8b0290500934e1c35fe80b5fd4fc0b4ca49479012e787e1614e7e7ad26bf
 SHA512:
-  metadata.gz: 4fa012c2ce250bef2375048c2a3011e1d6f9f929786c80e3a3e724944410251cd79099e70fb7f27b35c0b00a4246d6e9b4df4c60c9e918d8928eae0e7334c89d
-  data.tar.gz: d190f5b1c2ef2c8aad4affa4d831d2ce8baeca7a0884e5bb8a069c703f30d51e34cef6b722cac020b276d17c777881859e535377e5cf6fb3043a548f1f86979b
+  metadata.gz: '084ab61cd912af626f83c4452f4bea6848f9621c3be5c4f8ef1304fd9946b138b80d5536794808050b51c741359d51a065a6e1f87a80acfdc7b6edf5c2d34585'
+  data.tar.gz: 9b9838bca439d93c72b9fcac387844edd043aec1a91113264c4ef3dbdcf71791af9cf5ded637517e79ecb9916ce3a46ea01dc225b7fa40d45c0708d4e7e8aed3

data/README.md

@@ -1,55 +1,38 @@
-# fastlane-plugin-rustore
-Fastlane плагин для заливки приложений в Rustore
+# Fastlane Rustore plugin
 
-# Rustore plugin
+[![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-rustore) [![stability-wip](https://img.shields.io/badge/stability-wip-lightgrey.svg)](https://github.com/mkenney/software-guides/blob/master/STABILITY-BADGES.md#work-in-progress)
 
-[![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-rustore)
 
-## Getting Started
+## Дисклеймер
 
-This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To get started with `fastlane-plugin-rustore`, add it to your project by running:
+Пока что реализован базовый функционал с заливкой апк. Скриншоты, описание и прочие материалы наследуются от предыдущего релиза. Обработки ошибок нет. Если у вас уже есть черновик релиза, то скорей всего ничего не заработает. Черновик, созданный через апи, в админке отображаться не будет. Если случилась ошибка где-то на этапе заливки, то останется черновик, который будет мешать следующему запуску скрипта, удалить его лучше с помощью [питонскрипта](https://github.com/stfbee/python-rustore-api), а экшен удаления тут будет чуть позже.
 
+## Поехали
+
+Для начала добавь плагин в ваш fastlane проект:
 ```bash
 fastlane add_plugin rustore
 ```
-
-## About rustore
-
-Rustore fastlane integration
-
-**Note to author:** Add a more detailed description about this plugin here. If your plugin contains multiple actions, make sure to mention them here.
-
-## 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`.
-
-**Note to author:** Please set up a sample project to make it easy for users to explore what your plugin does. Provide everything that is necessary to try out the plugin in this project (including a sample Xcode/Android project if necessary)
-
-## Run tests for this plugin
-
-To run both the tests, and code style validation, run
-
-```
-rake
-```
-
-To automatically fix many of the styling issues, use
+После чего в каком-нибудь лейне дергай экшен плагина:
 ```
-rubocop -a
+    rustore_publish(
+        gms_apk: "../../app-release.apk",
+        hms_apk: "../../app-release-hms.apk",
+        package_name: "com.example.example",
+        publish_type: "MANUAL"
+        company_id: "123123",
+        private_key: "MIIE....."
+    )
 ```
 
-## Issues and Feedback
-
-For any other issues and feedback about this plugin, please submit it to this repository.
-
-## Troubleshooting
-
-If you have trouble using plugins, check out the [Plugins Troubleshooting](https://docs.fastlane.tools/plugins/plugins-troubleshooting/) guide.
-
-## Using _fastlane_ Plugins
-
-For more information about how the `fastlane` plugin system works, check out the [Plugins documentation](https://docs.fastlane.tools/plugins/create-plugin/).
-
-## About _fastlane_
-
-_fastlane_ is the easiest way to automate beta deployments and releases for your iOS and Android apps. To learn more, check out [fastlane.tools](https://fastlane.tools).
+* `gms_apk` - путь до .apk, который лучше скачать с гугл плея, у фастлейна даже есть для этого [инструмент](https://docs.fastlane.tools/actions/download_from_play_store/)
+* `hms_apk` - путь до .apk с Huawei-сервисами (опционально). У Рустора пока все плохо с документацией об этом, но залить его можно, что получится - пока хз. 
+* `package_name` - название пакета
+* `publish_type` - тип публикации (MANUAL - ручная, DELAYED - отложенная, INSTANTLY - автоматическая после модерации). По умолчанию - INSTANTLY. 
+* `company_id` и `private_key` надо взять в админке рустора, доступ к ним имеет только оунер.
+
+## Ссылочки
+* [_fastlane_](https://github.com/fastlane/fastlane)
+* [Plugins Troubleshooting](https://docs.fastlane.tools/plugins/plugins-troubleshooting/)
+* [Plugins documentation](https://docs.fastlane.tools/plugins/create-plugin/)
+* [Rustore API](https://help.rustore.ru/rustore/for_developers/work_with_RuStore_API)

data/lib/fastlane/plugin/rustore/actions/rustore_publish_action.rb

@@ -13,19 +13,17 @@ module Fastlane
       end
 
       def self.run(params)
-        version_name = params[:version_name]
         package_name = params[:package_name]
         company_id = params[:company_id]
         private_key = params[:private_key]
+        publish_type = params[:publish_type]
         gms_apk = params[:gms_apk]
         hms_apk = params[:hms_apk]
 
         # Получение токена
         token = Helper::RustoreHelper.get_token(company_id: company_id, private_key: private_key)
-        # Удаление черновика
-        # Helper::RustoreHelper.delete_draft(token, draft_id, package_name)
         # Создание черновика
-        draft_id = Helper::RustoreHelper.create_draft(token, package_name, version_name)
+        draft_id = Helper::RustoreHelper.create_draft(token, package_name, publish_type)
         # Загрузка апк
         Helper::RustoreHelper.upload_apk(token, draft_id, false, gms_apk, package_name)
         # Если путь до хмс передали, то и его заливаем
@@ -39,11 +37,6 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :version_name,
-                                       env_name: "RUSTORE_VERSION_NAME",
-                                       description: "имя версии приложения, например `1.0.0 (102)`",
-                                       optional: false,
-                                       type: String),
           FastlaneCore::ConfigItem.new(key: :package_name,
                                        env_name: "RUSTORE_PACKAGE_NAME",
                                        description: "пакет приложения, например `com.example.example`",
@@ -56,6 +49,10 @@ module Fastlane
                                        env_name: "RUSTORE_PRIVATE_KEY",
                                        description: "приватный ключ в русторе",
                                        optional: false),
+          FastlaneCore::ConfigItem.new(key: :publish_type,
+                                       env_name: "RUSTORE_PUBLISH_TYPE",
+                                       description: "Тип публикации (MANUAL, DELAYED, INSTANTLY). По умолчанию - INSTANTLY",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :gms_apk,
                                        env_name: "RUSTORE_GMS_APK",
                                        description: "путь до апк с гуглсервисами",

data/lib/fastlane/plugin/rustore/helper/rustore_helper.rb

@@ -7,13 +7,6 @@ module Fastlane
 
   module Helper
     class RustoreHelper
-      # class methods that you define here become available in your action
-      # as `Helper::RustoreHelper.your_method`
-      #
-      def self.show_message
-        UI.message("Hello from the rustore plugin helper!")
-      end
-
       def self.connection
         require 'faraday'
         require 'faraday_middleware'
@@ -50,30 +43,30 @@ module Fastlane
           req.body = { companyId: company_id, timestamp: timestamp, signature: signature }
         end
 
-        UI.message("Debug: response #{response.body}")
+        UI.message("Debug: response #{response.body}") if ENV['DEBUG']
 
         response.body["body"]["jwe"]
       end
 
-      def self.create_draft(token, package_name, version_name)
+      def self.create_draft(token, package_name, publish_type)
         url = "/public/v1/application/#{package_name}/version"
         response = connection.post(url) do |req|
           req.headers['Public-Token'] = token
-          req.body = { appName: version_name }
+          req.body = {}
+          req.body['publishType'] = publish_type unless publish_type.nil?
         end
 
-        UI.message("Debug: response #{response.body}")
-
-        response.body["body"]
-      end
-
-      def self.delete_draft(token, draft_id, package_name)
-        url = "/public/v1/application/#{package_name}/version/#{draft_id}"
-        response = connection.delete(url) do |req|
-          req.headers['Public-Token'] = token
+        UI.message("Debug: response #{response.body}") if ENV['DEBUG']
+        if response.body["body"]
+          # Если черновика не было, и мы создали новый, здесь будет draftId
+          return response.body["body"]
+        elsif response.body["message"]
+          # Если черновик уже существовал, в message будет ошибка вида
+          # "You already have draft version with ID = XXXXXXXXXX", откуда достаем ID существующего черновика.
+          return response.body["message"].scan(/\d+/).first.to_i
+        else
+          raise "Couldn't get draftId from RuStore"
         end
-
-        UI.message("Debug: response #{response.body}")
       end
 
       def self.upload_apk(token, draft_id, is_hms, file_path, package_name)
@@ -86,15 +79,21 @@ module Fastlane
         end
 
         url = "/public/v1/application/#{package_name}/version/#{draft_id}/apk"
-        payload = { servicesType: apk_type, isMainApk: is_main }
+        payload = {}
         payload[:file] = Faraday::Multipart::FilePart.new(file_path, 'application/vnd.android.package-archive')
 
         response = connection.post(url) do |req|
           req.headers['Public-Token'] = token
+          req.params['servicesType'] = apk_type
+          req.params['isMainApk'] = is_main
           req.body = payload
         end
 
-        UI.message("Debug: response #{response.body}")
+        if response.body["message"] == "File was not uploaded successfully: The code of this version must be larger than that of the previous one"
+          raise "Build with this version code was already uploaded earlier"
+        end
+
+        UI.message("Debug: response #{response.body}") if ENV['DEBUG']
       end
 
       def self.commit_version(token, draft_id, package_name)
@@ -103,9 +102,8 @@ module Fastlane
           req.headers['Public-Token'] = token
         end
 
-        UI.message("Debug: response #{response.body}")
+        UI.message("Debug: response #{response.body}") if ENV['DEBUG']
       end
-
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Rustore
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-rustore
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Vladislav Onishchenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Rustore fastlane integration plugin