gitolite 1.0.0 → 1.0.1

data/README.markdown

@@ -1,6 +1,6 @@
 # gitolite #
 
-This gem is designed to provide a Ruby interface to the {gitolite}[https://github.com/sitaramc/gitolite] git backend system.  I am aiming to provide all management functionality that is available via the gitolite-admin repository (like SSH keys, repository permissions, etc)
+This gem is designed to provide a Ruby interface to the [gitolite](https://github.com/sitaramc/gitolite) git backend system.  I am aiming to provide all management functionality that is available via the gitolite-admin repository (like SSH keys, repository permissions, etc)
 
 This gem can still have problems.  Please file an issue if you encounter a bug.  If you have a feature request, file one please.
 
@@ -14,7 +14,7 @@ This gem can still have problems.  Please file an issue if you encounter a bug.
 
 ## Requirements ##
 * Ruby 1.8.x or 1.9.x
-* a working {gitolite}[https://github.com/sitaramc/gitolite] installation
+* a working [gitolite](https://github.com/sitaramc/gitolite) installation
 * the <tt>gitolite-admin</tt> repository checked out locally
 
 ## Installation ##

data/lib/gitolite/config.rb

@@ -207,6 +207,8 @@ module Gitolite
 
         # Add each group to the graph
         @groups.each_value do |group|
+          dp.add_vertex! group
+
           # Select group names from the users
           subgroups = group.users.select {|u| u =~ /^#{Group::PREPEND_CHAR}.*$/}
                                  .map{|g| get_group g.gsub(Group::PREPEND_CHAR, '') }

data/lib/gitolite/version.rb

@@ -1,3 +1,3 @@
 module Gitolite
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/config_spec.rb

@@ -381,6 +381,44 @@ describe Gitolite::Config do
       # Attempt to write the config file
       lambda{ c.to_file('/tmp')}.should raise_error(Gitolite::Config::GroupDependencyError)
     end
+
+    it 'should resolve group dependencies even when there are disconnected portions of the graph' 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", "timmy", "stephanie"
+      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", "earl", "brandon", "@groupa"
+      c.add_group(g)
+
+      g = Gitolite::Config::Group.new "groupd"
+      g.add_users "larry", "chris", "emily"
+      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 == "@groupd             = chris emily larry"
+      lines[1].should == "@groupb             = andrew joe sam susan"
+      lines[2].should == "@groupa             = bob stephanie timmy"
+      lines[3].should == "@groupc             = @groupa brandon earl jane"
+
+      # Cleanup
+      File.unlink(file)
+    end
   end
 
   describe "#cleanup_config_line" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitolite
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec