[yegor256#312] update file structure

mbao01 · May 17, 2022 · c5dfa3d · c5dfa3d
1 parent c4f8750
commit c5dfa3d
Show file tree

Hide file tree

Showing 44 changed files with 60 additions and 60 deletions.
diff --git a/0pdd.rb b/0pdd.rb
@@ -33,32 +33,32 @@
 require 'glogin'
 
 require_relative 'version'
-require_relative 'objects/job'
-require_relative 'objects/job_detached'
-require_relative 'objects/job_emailed'
-require_relative 'objects/job_recorded'
-require_relative 'objects/job_starred'
-require_relative 'objects/job_commiterrors'
+require_relative 'objects/jobs/job'
+require_relative 'objects/jobs/job_detached'
+require_relative 'objects/jobs/job_emailed'
+require_relative 'objects/jobs/job_recorded'
+require_relative 'objects/jobs/job_starred'
+require_relative 'objects/jobs/job_commiterrors'
 require_relative 'objects/log'
-require_relative 'objects/github'
+require_relative 'objects/clients/github'
 require_relative 'objects/user_error'
 require_relative 'objects/git_repo'
-require_relative 'objects/github_invitations'
-require_relative 'objects/github_tickets'
-require_relative 'objects/github_tagged_tickets'
-require_relative 'objects/emailed_tickets'
-require_relative 'objects/logged_tickets'
-require_relative 'objects/commit_tickets'
-require_relative 'objects/sentry_tickets'
-require_relative 'objects/milestone_tickets'
-require_relative 'objects/safe_storage'
-require_relative 'objects/sync_storage'
-require_relative 'objects/logged_storage'
-require_relative 'objects/versioned_storage'
-require_relative 'objects/upgraded_storage'
-require_relative 'objects/cached_storage'
-require_relative 'objects/once_storage'
-require_relative 'objects/s3'
+require_relative 'objects/invitations/github_invitations'
+require_relative 'objects/tickets/github_tickets'
+require_relative 'objects/tickets/github_tagged_tickets'
+require_relative 'objects/tickets/emailed_tickets'
+require_relative 'objects/tickets/logged_tickets'
+require_relative 'objects/tickets/commit_tickets'
+require_relative 'objects/tickets/sentry_tickets'
+require_relative 'objects/tickets/milestone_tickets'
+require_relative 'objects/storage/safe_storage'
+require_relative 'objects/storage/sync_storage'
+require_relative 'objects/storage/logged_storage'
+require_relative 'objects/storage/versioned_storage'
+require_relative 'objects/storage/upgraded_storage'
+require_relative 'objects/storage/cached_storage'
+require_relative 'objects/storage/once_storage'
+require_relative 'objects/storage/s3'
 require_relative 'objects/dynamo'
 
 configure do

diff --git a/objects/github.rb → objects/clients/github.rb b/objects/github.rb → objects/clients/github.rb
@@ -31,7 +31,7 @@ def initialize(config = {})
 
   def client
     client = if @config['testing']
-      require_relative '../test/fake_github'
+      require_relative '../../test/fake_github'
       FakeGithub.new
     else
       args = {}

diff --git a/objects/github_invitations.rb → objects/invitations/github_invitations.rb b/objects/github_invitations.rb → objects/invitations/github_invitations.rb
diff --git a/objects/github_organization_invitations.rb → ...ations/github_organization_invitations.rb b/objects/github_organization_invitations.rb → ...ations/github_organization_invitations.rb
diff --git a/objects/job.rb → objects/jobs/job.rb b/objects/job.rb → objects/jobs/job.rb
@@ -19,8 +19,8 @@
 # SOFTWARE.
 
 require 'mail'
-require_relative 'puzzles'
-require_relative 'diff'
+require_relative '../puzzles'
+require_relative '../diff'
 
 #
 # One job.

diff --git a/objects/job_commiterrors.rb → objects/jobs/job_commiterrors.rb b/objects/job_commiterrors.rb → objects/jobs/job_commiterrors.rb
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative 'truncated'
+require_relative '../truncated'
 
 #
 # Job that posts exceptions as commit messages.

diff --git a/objects/job_detached.rb → objects/jobs/job_detached.rb b/objects/job_detached.rb → objects/jobs/job_detached.rb
diff --git a/objects/job_emailed.rb → objects/jobs/job_emailed.rb b/objects/job_emailed.rb → objects/jobs/job_emailed.rb
diff --git a/objects/job_recorded.rb → objects/jobs/job_recorded.rb b/objects/job_recorded.rb → objects/jobs/job_recorded.rb
diff --git a/objects/job_starred.rb → objects/jobs/job_starred.rb b/objects/job_starred.rb → objects/jobs/job_starred.rb
diff --git a/objects/cached_storage.rb → objects/storage/cached_storage.rb b/objects/cached_storage.rb → objects/storage/cached_storage.rb
diff --git a/objects/logged_storage.rb → objects/storage/logged_storage.rb b/objects/logged_storage.rb → objects/storage/logged_storage.rb
diff --git a/objects/once_storage.rb → objects/storage/once_storage.rb b/objects/once_storage.rb → objects/storage/once_storage.rb
diff --git a/objects/s3.rb → objects/storage/s3.rb b/objects/s3.rb → objects/storage/s3.rb
@@ -20,7 +20,7 @@
 
 require 'aws-sdk-s3'
 require 'nokogiri'
-require_relative '../version'
+require_relative '../../version'
 
 #
 # S3 storage.

diff --git a/objects/safe_storage.rb → objects/storage/safe_storage.rb b/objects/safe_storage.rb → objects/storage/safe_storage.rb
diff --git a/objects/sync_storage.rb → objects/storage/sync_storage.rb b/objects/sync_storage.rb → objects/storage/sync_storage.rb
diff --git a/objects/upgraded_storage.rb → objects/storage/upgraded_storage.rb b/objects/upgraded_storage.rb → objects/storage/upgraded_storage.rb
diff --git a/objects/versioned_storage.rb → objects/storage/versioned_storage.rb b/objects/versioned_storage.rb → objects/storage/versioned_storage.rb
diff --git a/objects/commit_tickets.rb → objects/tickets/commit_tickets.rb b/objects/commit_tickets.rb → objects/tickets/commit_tickets.rb
diff --git a/objects/emailed_tickets.rb → objects/tickets/emailed_tickets.rb b/objects/emailed_tickets.rb → objects/tickets/emailed_tickets.rb
diff --git a/objects/github_tagged_tickets.rb → objects/tickets/github_tagged_tickets.rb b/objects/github_tagged_tickets.rb → objects/tickets/github_tagged_tickets.rb
diff --git a/objects/github_tickets.rb → objects/tickets/github_tickets.rb b/objects/github_tickets.rb → objects/tickets/github_tickets.rb
@@ -20,8 +20,8 @@
 
 require 'haml'
 require 'octokit'
-require_relative 'truncated'
-require_relative 'maybe_text'
+require_relative '../truncated'
+require_relative '../maybe_text'
 
 #
 # Tickets in Github.
@@ -118,7 +118,7 @@ def body(puzzle)
     sha = @github.list_commits(@repo)[0]['sha']
     url = "https://github.com/#{@repo}/blob/#{sha}/#{file}#L#{start}-L#{stop}"
     template = File.read(
-      File.join(File.dirname(__FILE__), 'templates/github_tickets_body.haml')
+      File.join(File.dirname(__FILE__), '../templates/github_tickets_body.haml')
     )
     Haml::Engine.new(template).render(
       Object.new, url: url, puzzle: puzzle

diff --git a/objects/logged_tickets.rb → objects/tickets/logged_tickets.rb b/objects/logged_tickets.rb → objects/tickets/logged_tickets.rb
@@ -19,8 +19,8 @@
 # SOFTWARE.
 
 require 'cgi'
-require_relative 'truncated'
-require_relative 'user_error'
+require_relative '../truncated'
+require_relative '../user_error'
 
 #
 # Tickets that are logged.

diff --git a/objects/milestone_tickets.rb → objects/tickets/milestone_tickets.rb b/objects/milestone_tickets.rb → objects/tickets/milestone_tickets.rb
diff --git a/objects/sentry_tickets.rb → objects/tickets/sentry_tickets.rb b/objects/sentry_tickets.rb → objects/tickets/sentry_tickets.rb
@@ -21,8 +21,8 @@
 require 'octokit'
 require 'mail'
 require 'raven'
-require_relative 'user_error'
-require_relative 'truncated'
+require_relative '../user_error'
+require_relative '../truncated'
 
 #
 # Tickets that report to Sentry.

diff --git a/test/test_cached_storage.rb b/test/test_cached_storage.rb
@@ -21,7 +21,7 @@
 require 'test/unit'
 require_relative 'test__helper'
 require_relative 'fake_storage'
-require_relative '../objects/cached_storage'
+require_relative '../objects/storage/cached_storage'
 
 # CachedStorage test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_commit_tickets.rb b/test/test_commit_tickets.rb
@@ -21,7 +21,7 @@
 require 'test/unit'
 require 'yaml'
 require_relative 'test__helper'
-require_relative '../objects/commit_tickets'
+require_relative '../objects/tickets/commit_tickets'
 
 # CommitTickets test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_credentials.rb b/test/test_credentials.rb
@@ -24,8 +24,8 @@
 require 'tmpdir'
 require 'aws-sdk-dynamodb'
 require_relative 'test__helper'
-require_relative '../objects/s3'
-require_relative '../objects/github_tickets'
+require_relative '../objects/storage/s3'
+require_relative '../objects/tickets/github_tickets'
 require_relative '../objects/log'
 require_relative '../objects/git_repo'
 

diff --git a/test/test_github.rb b/test/test_github.rb
@@ -20,7 +20,7 @@
 
 require 'test/unit'
 require_relative 'test__helper'
-require_relative '../objects/github'
+require_relative '../objects/clients/github'
 
 # Github test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_github_invitations.rb b/test/test_github_invitations.rb
@@ -21,7 +21,7 @@
 require 'test/unit'
 require_relative 'test__helper'
 require_relative 'fake_github'
-require_relative '../objects/github_invitations'
+require_relative '../objects/invitations/github_invitations'
 
 # GithubInvitations test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_github_tickets.rb b/test/test_github_tickets.rb
@@ -22,7 +22,7 @@
 require 'nokogiri'
 require 'yaml'
 require_relative 'test__helper'
-require_relative '../objects/github_tickets'
+require_relative '../objects/tickets/github_tickets'
 
 # GithubTickets test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_job.rb b/test/test_job.rb
@@ -25,8 +25,8 @@
 require_relative 'fake_repo'
 require_relative 'fake_tickets'
 require_relative 'fake_storage'
-require_relative '../objects/job'
-require_relative '../objects/safe_storage'
+require_relative '../objects/jobs/job'
+require_relative '../objects/storage/safe_storage'
 
 # Job test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_job_commiterrors.rb b/test/test_job_commiterrors.rb
@@ -21,7 +21,7 @@
 require 'test/unit'
 require 'mocha/test_unit'
 require_relative 'test__helper'
-require_relative '../objects/job_commiterrors'
+require_relative '../objects/jobs/job_commiterrors'
 
 # JobCommitErrors test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_job_detached.rb b/test/test_job_detached.rb
@@ -20,7 +20,7 @@
 
 require 'test/unit'
 require_relative 'test__helper'
-require_relative '../objects/job_detached'
+require_relative '../objects/jobs/job_detached'
 
 # JobDetached test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_job_emailed.rb b/test/test_job_emailed.rb
@@ -23,7 +23,7 @@
 require_relative 'test__helper'
 require_relative 'fake_repo'
 require_relative 'fake_github'
-require_relative '../objects/job_emailed'
+require_relative '../objects/jobs/job_emailed'
 
 # JobEmailed test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_logged_storage.rb b/test/test_logged_storage.rb
@@ -22,8 +22,8 @@
 require_relative 'test__helper'
 require_relative 'fake_storage'
 require_relative 'fake_log'
-require_relative '../objects/logged_storage'
-require_relative '../objects/versioned_storage'
+require_relative '../objects/storage/logged_storage'
+require_relative '../objects/storage/versioned_storage'
 
 # LoggedStorage test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_logged_tickets.rb b/test/test_logged_tickets.rb
@@ -24,7 +24,7 @@
 require_relative 'test__helper'
 require_relative 'fake_log'
 require_relative 'fake_tickets'
-require_relative '../objects/logged_tickets'
+require_relative '../objects/tickets/logged_tickets'
 
 # LoggedTickets test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_milestone_tickets.rb b/test/test_milestone_tickets.rb
@@ -23,7 +23,7 @@
 require 'yaml'
 require 'fake_github'
 require_relative 'test__helper'
-require_relative '../objects/milestone_tickets'
+require_relative '../objects/tickets/milestone_tickets'
 
 # MilestoneTickets test.
 # Author:: George Aristy ([email protected])

diff --git a/test/test_once_storage.rb b/test/test_once_storage.rb
@@ -21,7 +21,7 @@
 require 'test/unit'
 require_relative 'test__helper'
 require_relative 'fake_storage'
-require_relative '../objects/once_storage'
+require_relative '../objects/storage/once_storage'
 
 # OnceStorage test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_puzzles.rb b/test/test_puzzles.rb
@@ -28,8 +28,8 @@
 require_relative '../version'
 require_relative '../objects/git_repo'
 require_relative '../objects/puzzles'
-require_relative '../objects/safe_storage'
-require_relative '../objects/versioned_storage'
+require_relative '../objects/storage/safe_storage'
+require_relative '../objects/storage/versioned_storage'
 
 # Puzzles test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_safe_storage.rb b/test/test_safe_storage.rb
@@ -23,7 +23,7 @@
 require_relative 'test__helper'
 require_relative 'fake_storage'
 require_relative 'fake_log'
-require_relative '../objects/safe_storage'
+require_relative '../objects/storage/safe_storage'
 
 # SafeStorage test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_sentry_tickets.rb b/test/test_sentry_tickets.rb
@@ -21,7 +21,7 @@
 require 'test/unit'
 require 'mocha/test_unit'
 require_relative 'test__helper'
-require_relative '../objects/sentry_tickets'
+require_relative '../objects/tickets/sentry_tickets'
 
 # SentryTickets test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_upgraded_storage.rb b/test/test_upgraded_storage.rb
@@ -23,9 +23,9 @@
 require_relative 'test__helper'
 require_relative 'fake_storage'
 require_relative 'fake_log'
-require_relative '../objects/safe_storage'
-require_relative '../objects/upgraded_storage'
-require_relative '../objects/versioned_storage'
+require_relative '../objects/storage/safe_storage'
+require_relative '../objects/storage/upgraded_storage'
+require_relative '../objects/storage/versioned_storage'
 
 # UpgradedStorage test.
 # Author:: Yegor Bugayenko ([email protected])

diff --git a/test/test_versioned_storage.rb b/test/test_versioned_storage.rb
@@ -23,7 +23,7 @@
 require_relative 'test__helper'
 require_relative 'fake_storage'
 require_relative 'fake_log'
-require_relative '../objects/versioned_storage'
+require_relative '../objects/storage/versioned_storage'
 
 # VersionedStorage test.
 # Author:: Yegor Bugayenko ([email protected])