[yegor256#312] resolve comments

0pdd.rb

@@ -340,7 +340,7 @@
       raise "Invalid content-type: \"#{request.content_type}\""
     end
   )
-  github = GithubHelper.new(settings.github, json, settings.config)
+  github = GithubRepo.new(settings.github, json, settings.config)
   return 'Thanks' unless github.is_valid
   unless ENV['RACK_ENV'] == 'test'
     process_request(github)
@@ -368,7 +368,7 @@
       raise "Invalid content-type: \"#{request.content_type}\""
     end
   )
-  gitlab = GitlabHelper.new(settings.gitlab, json, settings.config)
+  gitlab = GitlabRepo.new(settings.gitlab, json, settings.config)
   return 'Thanks' unless gitlab.is_valid
   unless ENV['RACK_ENV'] == 'test'
     process_request(gitlab)

Rakefile

@@ -76,7 +76,7 @@ end
 desc 'Sleep endlessly after the start of DynamoDB Local server'
 task :sleep do
   loop do
-    sleep(3600)
+    sleep(5)
     puts 'Still alive...'
   end
 end

dynamodb-local/tables/0pdd-events.json

@@ -2,7 +2,7 @@
   "TableName": "0pdd-events",
   "AttributeDefinitions": [
     {
-      "AttributeName": "id",
+      "AttributeName": "repo",
       "AttributeType": "S"
     },
     {
@@ -16,7 +16,7 @@
   ],
   "KeySchema": [
     {
-      "AttributeName": "id",
+      "AttributeName": "repo",
       "KeyType": "HASH"
     },
     {
@@ -33,7 +33,7 @@
       "IndexName": "tags",
       "KeySchema": [
         {
-          "AttributeName": "id",
+          "AttributeName": "repo",
           "KeyType": "HASH"
         },
         {

objects/clients/gitlab.rb

@@ -29,7 +29,7 @@ def self.new(config = {})
     begin
       client = if config['testing']
         require_relative '../../test/fake_gitlab'
-        FakeGitlab.new # TODO:: implement fake gitlab
+        FakeGitlab.new
       else
         token = config['gitlab']['token'] if config['gitlab']
         Gitlab.client(

objects/log.rb

@@ -32,8 +32,7 @@ def initialize(dynamo, repo, vcs_name = 'github')
     @dynamo = dynamo
     @repo = repo
     @vcs_name = (vcs_name || 'github').downcase
-    # TODO: Must perform seamless migration of existing DB
-    @id = Base64.encode64(@repo + @vcs_name).gsub(/[\s=\/]+/, '')
+    @id = @vcs_name == 'github' ? @repo : Base64.encode64(@repo + @vcs_name).gsub(/[\s=\/]+/, '')
 
     raise 'You need to specify your cloud VCS' unless [
       'gitlab',
@@ -45,9 +44,8 @@ def put(tag, text)
     @dynamo.put_item(
       table_name: '0pdd-events',
       item: {
-        'id' => @id,
+        'repo' => @id,
         'vcs' => @vcs_name,
-        'repo' => @repo,
         'time' => Time.now.to_i,
         'tag' => tag,
         'text' => "#{text} /#{VERSION}"
@@ -62,10 +60,10 @@ def get(tag)
       select: 'ALL_ATTRIBUTES',
       limit: 1,
       expression_attribute_values: {
-        ':i' => @id,
+        ':r' => @id,
         ':t' => tag
       },
-      key_condition_expression: 'id=:i and tag=:t'
+      key_condition_expression: 'repo=:r and tag=:t'
     ).items[0]
   end
 
@@ -76,18 +74,18 @@ def exists(tag)
       select: 'ALL_ATTRIBUTES',
       limit: 1,
       expression_attribute_values: {
-        ':i' => @id,
+        ':r' => @id,
         ':t' => tag
       },
-      key_condition_expression: 'id=:i and tag=:t'
+      key_condition_expression: 'repo=:r and tag=:t'
     ).items.empty?
   end
 
   def delete(time, tag)
     @dynamo.delete_item(
       table_name: '0pdd-events',
       key: {
-        'id' => @id,
+        'repo' => @id,
         'time' => time
       },
       expression_attribute_values: {
@@ -107,10 +105,10 @@ def list(since = Time.now.to_i)
         '#time' => 'time'
       },
       expression_attribute_values: {
-        ':i' => @id,
+        ':r' => @id,
         ':t' => since
       },
-      key_condition_expression: 'id=:i and #time<:t'
+      key_condition_expression: 'repo=:r and #time<:t'
     )
   end
 end

objects/puzzles.rb

@@ -64,44 +64,35 @@ def group(xml)
   end
 
   def expose(xml, tickets)
-    exceptions = [] # TODO: Send exceptions to the user's email or admin
     seen = []
     Kernel.loop do
-      begin
-        puzzles = xml.xpath(
-          '//puzzle[@alive="false" and issue
-          and issue != "unknown" and not(issue/@closed)' +
-          seen.map { |i| "and id != '#{i}'" }.join(' ') + ']'
-        )
-        break if puzzles.empty?
-        puzzle = puzzles[0]
-        puzzle.search('issue')[0]['closed'] = Time.now.iso8601 if tickets.close(puzzle)
-        save(xml)
-      rescue Exception => e
-        exceptions << e
-      end
+      puzzles = xml.xpath(
+        '//puzzle[@alive="false" and issue
+        and issue != "unknown" and not(issue/@closed)' +
+        seen.map { |i| "and id != '#{i}'" }.join(' ') + ']'
+      )
+      break if puzzles.empty?
+      puzzle = puzzles[0]
+      puzzle.search('issue')[0]['closed'] = Time.now.iso8601 if tickets.close(puzzle)
+      save(xml)
     end
     seen = []
     Kernel.loop do
-      begin
-        puzzles = xml.xpath(
-          '//puzzle[@alive="true" and (not(issue) or issue="unknown")' +
-          seen.map { |i| "and id != '#{i}'" }.join(' ') + ']'
-        )
-        break if puzzles.empty?
-        puzzle = puzzles[0]
-        id = puzzle.xpath('id')[0].text
-        seen << id
-        issue = tickets.submit(puzzle)
-        next if issue.nil?
-        puzzle.search('issue').remove
-        puzzle.add_child(
-          "<issue href='#{issue[:href]}'>#{issue[:number]}</issue>"
-        )
-        save(xml)
-      rescue Exception => e
-        exceptions << e
-      end
+      puzzles = xml.xpath(
+        '//puzzle[@alive="true" and (not(issue) or issue="unknown")' +
+        seen.map { |i| "and id != '#{i}'" }.join(' ') + ']'
+      )
+      break if puzzles.empty?
+      puzzle = puzzles[0]
+      id = puzzle.xpath('id')[0].text
+      seen << id
+      issue = tickets.submit(puzzle)
+      next if issue.nil?
+      puzzle.search('issue').remove
+      puzzle.add_child(
+        "<issue href='#{issue[:href]}'>#{issue[:number]}</issue>"
+      )
+      save(xml)
     end
   end
 end

objects/vcs/base.rb

@@ -19,9 +19,9 @@
 # SOFTWARE.
 
 #
-# VCS - provides a uniform interface to work with different VCSes
+# AbstractVCS - provides a uniform interface to work with different VCSes
 #
-module VCS
+class AbstractVCS
   attr_reader :is_valid, :repo, :name
 
   def initialize(client, json, config = {})

objects/vcs/github.rb

@@ -24,11 +24,10 @@
 require_relative '../clients/gitlab'
 
 #
-# Github helper
+# Github repo
 # API: https://github.com/NARKOZ/gitlab
 #
-class GithubHelper
-  include VCS # important to include this module
+class GithubRepo < AbstractVCS
   attr_reader :is_valid, :repo, :name
 
   def initialize(client, json, config = {})

objects/vcs/gitlab.rb

@@ -24,11 +24,10 @@
 require_relative '../clients/gitlab'
 
 #
-# Gitlab client
+# Gitlab repo
 # API: https://github.com/NARKOZ/gitlab
 #
-class GitlabHelper
-  include VCS
+class GitlabRepo < AbstractVCS
   attr_reader :is_valid, :repo, :name
 
   def initialize(client, json, config = {})