autoproj 1.9.7.rc3 → 1.9.7.rc4

data/bin/autoproj_bootstrap

@@ -235,14 +235,16 @@ fi
                     needs_locking, user_install_cmd, auto_install_cmd
             end
 
-            def generate_user_os_script(os_packages)
+            def generate_user_os_script(os_packages, options = Hash.new)
+                user_install_cmd = options[:user_install_cmd] || self.user_install_cmd
                 if user_install_cmd
                     (user_install_cmd % [os_packages.join("' '")])
                 else generate_auto_os_script(os_packages)
                 end
             end
 
-            def generate_auto_os_script(os_packages)
+            def generate_auto_os_script(os_packages, options = Hash.new)
+                auto_install_cmd = options[:auto_install_cmd] || self.auto_install_cmd
                 (auto_install_cmd % [os_packages.join("' '")])
             end
 
@@ -280,11 +282,11 @@ fi
                 false
             end
 
-            def install(packages)
+            def install(packages, options = Hash.new)
                 handled_os = OSDependencies.supported_operating_system?
                 if handled_os
-                    shell_script = generate_auto_os_script(packages)
-                    user_shell_script = generate_user_os_script(packages)
+                    shell_script = generate_auto_os_script(packages, options)
+                    user_shell_script = generate_user_os_script(packages, options)
                 end
                 if osdeps_interaction(packages, user_shell_script)
                     Autoproj.message "  installing OS packages: #{packages.sort.join(", ")}"
@@ -334,9 +336,28 @@ fi
         class ZypperManager < ShellScriptManager
             def initialize
                 super(['zypper'], true,
-                        "zypper -n install '%s'",
+                        "zypper install '%s'",
                         "zypper -n install '%s'")
             end
+
+            def install(packages)
+                patterns, packages = packages.partition { |pkg| pkg =~ /^@/ }
+                patterns = patterns.map { |str| str[1..-1] }
+                result = false
+                if !patterns.empty?
+                    result |= super(patterns,
+                                    :auto_install_cmd => "zypper --non-interactive install --type pattern '%s'",
+                                    :user_install_cmd => "zypper install --type pattern '%s'")
+                end
+                if !packages.empty?
+                    result |= super(packages)
+                end
+                if result
+                    # Invalidate caching of installed packages, as we just
+                    # installed new packages !
+                    @installed_packages = nil
+                end
+            end
         end
 
         # Package manager interface for systems that use yum
@@ -523,7 +544,7 @@ fi
             def install(gems)
                 guess_gem_program
 
-                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install']
+                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install', '--no-format-executable']
                 if !GemManager.with_doc
                     base_cmdline << '--no-rdoc' << '--no-ri'
                 end
@@ -2286,6 +2307,7 @@ ruby20:
   - ruby2.0-dev
   - rake
   - rubygems-integration
+  opensuse: ruby20-devel
   default: ignore
 ruby21:
   debian:
@@ -2300,7 +2322,9 @@ build-essential:
   arch,manjarolinux: base-dev
   fedora: ignore
   darwin: ignore
-  opensuse: ignore
+  opensuse:
+  - ! '@devel_C_C++'
+  - gcc-c++
 autobuild: gem
 autoproj: gem
 git:
@@ -2438,7 +2462,7 @@ end
 File.open('env.sh', 'w') do |io|
     io.write <<-EOSHELL
 export RUBYOPT=-rubygems
-export GEM_PATH=#{gem_path.join(":")}
+export GEM_PATH=#{gem_path}
 export GEM_HOME=#{gem_home}
 export PATH=$GEM_HOME/bin:$PATH
     EOSHELL

data/bin/autoproj_bootstrap.in

@@ -177,7 +177,7 @@ end
 File.open('env.sh', 'w') do |io|
     io.write <<-EOSHELL
 export RUBYOPT=-rubygems
-export GEM_PATH=#{gem_path.join(":")}
+export GEM_PATH=#{gem_path}
 export GEM_HOME=#{gem_home}
 export PATH=$GEM_HOME/bin:$PATH
     EOSHELL

data/lib/autoproj/default.osdeps

@@ -57,6 +57,7 @@ ruby20:
         - ruby2.0-dev
         - rake
         - rubygems-integration
+    opensuse: ruby20-devel
     default: ignore
 
 ruby21:
@@ -73,7 +74,7 @@ build-essential:
   arch,manjarolinux: base-dev
   fedora: ignore
   darwin: ignore
-  opensuse: ignore #Toto add scemata
+  opensuse: ["@devel_C_C++", "gcc-c++"]
 
 autobuild: gem
 autoproj: gem

data/lib/autoproj/osdeps.rb

@@ -119,14 +119,16 @@ fi
                     needs_locking, user_install_cmd, auto_install_cmd
             end
 
-            def generate_user_os_script(os_packages)
+            def generate_user_os_script(os_packages, options = Hash.new)
+                user_install_cmd = options[:user_install_cmd] || self.user_install_cmd
                 if user_install_cmd
                     (user_install_cmd % [os_packages.join("' '")])
                 else generate_auto_os_script(os_packages)
                 end
             end
 
-            def generate_auto_os_script(os_packages)
+            def generate_auto_os_script(os_packages, options = Hash.new)
+                auto_install_cmd = options[:auto_install_cmd] || self.auto_install_cmd
                 (auto_install_cmd % [os_packages.join("' '")])
             end
 
@@ -164,11 +166,11 @@ fi
                 false
             end
 
-            def install(packages)
+            def install(packages, options = Hash.new)
                 handled_os = OSDependencies.supported_operating_system?
                 if handled_os
-                    shell_script = generate_auto_os_script(packages)
-                    user_shell_script = generate_user_os_script(packages)
+                    shell_script = generate_auto_os_script(packages, options)
+                    user_shell_script = generate_user_os_script(packages, options)
                 end
                 if osdeps_interaction(packages, user_shell_script)
                     Autoproj.message "  installing OS packages: #{packages.sort.join(", ")}"
@@ -218,9 +220,28 @@ fi
         class ZypperManager < ShellScriptManager
             def initialize
                 super(['zypper'], true,
-                        "zypper -n install '%s'",
+                        "zypper install '%s'",
                         "zypper -n install '%s'")
             end
+
+            def install(packages)
+                patterns, packages = packages.partition { |pkg| pkg =~ /^@/ }
+                patterns = patterns.map { |str| str[1..-1] }
+                result = false
+                if !patterns.empty?
+                    result |= super(patterns,
+                                    :auto_install_cmd => "zypper --non-interactive install --type pattern '%s'",
+                                    :user_install_cmd => "zypper install --type pattern '%s'")
+                end
+                if !packages.empty?
+                    result |= super(packages)
+                end
+                if result
+                    # Invalidate caching of installed packages, as we just
+                    # installed new packages !
+                    @installed_packages = nil
+                end
+            end
         end
 
         # Package manager interface for systems that use yum
@@ -407,7 +428,7 @@ fi
             def install(gems)
                 guess_gem_program
 
-                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install']
+                base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem'), 'install', '--no-format-executable']
                 if !GemManager.with_doc
                     base_cmdline << '--no-rdoc' << '--no-ri'
                 end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc3"
+    VERSION = "1.9.7.rc4"
 end

metadata

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