autoproj 2.0.0.b7 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73644d1f3143dffe36b4af50d2f9dbdc348e8a3
-  data.tar.gz: 0ec902c6207a631ff578403a74e39eb6b72413ce
+  metadata.gz: 2e14963386c3223f37cae4cd4aac802b45309c50
+  data.tar.gz: e342ca9f0948df5ed55dc8fc04556eb86b6a633c
 SHA512:
-  metadata.gz: 4374b8c9855e3a85af8e1d0eb36d233e56d592ff046adc9eeb6405d2b229f0aa60221bdbc5e5f70a6e73ff67c0ec1c2064d3931dda661e9e5f32817f888bff76
-  data.tar.gz: d99c1417e26934cc5ebd0d2c55c1102a99e89ba10800aa593dbc21cbbc49deeb54ca0a9bcf3f714c62fe80e62b7b3ff342b3bda6ca31ad1691f687be718726d3
+  metadata.gz: d7ee59489d5403310fa672a19ed8421aeec98fc148c460f10dfaa4dc31cadde3481ddc33b64e0abb4ffd322fe057ac0237490327098f8f6a2970843da4375f6b
+  data.tar.gz: 513dfea794e5e082f408e5899f90258410f304688abec6c648758452587aafc37b6eaf637d60df4676d046d469a9a6c3fdb5a688eda6a0fbc74cddf250e00c68

data/.gitattributes

@@ -0,0 +1 @@
+*.rb diff=ruby

data/.gitignore

@@ -0,0 +1,8 @@
+doc
+*.sw*
+webgen.cache
+doc/guide/src/autoproj_bootstrap
+pkg/
+/vendor/
+/.bundle
+/coverage/

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'autobuild', github: 'rock-core/autobuild', branch: 'autoproj-2.0'
+gem 'pry'
+gem 'pry-byebug'
+gemspec

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/rock-core/autoproj.svg?branch=autoproj-2.0)](https://travis-ci.org/rock-core/autoproj)
+[![Gem Version](https://badge.fury.io/rb/autoproj.svg)](http://badge.fury.io/rb/autoproj)
+[![Documentation](http://b.repl.ca/v1/yard-docs-blue.png)](http://rubydoc.info/gems/autoproj/frames)
+
 What is Autoproj
 ----------------
 Autoproj allows to easily install and maintain software that is under source

data/Rakefile

@@ -1,93 +1,52 @@
-require 'utilrb/rake_common'
-$LOAD_PATH.unshift File.join(Dir.pwd, 'lib')
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 task 'default'
-Utilrb::Rake.hoe do
-    namespace 'dist' do
-        Hoe.spec 'autoproj' do
-            self.developer "Sylvain Joyeux", "sylvain.joyeux@m4x.org"
+task 'gem' => 'build'
 
-            self.urls = ["http://rock-robotics.org/documentation/autoproj"]
-            self.group_name = 'autobuild'
-            self.summary = 'Easy installation and management of sets of software packages'
-            self.description = "autoproj is a manager for sets of software packages. It allows the user to import and build packages from source, still using the underlying distribution's native package manager for software that is available on it."
-            self.email = "sylvain.joyeux@m4x.org"
-
-            self.spec_extras[:required_ruby_version] = ">= 1.9.3"
-
-            license 'BSD'
-
-            extra_deps << 
-                ['autobuild',   '~> 1.9', '>= 1.9.0'] <<
-                ['utilrb', '~> 2.0', '>= 2.0.0'] <<
-                ['highline', '~> 1.7', '>= 1.7.0'] <<
-                ['thor', '~> 0.19.0', '>= 0.19.1'] <<
-                ['concurrent-ruby']
-        end
-    end
+Rake::TestTask.new(:test) do |t|
+    t.libs << "lib" << Dir.pwd
+    t.test_files = FileList['test/**/test_*.rb']
 end
 
-namespace 'dist' do
-    desc "generate the bootstrap script"
-    task 'bootstrap' do
-        require 'yaml'
-        build_option_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'build_option.rb'))
-        config_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'configuration.rb'))
-        osdeps_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'osdeps.rb'))
-        system_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'system.rb'))
-        osdeps_defaults = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'default.osdeps'))
-        require 'autobuild'
-        tools_code = File.read(File.join(Autobuild::LIB_DIR, 'autobuild', 'tools.rb'))
-        # Filter rubygems dependencies from the OSdeps default. They will be
-        # installed at first build
-        osdeps = YAML.load(osdeps_defaults)
-        osdeps.delete_if do |name, content|
-            if content.respond_to?(:delete)
-                content.delete('gem')
-                content.empty?
-            else
-                content == 'gem'
-            end
-        end
-        osdeps_defaults = YAML.dump(osdeps)
-        # Since we are using gsub to replace the content in the bootstrap file,
-        # we have to quote all \
-        [osdeps_code, system_code, osdeps_defaults, tools_code].each do |text|
-            text.gsub! /\\/, '\\\\\\\\'
-        end
-
-        bootstrap_code = File.read(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap.in')).
-            gsub('BUILD_OPTION_CODE', build_option_code).
-            gsub('CONFIG_CODE', config_code).
-            gsub('OSDEPS_CODE', osdeps_code).
-            gsub('SYSTEM_CODE', system_code).
-            gsub('OSDEPS_DEFAULTS', osdeps_defaults).
-            gsub('TOOLS_CODE', tools_code)
-        File.open(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap'), 'w') do |io|
-            io.write bootstrap_code
+desc "generate the bootstrap script"
+task 'bootstrap' do
+    require 'yaml'
+    build_option_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'build_option.rb'))
+    config_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'configuration.rb'))
+    osdeps_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'osdeps.rb'))
+    system_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'system.rb'))
+    osdeps_defaults = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'default.osdeps'))
+    require 'autobuild'
+    tools_code = File.read(File.join(Autobuild::LIB_DIR, 'autobuild', 'tools.rb'))
+    # Filter rubygems dependencies from the OSdeps default. They will be
+    # installed at first build
+    osdeps = YAML.load(osdeps_defaults)
+    osdeps.delete_if do |name, content|
+        if content.respond_to?(:delete)
+            content.delete('gem')
+            content.empty?
+        else
+            content == 'gem'
         end
     end
-end
-file 'bin/autoproj_bootstrap' => 'dist:bootstrap'
-
-Utilrb::Rake.rdoc do
-    task 'doc' => 'doc:all'
-    task 'clobber_docs' => 'doc:clobber'
-    task 'redocs' do
-        Rake::Task['doc:clobber'].invoke
-        Rake::Task['doc'].invoke
+    osdeps_defaults = YAML.dump(osdeps)
+    # Since we are using gsub to replace the content in the bootstrap file,
+    # we have to quote all \
+    [osdeps_code, system_code, osdeps_defaults, tools_code].each do |text|
+        text.gsub! /\\/, '\\\\\\\\'
     end
 
-    namespace 'doc' do
-        task 'all' => %w{api}
-        task 'clobber' => 'clobber_api'
-        RDoc::Task.new("api") do |rdoc|
-            rdoc.rdoc_dir = 'doc'
-            rdoc.title    = "autoproj"
-            rdoc.options << '--show-hash'
-            rdoc.rdoc_files.include('lib/**/*.rb')
-        end
+    bootstrap_code = File.read(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap.in')).
+        gsub('BUILD_OPTION_CODE', build_option_code).
+        gsub('CONFIG_CODE', config_code).
+        gsub('OSDEPS_CODE', osdeps_code).
+        gsub('SYSTEM_CODE', system_code).
+        gsub('OSDEPS_DEFAULTS', osdeps_defaults).
+        gsub('TOOLS_CODE', tools_code)
+    File.open(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap'), 'w') do |io|
+        io.write bootstrap_code
     end
 end
-
+file 'bin/autoproj_bootstrap' => 'bootstrap'
 

data/autoproj.gemspec

@@ -0,0 +1,29 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'autoproj/version'
+
+Gem::Specification.new do |s|
+    s.name = "autoproj"
+    s.version = Autoproj::VERSION
+    s.authors = ["Sylvain Joyeux"]
+    s.email = "sylvain.joyeux@m4x.org"
+    s.summary = "Easy installation and management of sets of software packages"
+    s.description = "autoproj is a manager for sets of software packages. It allows the user to import and build packages from source, still using the underlying distribution's native package manager for software that is available on it."
+    s.homepage = "http://rock-robotics.org"
+    s.licenses = ["BSD"]
+
+    s.require_paths = ["lib"]
+    s.extensions = []
+    s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+
+    s.add_runtime_dependency "autobuild", ">= 1.10.0.a"
+    s.add_runtime_dependency "utilrb", ">= 2.0"
+    s.add_runtime_dependency "thor", '~> 0.19.0', '>= 0.19.1'
+    s.add_runtime_dependency 'concurrent-ruby'
+    s.add_development_dependency "flexmock", ">= 2.0.0"
+    s.add_development_dependency "minitest", ">= 5.0", "~> 5.0"
+    s.add_development_dependency "fakefs"
+    s.add_development_dependency "simplecov"
+end
+

data/lib/autoproj/cli/cache.rb

@@ -8,9 +8,14 @@ def validate_options(argv, options = Hash.new)
                 argv, options = super
 
                 if argv.empty?
-                    raise ArgumentError, "expected one cache directory as argument"
+                    default_cache_dirs = Autobuild::Importer.default_cache_dirs
+                    if !default_cache_dirs || default_cache_dirs.empty?
+                        raise ArgumentError, "no cache directory defined with e.g. the AUTOBUILD_CACHE_DIR environment variable, expected one cache directory as argument"
+                    end
+                    Autoproj.warn "using cache directory #{default_cache_dirs.first} from the autoproj configuration"
+                    argv << default_cache_dirs.first
                 elsif argv.size > 1
-                    raise ArgumentError, "expected one cache directory as argument"
+                    raise ArgumentError, "expected only one cache directory as argument"
                 end
 
                 return File.expand_path(argv.first, ws.root_dir), options

data/lib/autoproj/cli/main.rb

@@ -64,13 +64,13 @@ def status(*packages)
                 run_autoproj_cli(:status, :Status, Hash[], *packages)
             end
 
-            desc 'doc', 'generate API documentation for packages that support it'
+            desc 'doc [PACKAGES]', 'generate API documentation for packages that support it'
             option :without_deps, desc: 'generate documentation for the packages given on the command line, and not for their dependencies'
             def doc(*packages)
                 run_autoproj_cli(:doc, :Doc, Hash[], *packages)
             end
 
-            desc 'update', 'update packages'
+            desc 'update [PACKAGES]', 'update packages'
             option :aup, default: false, hide: true, type: :boolean,
                 desc: 'behave like aup'
             option :all, default: false, hide: true, type: :boolean,
@@ -110,7 +110,7 @@ def update(*packages)
                 run_autoproj_cli(:update, :Update, Hash[silent: false], *packages)
             end
 
-            desc 'build', 'build packages'
+            desc 'build [PACKAGES]', 'build packages'
             option :amake, default: false, hide: true, type: :boolean,
                 desc: 'behave like amake'
             option :all, default: false, hide: true, type: :boolean,
@@ -136,8 +136,8 @@ def build(*packages)
                 desc: 'do not stop on errors'
             option :checkout_only, aliases: :c, type: :boolean, default: false,
                 desc: "only checkout packages, do not update already-cached ones"
-            def cache(cache_dir)
-                run_autoproj_cli(:cache, :Cache, Hash[], cache_dir)
+            def cache(*cache_dir)
+                run_autoproj_cli(:cache, :Cache, Hash[], *cache_dir)
             end
 
             desc 'clean [PACKAGES]', 'remove build byproducts for the given packages'
@@ -164,7 +164,7 @@ def reconfigure
             desc 'test', 'interface for running tests'
             subcommand 'test', MainTest
 
-            desc 'show', 'show informations about package(s)'
+            desc 'show [PACKAGES]', 'show informations about package(s)'
             option :mainline, type: :string,
                 desc: "compare to the given baseline. if 'true', the comparison will ignore any override, otherwise it will take into account overrides only up to the given package set"
             def show(*packages)
@@ -216,14 +216,27 @@ def log(*args)
                 run_autoproj_cli(:log, :Log, Hash[], *args)
             end
 
-            desc 'reset VERSION_ID', 'resets packages to the required version (either reflog from autoproj log or commit/tag in the build configuration'
+            desc 'reset VERSION_ID', 'resets packages to the state stored in the required version'
+            long_desc <<-EOD
+reset VERSION_ID will infer the state of packages from the state stored in the requested version,
+and reset the packages to these versions. VERSION_ID can be:
+ - an autoproj log entry (e.g. autoproj@{10})
+ - a branch or tag from the autoproj main build configuration
+EOD
             option :freeze, type: :boolean, default: false,
                 desc: 'whether the version we reset to should be saved in overrides.d or not'
             def reset(version_id)
                 run_autoproj_cli(:reset, :Reset, Hash[], version_id)
             end
 
-            desc 'tag [TAG_NAME] [PACKAGES]', 'save the package current versions as a tag in the main build configuration, or lists the available tags if given no arguments'
+            desc 'tag [TAG_NAME] [PACKAGES]', 'save the package current versions as a tag, or lists the available tags if given no arguments.'
+            long_desc <<-EOD
+The tag subcommand stores the state of all packages (or of the packages selected
+on the command line) into a tag in the build configuration. This state can be
+retrieved later on by using "autoproj reset"
+
+If given no arguments, will list the existing tags
+EOD
             option :package_sets, type: :boolean,
                 desc: 'commit the package set state as well (enabled by default)'
             option :keep_going, aliases: :k, type: :boolean,
@@ -235,7 +248,15 @@ def tag(tag_name = nil, *packages)
                 run_autoproj_cli(:tag, :Tag, Hash[], tag_name, *packages)
             end
 
-            desc 'tag [PACKAGES]', 'save the package current versions as a new commit in the main build configuration'
+            desc 'commit [PACKAGES]', 'save the package current versions as a new commit in the main build configuration'
+            long_desc <<-EOD
+The commit subcommand stores the state of all packages (or of the packages
+selected on the command line) into a new commit in the currently checked-out
+branch of the build configuration. This state can be retrieved later on by using
+"autoproj reset"
+
+If given no arguments, will list the existing tags
+EOD
             option :package_sets, type: :boolean,
                 desc: 'commit the package set state as well (enabled by default)'
             option :keep_going, aliases: :k, type: :boolean,
@@ -243,8 +264,8 @@ def tag(tag_name = nil, *packages)
                 desc: 'do not stop on build or checkout errors'
             option :message, aliases: :m, type: :string,
                 desc: 'the message to use for the new commit (the default is to mention the creation of the tag)'
-            def tag(*packages)
-                run_autoproj_cli(:tag, :Tag, Hash[], *packages)
+            def commit(*packages)
+                run_autoproj_cli(:commit, :Commit, Hash[], *packages)
             end
 
             desc 'switch-config VCS URL [OPTIONS]', 'switches the main build configuration'
@@ -254,27 +275,27 @@ def switch_config(*args)
 
             desc 'query [QUERY]', 'searches for packages matching a query string. With no query string, matches all packages.'
             long_desc <<-EOD
-  Finds packages that match query_string and displays information about them (one per line)
-  By default, only the package name is displayed. It can be customized with the --format option
+Finds packages that match query_string and displays information about them (one per line)
+By default, only the package name is displayed. It can be customized with the --format option
 
-  QUERY KEYS
+QUERY KEYS
 
-    autobuild.name: the package name,
-    autobuild.srcdir: the package source directory,
-    autobuild.class.name: the package class,
-    vcs.type: the VCS type (as used in the source.yml files),
-    vcs.url: the URL from the VCS,
-    package_set.name: the name of the package set that defines the package
+  autobuild.name: the package name,
+  autobuild.srcdir: the package source directory,
+  autobuild.class.name: the package class,
+  vcs.type: the VCS type (as used in the source.yml files),
+  vcs.url: the URL from the VCS,
+  package_set.name: the name of the package set that defines the package
 
-  FORMAT SPECIFICATION
+FORMAT SPECIFICATION
 
-  The format is a string in which special values can be expanded using a $VARNAME format. The following variables are accepted:
+The format is a string in which special values can be expanded using a $VARNAME format. The following variables are accepted:
 
-    NAME: the package name,
+  NAME: the package name,
 
-    SRCDIR: the full path to the package source directory,
+  SRCDIR: the full path to the package source directory,
 
-    PREFIX: the full path to the package installation directory
+  PREFIX: the full path to the package installation directory
             EOD
             option :search_all, type: :boolean,
                 desc: 'search in all defined packages instead of only in those selected selected in the layout'

data/lib/autoproj/cli/main_test.rb

@@ -1,10 +1,12 @@
 module Autoproj
     module CLI
         class MainTest < Thor
+            namespace 'test'
+
             default_command 'exec'
             
             desc 'enable [PACKAGES]', 'enable tests for the given packages (or for all packages if none are given)'
-            option :deps, default: false,
+            option :deps, type: :boolean, default: false,
                 desc: 'controls whether the dependencies of the packages given on the command line should be enabled as well (the default is not)'
             def enable(*packages)
                 require 'autoproj/cli/test'
@@ -16,7 +18,7 @@ def enable(*packages)
             end
 
             desc 'disable [PACKAGES]', 'disable tests for the given packages (or for all packages if none are given)'
-            option :deps, default: false,
+            option :deps, type: :boolean, default: false,
                 desc: 'controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)'
             def disable(*packages)
                 require 'autoproj/cli/test'
@@ -28,7 +30,7 @@ def disable(*packages)
             end
 
             desc 'list [PACKAGES]', 'show test enable/disable status for the given packages (or all packages if none are given)'
-            option :deps, default: false,
+            option :deps, type: :boolean, default: false,
                 desc: 'controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)'
             def list(*packages)
                 require 'autoproj/cli/test'
@@ -40,7 +42,7 @@ def list(*packages)
             end
 
             desc 'exec [PACKAGES]', 'execute the tests for the given packages, or all if no packages are given on the command line'
-            option :deps, default: false,
+            option :deps, type: :boolean, default: false,
                 desc: 'controls whether to execute the tests of the dependencies of the packages given on the command line (the default is not)'
             def exec(*packages)
                 require 'autoproj/cli/test'

data/lib/autoproj/cli/status.rb

@@ -72,8 +72,8 @@ def status_of_package(package_description, options = Hash.new)
                             end
                         if snapshot_overrides_vcs?(importer, package_description.vcs, snapshot)
                             non_nil_values = snapshot.delete_if { |k, v| !v }
-                            package_status.msg << Autoproj.color("  found configuration that contains all local changes: #{non_nil_values.sort_by(&:first).map { |k, v| "#{k}: #{v}" }.join(", ")}", :light_green)
-                            package_status.msg << Autoproj.color("  consider adding this to your overrides, or use autoproj versions to do it for you", :light_green)
+                            package_status.msg << Autoproj.color("  found configuration that contains all local changes: #{non_nil_values.sort_by(&:first).map { |k, v| "#{k}: #{v}" }.join(", ")}", :bright_green)
+                            package_status.msg << Autoproj.color("  consider adding this to your overrides, or use autoproj versions to do it for you", :bright_green)
                             if options[:snapshot]
                                 importer.relocate(importer.repository, snapshot)
                             end

data/lib/autoproj/configuration.rb

@@ -255,6 +255,11 @@ def apply_autobuild_configuration
                 end
             end
         end
+        
+        # A cache directory for autobuild's importers
+        def importer_cache_dir
+            get('importer_cache_dir', nil)
+        end
 
         # The directory in which packages will be installed.
         #

data/lib/autoproj/git_server_configuration.rb

@@ -0,0 +1,117 @@
+module Autoproj
+    # Adds the relevant options to handle a gitorious server
+    # What this does is ask the user how he would like to access the gitorious
+    # server. Then, it sets
+    #
+    #   #{name}_ROOT to be the base URL for pulling
+    #   #{name}_PUSH_ROOT to be the corresponding ssh-based URL for pushing
+    #
+    # For instance, with
+    #
+    #   git_server_configuration "GITHUB", "github.com"
+    #
+    #
+    # One would use the following shortcut in its source.yml:
+    #
+    #   - my/package:
+    #     github: account/package
+    #
+    # which would be expanded to the expected URLs for pull and push.
+    #
+    def self.git_server_configuration(name, base_url, options = Hash.new)
+        options = Kernel.validate_options options,
+            git_url: "git://#{base_url}",
+            http_url: "https://git.#{base_url}",
+            ssh_url: "git@#{base_url}:",
+            default: 'http,ssh',
+            disabled_methods: [],
+            config: Autoproj.config,
+            fallback_to_http: nil
+
+        config = options.delete(:config)
+        disabled_methods = Array(options[:disabled_methods])
+
+        access_methods = Hash[
+            'git' => 'git,ssh',
+            'ssh' => 'ssh,ssh',
+            'http' => 'http,http']
+
+        gitorious_long_doc = [
+            "How should I interact with #{base_url} (#{(access_methods.keys - disabled_methods).sort.join(", ")})",
+            "If you give one value, it's going to be the method used for all access",
+            "If you give multiple values, comma-separated, the first one will be",
+            "used for pulling and the second one for pushing. An optional third value",
+            "will be used to pull from private repositories (the same than pushing is",
+            "used by default)"]
+
+        validator = lambda do |value|
+            values = (access_methods[value] || value).split(",")
+            values.each do |access_method|
+                if !access_methods.has_key?(access_method)
+                    raise Autoproj::InputError, "#{access_method} is not a known access method"
+                elsif disabled_methods.include?(access_method)
+                    raise Autoproj::InputError, "#{access_method} is disabled on #{base_url}"
+                end
+            end
+            value
+        end
+
+        config.declare name, 'string',
+            default: options[:default],
+            doc: gitorious_long_doc, &validator
+
+        access_mode = config.get(name)
+        begin
+            validator[access_mode]
+        rescue Autoproj::InputError => e
+            Autoproj.warn e.message
+            config.reset(name)
+            access_mode = config.get(name)
+        end
+        access_mode = access_methods[access_mode] || access_mode
+        pull, push, private_pull = access_mode.split(',')
+        private_pull ||= push
+        [[pull, "_ROOT"], [push, "_PUSH_ROOT"], [private_pull, "_PRIVATE_ROOT"]].each do |method, var_suffix|
+            url = if method == "git" then options[:git_url]
+                  elsif method == "http" then options[:http_url]
+                  elsif method == "ssh" then options[:ssh_url]
+                  end
+            config.set("#{name}#{var_suffix}", url)
+        end
+
+        Autoproj.add_source_handler name.downcase do |url, vcs_options|
+            if url !~ /\.git$/
+                url += ".git"
+            end
+            if url !~ /^\//
+                url = "/#{url}"
+            end
+            github_options, vcs_options = Kernel.filter_options vcs_options,
+                private: false
+
+            pull_base_url =
+                if github_options[:private]
+                    config.get("#{name}_PRIVATE_ROOT")
+                else
+                    config.get("#{name}_ROOT")
+                end
+            push_base_url = config.get("#{name}_PUSH_ROOT")
+            Hash[type: 'git',
+                 url: "#{pull_base_url}#{url}",
+                 push_to: "#{push_base_url}#{url}",
+                 interactive: (github_options[:private] && private_pull == 'http'),
+                 retry_count: 10,
+                 repository_id: "#{name.downcase}:#{url}"].merge(vcs_options)
+        end
+    end
+
+    def self.gitorious_server_configuration(name, base_url, options = Hash.new)
+        Autoproj.warn "gitorious_server_configuration is deprecated, replace by git_server_configuration"
+        Autoproj.warn "Note that the call interface has not changed, you only need to change the method name"
+        git_server_configuration(name, base_url, options)
+    end
+end
+
+Autoproj.git_server_configuration('GITORIOUS', 'gitorious.org', default: 'http,ssh', disabled_methods: 'git')
+Autoproj.git_server_configuration('GITHUB', 'github.com', http_url: 'https://github.com', default: 'http,ssh')
+