autoproj 1.6.0.rc5 → 1.6.0.rc6

data/bin/autoproj

@@ -13,7 +13,6 @@ require 'autoproj/cmdline'
 include Autoproj
 
 InputError = Autoproj::InputError
-selected_packages = Autoproj::CmdLine.parse_arguments(ARGV.dup)
 
 def color(*args)
     Autoproj.console.color(*args)
@@ -28,11 +27,13 @@ def report(debug)
 rescue ConfigError => e
     STDERR.puts
     STDERR.puts color(e.message, :red, :bold)
-    root_dir = /^#{Regexp.quote(Autoproj.root_dir)}(?!\/\.gems)/
-    e.backtrace.find_all { |path| path =~ root_dir }.
-        each do |path|
-            STDERR.puts color("  in #{path}", :red, :bold)
-        end
+    if Autoproj.in_autoproj_installation?(Dir.pwd)
+        root_dir = /^#{Regexp.quote(Autoproj.root_dir)}(?!\/\.gems)/
+        e.backtrace.find_all { |path| path =~ root_dir }.
+            each do |path|
+                STDERR.puts color("  in #{path}", :red, :bold)
+            end
+    end
     if debug then raise
     else exit 1
     end
@@ -48,6 +49,27 @@ Autoproj::OSDependencies.autodetect_ruby
 
 # Find the autoproj root dir
 report(Autobuild.debug) do
+    selected_packages =
+        begin Autoproj::CmdLine.parse_arguments(ARGV.dup)
+        rescue Exception => e
+            if Autoproj::CmdLine.bootstrap? && !Autoproj.in_autoproj_installation?(Dir.pwd)
+                STDERR.puts <<EOTEXT
+
+
+#{color('autoproj bootstrap failed', :red, :bold)}
+To retry, first source the env.sh script with
+  source #{Dir.pwd}/env.sh
+and then re-run autoproj bootstrap with
+  autoproj bootstrap <vcs_type> <vcs_url> <vcs_options>
+
+where
+  'vcs_type' is git, svn, darcs, cvs
+  'vcs_url' is the vcs-specific URL to the repository, and
+  'vcs_options' are optional values that can be given to the chosen VCS
+EOTEXT
+            end
+            raise
+        end
 
     # Expand directories in the selected_packages set, before we chdir to the
     # autoproj root
@@ -83,6 +105,30 @@ report(Autobuild.debug) do
     if Autoproj.verbose || Autoproj::CmdLine.display_configuration?
         Autoproj::CmdLine.display_sources(manifest)
     end
+    
+    if Autoproj::CmdLine.bootstrap?
+        STDERR.puts <<EOTEXT
+
+
+#{color('autoproj bootstrap successfully finished', :green, :bold)}
+
+#{color('To further use autoproj and the installed software', :bold)}, you
+must add the following line at the bottom of your .bashrc:
+  source #{Dir.pwd}/env.sh
+
+WARNING: autoproj will not work until your restart all
+your consoles, or run the following in them:
+  $ source #{Dir.pwd}/env.sh
+
+#{color('To import and build the packages', :bold)}, you can now run
+  autoproj update
+  autoproj build
+
+The resulting software is installed in
+  #{Dir.pwd}/install
+
+EOTEXT
+    end
 
     if Autoproj::CmdLine.only_config?
         exit(0)

data/doc/guide/src/autoproj_bootstrap

@@ -565,9 +565,18 @@ module Autoproj
                     puts
                 end
 
-                if automatic_osdeps_mode == ASK && (os_def || !gems.empty?)
+                if automatic_osdeps_mode == ASK
                     if !os_def
-                        print "Should I install the RubyGems packages ? [yes] "
+                        if gems.empty?
+                            # Nothing we can do, but the users required "ASK".
+                            # So, at least, let him press enter
+                            print "There are external packages, but I can't install them on this OS. Press ENTER to continue"
+                            STDOUT.flush
+                            STDIN.readline
+                            do_osdeps = false
+                        else
+                            print "Should I install the RubyGems packages ? [yes] "
+                        end
                     else
                         print "Should I install these packages ? [yes] "
                     end
