autoproj 2.0.0.rc3 → 2.0.0.rc4

data/bin/autoproj_install.in

@@ -0,0 +1,14 @@
+#! /usr/bin/ruby
+
+if RUBY_VERSION < "1.9.2"
+    STDERR.puts "autoproj requires Ruby >= 1.9.2"
+    exit 1
+end
+
+AUTOPROJ_OPS_INSTALL
+
+ENV.delete('BUNDLE_GEMFILE')
+ENV.delete('RUBYLIB')
+ops = Autoproj::Ops::Install.new(Dir.pwd)
+ops.parse_options(ARGV)
+ops.run

data/lib/autoproj.rb

@@ -16,7 +16,8 @@
 require 'autoproj/manifest'
 require 'autoproj/package_manifest'
 require 'autoproj/installation_manifest'
-require 'autoproj/osdeps'
+require 'autoproj/os_package_installer'
+require 'autoproj/os_package_resolver'
 require 'autoproj/system'
 require 'autoproj/build_option'
 require 'autoproj/configuration'

data/lib/autoproj/autobuild.rb

@@ -469,7 +469,7 @@ def only_on(*architectures)
         end
     end
 
-    os_names, os_versions = Autoproj::OSDependencies.operating_system
+    os_names, os_versions = Autoproj::OSPackageResolver.operating_system
     matching_archs = architectures.find_all { |arch| os_names.include?(arch[0].downcase) }
     if matching_archs.empty?
         return
@@ -494,7 +494,7 @@ def not_on(*architectures)
         end
     end
 
-    os_names, os_versions = Autoproj::OSDependencies.operating_system
+    os_names, os_versions = Autoproj::OSPackageResolver.operating_system
     matching_archs = architectures.find_all { |arch| os_names.include?(arch[0].downcase) }
     if matching_archs.empty?
         return yield

data/lib/autoproj/cli/bootstrap.rb

@@ -33,48 +33,9 @@ def validate_options(args, options)
                 return args, options
             end
             
-            def restart_if_needed(ws)
-                # Check if the .autoprojrc changed the PATH and therefore which autoproj script
-                # should be executed ... and restart if it did
-                autoproj_path = Autobuild.find_in_path('autoproj')
-                if $0 != autoproj_path
-                    puts "your .autoprojrc file changed PATH in a way that requires the restart of autoproj"
-
-                    if ENV['AUTOPROJ_RESTARTING']
-                        puts "infinite loop detected, will not restart this time"
-                    else
-                        require 'rbconfig'
-                        ws.config.save
-                        exec(ws.config.ruby_executable, autoproj_path, *ARGV)
-                    end
-                end
-            end
-
-            def install_autoproj_gem_in_new_root(ws)
-                # Install the autoproj/autobuild gem explicitely in the new
-                # root.
-                original_env =
-                    Hash['GEM_HOME' => Gem.paths.home,
-                         'GEM_PATH' => Gem.paths.path]
-
-                begin
-                    Gem.paths =
-                        Hash['GEM_HOME' => File.join(root_dir, '.gems'),
-                             'GEM_PATH' => []]
-                    PackageManagers::GemManager.with_prerelease(ws.config.use_prerelease?) do
-                        ws.osdeps.install(%w{autobuild autoproj})
-                    end
-                ensure
-                    Gem.paths = original_env
-                end
-            end
-
             def run(buildconf_info, options)
                 ws = Workspace.new(root_dir)
-
                 ws.setup
-                install_autoproj_gem_in_new_root(ws)
-                restart_if_needed(ws)
 
                 seed_config = options.delete(:seed_config)
 

data/lib/autoproj/cli/build.rb

@@ -57,9 +57,6 @@ def run(selected_packages, options)
                             raise Interrupt
                         end
                         if build_options[:rebuild]
-                            if options[:osdeps]
-                                ws.osdeps.reinstall
-                            end
                             ops.rebuild_all
                         else
                             ops.force_build_all

data/lib/autoproj/cli/main.rb

@@ -29,7 +29,7 @@ class Main < Thor
             no_commands do
                 def run_autoproj_cli(filename, classname, report_options, *args)
                     require "autoproj/cli/#{filename}"
-                    Autoproj.report(Hash[silent: true].merge(report_options)) do
+                    Autoproj.report(Hash[silent: !options[:debug], debug: options[:debug]].merge(report_options)) do
                         cli = CLI.const_get(classname).new
                         run_args = cli.validate_options(args, self.options)
                         cli.run(*run_args)
@@ -45,6 +45,13 @@ def run_autoproj_cli(filename, classname, report_options, *args)
                 banner: 'SEED_CONFIG',
                 desc: "a configuration file used to seed the bootstrap's configuration"
             def bootstrap(*args)
+                if !File.directory?(File.join(Dir.pwd, '.autoproj'))
+                    require 'autoproj/ops/install'
+                    ops = Autoproj::Ops::Install.new(Dir.pwd)
+                    remaining = ops.parse_options(args)
+                    ops.run
+                    exec Gem.ruby, $0, 'bootstrap', *args
+                end
                 run_autoproj_cli(:bootstrap, :Bootstrap, Hash[], *args)
             end
 
@@ -304,6 +311,11 @@ def switch_config(*args)
             def query(query_string = nil)
                 run_autoproj_cli(:query, :Query, Hash[], *Array(query_string))
             end
+
+            desc "upgrade autoproj itself"
+            def upgrade
+                run_autoproj_cli(:upgrade, :Upgrade, Hash[])
+            end
         end
     end
 end

data/lib/autoproj/cli/osdeps.rb

@@ -9,7 +9,7 @@ def run(user_selection, options = Hash.new)
                     finalize_setup(user_selection,
                                    ignore_non_imported_packages: true)
 
-                ws.osdeps.install(
+                ws.install_os_packages(
                     osdep_packages,
                     install_only: !options[:update])
             end

data/lib/autoproj/cli/show.rb

@@ -81,7 +81,7 @@ def display_source_package(pkg_name, default_packages, revdeps)
 
             def display_osdep_package(pkg_name, default_packages, revdeps)
                 puts Autoproj.color("the osdep '#{pkg_name}'", :bold)
-                ws.osdeps.resolve_os_dependencies([pkg_name]).each do |manager, packages|
+                ws.os_package_resolver.resolve_os_packages([pkg_name]).each do |manager, packages|
                     puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
                 end
 

data/lib/autoproj/cli/update.rb

@@ -15,7 +15,7 @@ def validate_options(packages, options)
                 if from = options[:from]
                     options[:from] = Autoproj::InstallationManifest.from_root(options[:from])
                 end
-                ws.osdeps.filter_uptodate_packages = options[:osdeps_filter_uptodate]
+                ws.os_package_installer.filter_uptodate_packages = options[:osdeps_filter_uptodate]
 
                 if options[:aup] && !options[:all] && packages.empty?
                     packages = ['.']
@@ -54,7 +54,7 @@ def run(selected_packages, options)
                 if options[:osdeps]
                     ws.config.set(
                         'operating_system',
-                        Autoproj::OSDependencies.operating_system(:force => true),
+                        Autoproj::OSPackageResolver.operating_system(:force => true),
                         true)
                 end
 
@@ -112,7 +112,7 @@ def run(selected_packages, options)
                             raise "cannot find package #{pkg_name}"
                         end
                     end
-                    ws.osdeps.install(vcs_to_install, osdeps_options)
+                    ws.install_os_packages(vcs_to_install, osdeps_options)
                 end
 
                 ops = Autoproj::Ops::Import.new(ws)
@@ -130,7 +130,7 @@ def run(selected_packages, options)
                 ws.export_installation_manifest
 
                 if options[:osdeps] && !osdep_packages.empty?
-                    ws.osdeps.install(osdep_packages, osdeps_options)
+                    ws.install_os_packages(osdep_packages, osdeps_options)
                 end
 
                 ws.export_env_sh(source_packages)

data/lib/autoproj/cli/upgrade.rb

@@ -0,0 +1,71 @@
+module Autoproj
+    module CLI
+        class Upgrade
+            def initialize(root_dir)
+                @root_dir = root_dir
+            end
+
+            def upgrade_from_v2
+                require 'autoproj/ops/install'
+                installer = Autoproj::Ops::Install.new(root_dir)
+                installer.install
+            end
+
+            def find_v1_root_dir(base_dir = ENV['AUTOPROJ_CURRENT_ROOT'] || Dir.pwd)
+                path = Pathname.new(base_dir)
+                while !path.root?
+                    if (path + "autoproj").exist?
+                        break
+                    end
+                    path = path.parent
+                end
+
+                if path.root?
+                    return
+                end
+
+                # I don't know if this is still useful or not ... but it does not hurt
+                #
+                # Preventing backslashed in path, that might be confusing on some path compares
+                if Autobuild.windows?
+                    result = result.gsub(/\\/,'/')
+                end
+                result
+            end
+
+            def upgrade_from_v1
+                # Do an install
+                require 'autoproj/ops/install'
+                installer = Autoproj::Ops::Install.new(root_dir)
+                installer.run
+                # Copy the current configuration
+                current_config = File.open(File.join(root_dir, 'autoproj', 'config.yml')) do |io|
+                    YAML.load(io)
+                end
+                new_config = File.open(config_file_path) do |io|
+                    YAML.load(io)
+                end
+                File.open(config_file_path, 'w') do |io|
+                    io.write YAML.dump(current_config.merge(new_config))
+                end
+
+                Autoproj.message "now, open a new console, source env.sh and run"
+                Autoproj.message "  autoproj osdeps"
+                Autoproj.message "  autoproj envsh"
+            end
+
+            def run(*args)
+                root_dir = Workspace.find_root_dir
+                if root_dir && File.directory?(File.join(root_dir, '.autoproj'))
+                    return upgrade_from_v2
+                end
+
+                root_dir = find_v1_root_dir
+                if root_dir && File.directory?(root_dir, '.gems')
+                    return upgrade_from_v1
+                end
+            end
+        end
+    end
+end
+

data/lib/autoproj/configuration.rb

@@ -206,11 +206,23 @@ def parallel_import_level=(level)
             set('parallel_import_level', level)
         end
 
+        def private_bundler?
+            get('private_bundler', false)
+        end
+
+        def private_autoproj?
+            get('private_autoproj', false)
+        end
+
+        def private_gems?
+            get('private_gems', false)
+        end
+
         def ruby_executable
             if path = get('ruby_executable', nil)
                 path
             else
-                path = OSDependencies.autodetect_ruby_program
+                path = OSPackageResolver.autodetect_ruby_program
                 set('ruby_executable', path, true)
                 path
             end
@@ -261,6 +273,11 @@ def importer_cache_dir
             get('importer_cache_dir', nil)
         end
 
+        # Sets the directory in which packages will be installed
+        def prefix_dir=(path)
+            set('prefix', path, true)
+        end
+
         # The directory in which packages will be installed.
         #
         # If it is a relative path, it is relative to the root dir of the

data/lib/autoproj/exceptions.rb

@@ -45,6 +45,13 @@ def initialize(selection)
     class UserError < RuntimeError; end
 
     class WorkspaceAlreadyCreated < RuntimeError; end
+
+    # Exception raised when looking for a workspace and it cannot be found
+    class NotWorkspace < RuntimeError; end
+
+    # Exception raised when initializing on a workspace that is not the current
+    # one
+    class MismatchingWorkspace < RuntimeError; end
 end
 
 

data/lib/autoproj/installation_manifest.rb

@@ -3,8 +3,6 @@ module Autoproj
     class InstallationManifest
         Package = Struct.new :name, :srcdir, :prefix, :builddir, :dependencies
 
-        DEFAULT_MANIFEST_NAME = ".autoproj-installation-manifest"
-
         attr_reader :path
         attr_reader :packages
         def initialize(path)
@@ -12,12 +10,8 @@ def initialize(path)
             @packages = Hash.new
         end
 
-        def default_manifest_path
-            File.join(path, DEFAULT_MANIFEST_NAME)
-        end
-
         def exist?
-            File.exist?(default_manifest_path)
+            File.exist?(path)
         end
 
         def [](name)
@@ -32,7 +26,7 @@ def delete_if
             packages.delete_if { |_, pkg| yield(pkg) }
         end
             
-        def load(path = default_manifest_path)
+        def load
             @packages = Hash.new
             raw = YAML.load(File.open(path))
             if raw.respond_to?(:to_str) # old CSV-based format
@@ -52,7 +46,8 @@ def load(path = default_manifest_path)
             end
         end
 
-        def save(path = default_manifest_path)
+        # Save the installation manifest
+        def save(path = self.path)
             File.open(path, 'w') do |io|
                 marshalled_packages = packages.values.map do |v|
                     Hash['name' => v.name,
@@ -65,18 +60,34 @@ def save(path = default_manifest_path)
             end
         end
 
+        # Enumerate the packages from this manifest
+        #
+        # @yieldparam [Package]
         def each(&block)
             packages.each_value(&block)
         end
 
+        # Returns information about a given package
+        #
+        # @return [Package]
         def [](name)
-            packages.each_value.find { |pkg| pkg.name == name }
+            packages[name]
+        end
+
+        # Returns the default Autoproj installation manifest path for a given
+        # autoproj workspace root
+        #
+        # @param [String] root_dir
+        # @return [String]
+        def self.path_for_root(root_dir)
+            File.join(root_dir, '.autoproj', 'installation-manifest')
         end
 
         def self.from_root(root_dir)
-            manifest = InstallationManifest.new(root_dir)
+            path = path_for_root(root_dir)
+            manifest = InstallationManifest.new(path)
             if !manifest.exist?
-                raise ConfigError.new, "no #{DEFAULT_MANIFEST_NAME} file exists in #{root_dir}. You should probably rerun autoproj envsh in that folder first"
+                raise ConfigError.new, "no #{path} file found. You should probably rerun autoproj envsh in that folder first"
             end
             manifest.load
             manifest

data/lib/autoproj/manifest.rb

@@ -88,7 +88,7 @@ def auto_osdeps?
         attr_accessor :vcs
 
         # The definition of all OS packages available on this installation
-        attr_reader :osdeps
+        attr_reader :os_package_resolver
 
 	def initialize
             @file = nil
@@ -96,7 +96,7 @@ def initialize
             @packages = Hash.new
             @package_manifests = Hash.new
             @package_sets = []
-            @osdeps = OSDependencies.new
+            @os_package_resolver = OSPackageResolver.new
 
             @automatic_exclusions = Hash.new
             @constants_definitions = Hash.new
@@ -104,7 +104,7 @@ def initialize
             @moved_packages = Hash.new
             @osdeps_overrides = Hash.new
             @metapackages = Hash.new
-            @ignored_os_dependencies = Set.new
+            @ignored_os_packages = Set.new
             @reused_installations = Array.new
             @ignored_packages = Set.new
             @manifest_exclusions = Set.new
@@ -621,16 +621,16 @@ def resolve_package_name_as_source_package(name)
         #   (type, package_name) pairs where type is either :package or :osdep and
         #   package_name the corresponding package name
         def resolve_package_name_as_osdep(name)
-	    osdeps_availability = osdeps.availability_of(name)
-            if osdeps_availability == Autoproj::OSDependencies::NO_PACKAGE
+	    osdeps_availability = os_package_resolver.availability_of(name)
+            if osdeps_availability == OSPackageResolver::NO_PACKAGE
                 raise PackageNotFound, "cannot resolve #{name}: it is not an osdep"
             end
 
             # There is an osdep definition for this package, check the
             # overrides
             osdeps_available =
-                (osdeps_availability == OSDependencies::AVAILABLE) ||
-                (osdeps_availability == OSDependencies::IGNORE)
+                (osdeps_availability == OSPackageResolver::AVAILABLE) ||
+                (osdeps_availability == OSPackageResolver::IGNORE)
             osdeps_overrides = self.osdeps_overrides[name]
             if osdeps_overrides && (!osdeps_available || osdeps_overrides[:force])
                 source_packages = osdeps_overrides[:packages].inject([]) do |result, src_pkg_name|
@@ -640,11 +640,11 @@ def resolve_package_name_as_osdep(name)
                 return [[:package, pkg.name]]
             elsif osdeps_available
                 return [[:osdeps, name]]
-            elsif osdeps_availability == OSDependencies::WRONG_OS
+            elsif osdeps_availability == OSPackageResolver::WRONG_OS
                 raise PackageNotFound, "#{name} is an osdep, but it is not available for this operating system"
-            elsif osdeps_availability == OSDependencies::UNKNOWN_OS
+            elsif osdeps_availability == OSPackageResolver::UNKNOWN_OS
                 raise PackageNotFound, "#{name} is an osdep, but the local operating system is unavailable"
-            elsif osdeps_availability == OSDependencies::NONEXISTENT
+            elsif osdeps_availability == OSPackageResolver::NONEXISTENT
                 raise PackageNotFound, "#{name} is an osdep, but it is explicitely marked as 'nonexistent' for this operating system"
             end
         end
@@ -662,7 +662,7 @@ def resolve_package_set(name)
                 end
                 pkg_set.each_package.
                     map(&:name).
-                    find_all { |pkg_name| !osdeps || !osdeps.has?(pkg_name) }
+                    find_all { |pkg_name| !os_package_resolver.has?(pkg_name) }
             end
         end
 
@@ -762,7 +762,7 @@ def all_packages
                 result |= metapackage(pkg_set.name).packages.map(&:name).to_set
             end
             result.to_a.
-                find_all { |pkg_name| !osdeps.has?(pkg_name) }
+                find_all { |pkg_name| !os_package_resolver.has?(pkg_name) }
         end
 
         # Returns true if +name+ is a valid package and is included in the build
@@ -773,7 +773,7 @@ def all_packages
         # If it is false, the method will simply return false on non-defined
         # packages 
         def package_enabled?(name, validate = true)
-            if !find_autobuild_package(name) && !osdeps.has?(name)
+            if !find_autobuild_package(name) && !os_package_resolver.has?(name)
                 if validate
                     raise ArgumentError, "package #{name} does not exist"
                 end
@@ -925,14 +925,14 @@ def disable_imports_from(pkg_set_name)
         end
 
         # call-seq:
-        #   list_os_dependencies(packages) => required_packages, ospkg_to_pkg
+        #   list_os_packages(packages) => required_packages, ospkg_to_pkg
         #
         # Returns the set of dependencies required by the listed packages.
         #
         # +required_packages+ is the set of osdeps names that are required for
         # +packages+ and +ospkg_to_pkg+ a mapping from the osdeps name to the
         # set of packages that require this OS package.
-        def list_os_dependencies(packages)
+        def list_os_packages(packages)
             required_os_packages = Set.new
             package_os_deps = Hash.new { |h, k| h[k] = Array.new }
             packages.each do |pkg_name|
@@ -950,7 +950,7 @@ def list_os_dependencies(packages)
             return required_os_packages, package_os_deps
         end
 
-        def filter_os_dependencies(required_os_packages, package_os_deps)
+        def filter_os_packages(required_os_packages, package_os_deps)
             required_os_packages.find_all do |pkg|
                 if excluded?(pkg)
                     raise ConfigError.new, "the osdeps package #{pkg} is excluded from the build in #{file}. It is required by #{package_os_deps[pkg].join(", ")}"
@@ -965,26 +965,6 @@ def filter_os_dependencies(required_os_packages, package_os_deps)
             end
         end
 
-        # Restores the OS dependencies required by the given packages to
-        # pristine conditions
-        #
-        # This is usually called as a rebuild step to make sure that all these
-        # packages are updated to whatever required the rebuild
-        def pristine_os_dependencies(packages)
-            required_os_packages, package_os_deps = list_os_dependencies(packages)
-            required_os_packages =
-                filter_os_dependencies(required_os_packages, package_os_deps)
-            osdeps.pristine(required_os_packages)
-        end
-
-        # Installs the OS dependencies that are required by the given packages
-        def install_os_dependencies(packages, options = Hash.new)
-            required_os_packages, package_os_deps = list_os_dependencies(packages)
-            required_os_packages =
-                filter_os_dependencies(required_os_packages, package_os_deps)
-            osdeps.install(required_os_packages, options)
-        end
-
         # The set of overrides added with #add_osdeps_overrides
         attr_reader :osdeps_overrides
 
@@ -1069,7 +1049,7 @@ def expand_package_selection(selection, options = Hash.new)
 
             # Finally, check for partial matches
             all_source_package_names = self.all_package_names
-            all_osdeps_package_names = osdeps.all_package_names
+            all_osdeps_package_names = os_package_resolver.all_package_names
             selection.each do |sel|
                 match_pkg_name = Regexp.new(Regexp.quote(sel))
                 all_matches = Array.new
@@ -1180,11 +1160,11 @@ def reuse(*dir)
         # Load OS dependency information contained in our registered package
         # sets into the provided osdep object
         #
-        # @param [OSDependencies] osdeps the osdep handling object
+        # @param [OSPackageResolver] osdeps the osdep handling object
         # @return [void]
         def load_osdeps_from_package_sets(osdeps)
-            each_osdeps_file do |source, file|
-                osdeps.merge(source.load_osdeps(file))
+            each_package_set do |pkg_set, file|
+                osdeps.merge(pkg_set.load_osdeps(file))
             end
         end
     end
@@ -1198,9 +1178,9 @@ def self.manifest
 
     def self.osdeps
         Autoproj.warn_deprecated(
-            __method__, "use workspace.osdeps instead")
+            __method__, "use workspace.os_package_resolver or workspace.os_package_installer instead")
 
-        workspace.osdeps
+        workspace.os_package_resolver
     end
 
     def self.config
@@ -1210,12 +1190,6 @@ def self.config
         workspace.config
     end
 
-    # Load the osdeps files contained in {manifest} into {osdeps}
-    def self.load_osdeps_from_package_sets
-        workspace.load_osdeps_from_package_sets(osdeps)
-        workspace.osdeps
-    end
-
     def self.add_osdeps_overrides(*args, &block)
         manifest.add_osdeps_overrides(*args, &block)
     end