autoproj 1.9.7.rc7 → 1.9.7.rc9

data/bin/autoproj_bootstrap

@@ -317,8 +317,8 @@ fi
         class PacmanManager < ShellScriptManager
             def initialize
                 super(['pacman'], true,
-                        "pacman '%s'",
-                        "pacman -Sy --noconfirm '%s'")
+                        "pacman -Sy --needed '%s'",
+                        "pacman -Sy --needed --noconfirm '%s'")
             end
         end
 
@@ -499,6 +499,15 @@ fi
             def self.gem_home
                 ENV['AUTOPROJ_GEM_HOME'] || File.join(Autoproj.root_dir, ".gems")
             end
+            
+            # Returns the set of default options that are added to gem
+            #
+            # By default, we add --no-user-install to un-break distributions
+            # like Arch that set --user-install by default (thus disabling the
+            # role of GEM_HOME)
+            def self.default_install_options
+                @default_install_options ||= ['--no-user-install', '--no-format-executable']
+            end
 
             def initialize
                 super(['gem'])
@@ -544,7 +553,7 @@ fi
             def install(gems)
                 guess_gem_program
 
-                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install', '--no-format-executable']
+                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install', *GemManager.default_install_options]
                 if !GemManager.with_doc
                     base_cmdline << '--no-rdoc' << '--no-ri'
                 end
@@ -856,7 +865,6 @@ fi
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
             'arch' => 'pacman',
-            'manjarolinux' => 'pacman',
             'fedora' => 'yum',
             'darwin' => 'port',
             'opensuse' => 'zypper'
@@ -1043,7 +1051,7 @@ fi
                     @operating_system = [names.split(','), versions.split(',')]
                 end
             else
-                Autoproj.message "  autodetecting the operating system"
+                Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
                 lsb_name, lsb_versions = os_from_lsb
                 if lsb_name
                     if lsb_name != 'debian' && File.exists?("/etc/debian_version")
@@ -1111,7 +1119,10 @@ fi
 
             @operating_system = [names, versions]
             Autoproj.change_option('operating_system', @operating_system, true)
+            Autobuild.progress :operating_system_autodetection, "operating system: #{(names - ['default']).join(",")} - #{(versions - ['default']).join(",")}"
             @operating_system
+        ensure
+            Autobuild.progress_done :operating_system_autodetection
         end
 
         def self.os_from_lsb

data/lib/autoproj/osdeps.rb

@@ -201,8 +201,8 @@ fi
         class PacmanManager < ShellScriptManager
             def initialize
                 super(['pacman'], true,
-                        "pacman '%s'",
-                        "pacman -Sy --noconfirm '%s'")
+                        "pacman -Sy --needed '%s'",
+                        "pacman -Sy --needed --noconfirm '%s'")
             end
         end
 
@@ -383,6 +383,15 @@ fi
             def self.gem_home
                 ENV['AUTOPROJ_GEM_HOME'] || File.join(Autoproj.root_dir, ".gems")
             end
+            
+            # Returns the set of default options that are added to gem
+            #
+            # By default, we add --no-user-install to un-break distributions
+            # like Arch that set --user-install by default (thus disabling the
+            # role of GEM_HOME)
+            def self.default_install_options
+                @default_install_options ||= ['--no-user-install', '--no-format-executable']
+            end
 
             def initialize
                 super(['gem'])
@@ -428,7 +437,7 @@ fi
             def install(gems)
                 guess_gem_program
 
-                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install', '--no-format-executable']
+                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install', *GemManager.default_install_options]
                 if !GemManager.with_doc
                     base_cmdline << '--no-rdoc' << '--no-ri'
                 end
@@ -740,7 +749,6 @@ fi
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
             'arch' => 'pacman',
-            'manjarolinux' => 'pacman',
             'fedora' => 'yum',
             'darwin' => 'port',
             'opensuse' => 'zypper'
@@ -927,7 +935,7 @@ fi
                     @operating_system = [names.split(','), versions.split(',')]
                 end
             else
-                Autoproj.message "  autodetecting the operating system"
+                Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
                 lsb_name, lsb_versions = os_from_lsb
                 if lsb_name
                     if lsb_name != 'debian' && File.exists?("/etc/debian_version")
@@ -995,7 +1003,10 @@ fi
 
             @operating_system = [names, versions]
             Autoproj.change_option('operating_system', @operating_system, true)
+            Autobuild.progress :operating_system_autodetection, "operating system: #{(names - ['default']).join(",")} - #{(versions - ['default']).join(",")}"
             @operating_system
+        ensure
+            Autobuild.progress_done :operating_system_autodetection
         end
 
         def self.os_from_lsb

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc7"
+    VERSION = "1.9.7.rc9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc7
+  version: 1.9.7.rc9
   prerelease: 6
 platform: ruby
 authors: