autoproj 2.0.0.rc12 → 2.0.0.rc13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3783d15f79e9891de1d0aad451928d94ba3f5868
-  data.tar.gz: 8cd5d53de5bc10304e7327de923739c69b2f7311
+  metadata.gz: d8151e59a3c0da556606a3a218bd89372b93f238
+  data.tar.gz: 50daf836ced22f12c40bd76cb847db3c3affae62
 SHA512:
-  metadata.gz: d21fb154c3098bf0455dcf38d0b243907497dfa30039a03d67e219ef8b1f94fc3d79ebc1f2f86ba42228d1c2fad3585b7cbf2e78abb83020a3c9b1be651cc40a
-  data.tar.gz: 2c729c154c16dccca56ca4eaeed705758302eacb7e6e9b49228bc687ad3579942f8dbbe1e0f01d41b4b4ea470dcc189094270b6632149e892d01f4c413d4319b
+  metadata.gz: 69f7fad5bdc6befbe1968aecee7612ef8cc2eabcb8a6a8ff5f80e9327abb17258eabe979ca675d508623a2c7bbf647da58f0232b9a82689ff07864a7c0e2e5a3
+  data.tar.gz: ac5d22bfdc874f48b8ed7a66c773b8006dfebac404c00df64edfcc44877043c079b6fd0f30708581bd973aca50f95c4113cd4918daf965423589e23f9e33f77c

data/bin/autoproj_bootstrap

@@ -241,7 +241,7 @@ module Autoproj
 
                 if !result
                     STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
-                    exit 1
+                    return
                 end
                 File.join(bundler_gem_home, 'bin', 'bundler')
             end
@@ -255,11 +255,8 @@ module Autoproj
                 clean_path = env_for_child['PATH']
                 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_home),
-                    Gem.ruby, '-S', 'gem', 'install', 'bundler')
-
-                if !result
+                bundler = install_bundler
+                if !bundler
                     if ENV['PATH'] != clean_path
                         STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
                         STDERR.puts "  - if you are running 'autoproj upgrade', please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
@@ -272,7 +269,6 @@ module Autoproj
                     end
                 end
 
-                bundler = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler)
                     bundler
                 else
@@ -416,7 +412,9 @@ module Autoproj
             def install
                 if private_bundler?
                     puts "Installing bundler in #{bundler_gem_home}"
-                    bundler = install_bundler
+                    if !(bundler = install_bundler)
+                        exit 1
+                    end
                 elsif bundler = find_bundler
                     puts "Detected bundler at #{bundler}"
                 else

data/bin/autoproj_install

@@ -241,7 +241,7 @@ module Autoproj
 
                 if !result
                     STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
-                    exit 1
+                    return
                 end
                 File.join(bundler_gem_home, 'bin', 'bundler')
             end
@@ -255,11 +255,8 @@ module Autoproj
                 clean_path = env_for_child['PATH']
                 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_home),
-                    Gem.ruby, '-S', 'gem', 'install', 'bundler')
-
-                if !result
+                bundler = install_bundler
+                if !bundler
                     if ENV['PATH'] != clean_path
                         STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
                         STDERR.puts "  - if you are running 'autoproj upgrade', please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
@@ -272,7 +269,6 @@ module Autoproj
                     end
                 end
 
-                bundler = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler)
                     bundler
                 else
@@ -416,7 +412,9 @@ module Autoproj
             def install
                 if private_bundler?
                     puts "Installing bundler in #{bundler_gem_home}"
-                    bundler = install_bundler
+                    if !(bundler = install_bundler)
+                        exit 1
+                    end
                 elsif bundler = find_bundler
                     puts "Detected bundler at #{bundler}"
                 else

data/lib/autoproj/cli/show.rb

@@ -81,8 +81,8 @@ def display_source_package(pkg_name, default_packages, revdeps)
 
             def display_osdep_package(pkg_name, default_packages, revdeps)
                 puts Autoproj.color("the osdep '#{pkg_name}'", :bold)
-                ws.os_package_resolver.resolve_os_packages([pkg_name]).each do |manager, packages|
-                    puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
+                ws.os_package_resolver.resolve_os_packages([pkg_name]).each do |manager_name, packages|
+                    puts "  #{manager_name}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
                 end
 
                 display_common_information(pkg_name, default_packages, revdeps)

data/lib/autoproj/cli/update.rb

@@ -25,10 +25,6 @@ def validate_options(packages, options)
                     options[:reset] = :force
                 end
 
-                if options[:autoproj].nil?
-                    options[:autoproj] = packages.empty?
-                end
-
                 if mainline = options[:mainline]
                     if mainline == 'mainline' || mainline == 'true'
                         options[:mainline] = true
@@ -42,27 +38,45 @@ def run(selected_packages, options)
                 selected_packages, config_selected =
                     normalize_command_line_package_selection(selected_packages)
 
-                if options[:config].nil?
-                    options[:config] = selected_packages.empty? || config_selected
-                end
+                # Autoproj and configuration are updated only if (1) it is
+                # explicitely selected or (2) nothing is explicitely selected
+                update_autoproj =
+                    (options[:autoproj] || (
+                        options[:autoproj] != false &&
+                        selected_packages.empty? &&
+                        !options[:config] && 
+                        !options[:checkout_only])
+                    )
+
+                update_config =
+                    (options[:config] || (
+                        options[:config] != false &&
+                        selected_packages.empty? &&
+                        !options[:autoproj]) ||
+                    config_selected)
+
+                update_packages =
+                    options[:all] ||
+                    !selected_packages.empty? ||
+                    (!options[:config] && !options[:autoproj])
 
                 ws.setup
                 parallel = options[:parallel] || ws.config.parallel_import_level
 
                 ws.autodetect_operating_system(force: true)
 
-                if options[:autoproj]
+                if update_autoproj
                     ws.update_autoproj
                 end
 
                 ws.load_package_sets(
                     mainline: options[:mainline],
                     only_local: options[:only_local],
-                    checkout_only: !options[:config] || options[:checkout_only],
+                    checkout_only: !update_config || options[:checkout_only],
                     reset: options[:reset],
                     ignore_errors: options[:keep_going],
                     retry_count: options[:retry_count])
-                if selected_packages.empty? && (config_selected || options[:config]) && !options[:all]
+                if !update_packages
                     return [], [], true
                 end
 

data/lib/autoproj/ops/install.rb

@@ -231,7 +231,7 @@ def install_bundler
 
                 if !result
                     STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
-                    exit 1
+                    return
                 end
                 File.join(bundler_gem_home, 'bin', 'bundler')
             end
@@ -245,11 +245,8 @@ def find_bundler
                 clean_path = env_for_child['PATH']
                 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_home),
-                    Gem.ruby, '-S', 'gem', 'install', 'bundler')
-
-                if !result
+                bundler = install_bundler
+                if !bundler
                     if ENV['PATH'] != clean_path
                         STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
                         STDERR.puts "  - if you are running 'autoproj upgrade', please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
@@ -262,7 +259,6 @@ def find_bundler
                     end
                 end
 
-                bundler = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler)
                     bundler
                 else
@@ -406,7 +402,9 @@ def gem_bindir
             def install
                 if private_bundler?
                     puts "Installing bundler in #{bundler_gem_home}"
-                    bundler = install_bundler
+                    if !(bundler = install_bundler)
+                        exit 1
+                    end
                 elsif bundler = find_bundler
                     puts "Detected bundler at #{bundler}"
                 else
@@ -481,7 +479,6 @@ def stage2(*vars)
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                puts "calling autoproj envsh #{autoproj_options}"
                 if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     exit 1
                 end

data/lib/autoproj/os_package_installer.rb

@@ -297,6 +297,14 @@ def pristine(packages, options = Hash.new)
             install(packages, options.merge(install_only: true))
             packages = os_package_resolver.resolve_os_packages(packages)
 
+            packages = packages.map do |handler_name, list|
+                if manager = package_managers[handler_name]
+                    [package_managers[handler_name], list]
+                else
+                    raise ArgumentError, "no package manager called #{handler_name} found"
+                end
+            end
+
             _, other_packages =
                 packages.partition { |handler, list| handler == os_package_manager }
             other_packages.each do |handler, list|

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc12"
+    VERSION = "2.0.0.rc13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc12
+  version: 2.0.0.rc13
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages