From b4f6fbd8cba3e7678462e68e6fc63df23b763187 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 27 Nov 2018 13:42:10 -0800 Subject: Remove circular dependency between HTTPHelper and GitlabNet HttpHelper depended on exceptions defined in GitLabNet, but GitLabNet included HttpHelper. Specs in Ruby 2.5 were breaking as a result of Action::Custom not able to reference constants in GitLabNet: https://gitlab.com/gitlab-org/gitlab-shell/-/jobs/126362702. Closes https://gitlab.com/gitlab-org/gitlab-shell/issues/169 --- lib/gitlab_net.rb | 3 --- lib/gitlab_net/errors.rb | 4 ++++ lib/http_helper.rb | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 lib/gitlab_net/errors.rb diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index bba68f3..cae3bdb 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -10,9 +10,6 @@ require_relative 'http_helper' class GitlabNet # rubocop:disable Metrics/ClassLength include HTTPHelper - class ApiUnreachableError < StandardError; end - class NotFound < StandardError; end - CHECK_TIMEOUT = 5 API_INACCESSIBLE_MESSAGE = 'API is not accessible'.freeze diff --git a/lib/gitlab_net/errors.rb b/lib/gitlab_net/errors.rb new file mode 100644 index 0000000..f32b3d8 --- /dev/null +++ b/lib/gitlab_net/errors.rb @@ -0,0 +1,4 @@ +class GitlabNet + class ApiUnreachableError < StandardError; end + class NotFound < StandardError; end +end diff --git a/lib/http_helper.rb b/lib/http_helper.rb index b2a6211..c66df53 100644 --- a/lib/http_helper.rb +++ b/lib/http_helper.rb @@ -1,5 +1,6 @@ require_relative 'httpunix' require_relative 'gitlab_logger' +require_relative 'gitlab_net/errors' module HTTPHelper READ_TIMEOUT = 300 -- cgit v1.2.1