zz-export-pull-requests 0.3.12 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7da2494c7c8ad182157844df4558d731231afc7c3c8453b4cd0cf128e56be5
-  data.tar.gz: 9b990c531f0a9beb4c93c8d188459c15381c6f36762a373a34e00d305e7e3cb1
+  metadata.gz: b50ba3a1501bbe7be4a6c373d5ad252882cd68e1cdfc9750fb3c33be247e61cb
+  data.tar.gz: 34a39672fda231758549b9d73c874a3d82b0654f0de14e7d62435b4f4a56facb
 SHA512:
-  metadata.gz: 644f2764fe9702db374e77e78f382fc8da73a246a5762702ea6586a4353585db6d1e56a8c474b970e7be2594d8f556fd6dceff66793fa20803b8bac5f82427dd
-  data.tar.gz: 0bd92c548197b23b1298a7c9b09755efc8656228104970b94d8237425dcddc88ffedea58e6e5007e030e3d80e1312617eb03657efb7a1831c713331fdcaef714
+  metadata.gz: e8970282ec36f3891e1d03911139433289877e192bcee1aa90e4315577a0bf7f1fa8f4d7199221e2b54b049493f6b18040862ee896629536ee6231d6c803377b
+  data.tar.gz: b105e4e5c0180ad62ed8628df56d0b194a0f3682d7631e228661d35e1c9fc25633d2cb72860460c7551953a5fc53777f1c594ad1eb085688615c6967a1bdfca6

data/bin/epr

@@ -10,7 +10,7 @@ require "github_api"
 require "gitlab"
 require "bitbucket_rest_api"
 
-VERSION = "0.3.12"
+VERSION = "0.3.17"
 SERVICES = %w[github gitlab bitbucket]
 GIT_CONFIGS = %w[epr.token github.oauth-token]
 
@@ -29,7 +29,7 @@ BITBUCKET_RATE_LIMIT = 950 # actually, it's 1000 - we play safe here
 # Data will persist in Redis DB/server until we shut it down.
 # Docs: https://www.rubydoc.info/github/redis/redis-rb/master/frames
 # Read: https://www.mikeperham.com/2015/09/24/storing-data-with-redis/#databases
-$redisLogger = Logger.new(STDOUT)
+$redisLogger = Logger.new(STDERR)
 $redisLogger.formatter = proc {|severity, datetime, progname, msg|
   "[#{datetime.strftime('%d/%m/%Y %H:%M:%S')}] EPR-#{severity} - #{msg}\n"
 }
@@ -93,20 +93,25 @@ end
 
 def sleep_if_limit_reached
   executions = $redis.get("bb-executed").to_i
-  $redisLogger.info("We have called the API for #{executions} times")
-
   if executions >= BITBUCKET_RATE_LIMIT
     now = Time.now
-    now_formatted = now.strftime("%I:%M:%S")
     one_hour = 1*60*60
     later = now + one_hour
     later_formatted = later.strftime("%I:%M:%S")
-    $redisLogger.info("#{now_formatted} - Rate limit reached. Will pause for an hour and will resume at #{later_formatted}.")
+    if ENV['SHOW_LOGS']
+      $redisLogger.info("Rate limit reached. Will pause for an hour and will resume at #{later_formatted}.")
+    end
     sleep one_hour
     $redis.set("bb-executed", 0)
   end
 end
 
+def check_api_rate_limit
+  executions = $redis.get("bb-executed").to_i
+  $redisLogger.info("We have called the API for #{executions} times") if ENV['SHOW_LOGS']
+  sleep_if_limit_reached
+end
+
 def bitbucket(user, repo)
   # TODO: make sure no need to translate any states
   # https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Busername%7D/%7Brepo_slug%7D/pullrequests
@@ -125,7 +130,7 @@ def bitbucket(user, repo)
 
     loop do
       page += 1
-      sleep_if_limit_reached
+      check_api_rate_limit
 
       prs = $bitbucket.repos.pull_request.all(user, repo, :page => page, :state => $filter.upcase)
       prs["values"].each do |pr|
@@ -170,7 +175,7 @@ def bitbucket(user, repo)
         comment_page = 0
         loop do
           comment_page += 1
-          sleep_if_limit_reached
+          check_api_rate_limit
 
           comments = $bitbucket.repos.pull_request.comments(user, repo, pr.id, :page => comment_page)
           comments["values"].each do |comment|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zz-export-pull-requests
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.17
 platform: ruby
 authors:
 - Zulhilmi Zainudin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2019-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api