From 634a519a38784372f729b51e006f260f7143531d Mon Sep 17 00:00:00 2001 From: Ash McKenzie Date: Wed, 25 Jul 2018 13:50:53 +1000 Subject: Rename gitlab_access_status -> git_access_status --- lib/git_access_status.rb | 28 ++++++++++++++++++++++++++++ lib/gitlab_access.rb | 2 +- lib/gitlab_access_status.rb | 28 ---------------------------- spec/gitlab_net_spec.rb | 2 +- spec/gitlab_shell_spec.rb | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 lib/git_access_status.rb delete mode 100644 lib/gitlab_access_status.rb diff --git a/lib/git_access_status.rb b/lib/git_access_status.rb new file mode 100644 index 0000000..783bc0c --- /dev/null +++ b/lib/git_access_status.rb @@ -0,0 +1,28 @@ +require 'json' + +class GitAccessStatus + attr_reader :message, :gl_repository, :gl_username, :repository_path, :gitaly + + def initialize(status, message, gl_repository:, gl_username:, repository_path:, gitaly:) + @status = status + @message = message + @gl_repository = gl_repository + @gl_username = gl_username + @repository_path = repository_path + @gitaly = gitaly + end + + def self.create_from_json(json) + values = JSON.parse(json) + new(values["status"], + values["message"], + gl_repository: values["gl_repository"], + gl_username: values["gl_username"], + repository_path: values["repository_path"], + gitaly: values["gitaly"]) + end + + def allowed? + @status + end +end diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index e1a5e35..3b732d8 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -1,6 +1,6 @@ require_relative 'gitlab_init' require_relative 'gitlab_net' -require_relative 'gitlab_access_status' +require_relative 'git_access_status' require_relative 'names_helper' require_relative 'gitlab_metrics' require_relative 'object_dirs_helper' diff --git a/lib/gitlab_access_status.rb b/lib/gitlab_access_status.rb deleted file mode 100644 index 783bc0c..0000000 --- a/lib/gitlab_access_status.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'json' - -class GitAccessStatus - attr_reader :message, :gl_repository, :gl_username, :repository_path, :gitaly - - def initialize(status, message, gl_repository:, gl_username:, repository_path:, gitaly:) - @status = status - @message = message - @gl_repository = gl_repository - @gl_username = gl_username - @repository_path = repository_path - @gitaly = gitaly - end - - def self.create_from_json(json) - values = JSON.parse(json) - new(values["status"], - values["message"], - gl_repository: values["gl_repository"], - gl_username: values["gl_username"], - repository_path: values["repository_path"], - gitaly: values["gitaly"]) - end - - def allowed? - @status - end -end diff --git a/spec/gitlab_net_spec.rb b/spec/gitlab_net_spec.rb index be2f4ba..2cfbaf7 100644 --- a/spec/gitlab_net_spec.rb +++ b/spec/gitlab_net_spec.rb @@ -1,6 +1,6 @@ require_relative 'spec_helper' require_relative '../lib/gitlab_net' -require_relative '../lib/gitlab_access_status' +require_relative '../lib/git_access_status' describe GitlabNet, vcr: true do let(:gitlab_net) { described_class.new } diff --git a/spec/gitlab_shell_spec.rb b/spec/gitlab_shell_spec.rb index 6d07b1c..1686207 100644 --- a/spec/gitlab_shell_spec.rb +++ b/spec/gitlab_shell_spec.rb @@ -1,6 +1,6 @@ require_relative 'spec_helper' require_relative '../lib/gitlab_shell' -require_relative '../lib/gitlab_access_status' +require_relative '../lib/git_access_status' describe GitlabShell do before do -- cgit v1.2.1