@@ -641,7 +650,7 @@ module Autoproj
                 end
 
                 cmdline = [Autobuild.tool('gem'), 'install']
-                if Autobuild::OSDependencies.gem_with_prerelease
+                if Autoproj::OSDependencies.gem_with_prerelease
                     cmdline << "--prerelease"
                 end
                 cmdline.concat(gems)
@@ -660,50 +669,16 @@ end
 
 DEFS = <<EODEFS
 --- 
-svn: 
-  arch: subversion
-  gentoo: dev-util/subversion
-  debian,ubuntu: subversion
-autobuild: gem
-zlib: 
-  debian,ubuntu: zlib1g-dev
-libxml2: 
-  arch: libxml2
-  gentoo: dev-libs/libxml2
-  debian,ubuntu: libxml2-dev
 none: ignore
-autotools: 
-  arch: automake autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-autoproj: gem
-archive: 
-  arch: 
-  - tar
-  - unzip
-  gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-  debian,ubuntu: 
-  - tar
-  - unzip
-lsb_release: 
-  arch: 
-  gentoo: sys-apps/lsb-release
-  debian,ubuntu: lsb-release
 ruby18: 
-  gentoo: 
-  - dev-lang/ruby:1.8
   debian,ubuntu: 
   - ruby1.8-dev
   - ruby1.8
   - rubygems1.8
   - ri1.8
   - libopenssl-ruby1.8
+  gentoo: 
+  - dev-lang/ruby:1.8
 ruby19: 
   debian: 
     squeeze,sid: 
@@ -714,96 +689,135 @@ ruby19:
     - ruby1.9.1
     - ruby1.9.1-dev
     - rubygems1.9.1
-  arch: 
-  - ruby
-  gentoo: 
-  - dev-lang/ruby:1.9
   ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - ri1.9.1
   - libopenssl-ruby1.9.1
+  gentoo: 
+  - dev-lang/ruby:1.9
+  arch: 
+  - ruby
+rdoc: gem
+build-essential: 
+  debian,ubuntu: build-essential
+  gentoo: 
+  arch: 
+libxml2: 
+  debian,ubuntu: libxml2-dev
+  gentoo: dev-libs/libxml2
+  arch: libxml2
+libxslt: 
+  debian,ubuntu: libxslt1-dev
+  gentoo: dev-libs/libxslt
+  arch: libxslt
+zlib: 
+  debian,ubuntu: zlib1g-dev
+autobuild: gem
+autoproj: gem
 git: 
-  arch: git
-  gentoo: dev-vcs/git
   debian,ubuntu: git-core
+  gentoo: dev-vcs/git
+  arch: git
+svn: 
+  debian,ubuntu: subversion
+  gentoo: dev-util/subversion
+  arch: subversion
 cmake: 
-  arch: cmake
-  gentoo: dev-util/cmake
   debian,ubuntu: cmake
-build-essential: 
+  gentoo: dev-util/cmake
+  arch: cmake
+autotools: 
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  arch: automake autoconf
+lsb_release: 
+  debian,ubuntu: lsb-release
+  gentoo: sys-apps/lsb-release
   arch: 
+archive: 
+  debian,ubuntu: 
+  - tar
+  - unzip
   gentoo: 
-  debian,ubuntu: build-essential
-libxslt: 
-  arch: libxslt
-  gentoo: dev-libs/libxslt
-  debian,ubuntu: libxslt1-dev
-rdoc: gem
+  - app-arch/tar
+  - app-arch/unzip
+  arch: 
+  - tar
+  - unzip
 
 EODEFS
 
