autoproj 2.0.0.rc30 → 2.0.0.rc31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11d96335f45757f964e4ab98d32c1a6a79ef8e5a
-  data.tar.gz: d391811655bfcedcebb48ab380417ab88ef71752
+  metadata.gz: 6f768ab32070ccf5661b6ef7e0713598cc32a2da
+  data.tar.gz: 6b9bc19bb4c653887479bdcafc512a7a8a308c19
 SHA512:
-  metadata.gz: d95c7ac9bd5637e8fcf4319b233bc194f5c596a61a7bc759969c9753edca2f5e3aa6130be5c513e48c53ac123eee29589fc2ca637ce4b4663da9aeeb0f8918ac
-  data.tar.gz: ac3ed377140d0715f658bfd81097e2dbc4cabb5c568bcc6b317bf15d197d81ea6040a7e91d2ab0fee16f07295bda0891cce1a5780cc489dc6b9d39ab00f6344b
+  metadata.gz: e0b7cb9352271cf11c4fb9f3d945fdafe5f8211dee6edb15c2320dfe7da6bf10c9a18e73ab77be7f1ce7e01979d8172a491738422819989a2a5f2df502e595bd
+  data.tar.gz: 3b59fac581a9e8ca86e342bd5799e49b381a6790fef9eb351258c39a653586a282fa54af79e25e6977dfcdc6a490981253ecf672108e91c2fc2bdea153799e60

data/lib/autoproj/manifest.rb

@@ -394,7 +394,16 @@ def definition_file(package_name)
             end
         end
 
+        # @deprecated use {#find_package_definition} instead
         def find_package(name)
+            find_package_definition(name)
+        end
+
+        # The autoproj description of a package by its name
+        #
+        # @param [String,#name] name the package name
+        # @return [PackageDefinition,nil]
+        def find_package_definition(name)
             if name.respond_to?(:name)
                 name = name.name
             end
@@ -402,16 +411,17 @@ def find_package(name)
             packages[name.to_str]
         end
 
+        # The autobuild description of a package by its name
+        #
+        # @param [String,#name] name the package name
+        # @return [Autobuild::Package,nil]
         def find_autobuild_package(name)
-            if name.respond_to?(:name)
-                name = name.name
-            end
-
-            if pkg = packages[name.to_str]
+            if pkg = find_package(name)
                 pkg.autobuild
             end
         end
 
+        # @deprecated use {#find_package} instead
         def package(name)
             find_package(name)
         end
@@ -427,9 +437,7 @@ def each_package(&block)
         #
         # @yieldparam [PackageDefinition] pkg
         def each_package_definition(&block)
-            if !block_given?
-                return enum_for(:each_package_definition)
-            end
+            return enum_for(__method__) if !block_given?
             packages.each_value(&block)
         end
 
@@ -438,7 +446,7 @@ def each_package_definition(&block)
         # @yieldparam [Autobuild::Package] pkg
         def each_autobuild_package
             return enum_for(__method__) if !block_given?
-            packages.each_value { |pkg| yield(pkg.autobuild) }
+            each_package_definition { |pkg| yield(pkg.autobuild) }
         end
 
         # @deprecated use Ops::Tools.create_autobuild_package or include

data/lib/autoproj/os_package_installer.rb

@@ -320,15 +320,20 @@ def install(osdep_packages, install_only: false, **options)
 
             setup_package_managers(**options)
 
+            managers = package_managers.dup
             packages = os_package_resolver.resolve_os_packages(osdep_packages)
             packages = packages.map do |handler_name, list|
-                if manager = package_managers[handler_name]
+                if manager = managers.delete(handler_name)
                     [manager, list]
                 else
                     raise ArgumentError, "no package manager called #{handler_name} found"
                 end
             end
 
+            managers.each_value do |pkg_manager|
+                packages << [pkg_manager, []]
+            end
+
             # Install OS packages first, as the other package handlers might
             # depend on OS packages
             os_packages, other_packages = packages.partition do |handler, list|
@@ -337,7 +342,7 @@ def install(osdep_packages, install_only: false, **options)
             [os_packages, other_packages].each do |packages|
                 packages.each do |handler, list|
                     list = list.to_set - installed_resolved_packages[handler]
-                    next if list.empty?
+                    next if list.empty? && !handler.call_while_empty?
 
                     handler.install(
                         list.to_a,

data/lib/autoproj/package_managers/apt_dpkg_manager.rb

@@ -9,8 +9,8 @@ def initialize(ws, status_file = "/var/lib/dpkg/status")
                 @status_file = status_file
                 @installed_packages = nil
                 super(ws, true,
-                      "apt-get install '%s'",
-                      "export DEBIAN_FRONTEND=noninteractive; apt-get install -y '%s'")
+                      %w{apt-get install},
+                      %w{DEBIAN_FRONTEND=noninteractive apt-get install -y})
             end
 
             # On a dpkg-enabled system, checks if the provided package is installed

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -24,6 +24,11 @@ def self.with_prerelease(*value)
                 end
             end
 
+            def initialize(ws)
+                super
+                self.call_while_empty = true
+            end
+
             # Filters all paths that come from other autoproj installations out
             # of GEM_PATH
             def initialize_environment

data/lib/autoproj/package_managers/emerge_manager.rb

@@ -5,8 +5,8 @@ module PackageManagers
         class EmergeManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                        "emerge '%s'",
-                        "emerge --noreplace '%s'")
+                        %w{emerge},
+                        %w{emerge --noreplace})
             end
         end
     end

data/lib/autoproj/package_managers/homebrew_manager.rb

@@ -5,8 +5,8 @@ module PackageManagers
         class HomebrewManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                        "brew install '%s'",
