autoproj 1.9.6 → 1.9.7.rc1

data/Manifest.txt

@@ -8,13 +8,17 @@ bin/aup
 bin/autolocate
 bin/autoproj
 bin/autoproj-bootstrap
+bin/autoproj-cache
 bin/autoproj-clean
 bin/autoproj-create-set
+bin/autoproj-doc
 bin/autoproj-envsh
 bin/autoproj-list
 bin/autoproj-locate
 bin/autoproj-query
 bin/autoproj-show
+bin/autoproj-snapshot
+bin/autoproj-test
 bin/autoproj_bootstrap
 bin/autoproj_bootstrap.in
 bin/autoproj_stress_test
@@ -23,14 +27,24 @@ lib/autoproj/autobuild.rb
 lib/autoproj/base.rb
 lib/autoproj/cmdline.rb
 lib/autoproj/default.osdeps
+lib/autoproj/environment.rb
 lib/autoproj/gitorious.rb
+lib/autoproj/installation_manifest.rb
+lib/autoproj/loader.rb
 lib/autoproj/manifest.rb
+lib/autoproj/metapackage.rb
 lib/autoproj/options.rb
 lib/autoproj/osdeps.rb
+lib/autoproj/package_definition.rb
+lib/autoproj/package_manifest.rb
+lib/autoproj/package_selection.rb
+lib/autoproj/package_set.rb
 lib/autoproj/query.rb
 lib/autoproj/system.rb
 lib/autoproj/templates/create-set/packages.autobuild
 lib/autoproj/templates/create-set/source.yml
+lib/autoproj/variable_expansion.rb
+lib/autoproj/vcs_definition.rb
 lib/autoproj/version.rb
 samples/autoproj/README.txt
 samples/autoproj/init.rb
@@ -51,6 +65,7 @@ test/package_managers/apt-dpkg-status.installed-last
 test/package_managers/apt-dpkg-status.noninstalled-last
 test/package_managers/test_apt_dpkg_manager.rb
 test/package_managers/test_gem.rb
+test/package_managers/test_pip.rb
 test/test_debian.rb
 test/test_manifest.rb
 test/test_os_dependencies.rb

data/Rakefile

@@ -8,11 +8,12 @@ Utilrb::Rake.hoe do
             self.developer "Rock Core Developers", "rock-dev@dfki.de"
 
             self.urls = ["http://rock-robotics.org/documentation/autoproj"]
-            self.rubyforge_name = 'autobuild'
+            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 = "rock-dev@dfki.de"
 
+            self.spec_extras[:required_ruby_version] = ">= 1.9.2"
             extra_deps << 
                 ['autobuild',   '>= 1.7.0'] <<
                 ['utilrb', '>= 1.6.0'] <<

data/bin/autoproj

@@ -267,9 +267,8 @@ EOTEXT
 
     if all_enabled_packages.empty?
         STDERR.puts color("autoproj: nothing to do", :bold)
-    elsif Autoproj::CmdLine.doc?
-        Autoproj::CmdLine.build_packages(command_line_selection, all_enabled_packages)
     elsif Autoproj::CmdLine.build? 
+        Autoproj.message("autoproj: building and installing packages", :bold)
         Autoproj::CmdLine.build_packages(command_line_selection, all_enabled_packages)
     end
 

data/bin/autoproj-cache

@@ -0,0 +1,56 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+
+root_dir = Autoproj::CmdLine.initialize_root_directory
+
+Autoproj::CmdLine.report do
+    cache_dir, *_ =
+        Autoproj.silent do
+            Autoproj::CmdLine.initialize_and_load(ARGV)
+        end
+    manifest = Autoproj.manifest
+
+    cache_dir = File.expand_path(cache_dir, root_dir)
+    if !File.exists?(cache_dir)
+        Autoproj.message "  creating autoproj cache in #{cache_dir}"
+        FileUtils.mkdir_p cache_dir
+    else
+        Autoproj.message "  updating already existing cache repository in #{cache_dir}"
+    end
+    archive_cache_dir = File.join(cache_dir, 'archives')
+    if !File.directory?(archive_cache_dir)
+        Autoproj.message "    creating archive cache in #{archive_cache_dir}"
+        FileUtils.mkdir_p archive_cache_dir
+    else
+        Autoproj.message "    updating already existing archive cache in #{archive_cache_dir}"
+    end
+    git_cache_dir = File.join(cache_dir, 'git')
+    if !File.directory?(git_cache_dir)
+        Autoproj.message "    creating git cache in #{git_cache_dir}"
+        FileUtils.mkdir_p git_cache_dir
+        Autobuild::Subprocess.run("autoproj-cache", "import", Autobuild.tool(:git), "--git-dir", git_cache_dir, 'init', "--bare")
+    else
+        Autoproj.message "    updating already existing git cache in #{git_cache_dir}"
+    end
+
+    manifest.each_package do |pkg|
+        if pkg.importer.kind_of?(Autobuild::Git)
+            Autoproj.message "  caching #{pkg.name} (git)"
+            pkg.importdir = git_cache_dir
+            pkg.importer.local_branch = nil
+            pkg.importer.remote_branch = nil
+            remote_name = pkg.name.gsub(/[^\w]/, '_')
+            pkg.importer.remote_name = remote_name
+            pkg.importer.update_remotes_configuration(pkg, 'autoproj-cache')
+            Autobuild::Subprocess.run('autoproj-cache', :import, Autobuild.tool('git'), '--git-dir', git_cache_dir, 'remote', 'update', remote_name)
+        elsif pkg.importer.kind_of?(Autobuild::ArchiveImporter)
+            Autoproj.message "  caching #{pkg.name} (archive)"
+            pkg.importer.cachedir = archive_cache_dir
+            pkg.importer.update_cache(pkg)
+        end
+    end
+
+    Autobuild::Subprocess.run('autoproj-cache', :import, Autobuild.tool('git'), '--git-dir', git_cache_dir, 'gc', '--aggressive', '--prune=all')
+end
+

data/bin/autoproj-doc

@@ -0,0 +1,28 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+user_selection = Autoproj.silent do
+    Autoproj::CmdLine.initialize_root_directory
+    Autoproj::CmdLine.initialize_and_load(ARGV)
+end
+
+user_selection = user_selection.map do |arg|
+    if File.directory?(arg)
+        File.expand_path(arg)
+    else arg
+    end
+end
+
+Autobuild.pass_doc_errors = false
+
+Autoproj::CmdLine.report do
+    resolved_selection = Autoproj::CmdLine.
+        resolve_user_selection(user_selection, :filter => false)
+    # This calls #prepare, which is required to run build_packages
+    packages = Autoproj::CmdLine.import_packages(resolved_selection)
+    packages.each { |pkg| Autobuild::Package[pkg].disable_phases('import', 'prepare', 'install') }
+    Autoproj::CmdLine.build_packages(resolved_selection, packages, ['doc'])
+end
+

data/bin/autoproj-query

@@ -38,42 +38,45 @@ end
 remaining = parser.parse(ARGV)
 
 root_dir  = Autoproj::CmdLine.initialize_root_directory
-selection = Autoproj::CmdLine.initialize_and_load(remaining)
-if selection.empty?
-    STDERR.puts Autoproj.console.color("no query given on the command line", :red)
-    exit 1
-elsif selection.size > 1
-    STDERR.puts Autoproj.console.color("more than one query given on the command line", :red)
-    exit 1
-end
-selection = selection.first
-query = Autoproj::Query.parse_query(selection)
+Autoproj::CmdLine.report do
+    selection = Autoproj::CmdLine.initialize_and_load(remaining)
 
-packages =
-    if search_all
-        Autoproj.manifest.packages.to_a
-    else
-        Autoproj.manifest.all_selected_packages.map do |pkg_name|
-            [pkg_name, Autoproj.manifest.packages[pkg_name]]
-        end
+    if selection.empty?
+        STDERR.puts Autoproj.console.color("no query given on the command line", :red)
+        exit 1
+    elsif selection.size > 1
+        STDERR.puts Autoproj.console.color("more than one query given on the command line", :red)
+        exit 1
     end
+    selection = selection.first
+    query = Autoproj::Query.parse_query(selection)
 
-matches = packages.map do |name, pkg_def|
-    if priority = query.match(pkg_def)
-        [priority, name]
-    end
-end.compact
+    packages =
+        if search_all
+            Autoproj.manifest.packages.to_a
+        else
+            Autoproj.manifest.all_selected_packages.map do |pkg_name|
+                [pkg_name, Autoproj.manifest.packages[pkg_name]]
+            end
+        end
 
-fields = Hash.new
-matches = matches.sort
-matches.each do |priority, name|
-    pkg = Autobuild::Package[name]
-    fields['SRCDIR'] = pkg.srcdir
-    fields['PREFIX'] = pkg.prefix
-    fields['NAME'] = name
-    fields['PRIORITY'] = priority
+    matches = packages.map do |name, pkg_def|
+        if priority = query.match(pkg_def)
+            [priority, name]
+        end
+    end.compact
+
+    fields = Hash.new
+    matches = matches.sort
+    matches.each do |priority, name|
+        pkg = Autobuild::Package[name]
+        fields['SRCDIR'] = pkg.srcdir
+        fields['PREFIX'] = pkg.prefix
+        fields['NAME'] = name
+        fields['PRIORITY'] = priority
 
-    value = Autoproj.expand(display_format, fields)
-    puts value
+        value = Autoproj.expand(display_format, fields)
+        puts value
+    end
 end
 

data/bin/autoproj-snapshot

@@ -0,0 +1,38 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+current_dir = Dir.pwd
+remaining_args = Autoproj.silent do
+    Autoproj::CmdLine.initialize_root_directory
+    Autoproj::CmdLine.initialize_and_load(ARGV)
+end
+
+snapshot_dir = File.expand_path(remaining_args.shift, current_dir)
+if !snapshot_dir
+    raise ConfigError.new, "target directory missing\nusage: autoproj snapshot target_dir"
+end
+
+user_selection = remaining_args.map do |arg|
+    if File.directory?(arg)
+        File.expand_path(arg)
+    else arg
+    end
+end
+manifest = Autoproj.manifest
+Autoproj::CmdLine.report do
+    resolved_selection = Autoproj::CmdLine.
+        resolve_user_selection(user_selection, :filter => false)
+    resolved_selection.filter_excluded_and_ignored_packages(Autoproj.manifest)
+    # This calls #prepare, which is required to run build_packages
+    packages = Autoproj::CmdLine.import_packages(resolved_selection)
+    # Remove non-existing packages
+    packages.each do |pkg|
+        if !File.directory?(manifest.package(pkg).autobuild.srcdir)
+            raise ConfigError, "cannot snapshot #{pkg.name} as it is not checked out"
+        end
+    end
+    Autoproj::CmdLine.snapshot(Autoproj.manifest, snapshot_dir, packages)
+end
+

data/bin/autoproj-test

@@ -0,0 +1,36 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+user_selection = Autoproj.silent do
+    Autoproj::CmdLine.initialize_root_directory
+    Autoproj::CmdLine.initialize_and_load(ARGV)
+end
+
+user_selection = user_selection.map do |arg|
+    if File.directory?(arg)
+        File.expand_path(arg)
+    else arg
+    end
+end
+
+Autobuild.pass_test_errors = true
+Autobuild.ignore_errors = true
+
+Autoproj::CmdLine.report do
+    resolved_selection = Autoproj::CmdLine.
+        resolve_user_selection(user_selection, :filter => false)
+    # Remove non-existing packages
+    Autoproj.manifest.each_package do |pkg|
+        if !File.directory?(pkg.srcdir)
+            Autoproj.manifest.add_exclusion(pkg, "#{pkg.name} is not checked out")
+        end
+    end
+    resolved_selection.filter_excluded_and_ignored_packages(Autoproj.manifest)
+    # This calls #prepare, which is required to run build_packages
+    packages = Autoproj::CmdLine.import_packages(resolved_selection)
+    packages.each { |pkg| Autobuild::Package[pkg].disable_phases('import', 'prepare', 'install') }
+    Autoproj::CmdLine.build_packages(resolved_selection, packages, ['test'])
+end
+

data/bin/autoproj_bootstrap

@@ -212,11 +212,11 @@ module Autoproj
                         end
                     end
                 end
-
-
+                
+                sudo = Autobuild.tool_in_path('sudo')
                 Tempfile.open('osdeps_sh') do |io|
                     io.puts "#! /bin/bash"
-                    io.puts GAIN_ROOT_ACCESS
+                    io.puts GAIN_ROOT_ACCESS % [sudo]
                     io.write script
                     io.flush
                     Autobuild::Subprocess.run 'autoproj', 'osdeps', '/bin/bash', io.path
@@ -226,7 +226,7 @@ module Autoproj
             GAIN_ROOT_ACCESS = <<-EOSCRIPT
 # Gain root access using sudo
 if test `id -u` != "0"; then
-    exec sudo /bin/bash $0 "$@"
+    exec %s /bin/bash $0 "$@"
 
 fi
             EOSCRIPT
@@ -338,6 +338,15 @@ fi
             end
         end
 
+        #Package manger for OpenSuse and Suse (untested)
+        class ZypperManager < ShellScriptManager
+            def initialize
+                super(['zypper'], true,
+                        "zypper -n install '%s'",
+                        "zypper -n install '%s'")
+            end
+        end
+
         # Package manager interface for systems that use yum
         class YumManager < ShellScriptManager
             def initialize
@@ -513,10 +522,18 @@ fi
                 end
             end
 
+            def reinstall
+                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem')]
+                Autobuild::Subprocess.run 'autoproj', 'osdeps', 'reinstall', *base_cmdline,
+                    'clean'
+                Autobuild::Subprocess.run 'autoproj', 'osdeps', 'reinstall', *base_cmdline,
+                    'pristine', '--all', '--extensions'
+            end
+
             def install(gems)
                 guess_gem_program
 
-                base_cmdline = [Autobuild.tool('gem'), 'install']
+                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install']
                 if !GemManager.with_doc
                     base_cmdline << '--no-rdoc' << '--no-ri'
                 end
@@ -814,6 +831,7 @@ fi
             PackageManagers::PacmanManager,
             PackageManagers::YumManager,
             PackageManagers::PortManager,
+            PackageManagers::ZypperManager,
             PackageManagers::PipManager]
         OS_PACKAGE_HANDLERS = {
             'debian' => 'apt-dpkg',
@@ -821,7 +839,8 @@ fi
             'arch' => 'pacman',
             'manjarolinux' => 'pacman',
             'fedora' => 'yum',
-            'darwin' => 'port'
+            'darwin' => 'port',
+            'opensuse' => 'zypper'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -1012,6 +1031,8 @@ fi
                         @operating_system = [[lsb_name, "debian"], lsb_versions]
                     elsif lsb_name != 'arch' && File.exists?("/etc/arch-release")
                         @operating_system = [[lsb_name, "arch"], lsb_versions]
+                    elsif lsb_name != 'opensuse' && File.exists?("/etc/SuSE-release")
+                        @operating_system = [[lsb_name, "opensuse"], lsb_versions]
                     elsif lsb_name != 'debian'
                         # Debian unstable cannot be detected with lsb_release,
                         # so debian has its own detection logic
@@ -1049,6 +1070,11 @@ fi
                         [['darwin'], [version.strip]]
                     elsif Autobuild.windows?
                         [['windows'], []]
+                    elsif File.exists?('/etc/SuSE-release')
+                        version = File.read('/etc/SuSE-release').strip
+                        version =~/.*VERSION\s+=\s+([^\s]+)/
+                        version = $1
+                        [['opensuse'], [version.strip]]
                     end
             end
 
@@ -1590,8 +1616,18 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
         # The set of packages that have already been installed
         attr_reader :installed_packages
 
-        # Requests the installation of the given set of packages
-        def install(packages, options = Hash.new)
+        # Set up the registered package handlers according to the specified osdeps mode
+        #
+        # It enables/disables package handlers based on either the value
+        # returned by {#osdeps_mode} or the value passed as option (the latter
+        # takes precedence). Moreover, sets the handler's silent flag using
+        # {#silent?}
+        #
+        # @option options [Array<String>] the package handlers that should be
+        #   enabled. The default value is returned by {#osdeps_mode}
+        # @return [Array<PackageManagers::Manager>] the set of enabled package
+        #   managers
+        def setup_package_handlers(options = Hash.new)
             options =
                 if Kernel.respond_to?(:validate_options)
                     Kernel.validate_options options, :osdeps_mode => osdeps_mode
@@ -1619,10 +1655,26 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
                 v.silent = self.silent?
             end
 
+            enabled_handlers = []
+            if os_package_handler.enabled?
+                enabled_handlers << os_package_handler
+            end
+            package_handlers.each_value do |v|
+                if v.enabled?
+                    enabled_handlers << v
+                end
+            end
+            enabled_handlers
+        end
+
+        # Requests the installation of the given set of packages
+        def install(packages, options = Hash.new)
             # Remove the set of packages that have already been installed 
             packages = packages.to_set - installed_packages
             return false if packages.empty?
 
+            setup_package_handlers(options)
+
             packages = resolve_os_dependencies(packages)
             packages = packages.map do |handler, list|
                 if filter_uptodate_packages? && handler.respond_to?(:filter_uptodate_packages)
@@ -1653,6 +1705,20 @@ end
 module Autoproj
     class InputError < RuntimeError; end
 
+    class << self
+        # Programatically overriden autoproj options
+        #
+        # @see override_option
+        attr_reader :option_overrides
+    end
+    @option_overrides = Hash.new
+
+    # Programatically override a user-selected option without changing the
+    # configuration file
+    def self.override_option(option_name, value)
+        @option_overrides[option_name] = value
+    end
+
     class BuildOption
         attr_reader :name
         attr_reader :type
@@ -1953,7 +2019,7 @@ module Autoproj
 
     # Run the provided command as root, using sudo to gain root access
     def self.run_as_root(*args)
-        if !system('sudo', *args)
+        if !system(Autobuild.tool_in_path('sudo'), *args)
             raise "failed to run #{args.join(" ")} as root"
         end
     end
@@ -2152,13 +2218,28 @@ ruby19:
   - ruby19
   - rake
   default: nonexistent
-ruby20: ignore
+  opensuse: ruby19-devel
+ruby20:
+  debian:
+  - ruby2.0
+  - ruby2.0-dev
+  - rake
+  - rubygems-integration
+  default: ignore
+ruby21:
+  debian:
+  - ruby2.1
+  - ruby2.1-dev
+  - rake
+  - rubygems-integration
+  default: ignore
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
   arch,manjarolinux: base-dev
   fedora: ignore
   darwin: ignore
+  opensuse: ignore
 autobuild: gem
 autoproj: gem
 git:
@@ -2170,24 +2251,28 @@ git:
   arch,manjarolinux: git
   fedora: git
   darwin: git-core
+  opensuse: git
 hg:
   debian,ubuntu: mercurial
   gentoo: dev-vcs/mercurial
   arch,manjarolinux: mercurial
   fedora: mercurial
   darwin: mercurial
+  opensuse: mercurial
 svn:
   debian,ubuntu: subversion
   gentoo: dev-util/subversion
   arch,manjarolinux: subversion
   fedora: subversion
   darwin: subversion
+  opensuse: subversion
 cmake:
   debian,ubuntu: cmake
   gentoo: dev-util/cmake
   arch,manjarolinux: cmake
   fedora: cmake
   darwin: cmake
+  opensuse: cmake
 autotools:
   debian,ubuntu:
   - automake1.9
@@ -2204,12 +2289,16 @@ autotools:
   darwin:
   - automake
   - autoconf
+  opensuse:
+  - automake
+  - autoconf
 lsb_release:
   debian,ubuntu: lsb-release
   gentoo: sys-apps/lsb-release
   arch,manjarolinux: lsb-release
   fedora: redhat-lsb
   darwin: ignore
+  opensuse: ignore
 archive:
   debian,ubuntu:
   - tar
@@ -2226,14 +2315,19 @@ archive:
   darwin:
   - gnutar
   - unzip
+  opensuse:
+  - tar
+  - unzip
 cvs:
   debian,ubuntu: cvs
   fedora: cvs
   darwin: cvs
   arch,manjarolinux: cvs
+  opensuse: cvs
 pip:
   debian,ubuntu: python-pip
   arch,manjarolinux: python2-pip
+  opensuse: python-pip
 
 EODEFS