autoproj 2.0.0.b5 → 2.0.0.b6

data/lib/autoproj/ops/main_config_switcher.rb

@@ -119,7 +119,7 @@ module Autoproj
             end
 
             def switch_config(*args)
-                vcs = ws.config.get('manifest_source', nil)
+                vcs = ws.manifest.vcs
                 if args.first =~ /^(\w+)=/
                     # First argument is an option string, we are simply setting the
                     # options without changing the type/url
@@ -132,12 +132,13 @@ module Autoproj
                 url = VCSDefinition.to_absolute_url(url)
 
                 if vcs && (vcs.type == type && vcs.url == url)
+                    vcs = vcs.to_hash
                     options.each do |opt|
                         opt_name, opt_value = opt.split('=')
-                        vcs[opt_name] = opt_value
+                        vcs[opt_name.to_sym] = opt_value
                     end
                     # Validate the VCS definition, but save the hash as-is
-                    VCSDefinition.from_raw(vcs)
+                    ws.manifest.vcs = VCSDefinition.from_raw(vcs)
                     ws.config.set "manifest_source", vcs.dup, true
                     ws.config.save
                     true
@@ -151,9 +152,9 @@ module Autoproj
                     return if !opt.ask(nil)
 
                     do_switch_config(true, type, url, *options)
+                    ws.config.save
                     false
                 end
-                ws.config.save
             end
 
             # @api private

data/lib/autoproj/ops/snapshot.rb

@@ -80,13 +80,13 @@ module Autoproj
         #
         # @return [Boolean]
         # @see initialize error_or_warn
-        def keep_going?; !!@keep_going end
+        def ignore_errors?; !!@ignore_errors end
 
         def initialize(manifest, options = Hash.new)
             @manifest = manifest
             options = Kernel.validate_options options,
-                keep_going: false
-            @keep_going = options[:keep_going]
+                ignore_errors: false
+            @ignore_errors = options[:ignore_errors]
         end
 
         def snapshot_package_sets(target_dir = nil)
@@ -103,11 +103,16 @@ module Autoproj
             result
         end
 
-        def error_or_warn(package, error_msg)
-            if keep_going?
-                Autoproj.warn error_msg
+        def error_or_warn(package, error)
+            if ignore_errors?
+                if !error.respond_to?(:to_str)
+                    error = error.message
+                end
+                Autoproj.warn error
+            elsif error.respond_to?(:to_str)
+                raise Autobuild::PackageException.new(package, 'snapshot'), error
             else
-                raise Autobuild::PackageException.new(package, 'snapshot'), error_msg
+                raise
             end
         end
 
@@ -127,7 +132,12 @@ module Autoproj
                     next
                 end
 
-                vcs_info = importer.snapshot(package.autobuild, target_dir)
+                vcs_info =
+                    begin importer.snapshot(package.autobuild, target_dir)
+                    rescue Exception => e
+                        error_or_warn(package, "cannot snapshot #{package_name}: #{e.message}")
+                    end
+
                 if vcs_info
                     result << Hash[package_name, vcs_info]
                 else

data/lib/autoproj/reporter.rb

@@ -73,6 +73,8 @@ module Autoproj
         if Autobuild.debug then raise
         else exit 1
         end
+    rescue SystemExit
+        raise
     rescue Exception => e
         STDERR.puts
         STDERR.puts Autobuild.color(e.message, :red, :bold)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.b5"
+    VERSION = "2.0.0.b6"
 end

data/lib/autoproj/workspace.rb

@@ -300,12 +300,16 @@ module Autoproj
                 silent: false, # NOTE: this is ignored, enclose call with Autoproj.silent { }
                 reconfigure: false,
                 ignore_errors: false,
-                mainline: nil
+                mainline: nil,
+                reset: false,
+                retry_count: nil
 
             Ops::Configuration.new(self).
                 load_package_sets(only_local: options[:only_local],
                                   checkout_only: options[:checkout_only],
-                                  ignore_errors: options[:ignore_errors])
+                                  ignore_errors: options[:ignore_errors],
+                                  reset: options[:reset],
+                                  retry_count: options[:retry_count])
 
             manifest.each_package_set do |pkg_set|
                 if Gem::Version.new(pkg_set.required_autoproj_version) > Gem::Version.new(Autoproj::VERSION)
@@ -539,23 +543,10 @@ module Autoproj
             env = self.env.dup
             manifest.all_selected_packages.each do |pkg_name|
                 pkg = manifest.find_autobuild_package(pkg_name)
-                if File.directory?(pkg.srcdir) && !pkg.applied_post_install?
-                    pkg.apply_post_install
-                end
-
                 pkg.apply_env(env)
             end
             env.export_env_sh(shell_helpers: shell_helpers)
         end
-
-        def apply_post_install
-            manifest.all_selected_packages.each do |pkg_name|
-                pkg = manifest.find_autobuild_package(pkg_name)
-                if File.directory?(pkg.srcdir) && !pkg.applied_post_install?
-                    pkg.apply_post_install
-                end
-            end
-        end
     end
 
     def self.workspace

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.b5
+  version: 2.0.0.b6
 platform: ruby
 authors:
-- Rock Core Developers
+- Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -90,6 +90,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +135,7 @@ dependencies:
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.
-email: rock-dev@dfki.de
+email: sylvain.joyeux@m4x.org
 executables:
 - alocate
 - amake
@@ -256,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"