ZReviewTender 1.0.5 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7424669fd10f388ab510a8e2dd5883fcf1341d008d3eb373935354f401bb02a
-  data.tar.gz: c71871531e5e011ae609b6fd42220a25350e7791882862f2c52329f8e3c9169e
+  metadata.gz: b73630248279980c724ee2b406c9cd9a6f593739e57aa29f799ba67ef149d8a8
+  data.tar.gz: 63ce65ad094fcd283e561423ce85a4c0417bff9a337d285c6cb87103f9244d7a
 SHA512:
-  metadata.gz: 7306096441bcf8f3bdd47f4b00a5449ff3a1baaaf045159699eff5bfcde01d9876b333ca55894b976e0919061c678df3453e463f9e7a5d6fe7242f242bdaa561
-  data.tar.gz: 2f0544786b27029a3a745553a729e1f65aa7758f69cf8a917e0da26e6c7f15d96fd22039e195c09f765a4093f54f2bbd193b997a6d37af2d2ca80bac1fa080a4
+  metadata.gz: 9018a501ad76e81d905221fb3b42077b95d6d752d914be3155862dd8beca1ef511c9fc00be84c2f03b5a399b6f83884afa5292eb96a67b016607ead567bde0a9
+  data.tar.gz: 19d1421f57614dcb79c1f20ffdc3a300473ae9ff1a7ad738f35b6cdd0bc0722154648b7ca979e2f63ff055c8e5735b62001f7f3a38ced9d5f500db11d43359a4

data/bin/ZReviewTender

@@ -8,6 +8,7 @@ require "Models/AppleConfig"
 require "Models/AndroidConfig"
 require "Models/Processor"
 require "Helper"
+require "ZLogger"
 require "AppleFetcher"
 require "AndroidFetcher"
 require "optparse"
@@ -22,10 +23,13 @@ class Main
             opts.banner = "Usage: ZReviewTender [options]"
 
             basePath = ENV['PWD'] || ::Dir.pwd
+            defaultConfigDirName = "config"
+            defaultAppleConfigFileName = "apple.yml"
+            defaultAndroidConfigFileName = "android.yml"
         
             opts.on('-a', '--apple[=CONFIGYMLFILEPATH]', 'execute apple platform with config yml file') do |configYMLFilePath|
                 if configYMLFilePath.nil?
-                    configYMLFilePath = "#{basePath}/config/apple.yml"
+                    configYMLFilePath = "#{basePath}/#{defaultConfigDirName}/#{defaultAppleConfigFileName}"
                 end
                 configFileCheck(configYMLFilePath, "--apple=CONFIG_YML_FILE_PATH")
 
@@ -33,9 +37,9 @@ class Main
                 fetcher.execute()
             end 
 
-            opts.on('-g', '--googleAndroid[=CONFIGYMLFILEPATH]', 'execute apple platform with config yml file') do |configYMLFilePath|
+            opts.on('-g', '--googleAndroid[=CONFIGYMLFILEPATH]', 'execute android platform with config yml file') do |configYMLFilePath|
                 if configYMLFilePath.nil?
-                    configYMLFilePath = "#{basePath}/config/android.yml"
+                    configYMLFilePath = "#{basePath}/#{defaultConfigDirName}/#{defaultAndroidConfigFileName}"
                 end
                 configFileCheck(configYMLFilePath, "--googleAndroid=CONFIG_YML_FILE_PATH")
 
@@ -43,8 +47,11 @@ class Main
                 fetcher.execute()
             end 
             
-            opts.on('-r', '--run', 'execute with config yml file') do
-                androidConfigFilePath = "#{basePath}/config/android.yml"
+            opts.on('-r', '--run=[=CONFIGFOLDERNAME]', 'execute both android and apple, specify an /config folder name') do |configFolderName|
+                if configFolderName.nil?
+                    configFolderName = defaultConfigDirName
+                end
+                androidConfigFilePath = "#{basePath}/#{configFolderName}/#{defaultAndroidConfigFileName}"
                 configFileCheck(androidConfigFilePath, "--googleAndroid=CONFIG_YML_FILE_PATH")
                 
                 fetcher = parseConfigYMLFile(androidConfigFilePath)
@@ -52,7 +59,7 @@ class Main
                 
                 #
                 
-                appleConfigFilePath = "#{basePath}/config/apple.yml"
+                appleConfigFilePath = "#{basePath}/#{configFolderName}/#{defaultAppleConfigFileName}"
                 configFileCheck(appleConfigFilePath, "--apple=CONFIG_YML_FILE_PATH")
 
                 fetcher = parseConfigYMLFile(appleConfigFilePath)
@@ -86,13 +93,19 @@ class Main
             end
 
             processors = Helper.unwrapRequiredParameter(configYMLObj, 'processors')
-            
+            if processors.nil?
+                processors = []
+            end
+
             if processors.length < 1
-                raise "must specify at least one processor."
+                raise "must specify/enable at least one processor."
             end
 
             processors.each do |processor|
                 processor.each do |key, value|
+                    if value["enable"] != true
+                        next
+                    end
                     processorClass = Helper.unwrapRequiredParameter(value, "class")
                     require "Processors/#{processorClass}"
                     fetcher.registerProcessor(eval("#{processorClass}.new(#{value}, '#{configFilePath}', '#{ENV['PWD'] || ::Dir.pwd}')"))
