jbox-gitolite 1.2.0 → 1.2.1

data/spec/fixtures/configs/simple.conf

@@ -0,0 +1,5 @@
+repo    gitolite-admin
+        RW+     =   bobzilla
+
+repo    testing
+        RW+     =   @all

data/spec/fixtures/keys/joe-bob@god-zilla.com@desktop.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsRofYfjAUdw0McxGpLTxBbZyKN05HGY19ZIjEQmBPUe2Skt1i/SLwIYzTzKv6vEgAdT9SwmCsO/jpDY/ZM+MhWy4okBisn04yIHCW10q4+YNo2WatzttEa1W+hC58nKtoq/0HkvPVdoeOZxcNtpjvgvkrXH2zdmX7xnA1AAWtqRNkRYWPKjiojkg92aqmJLISSIDeZs2wvXbFO3BJhkvyr3W60cinKhGBBscvdCYUi5pb9dXIFhEEqRf1JkT5CEmF3p4GqSt4/L79nR0LV45grS4NbcN+fCnjWZ8PQhmJ+WPLKkydgR1YvobeY7zDHdHJXWLhsPa+SjwI3WfzrB+GQ== bob@zilla.com

data/spec/gitolite_admin_spec.rb

@@ -1,15 +1,13 @@
-require 'gratr'
-require 'grit'
-require 'gitolite/gitolite_admin'
-require 'gitolite/config'
 require 'spec_helper'
-include Gitolite
 
 describe Gitolite::GitoliteAdmin do
 
+  output_dir = '/tmp'
+  # output_dir = File.join(File.dirname(File.dirname(__FILE__)), 'tmp')
+
   describe '#bootstrap' do
     it 'should bootstrap a gitolite-admin repository' do
-      test_dir = '/tmp/gitolite-admin-test'
+      test_dir = File.join(output_dir, 'gitolite-admin-test')
       opts = { :overwrite => false }
       gl_admin = GitoliteAdmin.bootstrap(test_dir, opts)
 
@@ -18,7 +16,7 @@ describe Gitolite::GitoliteAdmin do
     end
 
     it 'should bootstrap (overwrite) a gitolite-admin repository' do
-      test_dir = '/tmp/gitolite-admin-test'
+      test_dir = File.join(output_dir, 'gitolite-admin-test')
       opts = { :overwrite => true }
       gl_admin = GitoliteAdmin.bootstrap(test_dir, opts)
 
@@ -29,7 +27,7 @@ describe Gitolite::GitoliteAdmin do
 
   describe '#is_gitolite_admin_repo?' do
     it 'should detect a non gitolite-admin repository' do
-      test_dir = '/tmp'
+      test_dir = output_dir
       expect(GitoliteAdmin.is_gitolite_admin_repo?(test_dir)).to be false
     end
   end

data/spec/group_spec.rb

@@ -1,4 +1,3 @@
-require 'gitolite/config/group'
 require 'spec_helper'
 
 describe Gitolite::Config::Group do

data/spec/repo_spec.rb

@@ -1,4 +1,3 @@
-require 'gitolite/config/repo'
 require 'spec_helper'
 
 describe Gitolite::Config::Repo do

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'spork'
 require 'forgery'
-require 'tmpdir'
 
 require 'simplecov'
 require 'simplecov-rcov'
@@ -17,5 +16,6 @@ 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

data/spec/ssh_key_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
-require 'gitolite/ssh_key'
-include Gitolite
 
 describe Gitolite::SSHKey do
-  key_dir = File.join(File.dirname(__FILE__),'keys')
+
+  key_dir    = File.join(File.dirname(__FILE__), 'fixtures', 'keys')
+  output_dir = '/tmp'
+  # output_dir = File.join(File.dirname(File.dirname(__FILE__)), 'tmp')
 
   describe "#from_string" do
     it 'should construct an SSH key from a string' do
@@ -96,6 +97,12 @@ describe Gitolite::SSHKey do
       s.owner.should == '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.owner.should == '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)
@@ -313,10 +320,11 @@ describe Gitolite::SSHKey do
 
       s = SSHKey.new(type, blob, email, owner, location)
 
-      tmpdir = Dir.tmpdir
-      s.to_file(tmpdir)
+      ## write file
+      s.to_file(output_dir)
 
-      s.to_s.should == File.read(File.join(tmpdir, s.filename))
+      ## compare raw string with written file
+      s.to_s.should == File.read(File.join(output_dir, s.filename))
     end
 
     it 'should return the filename written' do
@@ -328,10 +336,7 @@ describe Gitolite::SSHKey do
 
       s = SSHKey.new(type, blob, email, owner, location)
 
