autoproj 2.0.0.rc35 → 2.0.0.rc36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c073da877e878b3392109e7b13db5155d57ea65
-  data.tar.gz: b7956cd83bf9b3f3f12a20f07c017c81ae4e1b19
+  metadata.gz: e3051262e3145e954b246bb65af46c3f933c559a
+  data.tar.gz: 95d31f3a23bc51706f5dfb810d27ba36723d254e
 SHA512:
-  metadata.gz: 431797f00765f0dbef2562d3f1473ad61636cbeee0b3b7cf94e6d066ea768a9019defef5bb04f5dbf643afc3b4852846e5e1c6bb3a5a66553a61dd505edef801
-  data.tar.gz: a1a0fb447536f9df2c22c3effdc0174eaee7133d06f001443c99077087a5fc33d9dd5a84b9862cd3cfd21fbbd61c51a71decf46e5527aa06c457c4be309cca0d
+  metadata.gz: 8a82835c379309530d2e8e5009aa3ccc4e6bab65d399b5add8c70522679a31b63772afdf836d0c2af442e73e08747689db4dae2cab555e0ada619d14e162ac81
+  data.tar.gz: 990a003ef1bbbf852cf1f64daae492c6660bf5d769b95acad70fd2ffb4dc171b110204e6908c3316a145427c469b576f8788e4b28883d695e99fe07a8fb172ea

data/lib/autoproj/autobuild.rb

@@ -40,6 +40,11 @@ def explicit_osdeps_selection(name, config = Autoproj.config)
 
 module Autobuild
     class Package
+        attr_writer :ws
+        def ws
+            @ws ||= Autoproj.workspace
+        end
+
         # The Autoproj::PackageManifest object that describes this package
         attr_accessor :description
         # The set of tags for this package. This is an union of the tags
@@ -136,7 +141,7 @@ def optional_dependency(name)
 
         def partition_package(pkg_name)
             pkg_autobuild, pkg_osdeps = [], []
-            Autoproj.workspace.manifest.resolve_package_name(pkg_name).each do |type, dep_name|
+            ws.manifest.resolve_package_name(pkg_name).each do |type, dep_name|
                 if type == :osdeps
                     pkg_osdeps << dep_name
                 elsif type == :package

data/lib/autoproj/cli/versions.rb

@@ -35,12 +35,23 @@ def run(user_selection, options)
                                    ignore_non_imported_packages: true)
                 
                 ops = Ops::Snapshot.new(ws.manifest, ignore_errors: options[:keep_going])
+                
+                if user_selection.empty?
+                    snapshot_package_sets = (options[:config] != false)
+                    snapshot_packages = !options[:config]
+                elsif config_selected
+                    snapshot_package_sets = true
+                    snapshot_packages = user_selection.size > 1
+                else
+                    snapshot_package_sets = options[:config]
+                    snapshot_packages = true
+                end
 
                 versions = Array.new
-                if (config_selected && options[:config] != false) || user_selection.empty?
+                if snapshot_package_sets
                     versions += ops.snapshot_package_sets(nil, only_local: options[:only_local])
                 end
-                if (!config_selected && !options[:config]) || !user_selection.empty?
+                if snapshot_packages
                     versions += ops.snapshot_packages(packages, nil, only_local: options[:only_local])
                 end
 

data/lib/autoproj/default.osdeps

@@ -95,84 +95,29 @@ build-essential:
   opensuse: ["@devel_C_C++", "gcc-c++"]
   default: clang
 
-autobuild:
-  - gem: autobuild
-  - osdep: readline
-autoproj:
-  - gem: autoproj
-  - osdep: readline
-
-readline:
-  debian,ubuntu: libreadline-dev
-  fedora: readline-devel
-  opensuse: readline-devel
-  arch: core/readline
-  macos-brew: readline
-  default: ignore
-
 # The following definitions are for the VCS and build systems
 git:
-  debian:
-    lenny: git
-    default: git-core
-  ubuntu: git-core
   gentoo: dev-vcs/git
-  arch: git
-  fedora: git
-  macos-port: git
-  macos-brew: git
-  opensuse: git
-  freebsd: git
+  default: git
 
 hg:
-  debian,ubuntu: mercurial
   gentoo: dev-vcs/mercurial
-  arch: mercurial
-  fedora: mercurial
-  darwin: mercurial
-  opensuse: mercurial
-  freebsd: mercurial
+  default: mercurial
 
 svn:
-  debian,ubuntu: subversion
   gentoo: dev-vcs/subversion
-  arch: subversion
-  fedora: subversion
-  darwin: subversion
-  opensuse: subversion
-  freebsd: subversion
+  default: subversion
 
 cmake:
-  debian,ubuntu:
-    - cmake
   gentoo: dev-util/cmake
-  arch: cmake
-  fedora: cmake
-  darwin: cmake
-  opensuse: cmake
-  freebsd: cmake
+  default: cmake
   osdep: build-essential
 
 autotools:
