jbox-gitolite 1.2.6 → 1.2.7

data/Rakefile

@@ -1,59 +1,15 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+# frozen_string_literal: true
 
-require 'rake'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-require 'rdoc/task'
 
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec
 
-## Helper Functions
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-
-def version
-  line = File.read("lib/#{name}/version.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-
-## RDoc Task
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-## Other Tasks
-desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end
-
-
-desc "Show library version"
-task :version do
-  puts "#{name} #{version}"
-end
-
-
-desc "Start unit tests"
-task :test => :default
-task :default do
-  RSpec::Core::RakeTask.new(:spec) do |config|
-    config.rspec_opts = "--color --format documentation"
-  end
-  Rake::Task["spec"].invoke
-end
-
-
-desc "Start unit tests in JUnit format"
-task :test_junit do
-  RSpec::Core::RakeTask.new(:spec) do |config|
-    config.rspec_opts = "--format RspecJunitFormatter --out junit/rspec.xml"
-  end
-  Rake::Task["spec"].invoke
+  require 'pry'
+  require 'gitolite'
+  puts 'Loaded Gitolite'
+  ARGV.clear
+  Pry.start
 end

data/bin/_guard-core

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application '_guard-core' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "_guard-core")

data/bin/guard

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'guard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "guard")

data/gitolite.gemspec

@@ -1,35 +1,30 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "gitolite/version"
+# frozen_string_literal: true
+
+require_relative 'lib/gitolite/version'
 
 Gem::Specification.new do |s|
-  s.name        = "jbox-gitolite"
+  s.name        = 'jbox-gitolite'
   s.version     = Gitolite::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Nicolas Rodriguez"]
-  s.email       = ["nrodriguez@jbox-web.com"]
-  s.homepage    = "https://github.com/jbox-web/gitolite"
+  s.authors     = ['Nicolas Rodriguez']
+  s.email       = ['nrodriguez@jbox-web.com']
+  s.homepage    = 'https://github.com/jbox-web/gitolite'
   s.summary     = %q{A Ruby gem for manipulating the Gitolite Git backend via the gitolite-admin repository.}
-  s.description = %q{This gem is designed to provide a Ruby interface to the Gitolite Git backend system.  This gem aims to provide all management functionality that is available via the gitolite-admin repository (like SSH keys, repository permissions, etc)}
+  s.description = %q{This gem is designed to provide a Ruby interface to the Gitolite Git backend system. This gem aims to provide all management functionality that is available via the gitolite-admin repository (like SSH keys, repository permissions, etc)}
   s.license     = 'MIT'
 
-  s.rubyforge_project = "jbox-gitolite"
+  s.rubyforge_project = 'jbox-gitolite'
 
-  s.add_development_dependency 'rake', '~> 10.3', '>= 10.3.1'
-  s.add_development_dependency 'rdoc', '~> 4.1', '>= 4.1.1'
-  s.add_development_dependency 'rspec', '~> 3.0', '>= 3.0.0'
-  s.add_development_dependency 'guard-rspec', '~> 4.2', '>= 4.2.8'
-  s.add_development_dependency 'guard-spork', '~> 1.5', '>= 1.5.1'
-  s.add_development_dependency 'forgery', '~> 0.6', '>= 0.6.0'
-  s.add_development_dependency 'simplecov', '~> 0.8', '>= 0.8.2'
-  s.add_development_dependency 'simplecov-rcov', '~> 0.2', '>= 0.2.3'
-  s.add_development_dependency 'rspec_junit_formatter', '~> 0.2', '>= 0.2.0'
+  s.files = `git ls-files`.split("\n")
 
-  s.add_runtime_dependency 'gitlab-grit', '~> 2.7', '>= 2.7.1'
+  s.add_runtime_dependency 'gitlab-grit', '~> 2.7', '>= 2.7.2'
   s.add_runtime_dependency 'gratr19', '~> 0.4', '>= 0.4.4.1'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.add_development_dependency 'forgery'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
 end

data/lib/gitolite.rb

@@ -1,6 +1,7 @@
+require 'grit'
+require 'gratr'
+
 module Gitolite
-  require 'grit'
-  require 'gratr'
   require 'gitolite/gitolite_admin'
   require 'gitolite/dirty_proxy'
   require 'gitolite/ssh_key'

data/lib/gitolite/config/repo.rb

@@ -95,12 +95,12 @@ module Gitolite
         end
       end
 
+    end
 
-      # Gets raised if a permission that isn't in the allowed
-      # list is passed in
-      class InvalidPermissionError < ArgumentError
-      end
 
+    # Gets raised if a permission that isn't in the allowed
+    # list is passed in
+    class InvalidPermissionError < ArgumentError
     end
 
   end

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

data/spec/spec_helper.rb

@@ -1,21 +1,22 @@
-require 'rubygems'
-require 'spork'
+require 'simplecov'
 require 'forgery'
+require 'rspec'
+require 'support/helper'
 
-require 'simplecov'
-require 'simplecov-rcov'
-SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-SimpleCov.start
+## Start Simplecov
+SimpleCov.start do
+  add_filter 'spec/'
+end
 
-Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However,
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
+## Configure RSpec
+RSpec.configure do |config|
+  include Helper
 
+  config.color = true
+  config.fail_fast = false
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end
 
-Spork.each_run do
-  # This code will be run each time you run your specs.
-  require File.expand_path('../../lib/gitolite', __FILE__)
-  include Gitolite
-end
+require 'gitolite'

data/spec/support/helper.rb

@@ -0,0 +1,12 @@
+module Helper
+
+  def config_files_dir
+    File.join(File.dirname(__FILE__), '..', 'fixtures', 'configs')
+  end
+
+
+  def ssh_key_files_dir
+    File.join(File.dirname(__FILE__), '..', 'fixtures', 'keys')
+  end
+
+end

