autoproj 2.0.0.rc10 → 2.0.0.rc11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a776d75893c24ae1bef6e5ac4063225e21c0bc
-  data.tar.gz: cc366c1d942136097608100172b8d1b559c14dd1
+  metadata.gz: e6381f80415323f5ad799fe1c75765244b7a363e
+  data.tar.gz: efebe68499b6ca24e0e21ad6d7753b9cad36f11c
 SHA512:
-  metadata.gz: b2d3ebc0d936f867e600e6b77b8711954b36522be806f2772172fad01a7d68cc5fbd6da1e2587c79e3c79f2407e0d3572b1060a899bf748376f29833f5070c9d
-  data.tar.gz: e6c5e0572ac7ffdabdb2cc0d1e93dfda7be46cd607394ed772dbccadba97bb8abcf801816fe07ca6ca08ba80e9fa4bedaf933109c7b4fa5ec6af3715880013af
+  metadata.gz: baf063f359e48c6b64276409753c8cae38544a144597558640c45a8962b9cfbceed3e9d617697e3988dfb5f30b543416398024758447d55cff9947c548a7e575
+  data.tar.gz: c0859c77140d14dfcbaf3c18b280d49ad25f50336e2e18b30c9c895757a2a7f9a3394ace2fd1aa4b7f5a1a6ae5c5433ecadb9784f19e837a7eae1d7f3a441caf

data/bin/autoproj_bootstrap

@@ -49,7 +49,7 @@ module Autoproj
             end
 
             def env_for_child
-                env.inject(Hash.new) do |h, (k, v)|
+                result = env.inject(Hash.new) do |h, (k, v)|
                     h[k] = (v.join(File::PATH_SEPARATOR) if v && !v.empty?)
                     h
                 end
@@ -98,7 +98,7 @@ module Autoproj
             def private_bundler?; !!@private_bundler end
             # The path to the directory into which the bundler gem should be
             # installed
-            def bundler_gem_home; @private_bundler || gem_bindir end
+            def bundler_gem_home; @private_bundler || Gem.user_dir end
             # (see #private_bundler?)
             def private_bundler=(flag)
                 @private_bundler =
@@ -112,7 +112,7 @@ module Autoproj
             def private_autoproj?; !!@private_autoproj end
             # The path to the directory into which the autoproj gem should be
             # installed
-            def autoproj_gem_home; @private_autoproj || gem_bindir end
+            def autoproj_gem_home; @private_autoproj || Gem.user_dir end
             # (see #private_autoproj?)
             def private_autoproj=(flag)
                 @private_autoproj =
@@ -233,7 +233,7 @@ module Autoproj
                 STDERR.puts "cannot find 'bundler' in PATH=#{clean_path}#{File::PATH_SEPARATOR}#{gem_bindir}"
                 STDERR.puts "installing it now ..."
                 result = system(
-                    clean_env.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_path),
+                    clean_env.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
                     Gem.ruby, '-S', 'gem', 'install', 'bundler')
 
                 if !result
@@ -249,7 +249,7 @@ module Autoproj
                     end
                 end
 
-                bundler = File.join(bundler_gem_path, 'bin', 'bundler')
+                bundler = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler)
                     bundler
                 else

data/bin/autoproj_install

@@ -49,7 +49,7 @@ module Autoproj
             end
 
             def env_for_child
-                env.inject(Hash.new) do |h, (k, v)|
+                result = env.inject(Hash.new) do |h, (k, v)|
                     h[k] = (v.join(File::PATH_SEPARATOR) if v && !v.empty?)
                     h
                 end
@@ -98,7 +98,7 @@ module Autoproj
             def private_bundler?; !!@private_bundler end
             # The path to the directory into which the bundler gem should be
             # installed
-            def bundler_gem_home; @private_bundler || gem_bindir end
+            def bundler_gem_home; @private_bundler || Gem.user_dir end
             # (see #private_bundler?)
             def private_bundler=(flag)
                 @private_bundler =
@@ -112,7 +112,7 @@ module Autoproj
             def private_autoproj?; !!@private_autoproj end
             # The path to the directory into which the autoproj gem should be
             # installed
-            def autoproj_gem_home; @private_autoproj || gem_bindir end
+            def autoproj_gem_home; @private_autoproj || Gem.user_dir end
             # (see #private_autoproj?)
             def private_autoproj=(flag)
                 @private_autoproj =