-  debian,ubuntu:
-  - automake
-  - autoconf
   gentoo:
-  - "sys-devel/automake"
+  - sys-devel/automake
   - sys-devel/autoconf
-  arch: 
-  - automake 
-  - autoconf
-  fedora:
-  - automake
-  - autoconf
-  darwin:
-  - automake
-  - autoconf
-  opensuse:
-  - automake
-  - autoconf
-  freebsd:
+  default:
   - automake
   - autoconf
   osdep: build-essential
@@ -201,12 +146,7 @@ archive:
   default: ignore
 
 cvs:
-  debian,ubuntu: cvs
-  fedora: cvs
-  darwin: cvs
-  arch: cvs
-  opensuse: cvs
-  freebsd: cvs
+  default: cvs
 
 pip:
   debian,ubuntu: python-pip

data/lib/autoproj/ops/import.rb

@@ -107,8 +107,6 @@ class ImportFailed < RuntimeError; end
             # Import all packages from the given selection, and their
             # dependencies
             def import_selected_packages(selection, updated_packages, options = Hash.new)
-                all_processed_packages = Set.new
-
                 parallel_options, options = Kernel.filter_options options,
                     parallel: ws.config.parallel_import_level
 
@@ -281,8 +279,8 @@ def finalize_package_load(processed_packages)
                     if File.directory?(pkg.srcdir)
                         pkg.prepare
                         Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
-                        pkg.update_environment
                     end
+                    pkg.update_environment
                     package_queue.concat(pkg.dependencies)
                 end
                 all

data/lib/autoproj/os_package_installer.rb

@@ -342,14 +342,14 @@ def install(osdep_packages, install_only: false, run_package_managers_without_pa
             [os_packages, other_packages].each do |packages|
                 packages.each do |handler, list|
                     list = list.to_set - installed_resolved_packages[handler]
-                    next if !run_package_managers_without_packages ||
-                        (list.empty? && !handler.call_while_empty?)
-
-                    handler.install(
-                        list.to_a,
-                        filter_uptodate_packages: filter_uptodate_packages?,
-                        install_only: install_only)
-                    installed_resolved_packages[handler].merge(list)
+
+                    if !list.empty? || (run_package_managers_without_packages && handler.call_while_empty?)
+                        handler.install(
+                            list.to_a,
+                            filter_uptodate_packages: filter_uptodate_packages?,
+                            install_only: install_only)
+                        installed_resolved_packages[handler].merge(list)
+                    end
                 end
             end
             installed_packages.merge(packages)

data/lib/autoproj/package_managers/manager.rb

@@ -31,11 +31,6 @@ def initialize(ws)
                 @call_while_empty = false
             end
 
-            # The primary name for this package manager
-            def name
-                names.first
-            end
-
             # Overload to perform initialization of environment variables in
             # order to have a properly functioning package manager
             #

data/lib/autoproj/test.rb

@@ -68,10 +68,11 @@ def teardown
         end
 
         def create_bootstrap
-            dir = Dir.mktmpdir
-            @tmpdir << dir
+            dir = make_tmpdir
             require 'autoproj/ops/main_config_switcher'
             FileUtils.cp_r Ops::MainConfigSwitcher::MAIN_CONFIGURATION_TEMPLATE, File.join(dir, 'autoproj')
+            FileUtils.mkdir_p File.join(dir, '.autoproj')
+            FileUtils.touch File.join(dir, '.autoproj', 'config.yml')
             Workspace.new(dir)
         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc35"
+    VERSION = "2.0.0.rc36"
 end

data/lib/autoproj/workspace.rb

@@ -25,6 +25,7 @@ def initialize(root_dir)
             @env = Environment.new
             env.source_before(File.join(dot_autoproj_dir, 'env.sh'))
             @manifest = Manifest.new
+            @config = Configuration.new
 
             @os_package_installer = OSPackageInstaller.new(self, os_package_resolver)
             env.prepare(root_dir)
@@ -60,7 +61,7 @@ def self.from_pwd
         def self.from_dir(dir)
             if path = Autoproj.find_workspace_dir(dir)
                 Workspace.new(path)
-            elsif find_v1_workspace_dir(dir)
+            elsif Autoproj.find_v1_workspace_dir(dir)
                 raise OutdatedWorkspace, "#{dir} looks like a v1 workspace, run autoproj upgrade before continuing"
             else
                 raise NotWorkspace, "not in a Autoproj installation"
@@ -703,6 +704,12 @@ def install_os_packages_for(packages, options = Hash.new)
             install_os_packages(required_os_packages, options)
         end
 
+        # Register a package on this workspace
+        def register_package(package, block = nil, package_set = manifest.main_package_set, file = nil)
+            pkg = manifest.register_package(package, block, package_set, file)
+            pkg.autobuild.ws = self
+            pkg
+        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.rc35
+  version: 2.0.0.rc36
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler