some refactoring based on feedbackfeature/hashed-storage-repo-import

4 files changed, 6 insertions, 6 deletions

diff --git a/lib/gitlab/bare_repository_import/importer.rb b/lib/gitlab/bare_repository_import/importer.rb
index 1a17cc4bf9e..1b1ca49bab7 100644
--- a/lib/gitlab/bare_repository_import/importer.rb
+++ b/lib/gitlab/bare_repository_import/importer.rb
@@ -10,7 +10,7 @@ module Gitlab
         repos_to_import = Dir.glob(import_path + '**/*.git')
 
         repos_to_import.each do |repo_path|
-          bare_repo = Gitlab::BareRepositoryImport::BareRepository.new(import_path, repo_path)
+          bare_repo = Gitlab::BareRepositoryImport::Repository.new(import_path, repo_path)
 
           if bare_repo.wiki?
             log " * Skipping wiki repo"
diff --git a/lib/gitlab/bare_repository_import/bare_repository.rb b/lib/gitlab/bare_repository_import/repository.rb
index edaba157b18..57908908be6 100644
--- a/lib/gitlab/bare_repository_import/bare_repository.rb
+++ b/lib/gitlab/bare_repository_import/repository.rb
@@ -1,6 +1,6 @@
 module Gitlab
   module BareRepositoryImport
-    class BareRepository
+    class Repository
       attr_reader :group_path, :project_name, :repo_path
 
       def initialize(root_path, repo_path)
@@ -8,7 +8,7 @@ module Gitlab
         @repo_path = repo_path
 
         # Split path into 'all/the/namespaces' and 'project_name'
-        @group_path, _sep, @project_name = repo_relative_path.rpartition('/')
+        @group_path, _, @project_name = repo_relative_path.rpartition('/')
       end
 
       def wiki?
diff --git a/spec/lib/gitlab/bare_repository_import/importer_spec.rb b/spec/lib/gitlab/bare_repository_import/importer_spec.rb
index f4dd36f6080..1efb76d0255 100644
--- a/spec/lib/gitlab/bare_repository_import/importer_spec.rb
+++ b/spec/lib/gitlab/bare_repository_import/importer_spec.rb
@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Gitlab::BareRepositoryImport::Importer, repository: true do
   let!(:admin) { create(:admin) }
-  let(:project_repo_path) { Gitlab::BareRepositoryImport::BareRepository.new(TestEnv.repos_path, File.join(TestEnv.repos_path, "#{project_path}.git")) }
+  let(:bare_repository) { Gitlab::BareRepositoryImport::Repository.new(TestEnv.repos_path, File.join(TestEnv.repos_path, "#{project_path}.git")) }
 
-  subject(:importer) { described_class.new(project_repo_path) }
+  subject(:importer) { described_class.new(bare_repository) }
 
   before do
     allow(described_class).to receive(:log)
diff --git a/spec/lib/gitlab/bare_repository_import/bare_repository_spec.rb b/spec/lib/gitlab/bare_repository_import/repository_spec.rb
index 1bbbb64a8c7..b42ef7b9aa4 100644
--- a/spec/lib/gitlab/bare_repository_import/bare_repository_spec.rb
+++ b/spec/lib/gitlab/bare_repository_import/repository_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ::Gitlab::BareRepositoryImport::BareRepository do
+describe ::Gitlab::BareRepositoryImport::Repository do
   let(:project_repo_path) { described_class.new('/full/path/', '/full/path/to/repo.git') }
 
   it 'stores the repo path' do