jbox-gitolite 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c530bb8eff13306344887fcc5580ef058cd745
-  data.tar.gz: 86b5e4506055f9355b1ac97d85dde40018c1f5c0
+  metadata.gz: 8242365723c05acd430cfdaa34f8f18e201fe860
+  data.tar.gz: 767660c5aa70ce7f4a3a8df74164ec667af0f289
 SHA512:
-  metadata.gz: 1bb6ea32939e9cb36c1d52f703bf0b89d0b19694371dee7d6a33781904fa0ec7c875da4b05fd8fee0e52b5aca947a0a261b48e3717008f8f087f54cefd4ae88b
-  data.tar.gz: 26c895891e7976fb68165923ec56e3d4490b1f0401fabee1c1a720609ba87599756b44dcbbc6ce0f07f38977a3f37ea54e3ad79cffe40310da8d2067e3f91f55
+  metadata.gz: a79d5689bede554598122604aacc28d7740cc9de1d13c4e7c8a9c3def8ade3363b7f401a172f6b71b573e62a86733cfbf6c9bfc8f88f16e2355b55f4d611dc8b
+  data.tar.gz: 3ae1bf550e36a15a22302d25b84af0dfb963506bfcf55bc0d02cf6623e3139e552666bcffd335d8fc4f77b9b9f8b3bb0e6e22e6cd30ddd9dbd8adb77f218c22c

data/.gitignore

@@ -1,9 +1,9 @@
-pkg/*
 *.gem
-.bundle
-rdoc/*
-*.conf
-coverage
 *.lock
-junit/
-tmp/
+*.log
+.bundle
+/pkg
+/rdoc
+/coverage
+/junit
+/tmp

data/Guardfile

@@ -1,12 +1,12 @@
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :cli => "--color --format nested --fail-fast" do
+guard :rspec, :cmd => "bundle exec rspec --color --format nested --fail-fast" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
 
-guard 'spork', :rspec_env => { 'RAILS_ENV' => 'test' }, :rspec_port => 9090 do
+guard :spork, :rspec_env => { 'RAILS_ENV' => 'test' }, :rspec_port => 9090 do
   watch(%r{^lib/(.+)\.rb$})
   watch('Gemfile.lock')
   watch('spec/spec_helper.rb') { :rspec }

data/README.md

@@ -15,8 +15,9 @@ You can follow announcements [here](https://github.com/jbox-web/gitolite/wiki/An
 ## Code status
 
 * [![Gem Version](https://badge.fury.io/rb/jbox-gitolite.svg)](http://badge.fury.io/rb/jbox-gitolite)
-* [![Build Status](https://travis-ci.org/jbox-web/gitolite.svg?branch=v1.2.0)](https://travis-ci.org/jbox-web/gitolite)
+* [![Build Status](https://travis-ci.org/jbox-web/gitolite.svg?branch=devel)](https://travis-ci.org/jbox-web/gitolite)
 * [![Code Climate](https://codeclimate.com/github/jbox-web/gitolite.png)](https://codeclimate.com/github/jbox-web/gitolite)
+* [![Dependency Status](https://gemnasium.com/jbox-web/gitolite.svg)](https://gemnasium.com/jbox-web/gitolite)
 
 ## Requirements ##
 * Ruby 1.9.x or 2.0.x
@@ -32,7 +33,7 @@ Read the documentation and more in the [Wiki](https://github.com/jbox-web/gitoli
 ## Copyrights & License
 gitolite is completely free and open source and released under the [MIT License](https://github.com/jbox-web/gitolite/blob/devel/LICENSE.txt).
 
-Copyright (c) 2013-2014 Nicolas Rodriguez (nrodriguez@jbox-web.com), JBox Web (http://www.jbox-web.com)
+Copyright (c) 2013-2014 Nicolas Rodriguez (nrodriguez@jbox-web.com), JBox Web (http://www.jbox-web.com) [![endorse](https://api.coderwall.com/n-rodriguez/endorsecount.png)](https://coderwall.com/n-rodriguez)
 
 Copyright (c) 2011-2013 Stafford Brunk (stafford.brunk@gmail.com)
 

data/Rakefile

@@ -5,24 +5,20 @@ require 'rake'
 require 'rspec/core/rake_task'
 require 'rdoc/task'
 
-# Helper Functions
+
+## 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
 
-# Standard tasks
-RSpec::Core::RakeTask.new(:spec) do |config|
-  config.rspec_opts = "--color --format nested --fail-fast"
-end
-
-task :default => :spec
-task :test    => :spec
 
+## RDoc Task
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "#{name} #{version}"
@@ -30,12 +26,34 @@ Rake::RDocTask.new do |rdoc|
   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 nested --fail-fast"
+  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
+end

data/gitolite.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake",        "~> 10.3.1"
   s.add_development_dependency "rdoc",        "~> 4.1.1"
   s.add_development_dependency "rspec",       "~> 2.14.1"
-  s.add_development_dependency "guard-rspec", "~> 2.6.0"
+  s.add_development_dependency "guard-rspec", "~> 4.2.8"
   s.add_development_dependency "guard-spork", "~> 1.5.1"
-  s.add_development_dependency "forgery",     "~> 0.5.0"
+  s.add_development_dependency "forgery",     "~> 0.6.0"
   s.add_development_dependency "travis-lint", "~> 1.8.0"
 
   s.add_development_dependency "simplecov",      "~> 0.8.2"
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec_junit_formatter", "~> 0.1.6"
 
   s.add_dependency "gitlab-grit", "~> 2.6.5"
-  s.add_dependency "gratr19",     "~> 0.4.4.1"
+  s.add_dependency "plexus",      "~> 0.5.10"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/gitolite.rb

@@ -1,7 +1,10 @@
 module Gitolite
   require 'grit'
-  require 'gratr'
+  require 'plexus'
+  require 'gitolite/gitolite_admin'
+  require 'gitolite/dirty_proxy'
   require 'gitolite/ssh_key'
   require 'gitolite/config'
-  require 'gitolite/gitolite_admin'
+  require 'gitolite/config/repo'
+  require 'gitolite/config/group'
 end

data/lib/gitolite/config.rb

@@ -1,17 +1,10 @@
 require 'tempfile'
-require File.join(File.dirname(__FILE__), 'config', 'repo')
-require File.join(File.dirname(__FILE__), 'config', 'group')
 
 module Gitolite
+
   class Config
-    attr_accessor :repos, :groups, :filename
 
-    def initialize(config)
-      @repos = {}
-      @groups = {}
-      @filename = File.basename(config)
-      process_config(config)
-    end
+    attr_accessor :repos, :groups, :filename
 
     def self.init(filename = "gitolite.conf")
       file = Tempfile.new(filename)
@@ -21,47 +14,64 @@ module Gitolite
       conf
     end
 
-    #TODO: merge repo unless overwrite = true
+
+    def initialize(config)
+      @repos = {}
+      @groups = {}
+      @filename = File.basename(config)
+      process_config(config)
+    end
+
+
+    # TODO: merge repo unless overwrite = true
     def add_repo(repo, overwrite = false)
       raise ArgumentError, "Repo must be of type Gitolite::Config::Repo!" unless repo.instance_of? Gitolite::Config::Repo
       @repos[repo.name] = repo
     end
 
+
     def rm_repo(repo)
       name = normalize_repo_name(repo)
       @repos.delete(name)
     end
 
+
     def has_repo?(repo)
       name = normalize_repo_name(repo)
       @repos.has_key?(name)
     end
 
+
     def get_repo(repo)
       name = normalize_repo_name(repo)
       @repos[name]
     end
 
+
     def add_group(group, overwrite = false)
       raise ArgumentError, "Group must be of type Gitolite::Config::Group!" unless group.instance_of? Gitolite::Config::Group
       @groups[group.name] = group
     end
 
+
     def rm_group(group)
       name = normalize_group_name(group)
       @groups.delete(name)
     end
 
+
     def has_group?(group)
       name = normalize_group_name(group)
       @groups.has_key?(name)
     end
 
+
     def get_group(group)
       name = normalize_group_name(group)
       @groups[name]
     end
 
+
     def to_file(path=".", filename=@filename)
       raise ArgumentError, "Path contains a filename or does not exist" unless File.directory?(path)
 
@@ -69,7 +79,7 @@ module Gitolite
       File.open(new_conf, "w") do |f|
         f.sync = true
 
-        #Output groups
+        # Output groups
         dep_order = build_groups_depgraph
         dep_order.each {|group| f.write group.to_s }
 
@@ -89,167 +99,186 @@ module Gitolite
       new_conf
     end
 
+
     private
-      #Based on
-      #https://github.com/sitaramc/gitolite/blob/pu/src/gl-compile-conf#cleanup_conf_line
-      def cleanup_config_line(line)
-        #remove comments, even those that happen inline
-        line.gsub!(/^((".*?"|[^#"])*)#.*/) {|m| m=$1}
-
-        #fix whitespace
-        line.gsub!('=', ' = ')
-        line.gsub!(/\s+/, ' ')
-        line.strip
-      end
 
-      def process_config(config)
-        context = [] #will store our context for permissions or config declarations
-
-        #Read each line of our config
-        File.open(config, 'r').each do |l|
-
-          line = cleanup_config_line(l)
-          next if line.empty? #lines are empty if we killed a comment
-
-          case line
-            #found a repo definition
-            when /^repo (.*)/
-              #Empty our current context
-              context = []
-
-              repos = $1.split
-              repos.each do |r|
-                context << r
-
-                @repos[r] = Repo.new(r) unless has_repo?(r)
-              end
-            #repo permissions
-            when /^(-|C|R|RW\+?(?:C?D?|D?C?)M?) (.* )?= (.+)/
-              perm = $1
-              refex = $2 || ""
-              users = $3.split
-
-              context.each do |c|
-                @repos[c].add_permission(perm, refex, users)
-              end
-            #repo git config
-            when /^config (.+) = ?(.*)/
-              key = $1
-              value = $2
-
-              context.each do |c|
-                @repos[c].set_git_config(key, value)
-              end
-            #repo gitolite option
-            when /^option (.+) = (.*)/
-              key = $1
-              value = $2
-
-              raise ParseError, "Missing gitolite option value for repo: #{repo} and key: #{key}" if value.nil?
-
-              context.each do |c|
-                @repos[c].set_gitolite_option(key, value)
-              end
-            #group definition
-            when /^#{Group::PREPEND_CHAR}(\S+) = ?(.*)/
-              group = $1
-              users = $2.split
-
-              @groups[group] = Group.new(group) unless has_group?(group)
-              @groups[group].add_users(users)
-            #gitweb definition
-            when /^(\S+)(?: "(.*?)")? = "(.*)"$/
-              repo = $1
-              owner = $2
-              description = $3
-
-              #Check for missing description
-              raise ParseError, "Missing Gitweb description for repo: #{repo}" if description.nil?
-
-              #Check for groups
-              raise ParseError, "Gitweb descriptions cannot be set for groups" if repo =~ /@.+/
-
-              if has_repo? repo
-                r = @repos[repo]
-              else
-                r = Repo.new(repo)
-                add_repo(r)
-              end
-
-              r.owner = owner
-              r.description = description
-            when /^include "(.+)"/
-              #TODO: implement includes
-              #ignore includes for now
-            when /^subconf (\S+)$/
-              #TODO: implement subconfs
-              #ignore subconfs for now
+
+    # Based on
+    # https://github.com/sitaramc/gitolite/blob/pu/src/gl-compile-conf#cleanup_conf_line
+    def cleanup_config_line(line)
+      # remove comments, even those that happen inline
+      line.gsub!(/^((".*?"|[^#"])*)#.*/) {|m| m=$1}
+
+      # fix whitespace
+      line.gsub!('=', ' = ')
+      line.gsub!(/\s+/, ' ')
+      line.strip
+    end
+
+
+    def process_config(config)
+      context = [] #will store our context for permissions or config declarations
+
+      #Read each line of our config
+      File.open(config, 'r').each do |l|
+
+        line = cleanup_config_line(l)
+        next if line.empty? #lines are empty if we killed a comment
+
+        case line
+
+          # found a repo definition
+          when /^repo (.*)/
+            #Empty our current context
+            context = []
+
+            repos = $1.split
+            repos.each do |r|
+              context << r
+
+              @repos[r] = Repo.new(r) unless has_repo?(r)
+            end
+
+          # repo permissions
+          when /^(-|C|R|RW\+?(?:C?D?|D?C?)M?) (.* )?= (.+)/
+            perm = $1
+            refex = $2 || ""
+            users = $3.split
+
+            context.each do |c|
+              @repos[c].add_permission(perm, refex, users)
+            end
+
+          # repo git config
+          when /^config (.+) = ?(.*)/
+            key = $1
+            value = $2
+
+            context.each do |c|
+              @repos[c].set_git_config(key, value)
+            end
+
+          # repo gitolite option
+          when /^option (.+) = (.*)/
+            key = $1
+            value = $2
+
+            raise ParseError, "Missing gitolite option value for repo: #{repo} and key: #{key}" if value.nil?
+
+            context.each do |c|
+              @repos[c].set_gitolite_option(key, value)
+            end
+
+          # group definition
+          when /^#{Group::PREPEND_CHAR}(\S+) = ?(.*)/
+            group = $1
+            users = $2.split
+
+            @groups[group] = Group.new(group) unless has_group?(group)
+            @groups[group].add_users(users)
+
+          # gitweb definition
+          when /^(\S+)(?: "(.*?)")? = "(.*)"$/
+            repo = $1
+            owner = $2
+            description = $3
+
+            #Check for missing description
+            raise ParseError, "Missing Gitweb description for repo: #{repo}" if description.nil?
+
+            #Check for groups
+            raise ParseError, "Gitweb descriptions cannot be set for groups" if repo =~ /@.+/
+
+            if has_repo? repo
+              r = @repos[repo]
             else
-              raise ParseError, "'#{line}' cannot be processed"
-          end
-        end
-      end
+              r = Repo.new(repo)
+              add_repo(r)
+            end
+
+            r.owner = owner
+            r.description = description
+
+          when /^include "(.+)"/
+            #TODO: implement includes
+            #ignore includes for now
+
+          when /^subconf (\S+)$/
+            #TODO: implement subconfs
+            #ignore subconfs for now
 
-      # Normalizes the various different input objects to Strings
-      def normalize_name(context, constant = nil)
-        case context
-          when constant
-            context.name
-          when Symbol
-            context.to_s
           else
-            context
+            raise ParseError, "'#{line}' cannot be processed"
         end
       end
+    end
 
-      def method_missing(meth, *args, &block)
-        if meth.to_s =~ /normalize_(\w+)_name/
-          #Could use Object.const_get to figure out the constant here
-          #but for only two cases, this is more readable
-          case $1
-            when "repo"
-              normalize_name(args[0], Gitolite::Config::Repo)
-            when "group"
-              normalize_name(args[0], Gitolite::Config::Group)
-          end
+
+    # Normalizes the various different input objects to Strings
+    def normalize_name(context, constant = nil)
+      case context
+        when constant
+          context.name
+        when Symbol
+          context.to_s
         else
-          super
-        end
+          context
       end
+    end
 
-      # Builds a dependency tree from the groups in order to ensure all groups
-      # are defined before they are used
-      def build_groups_depgraph
-        dp = ::GRATR::Digraph.new
 
-        # Add each group to the graph
-        @groups.each_value do |group|
-          dp.add_vertex! group
+    def method_missing(meth, *args, &block)
+      if meth.to_s =~ /normalize_(\w+)_name/
+        # Could use Object.const_get to figure out the constant here
+        # but for only two cases, this is more readable
+        case $1
+          when "repo"
+            normalize_name(args[0], Gitolite::Config::Repo)
+          when "group"
+            normalize_name(args[0], Gitolite::Config::Group)
+        end
+      else
+        super
+      end
+    end
+
 
-          # Select group names from the users
-          subgroups = group.users.select {|u| u =~ /^#{Group::PREPEND_CHAR}.*$/}.map{|g| get_group g.gsub(Group::PREPEND_CHAR, '') }
+    # Builds a dependency tree from the groups in order to ensure all groups
+    # are defined before they are used
+    def build_groups_depgraph
+      dp = ::Plexus::Digraph.new
 
-          subgroups.each do |subgroup|
-            dp.add_edge! subgroup, group
-          end
-        end
+      # Add each group to the graph
+      @groups.each_value do |group|
+        dp.add_vertex! group
 
-        # Figure out if we have a good depedency graph
-        dep_order = dp.topsort
+        # Select group names from the users
+        subgroups = group.users.select {|u| u =~ /^#{Group::PREPEND_CHAR}.*$/}.map{|g| get_group g.gsub(Group::PREPEND_CHAR, '') }
 
-        if dep_order.empty?
-          raise GroupDependencyError unless @groups.empty?
+        subgroups.each do |subgroup|
+          dp.add_edge! subgroup, group
         end
-
-        dep_order
       end
 
-      #Raised when something in a config fails to parse properly
-      class ParseError < RuntimeError
-      end
+      # Figure out if we have a good depedency graph
+      dep_order = dp.topsort
 
-      # Raised when group dependencies cannot be suitably resolved for output
-      class GroupDependencyError < RuntimeError
+      if dep_order.empty?
+        raise GroupDependencyError unless @groups.empty?
       end
+
+      dep_order
+    end
+
+
+    #Raised when something in a config fails to parse properly
+    class ParseError < RuntimeError
+    end
+
+
+    # Raised when group dependencies cannot be suitably resolved for output
+    class GroupDependencyError < RuntimeError
+    end
+
   end
 end