data/spec/{config_spec.rb → unit_tests/config_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gitolite::Config do
 
-  conf_dir   = File.join(File.dirname(__FILE__), 'fixtures', 'configs')
+  conf_dir   = config_files_dir
   output_dir = '/tmp'
   # output_dir = File.join(File.dirname(File.dirname(__FILE__)), 'tmp')
 

data/spec/{gitolite_admin_spec.rb → unit_tests/gitolite_admin_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gitolite::GitoliteAdmin do
 
-  conf_dir   = File.join(File.dirname(__FILE__), 'fixtures', 'configs')
+  conf_dir   = config_files_dir
   output_dir = '/tmp'
   # output_dir = File.join(File.dirname(File.dirname(__FILE__)), 'tmp')
 
@@ -10,26 +10,26 @@ describe Gitolite::GitoliteAdmin do
     it 'should bootstrap a gitolite-admin repository' do
       test_dir = File.join(output_dir, 'gitolite-admin-test1')
       opts = { :overwrite => false }
-      gl_admin = GitoliteAdmin.bootstrap(test_dir, opts)
+      gl_admin = Gitolite::GitoliteAdmin.bootstrap(test_dir, opts)
 
       expect(gl_admin).to be_a Gitolite::GitoliteAdmin
-      expect(GitoliteAdmin.is_gitolite_admin_repo?(test_dir)).to be true
+      expect(Gitolite::GitoliteAdmin.is_gitolite_admin_repo?(test_dir)).to be true
     end
 
     it 'should bootstrap (overwrite) a gitolite-admin repository' do
       test_dir = File.join(output_dir, 'gitolite-admin-test1')
       opts = { :overwrite => true }
-      gl_admin = GitoliteAdmin.bootstrap(test_dir, opts)
+      gl_admin = Gitolite::GitoliteAdmin.bootstrap(test_dir, opts)
 
       expect(gl_admin).to be_a Gitolite::GitoliteAdmin
-      expect(GitoliteAdmin.is_gitolite_admin_repo?(test_dir)).to be true
+      expect(Gitolite::GitoliteAdmin.is_gitolite_admin_repo?(test_dir)).to be true
     end
   end
 
   describe '#is_gitolite_admin_repo?' do
     it 'should detect a non gitolite-admin repository' do
       test_dir = output_dir
-      expect(GitoliteAdmin.is_gitolite_admin_repo?(test_dir)).to be false
+      expect(Gitolite::GitoliteAdmin.is_gitolite_admin_repo?(test_dir)).to be false
     end
   end
 
@@ -37,13 +37,13 @@ describe Gitolite::GitoliteAdmin do
     it 'should commit file to gitolite-admin repository' do
       test_dir = File.join(output_dir, 'gitolite-admin-test2')
       opts = { :overwrite => true }
-      gl_admin = GitoliteAdmin.bootstrap(test_dir, opts)
+      gl_admin = Gitolite::GitoliteAdmin.bootstrap(test_dir, opts)
 
       c = Gitolite::Config.new(File.join(conf_dir, 'complicated.conf'))
       c.filename = 'gitolite.conf'
 
       gl_admin.config = c
-      gl_admin.save
+      gl_admin.save('new commit', author: 'Test <test@example.com>')
 
       new_file = File.join(test_dir, 'conf', c.filename)
       expect(File.file?(new_file)).to be true

data/spec/{repo_spec.rb → unit_tests/repo_spec.rb}

@@ -52,7 +52,7 @@ describe Gitolite::Config::Repo do
     end
 
     it 'should not allow adding an invalid permission via an InvalidPermissionError' do
-      expect {@repo.add_permission("BadPerm")}.to raise_error
+      expect {@repo.add_permission("BadPerm")}.to raise_error(Gitolite::Config::InvalidPermissionError)
     end
   end
 

data/spec/{ssh_key_spec.rb → unit_tests/ssh_key_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gitolite::SSHKey do
 
-  key_dir    = File.join(File.dirname(__FILE__), 'fixtures', 'keys')
+  key_dir    = ssh_key_files_dir
   output_dir = '/tmp'
   # output_dir = File.join(File.dirname(File.dirname(__FILE__)), 'tmp')
 
@@ -10,7 +10,7 @@ describe Gitolite::SSHKey do
     it 'should construct an SSH key from a string' do
       key = File.join(key_dir, 'bob.pub')
       key_string = File.read(key)
-      s = SSHKey.from_string(key_string, "bob")
+      s = Gitolite::SSHKey.from_string(key_string, "bob")
 
       expect(s.owner).to eq 'bob'
       expect(s.location).to eq ""
@@ -19,13 +19,13 @@ describe Gitolite::SSHKey do
 
     it 'should raise an ArgumentError when an owner isnt specified' do
       key_string = "not_a_real_key"
-      expect(lambda { SSHKey.from_string(key_string) }).to raise_error
+      expect(lambda { Gitolite::SSHKey.from_string(key_string) }).to raise_error(ArgumentError)
     end
 
     it 'should have a location when one is specified' do
       key = File.join(key_dir, 'bob.pub')
       key_string = File.read(key)
-      s = SSHKey.from_string(key_string, "bob", "kansas")
+      s = Gitolite::SSHKey.from_string(key_string, "bob", "kansas")
 
       expect(s.owner).to eq 'bob'
       expect(s.location).to eq "kansas"
@@ -33,18 +33,18 @@ describe Gitolite::SSHKey do
     end
 
     it 'should raise an ArgumentError when owner is nil' do
-      expect(lambda { SSHKey.from_string("bad_string", nil) }).to raise_error
+      expect(lambda { Gitolite::SSHKey.from_string("bad_string", nil) }).to raise_error(ArgumentError)
     end
 
-    it 'should raise an ArgumentError when we get an invalid SSHKey string' do
-      expect(lambda { SSHKey.from_string("bad_string", "bob") }).to raise_error
+    it 'should raise an ArgumentError when we get an invalid Gitolite::SSHKey string' do
+      expect(lambda { Gitolite::SSHKey.from_string("bad_string", "bob") }).to raise_error(ArgumentError)
     end
   end
 
   describe "#from_file" do
     it 'should load a key from a file' do
       key = File.join(key_dir, 'bob.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       key_string = File.read(key).split
 
       expect(s.owner).to eq "bob"
@@ -53,14 +53,14 @@ describe Gitolite::SSHKey do
 
     it 'should load a key with a location from a file' do
       key = File.join(key_dir, 'bob@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'bob'
       expect(s.location).to eq 'desktop'
     end
 
     it 'should load a key with owner and location from a file' do
       key = File.join(key_dir, 'joe-bob@god-zilla.com@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'joe-bob@god-zilla.com'
       expect(s.location).to eq 'desktop'
     end
@@ -69,67 +69,67 @@ describe Gitolite::SSHKey do
   describe '#owner' do
     it 'owner should be bob for bob.pub' do
       key = File.join(key_dir, 'bob.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'bob'
     end
 
     it 'owner should be bob for bob@desktop.pub' do
       key = File.join(key_dir, 'bob@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'bob'
     end
 
     it 'owner should be bob@zilla.com for bob@zilla.com.pub' do
       key = File.join(key_dir, 'bob@zilla.com.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'bob@zilla.com'
     end
 
     it "owner should be joe-bob@god-zilla.com for joe-bob@god-zilla.com@desktop.pub" do
       key = File.join(key_dir, 'joe-bob@god-zilla.com@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'joe-bob@god-zilla.com'
     end
 
     it "owner should be bob.joe@test.zilla.com for bob.joe@test.zilla.com@desktop.pub" do
       key = File.join(key_dir, 'bob.joe@test.zilla.com@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'bob.joe@test.zilla.com'
     end
 
     it "owner should be bob+joe@test.zilla.com for bob+joe@test.zilla.com@desktop.pub" do
       key = File.join(key_dir, 'bob+joe@test.zilla.com@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'bob+joe@test.zilla.com'
     end
 
     it 'owner should be bob@zilla.com for bob@zilla.com@desktop.pub' do
       key = File.join(key_dir, 'bob@zilla.com@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'bob@zilla.com'
     end
 
     it 'owner should be jakub123 for jakub123.pub' do
       key = File.join(key_dir, 'jakub123.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'jakub123'
     end
 
     it 'owner should be jakub123@foo.net for jakub123@foo.net.pub' do
       key = File.join(key_dir, 'jakub123@foo.net.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'jakub123@foo.net'
     end
 
     it 'owner should be joe@sch.ool.edu for joe@sch.ool.edu' do
       key = File.join(key_dir, 'joe@sch.ool.edu.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'joe@sch.ool.edu'
     end
 
     it 'owner should be joe@sch.ool.edu for joe@sch.ool.edu@desktop.pub' do
       key = File.join(key_dir, 'joe@sch.ool.edu@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq 'joe@sch.ool.edu'
     end
   end
@@ -137,55 +137,55 @@ describe Gitolite::SSHKey do
   describe '#location' do
     it 'location should be "" for bob.pub' do
       key = File.join(key_dir, 'bob.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq ''
     end
 
     it 'location should be "desktop" for bob@desktop.pub' do
       key = File.join(key_dir, 'bob@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq 'desktop'
     end
 
     it 'location should be "" for bob@zilla.com.pub' do
       key = File.join(key_dir, 'bob@zilla.com.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq ''
     end
 
     it 'location should be "desktop" for bob@zilla.com@desktop.pub' do
       key = File.join(key_dir, 'bob@zilla.com@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq 'desktop'
     end
 
     it 'location should be "" for jakub123.pub' do
       key = File.join(key_dir, 'jakub123.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq ''
     end
 
     it 'location should be "" for jakub123@foo.net.pub' do
       key = File.join(key_dir, 'jakub123@foo.net.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq ''
     end
 
     it 'location should be "" for joe@sch.ool.edu' do
       key = File.join(key_dir, 'joe@sch.ool.edu.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq ''
     end
 
     it 'location should be "desktop" for joe@sch.ool.edu@desktop.pub' do
       key = File.join(key_dir, 'joe@sch.ool.edu@desktop.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq 'desktop'
     end
 
     it 'location should be "foo-bar" for bob@foo-bar.pub' do
       key = File.join(key_dir, 'bob@foo-bar.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.location).to eq 'foo-bar'
     end
   end
@@ -193,7 +193,7 @@ describe Gitolite::SSHKey do
   describe '#keys' do
     it 'should load ssh key properly' do
       key = File.join(key_dir, 'bob.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       parts = File.read(key).split #should get type, blob, email
 
       expect(s.type).to eq parts[0]
@@ -205,7 +205,7 @@ describe Gitolite::SSHKey do
   describe '#email' do
     it 'should use owner if email is missing' do
       key = File.join(key_dir, 'jakub123@foo.net.pub')
-      s = SSHKey.from_file(key)
+      s = Gitolite::SSHKey.from_file(key)
       expect(s.owner).to eq s.email
     end
   end
@@ -216,7 +216,7 @@ describe Gitolite::SSHKey do
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
 
-      s = SSHKey.new(type, blob, email)
+      s = Gitolite::SSHKey.new(type, blob, email)
 
       expect(s.to_s).to eq [type, blob, email].join(' ')
       expect(s.owner).to eq email
@@ -228,7 +228,7 @@ describe Gitolite::SSHKey do
       email = Forgery::Internet.email_address
       owner = Forgery::Name.first_name
 
-      s = SSHKey.new(type, blob, email, owner)
+      s = Gitolite::SSHKey.new(type, blob, email, owner)
 
       expect(s.to_s).to eq [type, blob, email].join(' ')
       expect(s.owner).to eq owner
@@ -241,7 +241,7 @@ describe Gitolite::SSHKey do
       owner = Forgery::Name.first_name
       location = Forgery::Name.location
 
-      s = SSHKey.new(type, blob, email, owner, location)
+      s = Gitolite::SSHKey.new(type, blob, email, owner, location)
 
       expect(s.to_s).to eq [type, blob, email].join(' ')
       expect(s.owner).to eq owner
@@ -258,7 +258,7 @@ describe Gitolite::SSHKey do
       location = Forgery::Name.location
 
       hash_test = [owner, location, type, blob, email].hash
-      s = SSHKey.new(type, blob, email, owner, location)
+      s = Gitolite::SSHKey.new(type, blob, email, owner, location)
 
       expect(s.hash).to eq hash_test
     end
@@ -270,7 +270,7 @@ describe Gitolite::SSHKey do
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
 
-      s = SSHKey.new(type, blob, email)
+      s = Gitolite::SSHKey.new(type, blob, email)
 
       expect(s.filename).to eq "#{email}.pub"
     end
@@ -281,7 +281,7 @@ describe Gitolite::SSHKey do
       email = Forgery::Internet.email_address
       owner = Forgery::Name.first_name
 
-      s = SSHKey.new(type, blob, email, owner)
+      s = Gitolite::SSHKey.new(type, blob, email, owner)
 
       expect(s.filename).to eq "#{owner}.pub"
     end
@@ -292,7 +292,7 @@ describe Gitolite::SSHKey do
       email = Forgery::Internet.email_address
       location = Forgery::Basic.text(:at_least => 8, :at_most => 15)
 
-      s = SSHKey.new(type, blob, email, nil, location)
+      s = Gitolite::SSHKey.new(type, blob, email, nil, location)
 
       expect(s.filename).to eq "#{email}@#{location}.pub"
     end
@@ -304,7 +304,7 @@ describe Gitolite::SSHKey do
       owner = Forgery::Name.first_name
       location = Forgery::Basic.text(:at_least => 8, :at_most => 15)
 
-      s = SSHKey.new(type, blob, email, owner, location)
+      s = Gitolite::SSHKey.new(type, blob, email, owner, location)
 
       expect(s.filename).to eq "#{owner}@#{location}.pub"
     end
@@ -318,7 +318,7 @@ describe Gitolite::SSHKey do
       owner = Forgery::Name.first_name
       location = Forgery::Basic.text(:at_least => 8, :at_most => 15)
 
-      s = SSHKey.new(type, blob, email, owner, location)
+      s = Gitolite::SSHKey.new(type, blob, email, owner, location)
 
       ## write file
       s.to_file(output_dir)
@@ -334,7 +334,7 @@ describe Gitolite::SSHKey do
       owner = Forgery::Name.first_name
       location = Forgery::Basic.text(:at_least => 8, :at_most => 15)
 
-      s = SSHKey.new(type, blob, email, owner, location)
+      s = Gitolite::SSHKey.new(type, blob, email, owner, location)
 
       expect(s.to_file(output_dir)).to eq File.join(output_dir, s.filename)
     end
@@ -346,8 +346,8 @@ describe Gitolite::SSHKey do
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
 
-      s1 = SSHKey.new(type, blob, email)
-      s2 = SSHKey.new(type, blob, email)
+      s1 = Gitolite::SSHKey.new(type, blob, email)
+      s2 = Gitolite::SSHKey.new(type, blob, email)
 
       expect(s1).to eq s2
     end