fastlane-plugin-rustore_developer 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c395b2d1c3bc9975ac41c1c3af329160363d0cc14da5b134d76bc81c1323685
-  data.tar.gz: afeee1b001b6819b0c0bc84e6bca475ee0b2cac2c5c80f8e2d523981a523477e
+  metadata.gz: 75f2a8ee857f51cd6a86b7bbc01676e6ae5c74a280712ada97a4d5ce6b90c2b5
+  data.tar.gz: d47d95eab1ba7085418cd6ed5c6c979a903d580cf2a71bfface9a73670d1a3df
 SHA512:
-  metadata.gz: f31b22723ed762ee134f45e2c340ad4d66a21ae331705f5c0dac9cde6d585e30815029d16d40e78fbc90b0799491b39260ad7ecac9ada41f2b9a6d2fba753738
-  data.tar.gz: ce59893ce3d290f2d7e5d52497bc7a7ce6e0b876647ded311dcc7b2b7d5e8da53795dd7a569a560357ca2f3a4fcdf174f499e48c49005d5a666295e70a353a01
+  metadata.gz: 9ac3f3720359ccf5af0cfad03f3e84eb8219355ca02d42de124bbd6fa651aee893dc6cf161f8c146a09b2d6a8ad2292953e65e097455fad60ab3ad5cfee4d041
+  data.tar.gz: acd73a0faf8ebf1735422694089f306d28b8c5e6c5296a78aa9ac3290c94aaddd00e58b7d50b0ac6850b1c1088b4ad107765ceeaa0a3efca5328f370506ee160

data/lib/fastlane/plugin/rustore_developer/actions/rustore_developer_status_action.rb

@@ -4,60 +4,72 @@ require_relative '../helper/rustore_developer_helper'
 module Fastlane
   module Actions
     class RustoreDeveloperStatusAction < Action
-
       def self.run(params)
         if params[:version].nil?
-          massive = Helper::RustoreDeveloperHelper.getStatusAll(params[:token], params[:package])
-          # puts(massive)
-          exclude_cols = ['paid', 'priceValue', 'whatsNew', 'partialValue', 'sendDateForModer', 'publishDateTime',]
-          col_labels = {versionId: "ID",
-                        appName: "Title",
-                        appType: "appType",
-                        versionName: "vName",
-                        versionCode: "vCode",
-                        versionStatus: "Status",
-                        publishType: 'publishType',
-                        publishDateTime: 'Published',
-                        sendDateForModer: 'Commited',
-                        partialValue: 'Part',
-                        whatsNew: 'whatsNew',
-                        priceValue: 'Price',
-                        paid: 'paid',
-          }
-          @columns = col_labels.each_with_object({}) { |(col, label), h|
-            h[col] = {label: label,
-                      width: [[(massive.map { |g| g[col.to_s].to_s.size }.max), 30].min, label.size].max}
-          }
-
-          # header top line
-          puts "+-#{@columns.map { |_, g| '-' * g[:width] }.join('-+-')}-+"
-          # header line
-          puts "| #{@columns.map { |_, g| g[:label].to_s.ljust(g[:width]) }.join(' | ')} |"
-          # # header bottom line
-          puts "+-#{@columns.map { |_, g| '-' * g[:width] }.join('-+-')}-+"
-
-          # row line
-          massive.each do |row|
-            str = row.keys.map { |k|
-              a = row[k]
-              if a.to_s.size > 30 then
-                a = a.to_s[0..26] + "..."
-              end
-              a.to_s.ljust(@columns[k.to_sym][:width])
-            }.join(' | ')
-            puts "| #{str} |"
-          end
-          # bottom line
-          puts "+-#{@columns.map { |_, g| '-' * g[:width] }.join('-+-')}-+"
+          data = Helper::RustoreDeveloperHelper.getStatusAll(params[:token], params[:package])
+          display(data, params[:table_view])
         else