@@ -233,7 +233,7 @@ module Autoproj
                 STDERR.puts "cannot find 'bundler' in PATH=#{clean_path}#{File::PATH_SEPARATOR}#{gem_bindir}"
                 STDERR.puts "installing it now ..."
                 result = system(
-                    clean_env.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_path),
+                    clean_env.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
                     Gem.ruby, '-S', 'gem', 'install', 'bundler')
 
                 if !result
@@ -249,7 +249,7 @@ module Autoproj
                     end
                 end
 
-                bundler = File.join(bundler_gem_path, 'bin', 'bundler')
+                bundler = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler)
                     bundler
                 else

data/lib/autoproj/cli.rb

@@ -4,7 +4,14 @@ class InvalidArguments < Exception
         end
 
         def self.load_plugins
-            Gem.find_latest_files('autoproj-*', true).each do |path|
+            finder_name =
+                if Gem.respond_to?(:find_latest_files)
+                    :find_latest_files
+                else
+                    :find_files
+                end
+
+            Gem.send(finder_name, 'autoproj-*', true).each do |path|
                 require path
             end
         end

data/lib/autoproj/ops/install.rb

@@ -42,7 +42,7 @@ def initialize(root_dir)
             end
 
             def env_for_child
-                env.inject(Hash.new) do |h, (k, v)|
+                result = env.inject(Hash.new) do |h, (k, v)|
                     h[k] = (v.join(File::PATH_SEPARATOR) if v && !v.empty?)
                     h
                 end
@@ -91,7 +91,7 @@ def local=(flag); @local = flag end
             def private_bundler?; !!@private_bundler end
             # The path to the directory into which the bundler gem should be
             # installed
-            def bundler_gem_home; @private_bundler || gem_bindir end
+            def bundler_gem_home; @private_bundler || Gem.user_dir end
             # (see #private_bundler?)
             def private_bundler=(flag)
                 @private_bundler =
@@ -105,7 +105,7 @@ def private_bundler=(flag)
             def private_autoproj?; !!@private_autoproj end
             # The path to the directory into which the autoproj gem should be
             # installed
-            def autoproj_gem_home; @private_autoproj || gem_bindir end
+            def autoproj_gem_home; @private_autoproj || Gem.user_dir end
             # (see #private_autoproj?)
             def private_autoproj=(flag)
                 @private_autoproj =
@@ -226,7 +226,7 @@ def find_bundler
                 STDERR.puts "cannot find 'bundler' in PATH=#{clean_path}#{File::PATH_SEPARATOR}#{gem_bindir}"
                 STDERR.puts "installing it now ..."
                 result = system(
-                    clean_env.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_path),
+                    clean_env.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
                     Gem.ruby, '-S', 'gem', 'install', 'bundler')
 
                 if !result
@@ -242,7 +242,7 @@ def find_bundler
                     end
                 end
 
-                bundler = File.join(bundler_gem_path, 'bin', 'bundler')
+                bundler = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler)
                     bundler
                 else

data/lib/autoproj/os_package_installer.rb

@@ -36,6 +36,9 @@ class OSPackageInstaller
         # The set of packages that have already been installed
         attr_reader :installed_packages
 
+        # The set of resolved packages that have already been installed
+        attr_reader :installed_resolved_packages
+
         attr_writer :silent
         def silent?; @silent end
 
@@ -47,6 +50,7 @@ def initialize(ws, os_package_resolver)
             @ws = ws
             @os_package_resolver = os_package_resolver
             @installed_packages = Set.new
+            @installed_resolved_packages = Hash.new { |h, k| h[k] = Set.new }
             @silent = true
             @filter_uptodate_packages = true
         end
@@ -253,15 +257,12 @@ def osdeps_mode
         #   enabled. The default value is returned by {#osdeps_mode}
         # @return [Array<PackageManagers::Manager>] the set of enabled package
         #   managers
-        def setup_package_managers(options = Hash.new)
-            options = Kernel.validate_options options,
-                osdeps_mode: osdeps_mode
-
+        def setup_package_managers(osdeps_mode: self.osdeps_mode)
             os_package_manager.enabled = false
             package_managers.each_value do |handler|
                 handler.enabled = false
             end
-            options[:osdeps_mode].each do |m|
+            osdeps_mode.each do |m|
                 if m == 'os'
                     os_package_manager.enabled = true
                 elsif pkg = package_managers[m]
@@ -306,16 +307,13 @@ def pristine(packages, options = Hash.new)
         end
 
         # Requests the installation of the given set of packages
-        def install(packages, options = Hash.new)
-            # Remove the set of packages that have already been installed 
-            packages = packages.to_set - installed_packages
-            return false if packages.empty?
+        def install(osdep_packages, install_only: false, **options)
+            osdep_packages = osdep_packages.to_set - installed_packages
+            return if osdep_packages.empty?
 
-            filter_options, options =
-                filter_options options, install_only: !Autobuild.do_update
-            setup_package_managers(options)
+            setup_package_managers(**options)
 
-            packages = os_package_resolver.resolve_os_packages(packages)
+            packages = os_package_resolver.resolve_os_packages(osdep_packages)
             packages = packages.map do |handler_name, list|
                 if manager = package_managers[handler_name]
                     [package_managers[handler_name], list]
@@ -324,28 +322,24 @@ def install(packages, options = Hash.new)
                 end
             end
 
-            needs_filter = (filter_uptodate_packages? || filter_options[:install_only])
-            packages = packages.map do |handler, list|
-                if needs_filter && handler.respond_to?(:filter_uptodate_packages)
-                    list = handler.filter_uptodate_packages(list, filter_options)
-                end
-
-                if !list.empty?
-                    [handler, list]
-                end
-            end.compact
-            return false if packages.empty?
-
             # Install OS packages first, as the other package handlers might
             # depend on OS packages
-            os_packages, other_packages = packages.partition { |handler, list| handler == os_package_manager }
+            os_packages, other_packages = packages.partition do |handler, list|
+                handler == os_package_manager
+            end
             [os_packages, other_packages].each do |packages|
                 packages.each do |handler, list|
-                    handler.install(list)
-                    @installed_packages |= list.to_set
+                    list = list.to_set - installed_resolved_packages[handler]
+                    next if list.empty?
+
+                    handler.install(
+                        list.to_a,
+                        filter_uptodate_packages: filter_uptodate_packages?,
+                        install_only: install_only)
+                    installed_resolved_packages[handler].merge(list)
                 end
             end
-            true
+            installed_packages.merge(packages)
         end
     end
 end 

data/lib/autoproj/package_managers/apt_dpkg_manager.rb

@@ -14,7 +14,7 @@ def initialize(ws, status_file = "/var/lib/dpkg/status")
 
             # On a dpkg-enabled system, checks if the provided package is installed
             # and returns true if it is the case
-            def installed?(package_name)
+            def installed?(package_name, filter_uptodate_packages: false, install_only: false)
                 if !@installed_packages
                     @installed_packages = Set.new
                     dpkg_status = File.readlines(status_file)
@@ -51,19 +51,19 @@ def installed?(package_name)
                 end
             end
             
-            def install(packages)
-                if super
+            def install(packages, filter_uptodate_packages: false, install_only: false)
+                if filter_uptodate_packages || install_only
+                    packages = packages.find_all do |package_name|
+                        !installed?(package_name)
+                    end
+                end
+
+                if super(packages)
                     # Invalidate caching of installed packages, as we just
                     # installed new packages !
                     @installed_packages = nil
                 end
             end
-            
-            def filter_uptodate_packages(packages, options = Hash.new)
-                packages.find_all do |package_name|
-                    !installed?(package_name)
-                end
-            end
         end
     end
 end

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -37,6 +37,12 @@ def initialize_environment
                 env.add_path 'PATH', File.join(ws.dot_autoproj_dir, 'autoproj', 'bin')
                 env.set 'GEM_HOME', config.gems_gem_home
 
+                root_dir     = File.join(ws.prefix_dir, 'gems')
+                gemfile_path = File.join(root_dir, 'Gemfile')
+                if File.file?(gemfile_path)
+                    env.set('BUNDLE_GEMFILE', gemfile_path)
+                end
+
                 if !config.private_bundler? || !config.private_autoproj? || !config.private_gems?
                     env.set('GEM_PATH', *Gem.default_path)
                 end
@@ -154,7 +160,7 @@ def self.run_bundler_install(ws, gemfile, *options, update: true, binstubs: nil)
                 end
             end
 
-            def install(gems)
+            def install(gems, filter_uptodate_packages: false, install_only: false)
                 root_dir     = File.join(ws.prefix_dir, 'gems')
                 gemfile_path = File.join(root_dir, 'Gemfile')
                 gemfile_lock_path = "#{gemfile_path}.lock"
@@ -179,22 +185,29 @@ def install(gems)
                     end
                 end
                 # In addition, look into overrides.d
-                Dir.glob(File.join(ws.config_dir, "*.gemfile")) do |gemfile_path|
+                Dir.glob(File.join(ws.overrides_dir, "*.gemfile")) do |gemfile_path|
                     gemfiles << gemfile_path
                 end
 
                 # Generate the gemfile and remove the lockfile
-                gems = gems.sort.map do |name|
+                gemfile_lines = gems.map do |name|
                     name, version = parse_package_entry(name)
                     "gem \"#{name}\", \"#{version || ">= 0"}\""
-                end.join("\n")
+                end
+                gemfiles.each do |gemfile|
+                    gemfile_lines.concat(File.readlines(gemfile).map(&:chomp))
+                end
+                gemfile_lines = gemfile_lines.sort.uniq
+                gemfile_contents = [
+                    "eval_gemfile \"#{File.join(ws.dot_autoproj_dir, 'autoproj', 'Gemfile')}\"",
+                    *gemfile_lines
+                ].join("\n")
+
                 FileUtils.mkdir_p root_dir
-                File.open(gemfile_path, 'w') do |io|
-                    io.puts "eval_gemfile \"#{File.join(ws.dot_autoproj_dir, 'autoproj', 'Gemfile')}\""
-                    gemfiles.each do |gemfile|
-                        io.puts File.read(gemfile)
+                if updated = (!File.exist?(gemfile_path) || File.read(gemfile_path) != gemfile_contents)
+                    File.open(gemfile_path, 'w') do |io|
+                        io.puts gemfile_contents
                     end
-                    io.puts gems
                 end
 
                 options = Array.new
@@ -203,8 +216,10 @@ def install(gems)
                 end
 
                 binstubs_path = File.join(root_dir, 'bin')
-                self.class.run_bundler_install ws, gemfile_path, *options,
-                    binstubs: binstubs_path
+                if updated || !install_only || !File.file?("#{gemfile_path}.lock")
+                    self.class.run_bundler_install ws, gemfile_path, *options,
+                        binstubs: binstubs_path
+                end
 
                 if bundle_rubylib = discover_bundle_rubylib
                     update_env_rubylib(bundle_rubylib)

data/lib/autoproj/package_managers/homebrew_manager.rb

@@ -10,7 +10,7 @@ def initialize(ws)
                         false)
             end
 
-            def filter_uptodate_packages(packages, options = Hash.new)
+            def filter_uptodate_packages(packages)
                 # TODO there might be duplicates in packages which should be fixed
                 # somewhere else
                 packages = packages.uniq
@@ -38,6 +38,13 @@ def filter_uptodate_packages(packages, options = Hash.new)
                 end
                 new_packages
             end
+
+            def install(packages, filter_uptodate_packages: true, install_only: false)
+                if filter_uptodate_packages || install_only
+                    packages = filter_uptodate_packages(packages)
+                end
+                super(packages)
+            end
         end
     end
 end

data/lib/autoproj/package_managers/pip_manager.rb

@@ -27,7 +27,7 @@ def guess_pip_program
                 Autobuild.programs['pip'] = "pip"
             end
 
-            def install(pips)
+            def install(pips, filter_uptodate_packages: false, install_only: false)
                 guess_pip_program
                 if pips.is_a?(String)
                     pips = [pips]

data/lib/autoproj/package_managers/shell_script_manager.rb

@@ -108,8 +108,7 @@ def initialize(ws, needs_locking, user_install_cmd, auto_install_cmd,needs_root=
             #   command-line pattern that should be used to generate the script.
             #   If given, it overrides the default value stored in
             #   {#user_install_cmd]
-            def generate_user_os_script(os_packages, options = Hash.new)
-                user_install_cmd = options[:user_install_cmd] || self.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("' '")])
                 else generate_auto_os_script(os_packages)
@@ -125,8 +124,7 @@ def generate_user_os_script(os_packages, options = Hash.new)
             #   command-line pattern that should be used to generate the script.
             #   If given, it overrides the default value stored in
             #   {#auto_install_cmd]
-            def generate_auto_os_script(os_packages, options = Hash.new)
-                auto_install_cmd = options[:auto_install_cmd] || self.auto_install_cmd
+            def generate_auto_os_script(os_packages, auto_install_cmd: self.auto_install_cmd)
                 (auto_install_cmd % [os_packages.join("' '")])
             end
 
@@ -183,11 +181,14 @@ def osdeps_interaction(os_packages, shell_script)
             #   command line that should be used by autoproj to install said
             #   packages. See the option in {#generate_auto_os_script}
             # @return [Boolean] true if packages got installed, false otherwise
-            def install(packages, options = Hash.new)
+            def install(packages, filter_uptodate_packages: false, install_only: false,
+                        auto_install_cmd: self.auto_install_cmd, user_install_cmd: self.user_install_cmd)
+                return if packages.empty?
+
                 handled_os = ws.supported_operating_system?
                 if handled_os
-                    shell_script = generate_auto_os_script(packages, options)
-                    user_shell_script = generate_user_os_script(packages, options)
+                    shell_script = generate_auto_os_script(packages, auto_install_cmd: auto_install_cmd)
+                    user_shell_script = generate_user_os_script(packages, user_install_cmd: user_install_cmd)
                 end
                 if osdeps_interaction(packages, user_shell_script)
                     Autoproj.message "  installing OS packages: #{packages.sort.join(", ")}"

data/lib/autoproj/package_managers/yum_manager.rb

@@ -8,7 +8,7 @@ def initialize(ws)
                       "yum install -y '%s'")
             end
 
-            def filter_uptodate_packages(packages, options = Hash.new)
+            def filter_uptodate_packages(packages)
                 result = `LANG=C rpm -q --queryformat "%{NAME}\n" '#{packages.join("' '")}'`
 
                 installed_packages = []
@@ -32,14 +32,18 @@ def filter_uptodate_packages(packages, options = Hash.new)
                 new_packages
             end
 
-            def install(packages)
+            def install(packages, filter_uptodate_packages: false, install_only: false)
+                if filter_uptodate_packages
+                    packages = filter_uptodate_packages(packages)
+                end
+
                 patterns, packages = packages.partition { |pkg| pkg =~ /^@/ }
                 patterns = patterns.map { |str| str[1..-1] }
                 result = false
                 if !patterns.empty?
                     result |= super(patterns,
-                                    :auto_install_cmd => "yum groupinstall -y '%s'",
-                                    :user_install_cmd => "yum groupinstall '%s'")
+                                    auto_install_cmd: "yum groupinstall -y '%s'",
+                                    user_install_cmd: "yum groupinstall '%s'")
                 end
                 if !packages.empty?
                     result |= super(packages)

data/lib/autoproj/package_managers/zypper_manager.rb

@@ -8,7 +8,7 @@ def initialize(ws)
                         "zypper -n install '%s'")
             end
 
-            def filter_uptodate_packages(packages, options = Hash.new)
+            def filter_uptodate_packages(packages)
                 result = `LANG=C rpm -q --whatprovides '#{packages.join("' '")}'`
                 has_all_pkgs = $?.success?
 
@@ -19,14 +19,18 @@ def filter_uptodate_packages(packages, options = Hash.new)
                 end
             end
 
-            def install(packages)
+            def install(packages, filter_uptodate_packages: false, install_only: false)
+                if filter_uptodate_packages || install_only
+                    packages = filter_uptodate_packages(packages)
+                end
+
                 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'")
+                                    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)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc10"
+    VERSION = "2.0.0.rc11"
 end

data/lib/autoproj/workspace.rb

@@ -298,7 +298,7 @@ def update_autoproj(restart_on_update: true)
 
             # Find out what version of autoproj bundler locked on
             autoproj = File.readlines("#{gemfile}.lock").
-                find_all { |l| l =~ /^\s+autoproj \(.*\)$/ }
+                find_all { |l| l =~ /^\s+autoproj \(\d.*\)$/ }
             if autoproj.size == 1
                 autoproj[0] =~ /^\s+autoproj \((.*)\)$/
                 installed_version = $1

metadata

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