-operating_system = Autoproj::OSDependencies.operating_system
-if !operating_system
-    puts <<-EOT
-
-autoproj is usually able to handle the installation of operating system packages
-himself. However, it does not know about your operating system, and will
-therefore have to let you install the packages yourself.
+if ENV['AUTOPROJ_AUTOMATIC_OSDEPS']
+    automatic_osdeps = ENV['AUTOPROJ_AUTOMATIC_OSDEPS']
+else
+    operating_system = Autoproj::OSDependencies.operating_system
+    if !operating_system
+        puts <<-EOT
 
-It can still install the RubyGems packages that are required by the built
-packages.
+    autoproj is usually able to handle the installation of operating system packages
+    himself. However, it does not know about your operating system, and will
+    therefore have to let you install the packages yourself.
 
-If you answer 'no' to the following question, autoproj will always go on,
-assuming that all the required dependencies are already installed. If you answer
-'yes', it will make sure that the RubyGems are installed himself, but it will
-assume that you took care of the other packages. If you answer 'wait', it will
-not install anything but will wait for you to press ENTER each time some
-external software is needed. Finally, if you answer 'ask', it will ask you each
-time what it should do when there is something to install
+    It can still install the RubyGems packages that are required by the built
+    packages.
 
-    EOT
+    If you answer 'no' to the following question, autoproj will always go on,
+    assuming that all the required dependencies are already installed. If you answer
+    'yes', it will make sure that the RubyGems are installed himself, but it will
+    assume that you took care of the other packages. If you answer 'wait', it will
+    not install anything but will wait for you to press ENTER each time some
+    external software is needed. Finally, if you answer 'ask', it will ask you each
+    time what it should do when there is something to install
 
-    print "How should autoproj install RubyGems packages automatically (yes, no, wait or ask) ? [yes] "
-    STDOUT.flush
-else
-    # Before doing *anything*, we have to ask the user if he wants us to install
-    # the osdeps ...
-    puts <<-EOT
-
-autoproj is able to handle the installation of operating system packages
-himself. This functionality will use 'sudo' to gain root access each time
-it is needed.
-
-If you answer 'no' to the following question, autoproj will go on, assuming that
-all the required dependencies are already installed. If you answer 'yes', it
-will make sure that they are installed himself. If you answer 'wait', it will
-not install anything but wait for you to press ENTER each time some external
-software is needed.  Finally, if you answer 'ask', it will ask you what it
-should do each time there is something to install.
-
-    EOT
-    print "Should autoproj install OS packages automatically (yes, no, wait or ask) ? [yes] "
-    STDOUT.flush
-end
+        EOT
 
-automatic_osdeps = nil
-while automatic_osdeps.nil?
-    answer = STDIN.readline.chomp
-    if answer == ''
-        automatic_osdeps = true
-    elsif answer == "no"
-        automatic_osdeps = false
-    elsif answer == 'ask'
-        automatic_osdeps = :ask
-    elsif answer == 'yes'
-        automatic_osdeps = true
+        print "How should autoproj install RubyGems packages automatically (yes, no, wait or ask) ? [yes] "
+        STDOUT.flush
     else
-        print "invalid answer. Please answer with 'yes', 'no' or 'ask' "
+        # Before doing *anything*, we have to ask the user if he wants us to install
+        # the osdeps ...
+        puts <<-EOT
+
+    autoproj is able to handle the installation of operating system packages
+    himself. This functionality will use 'sudo' to gain root access each time
+    it is needed.
+
+    If you answer 'no' to the following question, autoproj will go on, assuming that
+    all the required dependencies are already installed. If you answer 'yes', it
+    will make sure that they are installed himself. If you answer 'wait', it will
+    not install anything but wait for you to press ENTER each time some external
+    software is needed.  Finally, if you answer 'ask', it will ask you what it
+    should do each time there is something to install.
+
+        EOT
+        print "Should autoproj install OS packages automatically (yes, no, wait or ask) ? [yes] "
         STDOUT.flush
     end
+
+    automatic_osdeps = nil
+    while automatic_osdeps.nil?
+        answer = STDIN.readline.chomp
+        if answer == ''
+            automatic_osdeps = true
+        elsif answer == "no"
+            automatic_osdeps = false
+        elsif answer == 'ask'
+            automatic_osdeps = :ask
+        elsif answer == 'yes'
+            automatic_osdeps = true
+        else
+            print "invalid answer. Please answer with 'yes', 'no' or 'ask' "
+            STDOUT.flush
+        end
+    end
 end
+
 Autoproj.config['automatic_osdeps'] =
     automatic_osdeps
 
@@ -823,32 +837,35 @@ rescue Autoproj::ConfigError => e
 end
 
 # Now try to find out the name of the gem binary
-PACKAGES      = %w{rdoc libxml2 libxslt zlib build-essential lsb_release}
-USER_PACKAGES = %w{autoproj}
+PACKAGES      = %w{rdoc autobuild libxml2 libxslt zlib build-essential lsb_release}
 
 ENV['RUBYOPT']  = "-rubygems"
 require 'rubygems'
 
-packages = PACKAGES + USER_PACKAGES
-
+osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
+STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
+# First install the dependencies of autoproj, as we don't want them to be
+# affected by the prerelease flag
 begin
-    osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
-    STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
-    osdeps_management.install(packages)
+    osdeps_management.install(PACKAGES)
 rescue Autoproj::ConfigError => e
     STDERR.puts "failed: #{e.message}"
     exit(1)
 end
 
+# If the user specifies "dev" on the command line, install the prerelease
+# version of autoproj
 if ARGV.first == "dev"
     Autoproj::OSDependencies.gem_with_prerelease = true
+    ARGV.shift
 end
-
-ENV['AUTOPROJ_AUTOMATIC_OSDEPS'] = automatic_osdeps.to_s
-if !system('autoproj', 'bootstrap', *ARGV)
-    STDERR.puts "ERROR: failed to run autoproj bootstrap #{ARGV.join(", ")}"
-    exit 1
+begin
+    osdeps_management.install('autoproj')
+rescue Autoproj::ConfigError => e
+    STDERR.puts "failed: #{e.message}"
+    exit(1)
 end
+Autoproj::OSDependencies.gem_with_prerelease = false
 
 File.open('env.sh', 'w') do |io|
     io.write <<-EOSHELL
@@ -858,15 +875,9 @@ export PATH=$GEM_HOME/bin:$PATH
     EOSHELL
 end
 
-STDERR.puts <<EOTEXT
-
-
-add the following line at the bottom of your .bashrc:
-  source #{Dir.pwd}/env.sh
-
-WARNING: autoproj will not work until your restart all
-your consoles, or run the following in them:
-  $ source #{Dir.pwd}/env.sh
-
-EOTEXT
+ENV['AUTOPROJ_AUTOMATIC_OSDEPS'] = automatic_osdeps.to_s
+if !system('autoproj', 'bootstrap', *ARGV)
+    STDERR.puts "ERROR: failed to run autoproj bootstrap #{ARGV.join(", ")}"
+    exit 1
+end
 

data/lib/autoproj/cmdline.rb

@@ -496,6 +496,7 @@ OS dependencies through autoproj.
         end
 
         def self.manifest; Autoproj.manifest end
+        def self.bootstrap?; !!@bootstrap end
         def self.only_status?; !!@only_status end
         def self.check?; !!@check end
         def self.manifest_update?; !!@manifest_update end
@@ -665,8 +666,18 @@ where 'mode' is one of:
         end
 
         def self.handle_mode(mode, remaining_args)
+            case mode
+            when "update-sets"
+                Autoproj.warn("update-sets is deprecated. Use update-config instead")
+                mode = "update-config"
+            when "list-sets"
+                Autoproj.warn("list-sets is deprecated. Use list-config instead")
+                mode = "list-config"
+            end
+
             case mode
             when "bootstrap"
+                @bootstrap = true
                 bootstrap(*remaining_args)
                 remaining_args.clear
 
@@ -674,6 +685,7 @@ where 'mode' is one of:
                 Autobuild.do_build = false
                 Autobuild.do_update = false
                 @update_os_dependencies = false
+                @only_config = true
 
             when "switch-config"
                 # We must switch to the root dir first, as it is required by the
@@ -731,13 +743,7 @@ where 'mode' is one of:
                 Autobuild.do_update = true
                 @update_os_dependencies = false
                 Autobuild.do_build = false
-            when "update-sets" # provided for backward compatibility
-                Autoproj.warn("update-sets is deprecated. Use update-config instead")
-                @only_config = true
-                Autobuild.do_update = true
-                @update_os_dependencies = false
-                Autobuild.do_build = false
-            when "list", "list-sets"
+            when "list-config"
                 @only_config = true
                 @display_configuration = true
                 Autobuild.do_update = false
@@ -960,11 +966,14 @@ manifest_source:
             end
             Autobuild.logdir = File.join('build', 'log')
 
-            # Check if we are being called from another GEM_HOME. If it is the case,
-            # assume that we are bootstrapping from another installation directory and
-            # start by copying the .gems directory
-            needed_gem_home = Autoproj.gem_home
-            if ENV['GEM_HOME'] && ENV['GEM_HOME'] =~ /\.gems\/?$/ && ENV['GEM_HOME'] != needed_gem_home
+            # Check if GEM_HOME is set. If it is the case, assume that we are
+            # bootstrapping from another installation directory and start by
+            # copying the .gems directory
+            #
+            # We don't use Autoproj.gem_home there as we might not be in an
+            # autoproj directory at all
+            if ENV['GEM_HOME'] && Autoproj.in_autoproj_installation?(ENV['GEM_HOME']) &&
+                ENV['GEM_HOME'] != ENV['AUTOPROJ_GEM_HOME']
                 Autoproj.progress "autoproj: reusing bootstrap from #{File.dirname(ENV['GEM_HOME'])}"
                 FileUtils.cp_r ENV['GEM_HOME'], ".gems"
                 ENV['GEM_HOME'] = File.join(Dir.pwd, ".gems")
@@ -1005,22 +1014,11 @@ manifest_source:
             # Finally, generate an env.sh script
             File.open('env.sh', 'w') do |io|
                 io.write <<-EOSHELL
-        export RUBYOPT=-rubygems
-        export GEM_HOME=#{Autoproj.gem_home}
-        export PATH=$GEM_HOME/bin:$PATH
+export RUBYOPT=-rubygems
+export GEM_HOME=#{Autoproj.gem_home}
+export PATH=$GEM_HOME/bin:$PATH
                 EOSHELL
             end
-
-            Autoproj.progress <<EOTEXT
-
-add the following line at the bottom of your .bashrc:
-  source #{Dir.pwd}/env.sh
-
-WARNING: autoproj will not work until your restart all
-your consoles, or run the following in them:
-  $ source #{Dir.pwd}/env.sh
-
-EOTEXT
         end
 
         def self.missing_dependencies(pkg)

data/lib/autoproj/system.rb

@@ -1,12 +1,19 @@
 module Autoproj
     class UserError < RuntimeError; end
 
+    # Returns true if +path+ is part of an autoproj installation
+    def self.in_autoproj_installation?(path)
+        root_dir(File.expand_path(path))
+        true
+    rescue UserError
+        false
+    end
+
     # Returns the root directory of the current autoproj installation.
     #
     # If the current directory is not in an autoproj installation,
     # raises UserError.
-    def self.root_dir
-        dir = Dir.pwd
+    def self.root_dir(dir = Dir.pwd)
         while dir != "/" && !File.directory?(File.join(dir, "autoproj"))
             dir = File.dirname(dir)
         end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.0.rc5"
+    VERSION = "1.6.0.rc6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 977940586
+  hash: 977940587
   prerelease: true
   segments: 
   - 1
   - 6
   - 0
-  - rc5
-  version: 1.6.0.rc5
+  - rc6
+  version: 1.6.0.rc6
 platform: ruby
 authors: 
 - Sylvain Joyeux