-          info = Helper::RustoreDeveloperHelper.getStatus(params[:token], params[:package], params[:version])
-          puts(info)
+          data = Helper::RustoreDeveloperHelper.getStatus(params[:token], params[:package], params[:version])
+          display(data, params[:table_view])
+          # puts(data)
         end
+      end
 
+      def self.display(data, table_view)
+          if table_view
+                  # puts(data)
+                  exclude_cols = ['paid', 'priceValue', 'whatsNew', 'partialValue', 'sendDateForModer', 'publishDateTime', 'testingType']
+                  col_labels = { versionId: "ID",
+                                appName: "Title",
+                                appType: "AppType",
+                                versionName: "vName",
+                                versionCode: "vCode",
+                                versionStatus: "Status",
+                                publishType: 'PublishType',
+                                publishDateTime: 'Published',
+                                sendDateForModer: 'Commited',
+                                partialValue: 'Part',
+                                whatsNew: 'Changelog',
+                                priceValue: 'Price',
+                                paid: 'Paid' }
+
+                  @columns = col_labels.each_with_object({}) do |(col, label), h|
+                    h[col] = { label: label,
+                              width: [[data.map { |g| g[col.to_s].to_s.size }.max, 30].min, label.size].max }
+                  end
+
+                  # header top line
+                  puts("+-#{@columns.map { |_, g| '-' * g[:width] }.join('-+-')}-+")
+                  # header line
+                  puts("| #{@columns.map { |_, g| g[:label].to_s.ljust(g[:width]) }.join(' | ')} |")
+                  # # header bottom line
+                  puts("+-#{@columns.map { |_, g| '-' * g[:width] }.join('-+-')}-+")
+
+                  # row line
+                  data.each do |row|
+                    str = row.keys.map do |k|
+                      a = row[k]
+                      if a.to_s.size > 30
+                        a = "#{a.to_s[0..26]}..."
+                      end
+                      if a
+                        # if @columns[k.to_sym]
+                        a.to_s.ljust(@columns[k.to_sym][:width])
+                      else
+                        a.to_s
+                      end
+                    end.join(' | ')
+                    puts("| #{str} |")
+                  end
+                  # bottom line
+                  puts("+-#{@columns.map { |_, g| '-' * g[:width] }.join('-+-')}-+")
+          else
+            puts(data)
+          end
       end
 
       def self.description
-        "RUSTORE: Get app versions statuses"
+        "RUSTORE: Get app statuses for the last 100 versions"
       end
 
       def self.authors
@@ -85,6 +97,12 @@ module Fastlane
                                          optional: true,
                                          type: String,
                                          default_value: Actions.lane_context[SharedValues::RUSTORE_DEVELOPER_DRAFT_VERSION]),
+            FastlaneCore::ConfigItem.new(key: :table_view,
+                                         env_name: "RUSTORE_TABLE_VIEW",
+                                         description: "Show result in a tabular format",
+                                         optional: true,
+                                         type: Boolean,
+                                         default_value: false),
             FastlaneCore::ConfigItem.new(key: :token,
                                          description: "Access token",
                                          optional: false,

data/lib/fastlane/plugin/rustore_developer/helper/rustore_developer_helper.rb

@@ -2,15 +2,14 @@ require 'fastlane_core/ui/ui'
 require "base64"
 
 module Fastlane
-  UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
+  UI = FastlaneCore::UI unless Fastlane.const_defined?(:UI)
 
   module Helper
     class RustoreDeveloperHelper
-
       BASE_URL = 'https://public-api.rustore.ru'
 
-      def self.getTimestamp()
-        return DateTime.now.to_s()
+      def self.getTimestamp
+        return DateTime.now.to_s
         # return '2023-08-23T09:00:32.939+03:00'
       end
 
@@ -24,14 +23,14 @@ module Fastlane
 
       def self.getAccessToken(key_id, key_path)
         UI.important("Getting access token ...")
-        timestamp = getTimestamp()
+        timestamp = getTimestamp
         sign = getSignatureEncoded(key_id, timestamp, key_path)
         uri = URI(BASE_URL + '/public/auth/')
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
         req = Net::HTTP::Post.new(uri.path)
         req["Content-Type"] = "application/json"
-        data = {'keyId': key_id, 'timestamp': timestamp, 'signature': sign}
+        data = { keyId: key_id, timestamp: timestamp, signature: sign }
         req.body = data.to_json
         res = http.request(req)
         result_json = JSON.parse(res.body)
@@ -40,8 +39,8 @@ module Fastlane
         if token.nil?
           UI.error("Cannot retrieve access token, please check your credentials.\n#{result_json['message']}")
         else
-          UI.success 'Got access token'
-          # UI.message token
+          UI.success('Got access token')
+          UI.message(token)
         end
 
         return token
@@ -50,13 +49,13 @@ module Fastlane
       def self.createVersion(token, package_name, publish_type = 'INSTANTLY', app_type = 'MAIN', whats_new)
         UI.important("Creating draft version of '#{package_name}' ...")
         uri = URI(BASE_URL + "/public/v1/application/#{package_name}/version")
-        p uri
+        # p uri
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
         req = Net::HTTP::Post.new(uri.path)
         req["Content-Type"] = "application/json"
         req["Public-Token"] = token
-        data = {'publishType': publish_type, 'appType': app_type, 'whatsNew': whats_new}
+        data = { publishType: publish_type, appType: app_type, whatsNew: whats_new }
         req.body = data.to_json
         # puts req.body
         res = http.request(req)
@@ -64,9 +63,9 @@ module Fastlane
         result_json = JSON.parse(res.body)
         version = result_json['body'] if result_json['code'] == 'OK'
         if version.nil?
-          UI.error("#{result_json['message']}")
+          UI.error((result_json['message']).to_s)
         else
-          UI.success "Created new version: #{version}"
+          UI.success("Created new version: #{version}")
         end
         return version
       end
@@ -74,7 +73,7 @@ module Fastlane
       def self.deleteDraft(token, package_name, version_id)
         UI.important("Deleting draft version #{version_id} ...")
         uri = URI(BASE_URL + "/public/v1/application/#{package_name}/version/#{version_id}")
-        p uri
+        # p uri
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
         req = Net::HTTP::Delete.new(uri.path)
@@ -82,31 +81,33 @@ module Fastlane
         req["Content-Type"] = "application/json"
         res = http.request(req)
         result_json = JSON.parse(res.body)
-        if result_json['code'] != 'OK'
-          UI.error("#{result_json['message']}")
-          return false
-        else
-          UI.success "Successfully deleted"
+        if result_json['code'] == 'OK'
+          UI.success("Successfully deleted")
           return true
+        else
+          UI.error((result_json['message']).to_s)
+          return false
         end
       end
 
       def self.getStatus(token, package_name, version_id, page = 0, size = 10)
         # METHOD_URL = BASE_URL + "/public/v1/application/#{package_name}/version"
+        p(size)
         if version_id.nil?
           UI.important("Getting status of \'#{package_name}\' versions on page #{page} ...")
           uri = URI(BASE_URL + "/public/v1/application/#{package_name}/version?page=#{page}&size=#{size}")
         else
           UI.important("Getting status of \'#{package_name}\' version #{version_id} ...")
-          uri = URI(BASE_URL + "/public/v1/application/#{package_name}/version?id=#{version_id}")
+          uri = URI(BASE_URL + "/public/v1/application/#{package_name}/version?ids=#{version_id}")
         end
-        p uri
+        # p(uri)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
-        req = Net::HTTP::Get.new(uri.path)
+        req = Net::HTTP::Get.new(uri)
         req["Public-Token"] = token
-        req["Content-Type"] = "application/json"
+        req["Accept"] = "application/json"
         res = http.request(req)
+        p(req)
         result_json = JSON.parse(res.body)
         if result_json['code'] == 'OK'
           content = result_json['body']['content']
@@ -115,12 +116,12 @@ module Fastlane
         end
 
         if content.nil?
-          UI.error("#{result_json['message']}")
+          UI.error((result_json['message']).to_s)
         else
           if version_id.nil?
-            UI.success "Got #{totalVersions} versions in #{totalPages} pages"
+            UI.success("Got #{totalVersions} versions in #{totalPages} pages")
           else
-            UI.success "Got version info"
+            UI.success("Got version info")
           end
         end
 
@@ -135,21 +136,21 @@ module Fastlane
         UI.important("Uploading APK #{apk_path} ...")
         # uri = URI(BASE_URL + "/public/v1/application/#{package_name}/version/#{version_id}/apk?isMainApk=#{is_main}&servicesType=#{service_type}")
         uri = URI(BASE_URL + "/public/v1/application/#{package_name}/version/#{version_id}/apk")
-        p uri
+        # p uri
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
         req = Net::HTTP::Post.new(uri.path)
         req["Public-Token"] = token
         req.set_content_type("multipart/form-data")
-        req.set_form([['file', File.open(apk_path)],['isMainApk', is_main.to_s],['servicesType', service_type]], 'multipart/form-data')
+        req.set_form([['file', File.open(apk_path)], ['isMainApk', is_main.to_s], ['servicesType', service_type]], 'multipart/form-data')
         res = http.request(req)
         result_json = JSON.parse(res.body)
-        if result_json['code'] != 'OK'
-          UI.error("#{result_json['message']}")
-          return false
-        else
-          UI.success "APK uploaded"
+        if result_json['code'] == 'OK'
+          UI.success("APK uploaded")
           return true
+        else
+          UI.error((result_json['message']).to_s)
+          return false
         end
       end
 
@@ -160,16 +161,16 @@ module Fastlane
         http.use_ssl = true
         req = Net::HTTP::Post.new(uri.path)
         req["Public-Token"] = token
-        puts req.body
+        puts(req.body)
         res = http.request(req)
-        puts res.body
+        puts(res.body)
         result_json = JSON.parse(res.body)
-        if result_json['code'] != 'OK'
-          UI.error("#{result_json['message']}")
-          return false
-        else
-          UI.success "Successfully committed"
+        if result_json['code'] == 'OK'
+          UI.success("Successfully committed")
           return true
+        else
+          UI.error((result_json['message']).to_s)
+          return false
         end
       end
 
@@ -180,19 +181,18 @@ module Fastlane
         http.use_ssl = true
         req = Net::HTTP::Post.new(uri.path)
         req["Public-Token"] = token
-        puts req.body
+        puts(req.body)
         res = http.request(req)
-        puts res.body
+        puts(res.body)
         result_json = JSON.parse(res.body)
-        if result_json['code'] != 'OK'
-          return false
-          UI.error("#{result_json['message']}")
-        else
-          UI.success "Successfully published"
+        if result_json['code'] == 'OK'
+          UI.success("Successfully published")
           return true
+        else
+          return false
+          UI.error((result_json['message']).to_s)
         end
       end
     end
-
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module RustoreDeveloper
-    VERSION = "0.3.1"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-rustore_developer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - RimiX2
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +149,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: cj_rimix@rambler.ru
 executables: []
 extensions: []
@@ -168,11 +166,9 @@ files:
 - lib/fastlane/plugin/rustore_developer/actions/rustore_developer_upload_action.rb
 - lib/fastlane/plugin/rustore_developer/helper/rustore_developer_helper.rb
 - lib/fastlane/plugin/rustore_developer/version.rb
-homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.8
 specification_version: 4
 summary: RUSTORE beta API integration plugin
 test_files: []