@@ -110,6 +123,15 @@ end
 begin 
     Main.new()
 rescue => e
-    puts "#Error: #{e.class} #{e.message}\n"
-    puts e.backtrace
-end
+    logger = ZLogger.new(ENV['PWD'] || ::Dir.pwd)
+    title = "#Error: #{e.class} #{e.message}"
+    body = e.backtrace
+    
+    logger.logError("===RUNTIME EXCEPTION START===")
+    logger.logError(title)
+    logger.logError(body)
+    logger.logError("===RUNTIME EXCEPTION END===")
+        
+    puts title
+    puts body
+end

data/lib/AndroidFetcher.rb

@@ -23,13 +23,6 @@ class AndroidFetcher < ReviewFetcher
 
         latestCheckTimestamp = getPlatformLatestCheckTimestamp()
 
-        # init first time, send welcome message
-        if latestCheckTimestamp == 0 
-            sendWelcomMessage()
-            setPlatformLatestCheckTimestamp(Time.now().to_i)
-            return
-        end
-
         reviews = []
         
         # Google API Bug, couldn't specify limit/offse/pagination, google only return a few recent reviews.
@@ -52,22 +45,25 @@ class AndroidFetcher < ReviewFetcher
             end
             customerReviewPlatform = "Android #{customerReview.comments[0].user_comment.android_os_version}"
             
-            if latestCheckTimestamp >= customerReviewCreatedDateTimestamp
-                break
-            else
-                url = "https://play.google.com/store/apps/details?id=#{config.packageName}&reviewId=#{customerReviewID}"
-                if !config.accountID.nil? && !config.appID.nil?
-                    url = "https://play.google.com/console/developers/#{config.accountID}/app/#{config.appID}/user-feedback/review-details?reviewId=#{customerReviewID}"
-                end
-                reviews.append(Review.new(customerReviewPlatform, customerReviewID, customerReviewReviewerNickname, customerReviewRating, customerReviewTitle, customerReviewBody, customerReviewCreatedDateTimestamp, url, customerReviewVersionString, customerReviewTerritory))
+            url = "https://play.google.com/store/apps/details?id=#{config.packageName}&reviewId=#{customerReviewID}"
+            if !config.accountID.nil? && !config.appID.nil?
+                url = "https://play.google.com/console/developers/#{config.accountID}/app/#{config.appID}/user-feedback/review-details?reviewId=#{customerReviewID}"
             end
-
+            reviews.append(Review.new(customerReviewPlatform, customerReviewID, customerReviewReviewerNickname, customerReviewRating, customerReviewTitle, customerReviewBody, customerReviewCreatedDateTimestamp, url, customerReviewVersionString, customerReviewTerritory))
         end
+
+        reviews = reviews.reject{ |review| latestCheckTimestamp >= review.createdDateTimestamp }.sort! { |a, b|  a.createdDateTimestamp <=> b.createdDateTimestamp }
       
         if reviews.length > 0
-            reviews.sort! { |a, b|  a.createdDateTimestamp <=> b.createdDateTimestamp }
+
             setPlatformLatestCheckTimestamp(reviews.last.createdDateTimestamp)
 
+            # init first time, send welcome message
+            if latestCheckTimestamp == 0 
+                sendWelcomMessage()
+                return
+            end
+
             processReviews(reviews, platform)
         end
     end

data/lib/AppleFetcher.rb

@@ -24,20 +24,18 @@ class AppleFetcher < ReviewFetcher
 
         latestCheckTimestamp = getPlatformLatestCheckTimestamp()
 
-
-        # init first time, send welcome message
-        if latestCheckTimestamp == 0 
-            sendWelcomMessage()
-            setPlatformLatestCheckTimestamp(Time.now().to_i)
-            return;
-        end
-
         reviews = fetchReviews(latestCheckTimestamp)
 
         if reviews.length > 0
             reviews.sort! { |a, b|  a.createdDateTimestamp <=> b.createdDateTimestamp }
             setPlatformLatestCheckTimestamp(reviews.last.createdDateTimestamp)
 
+            # init first time, send welcome message
+            if latestCheckTimestamp == 0 
+                sendWelcomMessage()
+                return;
+            end
+
             reviews = fullfillAppInfo(reviews)
             processReviews(reviews, platform)
         end
@@ -73,6 +71,12 @@ class AppleFetcher < ReviewFetcher
                 else
                     url = "https://appstoreconnect.apple.com/apps/#{config.appID}/appstore/activity/ios/ratingsResponses"
                     reviews.append(Review.new(nil, customerReviewID, customerReviewReviewerNickname, customerReviewRating, customerReviewTitle, customerReviewBody, customerReviewCreatedDateTimestamp, url, nil, customerReviewTerritory))
+                    
+                    # init first time, need first review to set as latestCheckTimestamp
+                    if latestCheckTimestamp == 0
+                        customerReviewsLink = nil
+                        break
+                    end
                 end
             end
 

data/lib/Processors/SlackProcessor.rb

@@ -77,6 +77,7 @@ class SlackProcessor < Processor
 
             result = request(payload)
             if !result[:ok]
+                logger.logError(payload)
                 logger.logError(result)
                 if result[:message] == "ratelimited"
                     sleep(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZReviewTender
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.8
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http