-      tmpdir = Dir.tmpdir
-
-
-      s.to_file(tmpdir).should == File.join(tmpdir, s.filename)
+      s.to_file(output_dir).should == File.join(output_dir, s.filename)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbox-gitolite
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Nicolas Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 4.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: guard-spork
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: travis-lint
   requirement: !ruby/object:Gem::Requirement
@@ -165,19 +165,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.6.5
 - !ruby/object:Gem::Dependency
-  name: gratr19
+  name: plexus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4.1
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4.1
+        version: 0.5.10
 description: 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)
@@ -205,23 +205,24 @@ files:
 - lib/gitolite/ssh_key.rb
 - lib/gitolite/version.rb
 - spec/config_spec.rb
-- spec/configs/complicated.conf
-- spec/configs/simple.conf
 - spec/dirty_proxy_spec.rb
+- spec/fixtures/configs/complicated.conf
+- spec/fixtures/configs/simple.conf
+- spec/fixtures/keys/bob+joe@test.zilla.com@desktop.pub
+- spec/fixtures/keys/bob-ins@zilla-site.com@desktop.pub
+- spec/fixtures/keys/bob.joe@test.zilla.com@desktop.pub
+- spec/fixtures/keys/bob.pub
+- spec/fixtures/keys/bob@desktop.pub
+- spec/fixtures/keys/bob@foo-bar.pub
+- spec/fixtures/keys/bob@zilla.com.pub
+- spec/fixtures/keys/bob@zilla.com@desktop.pub
+- spec/fixtures/keys/jakub123.pub
+- spec/fixtures/keys/jakub123@foo.net.pub
+- spec/fixtures/keys/joe-bob@god-zilla.com@desktop.pub
+- spec/fixtures/keys/joe@sch.ool.edu.pub
+- spec/fixtures/keys/joe@sch.ool.edu@desktop.pub
 - spec/gitolite_admin_spec.rb
 - spec/group_spec.rb
-- spec/keys/bob-ins@zilla-site.com@desktop.pub
-- spec/keys/bob.joe@test.zilla.com@desktop.pub
-- spec/keys/bob.pub
-- spec/keys/bob@desktop.pub
-- spec/keys/bob@foo-bar.pub
-- spec/keys/bob@zilla.com.pub
-- spec/keys/bob@zilla.com@desktop.pub
-- spec/keys/jakub123.pub
-- spec/keys/jakub123@foo.net.pub
-- spec/keys/joe-bob@god-zilla.com@desktop.pub
-- spec/keys/joe@sch.ool.edu.pub
-- spec/keys/joe@sch.ool.edu@desktop.pub
 - spec/repo_spec.rb
 - spec/spec_helper.rb
 - spec/ssh_key_spec.rb
@@ -252,23 +253,24 @@ summary: A Ruby gem for manipulating the Gitolite Git backend via the gitolite-a
   repository.
 test_files:
 - spec/config_spec.rb
-- spec/configs/complicated.conf
-- spec/configs/simple.conf
 - spec/dirty_proxy_spec.rb
+- spec/fixtures/configs/complicated.conf
+- spec/fixtures/configs/simple.conf
+- spec/fixtures/keys/bob+joe@test.zilla.com@desktop.pub
+- spec/fixtures/keys/bob-ins@zilla-site.com@desktop.pub
+- spec/fixtures/keys/bob.joe@test.zilla.com@desktop.pub
+- spec/fixtures/keys/bob.pub
+- spec/fixtures/keys/bob@desktop.pub
+- spec/fixtures/keys/bob@foo-bar.pub
+- spec/fixtures/keys/bob@zilla.com.pub
+- spec/fixtures/keys/bob@zilla.com@desktop.pub
+- spec/fixtures/keys/jakub123.pub
+- spec/fixtures/keys/jakub123@foo.net.pub
+- spec/fixtures/keys/joe-bob@god-zilla.com@desktop.pub
+- spec/fixtures/keys/joe@sch.ool.edu.pub
+- spec/fixtures/keys/joe@sch.ool.edu@desktop.pub
 - spec/gitolite_admin_spec.rb
 - spec/group_spec.rb
-- spec/keys/bob-ins@zilla-site.com@desktop.pub
-- spec/keys/bob.joe@test.zilla.com@desktop.pub
-- spec/keys/bob.pub
-- spec/keys/bob@desktop.pub
-- spec/keys/bob@foo-bar.pub
-- spec/keys/bob@zilla.com.pub
-- spec/keys/bob@zilla.com@desktop.pub
-- spec/keys/jakub123.pub
-- spec/keys/jakub123@foo.net.pub
-- spec/keys/joe-bob@god-zilla.com@desktop.pub
-- spec/keys/joe@sch.ool.edu.pub
-- spec/keys/joe@sch.ool.edu@desktop.pub
 - spec/repo_spec.rb
 - spec/spec_helper.rb
 - spec/ssh_key_spec.rb