gitolite 0.0.3.alpha → 1.0.0

data/lib/gitolite/ssh_key.rb

@@ -21,7 +21,6 @@ module Gitolite
     end
 
     def self.from_file(key)
-
       raise "#{key} does not exist!" unless File.exists?(key)
 
       #Get our owner and location
@@ -29,8 +28,23 @@ module Gitolite
       owner = $1
       location = $2 || ""
 
+      # Use string key constructor
+      self.from_string(File.read(key), owner, location)
+    end
+
+    # Construct a SSHKey from a string
+    def self.from_string(key_string, owner, location = "")
+      if owner.nil?
+        raise ArgumentError, "owner was nil, you must specify an owner"
+      end
+
       #Get parts of the key
-      type, blob, email = File.read(key).split
+      type, blob, email = key_string.split
+
+      # We need at least a type or blob
+      if type.nil? || blob.nil?
+        raise ArgumentError, "'#{key_string}' is not a valid SSH key string"
+      end
 
       #If the key didn't have an email, just use the owner
       if email.nil?

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "0.0.3.alpha"
+  VERSION = "1.0.0"
 end

data/spec/config_spec.rb

@@ -1,3 +1,4 @@
+require 'plexus'
 require 'gitolite/config'
 require 'spec_helper'
 
@@ -317,6 +318,69 @@ describe Gitolite::Config do
       c = Gitolite::Config.init
       lambda{ c.to_file('/home/test.rb') }.should raise_error(ArgumentError)
     end
+
+    it 'should resolve group dependencies such that all groups are defined before they are used' do
+      c = Gitolite::Config.init
+      c.filename = "test_deptree.conf"
+
+      # Build some groups out of order
+      g = Gitolite::Config::Group.new "groupa"
+      g.add_users "bob", "@groupb"
+      c.add_group(g)
+
+      g = Gitolite::Config::Group.new "groupb"
+      g.add_users "joe", "sam", "susan", "andrew"
+      c.add_group(g)
+
+      g = Gitolite::Config::Group.new "groupc"
+      g.add_users "jane", "@groupb", "brandon"
+      c.add_group(g)
+
+      g = Gitolite::Config::Group.new "groupd"
+      g.add_users "larry", "@groupc"
+      c.add_group(g)
+
+      # Write the config to a file
+      file = c.to_file('/tmp')
+
+      # Read the conf and make sure our order is correct
+      f = File.read(file)
+      lines = f.lines.map {|l| l.strip}
+
+      # Compare the file lines.  Spacing is important here since we are doing a direct comparision
+      lines[0].should == "@groupb             = andrew joe sam susan"
+      lines[1].should == "@groupc             = @groupb brandon jane"
+      lines[2].should == "@groupd             = @groupc larry"
+      lines[3].should == "@groupa             = @groupb bob"
+
+      # Cleanup
+      File.unlink(file)
+    end
+
+    it 'should raise a GroupDependencyError if there is a cyclic dependency' do
+      c = Gitolite::Config.init
+      c.filename = "test_deptree.conf"
+
+      # Build some groups out of order
+      g = Gitolite::Config::Group.new "groupa"
+      g.add_users "bob", "@groupb"
+      c.add_group(g)
+
+      g = Gitolite::Config::Group.new "groupb"
+      g.add_users "joe", "sam", "susan", "@groupc"
+      c.add_group(g)
+
+      g = Gitolite::Config::Group.new "groupc"
+      g.add_users "jane", "@groupa", "brandon"
+      c.add_group(g)
+
+      g = Gitolite::Config::Group.new "groupd"
+      g.add_users "larry", "@groupc"
+      c.add_group(g)
+
+      # Attempt to write the config file
+      lambda{ c.to_file('/tmp')}.should raise_error(Gitolite::Config::GroupDependencyError)
+    end
   end
 
   describe "#cleanup_config_line" do

data/spec/repo_spec.rb

@@ -1,3 +1,4 @@
+require 'hashery'
 require 'gitolite/config/repo'
 require 'spec_helper'
 
@@ -57,6 +58,92 @@ describe Gitolite::Config::Repo do
     end
   end
 
+  describe "permissions" do
+    before(:each) do
+      @repo = Gitolite::Config::Repo.new("CoolRepo")
+    end
+
+    it 'should allow adding the permission C' do
+      @repo.add_permission("C", "", "bob")
+    end
+
+    it 'should allow adding the permission -' do
+      @repo.add_permission("-", "", "bob")
+    end
+
+    it 'should allow adding the permission R' do
+      @repo.add_permission("R", "", "bob")
+    end
+
+    it 'should allow adding the permission RM' do
+      @repo.add_permission("RM", "", "bob")
+    end
+
+    it 'should allow adding the permission RW' do
+      @repo.add_permission("RW", "", "bob")
+    end
+
+    it 'should allow adding the permission RWM' do
+      @repo.add_permission("RWM", "", "bob")
+    end
+
+    it 'should allow adding the permission RW+' do
+      @repo.add_permission("RW+", "", "bob")
+    end
+
+    it 'should allow adding the permission RW+M' do
+      @repo.add_permission("RW+M", "", "bob")
+    end
+
+    it 'should allow adding the permission RWC' do
+      @repo.add_permission("RWC", "", "bob")
+    end
+
+    it 'should allow adding the permission RWCM' do
+      @repo.add_permission("RWCM", "", "bob")
+    end
+
+    it 'should allow adding the permission RW+C' do
+      @repo.add_permission("RW+C", "", "bob")
+    end
+
+    it 'should allow adding the permission RW+CM' do
+      @repo.add_permission("RW+CM", "", "bob")
+    end
+
+    it 'should allow adding the permission RWD' do
+      @repo.add_permission("RWD", "", "bob")
+    end
+
+    it 'should allow adding the permission RWDM' do
+      @repo.add_permission("RWDM", "", "bob")
+    end
+
+    it 'should allow adding the permission RW+D' do
+      @repo.add_permission("RW+D", "", "bob")
+    end
+
+    it 'should allow adding the permission RW+DM' do
+      @repo.add_permission("RW+DM", "", "bob")
+    end
+
+    it 'should allow adding the permission RWCD' do
+      @repo.add_permission("RWCD", "", "bob")
+    end
+
+    it 'should allow adding the permission RWCDM' do
+      @repo.add_permission("RWCDM", "", "bob")
+    end
+
+    it 'should allow adding the permission RW+CD' do
+      @repo.add_permission("RW+CD", "", "bob")
+    end
+
+    it 'should allow adding the permission RW+CDM' do
+      @repo.add_permission("RW+CDM", "", "bob")
+    end
+  end
+
   describe 'git config options' do
     it 'should allow setting a git configuration option' do
       email = "bob@zilla.com"

data/spec/ssh_key_spec.rb

@@ -4,7 +4,67 @@ include Gitolite
 
 describe Gitolite::SSHKey do
   key_dir = File.join(File.dirname(__FILE__),'keys')
-  
+
+  describe "#from_string" 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.owner.should == 'bob'
+      s.location.should == ""
+      s.blob.should == key_string.split[1]
+    end
+
+    it 'should raise an ArgumentError when an owner isnt specified' do
+      key_string = "not_a_real_key"
+      lambda { SSHKey.from_string(key_string) }.should raise_error
+    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.owner.should == 'bob'
+      s.location.should == "kansas"
+      s.blob.should == key_string.split[1]
+    end
+
+    it 'should raise an ArgumentError when owner is nil' do
+      lambda { SSHKey.from_string("bad_string", nil) }.should raise_error
+    end
+
+    it 'should raise an ArgumentError when we get an invalid SSHKey string' do
+      lambda { SSHKey.from_string("bad_string", "bob") }.should raise_error
+    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)
+      key_string = File.read(key).split
+
+      s.owner.should == "bob"
+      s.blob.should == key_string[1]
+    end
+
+    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.owner.should == 'bob'
+      s.location.should == '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.owner.should == 'joe-bob@god-zilla.com'
+      s.location.should == 'desktop'
+    end
+  end
+
   describe '#owner' do
     it 'owner should be bob for bob.pub' do
       key = File.join(key_dir, 'bob.pub')
@@ -136,92 +196,92 @@ describe Gitolite::SSHKey do
       s.owner.should == s.email
     end
   end
-  
+
   describe '#new' do
     it 'should create a valid ssh key' do
       type = "ssh-rsa"
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
-      
+
       s = SSHKey.new(type, blob, email)
-      
+
       s.to_s.should == [type, blob, email].join(' ')
       s.owner.should == email
     end
-    
+
     it 'should create a valid ssh key while specifying an owner' do
       type = "ssh-rsa"
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
       owner = Forgery::Name.first_name
-      
+
       s = SSHKey.new(type, blob, email, owner)
-      
+
       s.to_s.should == [type, blob, email].join(' ')
       s.owner.should == owner
     end
-    
+
     it 'should create a valid ssh key while specifying an owner and location' do
       type = "ssh-rsa"
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
       owner = Forgery::Name.first_name
       location = Forgery::Name.location
-      
+
       s = SSHKey.new(type, blob, email, owner, location)
-      
+
       s.to_s.should == [type, blob, email].join(' ')
       s.owner.should == owner
       s.location.should == location
     end
   end
-  
+
   describe '#filename' do
     it 'should create a filename that is the <email>.pub' do
       type = "ssh-rsa"
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
-      
+
       s = SSHKey.new(type, blob, email)
-      
+
       s.filename.should == "#{email}.pub"
     end
-    
+
     it 'should create a filename that is the <owner>.pub' do
       type = "ssh-rsa"
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
       owner = Forgery::Name.first_name
-      
+
       s = SSHKey.new(type, blob, email, owner)
-      
+
       s.filename.should == "#{owner}.pub"
     end
-    
+
     it 'should create a filename that is the <email>@<location>.pub' do
       type = "ssh-rsa"
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
       location = Forgery::Basic.text(:at_least => 8, :at_most => 15)
-      
+
       s = SSHKey.new(type, blob, email, nil, location)
-      
+
       s.filename.should == "#{email}@#{location}.pub"
     end
-    
+
     it 'should create a filename that is the <owner>@<location>.pub' do
       type = "ssh-rsa"
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
       owner = Forgery::Name.first_name
       location = Forgery::Basic.text(:at_least => 8, :at_most => 15)
-      
+
       s = SSHKey.new(type, blob, email, owner, location)
-      
+
       s.filename.should == "#{owner}@#{location}.pub"
     end
   end
-  
+
   describe '#to_file' do
     it 'should write a "valid" SSH public key to the file system' do
       type = "ssh-rsa"
@@ -229,40 +289,40 @@ describe Gitolite::SSHKey do
       email = Forgery::Internet.email_address
       owner = Forgery::Name.first_name
       location = Forgery::Basic.text(:at_least => 8, :at_most => 15)
-      
+
       s = SSHKey.new(type, blob, email, owner, location)
-      
+
       tmpdir = Dir.tmpdir
       s.to_file(tmpdir)
-      
+
       s.to_s.should == File.read(File.join(tmpdir, s.filename))
     end
-    
+
     it 'should return the filename written' do
       type = "ssh-rsa"
       blob = Forgery::Basic.text(:at_least => 372, :at_most => 372)
       email = Forgery::Internet.email_address
       owner = Forgery::Name.first_name
       location = Forgery::Basic.text(:at_least => 8, :at_most => 15)
-      
+
       s = SSHKey.new(type, blob, email, owner, location)
-      
+
       tmpdir = Dir.tmpdir
-      
-      
+
+
       s.to_file(tmpdir).should == File.join(tmpdir, s.filename)
     end
   end
-  
+
   describe '==' do
     it 'should have two keys equalling one another' do
       type = "ssh-rsa"
       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.should == s2
     end
   end

metadata

@@ -1,135 +1,143 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gitolite
-version: !ruby/object:Gem::Version 
-  hash: -1851332174
-  prerelease: 6
-  segments: 
-  - 0
-  - 0
-  - 3
-  - alpha
-  version: 0.0.3.alpha
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stafford Brunk
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+      - !ruby/object:Gem::Version
+        version: 2.9.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: forgery
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: forgery
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 3
-        - 9
-        - 4
-        version: 3.9.4
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 9
-        - 11
-        version: 0.9.11
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: grit
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 4
-        - 1
-        version: 2.4.1
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
   name: hashery
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: plexus
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
+      - !ruby/object:Gem::Version
+        version: 0.5.10
   type: :runtime
-  version_requirements: *id006
-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)
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        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)
+email:
 - wingrunr21@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - gitolite.gemspec
 - lib/gitolite.rb
@@ -161,40 +169,30 @@ files:
 - spec/ssh_key_spec.rb
 homepage: https://www.github.com/wingrunr21/gitolite
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gitolite
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: A Ruby gem for manipulating the gitolite git backend via the gitolite-admin repository.
-test_files: 
+summary: A Ruby gem for manipulating the gitolite git backend via the gitolite-admin
+  repository.
+test_files:
 - spec/concurrency_spec.rb
 - spec/config_spec.rb
 - spec/configs/complicated.conf