ZReviewTender 1.0.1 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa2c137be0a68444622a08d3ab704b221900d1b9a7ea924431647f79f4aba13
-  data.tar.gz: 571f7acf138712cf7128565ed6810b0504b39b370009556a25603d963c40a3b4
+  metadata.gz: b4e15499027773482cf0b32287e29bc453c00115dfa5816372a900ace9ba9ec2
+  data.tar.gz: b9b916a755ee4957f3183019e7fc7fefb7999f2572629f10506f55d5f0198cf8
 SHA512:
-  metadata.gz: ccf6b17d95cca68d1bdd9c6f2f49ce4556a9884eccbd161e0ec9cea2ab5e44360d563d6a40181d4b796cf15e11dd238a8a48cb280291e8a3c192b9e314331ff4
-  data.tar.gz: 8a28b397e178f3ecdc67ee80e01e6e3d405c4d17cf5749ba93898365b51fee7534c8e22d2f5ae2a33df22761240a37524e1618c022dc8dc2f016f146dbbef95a
+  metadata.gz: 37ecac4e478add72f532ad4c70937d9f36b142897cfbddadf1cbc20c0d98d3c6a706d1b43873ab3290a91998e532ce6274cf63b97971e12301114225b427d458
+  data.tar.gz: 63af7bf0f7b55db49f70ff277765e1049a61ee8f5b1e50cdf05776d1ce78732a15ac1670906ebe548cfd2c5041815cb4bc4d72e09e2f68a532a79e9773d73145

data/bin/ZReviewTender

@@ -22,35 +22,60 @@ 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")
+
                 fetcher = parseConfigYMLFile(configYMLFilePath)
                 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")
+
                 fetcher = parseConfigYMLFile(configYMLFilePath)
                 fetcher.execute()
             end 
             
-            opts.on('-r', '--run', 'execute with config yml file') do
-                appleConfigFilePath = "#{basePath}/config/android.yml"
-                fetcher = parseConfigYMLFile(appleConfigFilePath)
+            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)
                 fetcher.execute()
+                
+                #
+                
+                appleConfigFilePath = "#{basePath}/#{configFolderName}/#{defaultAppleConfigFileName}"
+                configFileCheck(appleConfigFilePath, "--apple=CONFIG_YML_FILE_PATH")
 
-                appleConfigFilePath = "#{basePath}/config/apple.yml"
                 fetcher = parseConfigYMLFile(appleConfigFilePath)
                 fetcher.execute()
             end 
         end.parse!
     end
 
+    private
+    def configFileCheck(path, command)
+        if !File.exists? path
+            puts "Make sure you have vaild config file at #{path}"
+            puts "Or use ZReviewTender #{command} specify config.yml file path"
+            raise "Config file not found: #{path}"
+        end
+    end
+
     private
     def parseConfigYMLFile(configFilePath)
         configYMLObj = YAML.load_file(configFilePath)
@@ -67,9 +92,14 @@ class Main
             end
 
             processors = Helper.unwrapRequiredParameter(configYMLObj, 'processors')
-            
+            if processors.nil?
+                processors = []
+            else
+                processors = processors.select{ |processor| processor.select{ |key, value| value["enable"] == true }}
+            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|

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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZReviewTender
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.7
 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