autoproj 1.6.1.b1 → 1.6.1

data/History.txt

@@ -2,8 +2,9 @@
  * fix a limitation of giving directories on the command line. Before, only
    packages that were explicitely listed in the layout would be selected. Now,
    all packages are looked for -- even
- * fix Fedora and other flavors of Linux being (wrongly) detected as being
-   supported.
+ * fix Fedora and other flavors of Linux being (wrongly) detected as supported
+   OSes
+ * fix answering 'wait' at bootstrap time. This was rejected later on.
 
 = Version 1.6.0
  * starting this version, autoproj becomes the official build system for the

data/doc/guide/src/autoproj_bootstrap

@@ -191,6 +191,15 @@ module Autoproj
             end
         end
 
+        # Returns true if it is possible to install packages for the operating
+        # system on which we are installed
+        def self.supported_operating_system?
+            osdef = operating_system
+            return false if !osdef
+
+            OS_PACKAGE_INSTALL.has_key?(osdef[0])
+        end
+
         # Autodetects the operating system name and version
         #
         # +osname+ is the operating system name, all in lowercase (e.g. ubuntu,
@@ -266,10 +275,10 @@ module Autoproj
         EOSCRIPT
 
         OS_PACKAGE_INSTALL = {
-            'debian' => 'export DEBIAN_FRONTEND=noninteractive; apt-get install -y %s',
-            'ubuntu' => 'export DEBIAN_FRONTEND=noninteractive; apt-get install -y %s',
-            'gentoo' => 'emerge --noreplace %s',
-            'arch' => 'pacman -Sy --noconfirm %s'
+            'debian' => "export DEBIAN_FRONTEND=noninteractive; apt-get install -y '%s'",
+            'ubuntu' => "export DEBIAN_FRONTEND=noninteractive; apt-get install -y '%s'",
+            'gentoo' => "emerge --noreplace '%s'",
+            'arch' => "pacman -Sy --noconfirm '%s'"
         }
 
         NO_PACKAGE       = 0
@@ -396,7 +405,7 @@ module Autoproj
 
             "#! /bin/bash\n" +
             GAIN_ROOT_ACCESS + "\n" +
-                (OS_PACKAGE_INSTALL[os_name] % [os_packages.join(" ")]) +
+                (OS_PACKAGE_INSTALL[os_name] % [os_packages.join("' '")]) +
                 "\n" + shell_snippets.join("\n")
         end
 
@@ -533,14 +542,14 @@ module Autoproj
 
         # Requests the installation of the given set of packages
         def install(packages, package_osdeps = Hash.new)
-            os_def = OSDependencies.operating_system
+            handled_os = OSDependencies.supported_operating_system?
             osdeps, gems = partition_packages(packages, package_osdeps)
             gems = filter_uptodate_gems(gems)
             if osdeps.empty? && gems.empty?
                 return
             end
 
-            if automatic_osdeps_mode == AUTOMATIC && !os_def && !osdeps.empty?
+            if automatic_osdeps_mode == AUTOMATIC && !handled_os && !osdeps.empty?
                 puts
                 puts Autoproj.color("==============================", :bold)
                 puts Autoproj.color("The packages that will be built require some other software to be installed", :bold)
@@ -566,7 +575,7 @@ module Autoproj
                 end
 
                 if automatic_osdeps_mode == ASK
-                    if !os_def
+                    if !handled_os
                         if gems.empty?
                             # Nothing we can do, but the users required "ASK".
                             # So, at least, let him press enter
@@ -618,7 +627,7 @@ module Autoproj
 
             did_something = false
 
-            if os_def && !osdeps.empty?
+            if handled_os && !osdeps.empty?
                 shell_script = generate_os_script(osdeps)
                 if Autoproj.verbose
                     Autoproj.progress "Installing non-ruby OS dependencies with"
@@ -756,12 +765,11 @@ EODEFS
 if ENV['AUTOPROJ_AUTOMATIC_OSDEPS']
     automatic_osdeps = ENV['AUTOPROJ_AUTOMATIC_OSDEPS']
 else
-    operating_system = Autoproj::OSDependencies.operating_system
-    if !operating_system
+    if !Autoproj::OSDependencies.supported_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
+    himself. However, it does not handle your operating system (yet), and will
     therefore have to let you install the packages yourself.
 
     It can still install the RubyGems packages that are required by the built
@@ -807,12 +815,14 @@ else
             automatic_osdeps = true
         elsif answer == "no"
             automatic_osdeps = false
+        elsif answer == 'wait'
+            automatic_osdeps = :wait
         elsif answer == 'ask'
             automatic_osdeps = :ask
         elsif answer == 'yes'
             automatic_osdeps = true
         else
-            print "invalid answer. Please answer with 'yes', 'no' or 'ask' "
+            print "invalid answer. Please answer with 'yes', 'no', 'wait' or 'ask' "
             STDOUT.flush
         end
     end
@@ -853,20 +863,6 @@ rescue Autoproj::ConfigError => e
     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
-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
 export RUBYOPT=-rubygems
@@ -875,9 +871,26 @@ export PATH=$GEM_HOME/bin:$PATH
     EOSHELL
 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
+# If the user specifies "dev" on the command line, install the prerelease
+# version of autoproj. If it is "localdev", expect him to install autoproj and
+# run autoproj bootstrap manually.
+if ARGV.first != "localdev"
+    if ARGV.first == "dev"
+        Autoproj::OSDependencies.gem_with_prerelease = true
+        ARGV.shift
+    end
+    begin
+        osdeps_management.install(['autoproj'])
+    rescue Autoproj::ConfigError => e
+        STDERR.puts "failed: #{e.message}"
+        exit(1)
+    end
+    Autoproj::OSDependencies.gem_with_prerelease = false
+
+    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
 end
 

data/lib/autoproj/cmdline.rb

@@ -588,10 +588,14 @@ where 'mode' is one of:
                 end
                 opts.on("--os", "displays the operating system as detected by autoproj") do
                     os = OSDependencies.operating_system
-                    puts "name: #{os[0]}"
-                    puts "version:"
-                    os[1].each do |version_name|
-                        puts "  #{version_name}"
+                    if !os
+                        puts "no information about that OS"
+                    else
+                        puts "name: #{os[0]}"
+                        puts "version:"
+                        os[1].each do |version_name|
+                            puts "  #{version_name}"
+                        end
                     end
                     exit 0
                 end

data/lib/autoproj/osdeps.rb

@@ -189,10 +189,10 @@ module Autoproj
         EOSCRIPT
 
         OS_PACKAGE_INSTALL = {
-            'debian' => 'export DEBIAN_FRONTEND=noninteractive; apt-get install -y %s',
-            'ubuntu' => 'export DEBIAN_FRONTEND=noninteractive; apt-get install -y %s',
-            'gentoo' => 'emerge --noreplace %s',
-            'arch' => 'pacman -Sy --noconfirm %s'
+            'debian' => "export DEBIAN_FRONTEND=noninteractive; apt-get install -y '%s'",
+            'ubuntu' => "export DEBIAN_FRONTEND=noninteractive; apt-get install -y '%s'",
+            'gentoo' => "emerge --noreplace '%s'",
+            'arch' => "pacman -Sy --noconfirm '%s'"
         }
 
         NO_PACKAGE       = 0
@@ -319,7 +319,7 @@ module Autoproj
 
             "#! /bin/bash\n" +
             GAIN_ROOT_ACCESS + "\n" +
-                (OS_PACKAGE_INSTALL[os_name] % [os_packages.join(" ")]) +
+                (OS_PACKAGE_INSTALL[os_name] % [os_packages.join("' '")]) +
                 "\n" + shell_snippets.join("\n")
         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.1.b1"
+    VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 6629755
-  prerelease: true
+  hash: 13
+  prerelease: false
   segments: 
   - 1
   - 6
   - 1
-  - b1
-  version: 1.6.1.b1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -274,14 +273,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: autobuild