-                        "brew install '%s'",
+                        %w{brew install},
+                        %w{brew install},
                         false)
             end
 

data/lib/autoproj/package_managers/manager.rb

@@ -16,6 +16,9 @@ def enabled?; !!@enabled end
             attr_writer :silent
             def silent?; !!@silent end
 
+            attr_writer :call_while_empty
+            def call_while_empty?; !!@call_while_empty end
+
             # Create a package manager registered with various names
             #
             # @param [Array<String>] names the package manager names. It MUST be
@@ -25,6 +28,7 @@ def initialize(ws)
                 @ws = ws
                 @enabled = true
                 @silent = true
+                @call_while_empty = false
             end
 
             # The primary name for this package manager

data/lib/autoproj/package_managers/pacman_manager.rb

@@ -5,8 +5,8 @@ module PackageManagers
         class PacmanManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                        "pacman -Sy --needed '%s'",
-                        "pacman -Sy --needed --noconfirm '%s'")
+                        %w{pacman -Sy --needed},
+                        %w{pacman -Sy --needed --noconfirm})
             end
         end
     end

data/lib/autoproj/package_managers/pkg_manager.rb

@@ -5,8 +5,8 @@ module PackageManagers
         class PkgManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                        "pkg install -y '%s'",
-                        "pkg install -y '%s'")
+                        %w{pkg install -y},
+                        %w{pkg install -y})
             end
         end
     end

data/lib/autoproj/package_managers/port_manager.rb

@@ -5,8 +5,8 @@ module PackageManagers
         class PortManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                        "port install '%s'",
-                        "port install '%s'")
+                        %w{port install},
+                        %w{port install})
             end
         end
     end

data/lib/autoproj/package_managers/shell_script_manager.rb

@@ -3,7 +3,7 @@ module PackageManagers
         # Base class for all package managers that simply require the call of a
         # shell script to install packages (e.g. yum, apt, ...)
         class ShellScriptManager < Manager
-            def self.execute(script, with_locking, with_root)
+            def self.execute(command_line, with_locking, with_root)
                 if with_locking
                     File.open('/tmp/autoproj_osdeps_lock', 'w') do |lock_io|
                         begin
@@ -11,30 +11,20 @@ def self.execute(script, with_locking, with_root)
                                 Autoproj.message "  waiting for other autoproj instances to finish their osdeps installation"
                                 sleep 5
                             end
-                            return execute(script, false,with_root)
+                            return execute(command_line, false, with_root)
                         ensure
                             lock_io.flock(File::LOCK_UN)
                         end
                     end
                 end
                 
-                sudo = Autobuild.tool_in_path('sudo')
-                Tempfile.open('osdeps_sh') do |io|
-                    io.puts "#! /bin/bash"
-                    io.puts GAIN_ROOT_ACCESS % [sudo] if with_root
-                    io.write script
-                    io.flush
-                    Autobuild::Subprocess.run 'autoproj', 'osdeps', '/bin/bash', io.path
+                if with_root
+                    sudo = Autobuild.tool_in_path('sudo')
+                    command_line = [sudo, *command_line]
                 end
-            end
-
-            GAIN_ROOT_ACCESS = <<-EOSCRIPT
-# Gain root access using sudo
-if test `id -u` != "0"; then
-    exec %s /bin/bash $0 "$@"
 
-fi
-            EOSCRIPT
+                Autobuild::Subprocess.run 'autoproj', 'osdeps', *command_line
+            end
 
             # Overrides the {#needs_locking?} flag
             attr_writer :needs_locking
@@ -110,7 +100,7 @@ def initialize(ws, needs_locking, user_install_cmd, auto_install_cmd,needs_root=
             #   {#user_install_cmd]
             def generate_user_os_script(os_packages, user_install_cmd: self.user_install_cmd)
                 if user_install_cmd
-                    (user_install_cmd % [os_packages.join("' '")])
+                    user_install_cmd.join(" ") + " " + os_packages.join("' '")
                 else generate_auto_os_script(os_packages)
                 end
             end
@@ -125,7 +115,7 @@ def generate_user_os_script(os_packages, user_install_cmd: self.user_install_cmd
             #   If given, it overrides the default value stored in
             #   {#auto_install_cmd]
             def generate_auto_os_script(os_packages, auto_install_cmd: self.auto_install_cmd)
-                (auto_install_cmd % [os_packages.join("' '")])
+                auto_install_cmd.join(" ") + " " + os_packages.join("' '")
             end
 
             # Handles interaction with the user
@@ -197,7 +187,8 @@ def install(packages, filter_uptodate_packages: false, install_only: false,
                         Autoproj.message "Generating installation script for non-ruby OS dependencies"
                         Autoproj.message shell_script
                     end
-                    ShellScriptManager.execute(shell_script, needs_locking?,needs_root?)
+
+                    ShellScriptManager.execute([*auto_install_cmd, *packages], needs_locking?, needs_root?)
                     return true
                 end
                 false

data/lib/autoproj/package_managers/yum_manager.rb

@@ -4,8 +4,8 @@ module PackageManagers
         class YumManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                      "yum install '%s'",
-                      "yum install -y '%s'")
+                      %w{yum install},
+                      %w{yum install -y})
             end
 
             def filter_uptodate_packages(packages)

data/lib/autoproj/package_managers/zypper_manager.rb

@@ -4,8 +4,8 @@ module PackageManagers
         class ZypperManager < ShellScriptManager
             def initialize(ws)
                 super(ws, true,
-                        "zypper install '%s'",
-                        "zypper -n install '%s'")
+                        %w{zypper install},
+                        %w{zypper -n install})
             end
 
             def filter_uptodate_packages(packages)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc30"
+    VERSION = "2.0.0.rc31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc30
+  version: 2.0.0.rc31
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild