autoproj 2.0.0.b7 → 2.0.0.rc1

data/lib/autoproj/package_manifest.rb

@@ -110,7 +110,7 @@ def each_os_dependency(modes = Array.new, &block)
             return each_dependency(modes, &block)
         end
 
-        def each_package_dependency(modes = Array.new)
+        def each_package_dependency(modes = Array.new, &block)
             Autoproj.warn "PackageManifest#each_os_dependency called, fix your code"
             return each_dependency(modes, &block)
         end

data/lib/autoproj/test.rb

@@ -3,19 +3,21 @@
 if ENV['TEST_ENABLE_COVERAGE'] == '1'
     begin
         require 'simplecov'
-        SimpleCov.start
+        SimpleCov.start do
+            add_filter "/test/"
+        end
     rescue LoadError
-        require 'dummy_project'
+        require 'autoproj'
         Autoproj.warn "coverage is disabled because the 'simplecov' gem cannot be loaded"
     rescue Exception => e
-        require 'dummy_project'
+        require 'autoproj'
         Autoproj.warn "coverage is disabled: #{e.message}"
     end
 end
 
+require 'minitest/autorun'
 require 'autoproj'
-## Uncomment this to enable flexmock
-require 'flexmock/test_unit'
+require 'flexmock/minitest'
 require 'minitest/spec'
 
 if ENV['TEST_ENABLE_PRY'] != '0'
@@ -38,13 +40,14 @@ module Autoproj
     #   end
     #
     module SelfTest
-        if defined? FlexMock
-            include FlexMock::ArgumentTypes
-            include FlexMock::MockContainer
-        end
+        attr_reader :ws
 
         def setup
             @tmpdir = Array.new
+            @ws = Workspace.new('/test/dir')
+            ws.config = Configuration.new
+            Autoproj.workspace = ws
+
             super
         end
 
@@ -53,14 +56,10 @@ def create_bootstrap
             @tmpdir << dir
             require 'autoproj/ops/main_config_switcher'
             FileUtils.cp_r Ops::MainConfigSwitcher::MAIN_CONFIGURATION_TEMPLATE, File.join(dir, 'autoproj')
-            Autoproj.root_dir = dir
-            Autoproj.manifest = Manifest.load(File.join(dir, 'autoproj', 'manifest'))
+            Workspace.new(dir)
         end
 
         def teardown
-            if defined? FlexMock
-                flexmock_teardown
-            end
             super
             @tmpdir.each do |dir|
                 FileUtils.remove_entry_secure dir

data/lib/autoproj/variable_expansion.rb

@@ -53,7 +53,9 @@ def self.expand_environment(value)
     #
     # If the values listed in +definitions+ also contain configuration
     # variables, they do not get expanded
-    def self.single_expansion(data, definitions)
+    def self.single_expansion(data, definitions, options = Hash.new)
+        options = Kernel.validate_options options, config: Autoproj.config
+
         if !data.respond_to?(:to_str)
             return data
         end
@@ -71,7 +73,7 @@ def self.single_expansion(data, definitions)
             end
 
             if !(value = definitions[constant_name])
-                if !(value = config.get(constant_name))
+                if !(value = options[:config].get(constant_name))
                     if !block_given? || !(value = yield(constant_name))
                         raise ArgumentError, "cannot find a definition for $#{constant_name}"
                     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.b7"
+    VERSION = "2.0.0.rc1"
 end

data/lib/autoproj/workspace.rb

@@ -4,7 +4,7 @@ module Autoproj
     class Workspace < Ops::Loader
         attr_reader :root_dir
 
-        attr_reader :config
+        attr_accessor :config
         attr_reader :env
         attr_reader :manifest
         attr_reader :loader
@@ -170,6 +170,9 @@ def setup
             Autobuild.prefix = prefix_dir
             Autobuild.srcdir = root_dir
             Autobuild.logdir = log_dir
+            if cache_dir = config.importer_cache_dir
+                Autobuild::Importer.default_cache_dirs = cache_dir
+            end
             env.prepare(root_dir)
             Autoproj::OSDependencies::PACKAGE_HANDLERS.each do |pkg_mng|
                 pkg_mng.initialize_environment(env, manifest, root_dir)
@@ -560,6 +563,7 @@ def self.workspace
 
     def self.workspace=(ws)
         @workspace = ws
+        self.root_dir = ws.root_dir
     end
 
     def self.env

data/manifest.xml

@@ -0,0 +1,20 @@
+<package>
+    <description brief="project-level build tool">
+        Autoproj allows to easily install and maintain software that is under
+        source code form (usually from a version control system). It has been
+        designed to support a package-oriented development process, where each
+        package can have its own version control repository (think "distributed
+        version control"). It also provides an easy integration of the local
+        operating system (Debian, Ubuntu, Fedora, maybe MacOSX at some point).
+    </description>
+    <maintainer>Sylvain Joyeux/sylvain.joyeux@m4x.org</maintainer>
+    <license>LGPLv3 or later</license>
+    <url>http://rock-robotics.org</url>
+
+    <depend package="autobuild" />
+    <depend package="thor" />
+    <depend package="utilrb" />
+    <depend package="concurrent-ruby" />
+    <test_depend package="flexmock" />
+    <test_depend package="minitest" />
+</package>

metadata

@@ -1,160 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.b7
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0.a
 - !ruby/object:Gem::Dependency
   name: utilrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.19.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.19.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 2.0.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '0'
 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: sylvain.joyeux@m4x.org
-executables:
-- alocate
-- amake
-- aup
-- autoproj
-- autoproj_bootstrap
-- autoproj_bootstrap.in
+executables: []
 extensions: []
-extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- README.md
-- samples/autoproj/README.txt
+extra_rdoc_files: []
 files:
-- ".gemtest"
+- ".gitattributes"
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
 - History.txt
-- Manifest.txt
 - README.md
 - Rakefile
+- autoproj.gemspec
 - bin/alocate
 - bin/amake
 - bin/aup
@@ -195,6 +190,7 @@ files:
 - lib/autoproj/default.osdeps
 - lib/autoproj/environment.rb
 - lib/autoproj/exceptions.rb
+- lib/autoproj/git_server_configuration.rb
 - lib/autoproj/gitorious.rb
 - lib/autoproj/installation_manifest.rb
 - lib/autoproj/manifest.rb
@@ -210,6 +206,19 @@ files:
 - lib/autoproj/options.rb
 - lib/autoproj/osdeps.rb
 - lib/autoproj/package_definition.rb
+- lib/autoproj/package_managers/apt_dpkg_manager.rb
+- lib/autoproj/package_managers/emerge_manager.rb
+- lib/autoproj/package_managers/gem_manager.rb
+- lib/autoproj/package_managers/homebrew_manager.rb
+- lib/autoproj/package_managers/manager.rb
+- lib/autoproj/package_managers/pacman_manager.rb
+- lib/autoproj/package_managers/pip_manager.rb
+- lib/autoproj/package_managers/pkg_manager.rb
+- lib/autoproj/package_managers/port_manager.rb
+- lib/autoproj/package_managers/shell_script_manager.rb
+- lib/autoproj/package_managers/unknown_os_manager.rb
+- lib/autoproj/package_managers/yum_manager.rb
+- lib/autoproj/package_managers/zypper_manager.rb
 - lib/autoproj/package_manifest.rb
 - lib/autoproj/package_selection.rb
 - lib/autoproj/package_set.rb
@@ -223,6 +232,7 @@ files:
 - lib/autoproj/vcs_definition.rb
 - lib/autoproj/version.rb
 - lib/autoproj/workspace.rb
+- manifest.xml
 - samples/autoproj/README.txt
 - samples/autoproj/init.rb
 - samples/autoproj/manifest
@@ -233,44 +243,19 @@ files:
 - shell/autoproj_bash
 - shell/autoproj_sh
 - shell/autoproj_zsh
-- test/data/empty_manifest.xml
-- test/data/full_manifest.xml
-- test/data/invalid_manifest.xml
-- test/data/os_release.with_complex_version_field
-- test/data/os_release.with_duplicate_values
-- test/data/os_release.with_missing_optional_fields
-- test/data/os_release.with_quoted_and_unquoted_fields
-- test/data/test_manifest/autoproj/local_set/local.autobuild
-- test/data/test_manifest/autoproj/local_set/source.yml
-- test/data/test_manifest/autoproj/manifest
-- test/ops/test_configuration.rb
-- test/ops/test_snapshot.rb
-- test/package_managers/apt-dpkg-status
-- test/package_managers/apt-dpkg-status.installed-last
-- test/package_managers/apt-dpkg-status.noninstalled-last
-- test/package_managers/test_apt_dpkg_manager.rb
-- test/package_managers/test_gem.rb
-- test/package_managers/test_pip.rb
-- test/test_manifest.rb
-- test/test_os_dependencies.rb
-- test/test_package.rb
-- test/test_package_manifest.rb
-- test/test_vcs_definition.rb
-homepage: http://rock-robotics.org/documentation/autoproj
+homepage: http://rock-robotics.org
 licenses:
 - BSD
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -278,8 +263,9 @@ 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
 test_files: []
+has_rdoc: