autoproj 1.9.4 → 1.9.5.rc1

data/bin/autoproj

@@ -85,6 +85,9 @@ EOTEXT
         if name =~ /^#{Regexp.quote(Autoproj.config_dir + File::SEPARATOR)}/ ||
             name =~ /^#{Regexp.quote(Autoproj.remotes_dir + File::SEPARATOR)}/
             needs_update_config = true
+        elsif (Autoproj.config_dir + File::SEPARATOR) =~ /^#{Regexp.quote(name)}/
+            needs_update_config = true
+            false
         end
     end
 

data/bin/autoproj_bootstrap

@@ -142,6 +142,13 @@ module Autoproj
             def name
                 names.first
             end
+
+            # Overload to perform initialization of environment variables in
+            # order to have a properly functioning package manager
+            #
+            # This is e.g. needed for python pip or rubygems
+            def self.initialize_environment
+            end
         end
 
         # Dummy package manager used for unknown OSes. It simply displays a
@@ -432,6 +439,44 @@ fi
             @with_prerelease = false
             @with_doc = false
 
+            # Filters all paths that come from other autoproj installations out
+            # of GEM_PATH
+            def self.initialize_environment
+                Autobuild::ORIGINAL_ENV['GEM_PATH'] =
+                    (ENV['GEM_PATH'] || "").split(":").find_all do |p|
+                        !Autoproj.in_autoproj_installation?(p)
+                    end.join(":")
+                Autobuild.env_inherit 'GEM_PATH'
+                Autobuild.env_init_from_env 'GEM_PATH'
+
+                orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(':')
+                Gem.default_path.each do |p|
+                    if !orig_gem_path.include?(p)
+                        orig_gem_path << ":#{p}"
+                    end
+                end
+
+                Autoproj.manifest.each_reused_autoproj_installation do |p|
+                    p_gems = File.join(Autoproj.root_dir, '.gems')
+                    if File.directory?(p_gems)
+                        Autobuild.env_add_path 'GEM_PATH', p_gems
+                    end
+                end
+                Autobuild.env_add_path 'GEM_PATH', gem_home
+                Autobuild.env_set 'GEM_HOME', gem_home
+                Autobuild.env_add_path 'PATH', "#{gem_home}/bin"
+
+                # Now, reset the directories in our own RubyGems instance
+                if Gem::Specification.respond_to?(:dirs=)
+                    Gem::Specification.dirs = ENV['GEM_PATH'].split(':')
+                end
+            end
+
+            # Return the directory in which RubyGems package should be installed
+            def self.gem_home
+                ENV['AUTOPROJ_GEM_HOME'] || File.join(Autoproj.root_dir, ".gems")
+            end
+
             def initialize
                 super(['gem'])
                 @installed_gems = Set.new
@@ -595,8 +640,94 @@ fi
                 false
             end
         end
+    
+        # Using pip to install python packages
+        class PipManager < Manager
+
+            attr_reader :installed_gems
+
+            def self.initialize_environment
+                Autoproj.env_set 'PYTHONUSERBASE', pip_home
+            end
+
+            # Return the directory where python packages are installed to.
+            # The actual path is pip_home/lib/pythonx.y/site-packages.
+            def self.pip_home
+                ENV['AUTOPROJ_PYTHONUSERBASE'] || File.join(Autoproj.root_dir,".pip")
+            end
+
+
+            def initialize
+                super(['pip'])
+                @installed_pips = Set.new
+            end
+
+            def guess_pip_program
+                if Autobuild.programs['pip']
+                    return Autobuild.programs['pip']
+                end
+
+                Autobuild.programs['pip'] = "pip"
+            end
+
+            def install(pips)
+                guess_pip_program
+                if pips.is_a?(String)
+                    pips = [pips]
+                end
+
+                base_cmdline = [Autobuild.tool('pip'), 'install','--user']
+
+                cmdlines = [base_cmdline + pips]
+
+                if pips_interaction(pips, cmdlines)
+                    Autoproj.message "  installing/updating Python dependencies: "+
+                        "#{pips.sort.join(", ")}"
+
+                    cmdlines.each do |c|
+                        Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
+                    end
+
+                    pips.each do |p|
+                        @installed_pips << p
+                    end
+                end
+            end
+            
+            def pips_interaction(pips, cmdlines)
+                if OSDependencies.force_osdeps
+                    return true
+                elsif enabled?
+                    return true
+                elsif silent?
+                    return false
+                end
+
+                # We're not supposed to install rubygem packages but silent is not
+                # set, so display information about them anyway
+                puts <<-EOMSG
+      #{Autoproj.color("The build process and/or the packages require some Python packages to be installed", :bold)}
+      #{Autoproj.color("and you required autoproj to not do it itself", :bold)}
+        The following command line can be used to install them manually
+        
+          #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
+        
+        Autoproj expects these Python packages to be installed in #{Autoproj.pip_home} This can
+        be overridden by setting the AUTOPROJ_PYTHONUSERBASE environment variable manually
+
+                EOMSG
+                print "    #{Autoproj.color("Press ENTER to continue ", :bold)}"
+
+                STDOUT.flush
+                STDIN.readline
+                puts
+                false
+            end
+        end
+
     end
 
+
     # Manager for packages provided by external package managers
     class OSDependencies
 	class << self
@@ -678,7 +809,8 @@ fi
             PackageManagers::EmergeManager,
             PackageManagers::PacmanManager,
             PackageManagers::YumManager,
-            PackageManagers::PortManager]
+            PackageManagers::PortManager,
+            PackageManagers::PipManager]
         OS_PACKAGE_HANDLERS = {
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
@@ -1299,27 +1431,22 @@ packages)
 This option is meant to allow you to control autoproj's behaviour while handling
 OS dependencies.
 
-* if you say "ruby", the RubyGem packages will be installed.
+* if you say "gem", the RubyGem packages will be installed.
 * if you say "none", autoproj will not do anything related to the OS
   dependencies.
 
 As any configuration value, the mode can be changed anytime by calling
-an autoproj operation with the --reconfigure option (e.g. autoproj update
---reconfigure).
+  autoproj reconfigure
 
-Finally, OS dependencies can be installed by calling "autoproj osdeps"
-with the corresponding option (--all, --ruby, --os or --none). Calling
-"autoproj osdeps" without arguments will also give you information as
-to what you should install to compile the software successfully.
+Finally, the "autoproj osdeps" command will give you the necessary information about the OS packages that you will need to install manually.
 
-So, what do you want ? (ruby or none)
+So, what do you want ? (either 'all', 'none', or a comma-separated list of 'gem' and 'pip' -- without the quotes)
             EOT
-            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (ruby, none) ?", long_doc.strip ]
+            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically ('all', 'none', or a comma-separated list of 'gem' and 'pip' -- without the quotes) ?", long_doc.strip ]
 
 	    Autoproj.configuration_option 'osdeps_mode', 'string',
 		:default => 'ruby',
 		:doc => message,
-                :possible_values => %w{ruby none},
                 :lowercase => true
         end
 
@@ -1337,7 +1464,9 @@ while handling OS dependencies.
 
 * if you say "all", it will install all packages automatically.
   This requires root access thru 'sudo'
-* if you say "ruby", only the Ruby packages will be installed.
+* if you say "pip", only the Ruby packages will be installed.
+  Installing these packages does not require root access.
+* if you say "gem", only the Ruby packages will be installed.
   Installing these packages does not require root access.
 * if you say "os", only the OS-provided packages will be installed.
   Installing these packages requires root access.
@@ -1345,20 +1474,17 @@ while handling OS dependencies.
   OS dependencies.
 
 As any configuration value, the mode can be changed anytime by calling
-an autoproj operation with the --reconfigure option (e.g. autoproj update
---reconfigure).
+  autoproj reconfigure
 
-Finally, OS dependencies can be installed by calling "autoproj osdeps"
-with the corresponding option (--all, --ruby, --os or --none).
+Finally, the "autoproj osdeps" command 
 
-So, what do you want ? (all, ruby, os or none)
+So, what do you want ? (either 'all', 'none', or a comma-separated list of 'os', 'gem' and 'pip' -- without the quotes)
             EOT
-            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, ruby, os, none) ?", long_doc.strip ]
+            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically ('all', 'none', or a comma-separated list of 'os', 'gem' and 'pip' -- without the quotes) ?", long_doc.strip ]
 
 	    Autoproj.configuration_option 'osdeps_mode', 'string',
 		:default => 'all',
 		:doc => message,
-                :possible_values => %w{all ruby os none},
                 :lowercase => true
         end
 
@@ -1373,11 +1499,11 @@ So, what do you want ? (all, ruby, os or none)
         def self.osdeps_mode_string_to_value(string)
             string = string.to_s.downcase
             case string
-            when 'all'  then HANDLE_ALL
-            when 'ruby' then HANDLE_RUBY
-            when 'os'   then HANDLE_OS
-            when 'none' then HANDLE_NONE
-            else raise ArgumentError, "invalid osdeps mode string '#{string}'"
+            when 'all'  then ['os', 'gem', 'pip']
+            when 'ruby' then ['gem']
+            when 'os'   then ['os']
+            when 'none' then ['none']
+            else string.split(',')
             end
         end
 
@@ -1446,20 +1572,26 @@ So, what do you want ? (all, ruby, os or none)
         # The set of packages that have already been installed
         attr_reader :installed_packages
 
-        def installs_os_packages?
-            osdeps_mode == HANDLE_ALL || osdeps_mode == HANDLE_OS
-        end
-
-        def installs_ruby_packages?
-            osdeps_mode == HANDLE_ALL || osdeps_mode == HANDLE_RUBY
-        end
-
-
         # Requests the installation of the given set of packages
-        def install(packages, package_osdeps = Hash.new)
-            os_package_handler.enabled = installs_os_packages?
+        def install(packages, options = Hash.new)
+            options =
+                if Kernel.respond_to?(:validate_options)
+                    Kernel.validate_options options, :osdeps_mode => osdeps_mode
+                else options.dup
+                end
+
+            os_package_handler.enabled = false
+            package_handlers.each_value do |handler|
+                handler.enabled = false
+            end
+            osdeps_mode.each do |m|
+                if m == 'os'
+                    os_package_handler.enabled = true
+                else
+                    package_handlers[m].enabled = true
+                end
+            end
             os_package_handler.silent = self.silent?
-            package_handlers['gem'].enabled = installs_ruby_packages?
             package_handlers.each_value do |v|
                 v.silent = self.silent?
             end
@@ -1809,10 +1941,6 @@ module Autoproj
         File.join(root_dir, ".remotes")
     end
 
-    # Return the directory in which RubyGems package should be installed
-    def self.gem_home
-        ENV['AUTOPROJ_GEM_HOME'] || File.join(root_dir, ".gems")
-    end
 
     def self.env_inherit(*names)
         Autobuild.env_inherit(*names)
@@ -1828,15 +1956,30 @@ module Autoproj
         File.join(result, name)
     end
 
+    # @deprecated use isolate_environment instead
+    def self.set_initial_env
+        isolate_environment
+    end
+
     # Initializes the environment variables to a "sane default"
     #
     # Use this in autoproj/init.rb to make sure that the environment will not
     # get polluted during the build.
-    def self.set_initial_env
+    def self.isolate_environment
         Autobuild.env_inherit = false
-        Autoproj.env_set 'RUBYOPT', "-rubygems"
-        Autobuild.env_push_path 'GEM_PATH', Autoproj.gem_home
-        Autobuild.env_push_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
+        Autobuild.env_push_path 'PATH', "/usr/local/bin", "/usr/bin", "/bin"
+    end
+
+    def self.prepare_environment
+        # Set up some important autobuild parameters
+        env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB', \
+            'LD_LIBRARY_PATH', 'CMAKE_PREFIX_PATH', 'PYTHONPATH'
+        
+        env_set 'AUTOPROJ_CURRENT_ROOT', Autoproj.root_dir
+        env_set 'RUBYOPT', "-rubygems"
+        Autoproj::OSDependencies::PACKAGE_HANDLERS.each do |pkg_mng|
+            pkg_mng.initialize_environment
+        end
     end
 
     class << self
@@ -1847,10 +1990,8 @@ module Autoproj
 
     # Create the env.sh script in +subdir+. In general, +subdir+ should be nil.
     def self.export_env_sh(subdir = nil)
-        # Make sure that we have the environment of all selected packages
-        if Autoproj.manifest # we don't have a manifest if we are bootstrapping
-            Autoproj::CmdLine.update_environment
-        end
+        # Make sure that we have as much environment as possible
+        Autoproj::CmdLine.update_environment
 
         filename = if subdir
                File.join(Autoproj.root_dir, subdir, ENV_FILENAME)
@@ -1873,10 +2014,13 @@ module Autoproj
         end
 
         File.open(filename, "w") do |io|
+            io.write <<-EOF
+            if test -n "$AUTOPROJ_CURRENT_ROOT" && test "$AUTOPROJ_CURRENT_ROOT" != "#{Autoproj.root_dir}"; then
+                echo "the env.sh from $AUTOPROJ_CURRENT_ROOT is already loaded. Start a new shell before sourcing this one"
+                return
+            fi
+            EOF
             Autobuild.export_env_sh(io)
-            if Autobuild.environment.has_key?('GEM_PATH')
-                io.puts "export GEM_PATH=$GEM_PATH:#{Gem.default_path.join(":")}"
-            end
         end
     end
 
@@ -1935,130 +2079,132 @@ module Autoproj
 end
 
 DEFS = <<EODEFS
----
-none: ignore
-ruby18:
-  debian,ubuntu:
-  - ruby1.8-dev
-  - ruby1.8
-  - rubygems1.8
-  - ri1.8
-  - libopenssl-ruby1.8
+--- 
+ruby20: ignore
+pip: 
+  debian,ubuntu: python-pip
+lsb_release: 
+  gentoo: sys-apps/lsb-release
+  darwin: ignore
+  fedora: redhat-lsb
+  debian,ubuntu: lsb-release
+  arch: ignore
+svn: 
+  gentoo: dev-util/subversion
+  darwin: subversion
+  fedora: subversion
+  debian,ubuntu: subversion
+  arch: subversion
+autoproj: gem
+build-essential: 
+  gentoo: ignore
+  darwin: ignore
+  fedora: ignore
+  debian,ubuntu: build-essential
+  arch: ignore
+cmake: 
+  gentoo: dev-util/cmake
+  darwin: cmake
+  fedora: cmake
+  debian,ubuntu: cmake
+  arch: cmake
+ruby19: 
+  gentoo: 
+  - dev-lang/ruby:1.9
   - rake
-  gentoo:
-  - dev-lang/ruby:1.8
+  darwin: 
+  - ruby19
   - rake
-  fedora:
-    '15,16':
+  default: nonexistent
+  fedora: 
+    "17": 
     - ruby
     - rubygems
-  darwin:
-  - ruby
-  - rb-rake
-  default: nonexistent
-ruby19:
-  debian:
+  ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
+  - ri1.9.1
+  - libopenssl-ruby1.9.1
   - rake
-  - rubygems-integration
-  ubuntu:
+  debian: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
-  - ri1.9.1
-  - libopenssl-ruby1.9.1
-  - rake
-  gentoo:
-  - dev-lang/ruby:1.9
   - rake
-  arch:
+  - rubygems-integration
+  arch: 
   - ruby
   - rake
-  fedora:
-    '17':
+ruby18: 
+  gentoo: 
+  - dev-lang/ruby:1.8
+  - rake
+  darwin: 
+  - ruby
+  - rb-rake
+  default: nonexistent
+  fedora: 
+    "15,16": 
     - ruby
     - rubygems
-  darwin:
-  - ruby19
+  debian,ubuntu: 
+  - ruby1.8-dev
+  - ruby1.8
+  - rubygems1.8
+  - ri1.8
+  - libopenssl-ruby1.8
   - rake
-  default: nonexistent
-ruby20: ignore
-build-essential:
-  debian,ubuntu: build-essential
-  gentoo: ignore
-  arch: ignore
-  fedora: ignore
-  darwin: ignore
 autobuild: gem
-autoproj: gem
-git:
-  debian:
-    lenny: git
-    default: git-core
-  ubuntu: git-core
-  gentoo: dev-vcs/git
-  arch: git
-  fedora: git
-  darwin: git-core
-svn:
-  debian,ubuntu: subversion
-  gentoo: dev-util/subversion
-  arch: subversion
-  fedora: subversion
-  darwin: subversion
-cmake:
-  debian,ubuntu: cmake
-  gentoo: dev-util/cmake
-  arch: cmake
-  fedora: cmake
-  darwin: cmake
-autotools:
-  debian,ubuntu:
-  - automake1.9
-  - autoconf
-  gentoo:
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  arch: automake autoconf
-  fedora:
-  - automake
-  - autoconf
-  darwin:
-  - automake
-  - autoconf
-lsb_release:
-  debian,ubuntu: lsb-release
-  gentoo: sys-apps/lsb-release
-  arch: ignore
-  fedora: redhat-lsb
-  darwin: ignore
-archive:
-  debian,ubuntu:
-  - tar
-  - unzip
-  gentoo:
+cvs: 
+  darwin: cvs
+  fedora: cvs
+  debian,ubuntu: cvs
+archive: 
+  gentoo: 
   - app-arch/tar
   - app-arch/unzip
-  arch:
+  darwin: 
+  - gnutar
+  - unzip
+  fedora: 
   - tar
   - unzip
-  fedora:
+  debian,ubuntu: 
   - tar
   - unzip
-  darwin:
-  - gnutar
+  arch: 
+  - tar
   - unzip
-cvs:
-  debian,ubuntu: cvs
-  fedora: cvs
-  darwin: cvs
+none: ignore
+autotools: 
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  darwin: 
+  - automake
+  - autoconf
+  fedora: 
+  - automake
+  - autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+  arch: automake autoconf
+git: 
+  gentoo: dev-vcs/git
+  darwin: git-core
+  fedora: git
+  ubuntu: git-core
+  debian: 
+    lenny: git
+    default: git-core
+  arch: git
 
 EODEFS
 
 Autoproj::OSDependencies.define_osdeps_mode_option
-osdeps_mode = Autoproj::OSDependencies.osdeps_mode
+osdeps_mode = Autoproj::OSDependencies.osdeps_mode.join(",")
 ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps_mode
 
 # First thing we do is install a proper ruby environment. We make sure that we