autoproj 2.0.3 → 2.1.0.rc1

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.3"
+    VERSION = "2.1.0.rc1"
 end

data/lib/autoproj/workspace.rb

@@ -333,6 +333,14 @@ def rewrite_shims
             Ops::Install.rewrite_shims(binstubs, config.ruby_executable, gemfile, config.gems_gem_home)
         end
 
+        def update_bundler
+            require 'autoproj/ops/install'
+            gem_program = Ops::Install.guess_gem_program
+            install = Ops::Install.new(root_dir)
+            Autoproj.message "  updating bundler"
+            install.install_bundler(gem_program, silent: true)
+        end
+
         def update_autoproj(restart_on_update: true)
             config.validate_ruby_executable
 
@@ -478,6 +486,10 @@ def load_packages(selection = manifest.default_packages(false), options = Hash.n
             ops = Ops::Import.new(self)
             ops.import_packages(selection, options)
         end
+
+        def load_all_available_package_manifests
+            manifest.load_all_available_package_manifests
+        end
         
         def setup_all_package_directories
             # Override the package directories from our reused installations
@@ -613,7 +625,7 @@ def export_installation_manifest
         end
 
         # Export the workspace's env.sh file
-        def export_env_sh(package_names = all_present_packages, shell_helpers: true)
+        def export_env_sh(package_names = nil, shell_helpers: true)
             env = self.env.dup
             manifest.all_selected_source_packages.each do |pkg|
                 pkg.autobuild.apply_env(env)

data/samples/autoproj/README.md

@@ -0,0 +1,60 @@
+This is the main build configuration of an autoproj installation
+
+See http://rock-robotics.org/stable/documentation/autoproj for detailed information about autoproj.
+
+Assuming that this build configuration is on e.g. github at
+https://github.com/myorg/buildconf, a workspace based on this build
+configuration can be bootstrapped using:
+
+```
+wget http://rock-robotics.org/autoproj_bootstrap
+ruby autoproj_bootstrap git https://github.com/myorg/buildconf
+```
+
+Once bootstrapped, the main build configuration is checked out in the
+workspace's `autoproj/` folder.
+
+## Day-to-day workflow
+
+`aup` updates the current package (or, if within a directory, the packages
+under that directory). Use `--all` to update the whole workspace.
+
+`amake` build the current package (or, if within a directory, the packages
+under that directory). Use `--all` to build the whole workspace.
+
+`autoproj status` will show the difference between the local workspace and
+the remote repositories
+
+`autoproj show PACKAGE` will display the configuration of said package, which
+includes whether that package is selected in the current workspace ("a.k.a.
+will be updated and built") and the import information (where the package
+will be downloaded from)
+
+## Autoproj configuration structure
+
+The main build configuration tells autoproj about:
+
+- which extra configurations should be imported ("package sets") in the
+  `package_sets` section of the `manifest`. Once loaded, these package
+  sets are made available in the `remotes/` subfolder of this configuration.
+- which packages / package sets should be built in the `layout` section of
+  the `manifest`
+- which local overrides should be applied on package import (e.g. allowing
+  to change a package's import branch or URL) in `.yml` files located in
+  the `overrides.d` folder.
+
+Overall, autoproj does the following with its configuration:
+
+- load package description by (1) importing the package sets listed in
+  `manifest` and (2) loading the `.autobuild` files in the imported package sets.
+  Imported package sets are made available in the `remotes/` folder of this
+  directory.
+- resolve the import information (which can be inspected with `autoproj show`)
+
+## Using extra RubyGems in an autoproj workspace
+
+One can add new gems to a workspace, without passing through autoproj's osdeps
+system, by adding new `.gemfile` files to the workspace's
+`autoproj/overrides.d/` folder. These files must follow
+[Bundler](http://bundler.io) gemfile format
+

data/samples/autoproj/init.rb

@@ -1,23 +1,22 @@
-# Write in this file customization code that will get executed before all the
-# soures are loaded.
+# Define the github handler
+require 'autoproj/git_server_configuration'
 
-# Set the path to 'make'
-# Autobuild.commands['make'] = '/path/to/ccmake'
+# Comment this line if you want Autoproj to import the overall shell
+# environment. The default is to reset all build-related environment variables,
+# forcing the build configuration to set them explicitly, to improve
+# repeatability
+Autoproj.isolate_environment
 
-# Set the parallel build level (defaults to the number of CPUs)
-# Autobuild.parallel_build_level = 10
+# Display CMake/GCC build messages
+Autobuild::CMake.show_make_messages = true
 
-# Uncomment to initialize the environment variables to default values. This is
-# useful to ensure that the build is completely self-contained, but leads to
-# miss external dependencies installed in non-standard locations.
+# Install each package in a separate directory of install/
 #
-# set_initial_env
-#
-# Additionally, you can set up your own custom environment with calls to env_add
-# and env_set:
-#
-# env_add 'PATH', "/path/to/my/tool"
-# env_set 'VAR', "value"
-#
-# Variables set like this are exported in the generated env.sh scripts.
+# This makes the dependencies stricter, so builds that were fine without this
+# option might fail with it. However, it is also cleaner (allows to remove
+# obsolete package byproducts easily) and allows to turn the
+# delete_obsolete_files_in_prefix CMake option, in which autoproj's cmake
+# handler will remove installed files that are not part of the package anymore.
+Autoproj.config.separate_prefixes = true
+Autobuild::CMake.delete_obsolete_files_in_prefix = Autoproj.config.separate_prefixes?
 

data/samples/autoproj/manifest

@@ -2,51 +2,35 @@
 # package set definitions.
 package_sets:
 # Examples from the Rock package set
-#   - type: git
-#     url: git://gitorious.com/rock/package_set.git
+#   - github: rock-core/package_set
 
-# The layout section specifies what to build, and where to build it (as a
-# subdirectory of the root installation directory). In the example below, all
-# the packages of the rubim.orocos package set will be built, in the tools/
-# subdirectory: source in tools/typelib, tools/orocos/rtt, ... and installed
-# files in build/tools/typelib, build/tools/orocos/rtt, ...
+# The layout section specifies what to build. Can include both whole package sets or single packages.
 #
 # layout:
-#   - rock:
-#     - rock.toolchain
+# - rock.core
 #
-# Single packages can also be selected instead of whole package sets. The
-# package names are interpreted as a regular expression, so it is possible to
-# do:
-#
-# layout:
-#   - tools:
-#     - typelib
-#     - utilmm
-#     - orocos/
-#
-# The first two match the typelib and utilmm packages, while the second one
-# match all packages in which "orocos/" is found.
-#
-# Again, note that if a layout section is present, only the packages listed
-# there will be built.
 
 # Package exclusion: packages can be completely excluded from the build. This is
-# an alternative way than using the layout, mainly useful if you want to enable
-# all packages but a few ones. As with layout, the names are actually regular
-# expressions.
+# an alternative way than using the layout.
+#
+# Useful if you want to enable a whole package set except a few packages, or if
+# you want to exclude some package's optional dependencies.
 #
 # exclude_packages:
-#   - orocos/
+# - gui/.*
 
-# Ignoring packages: same principle than package exclusion, but this time the
-# packages are considered to be installed and up-to-date. This is useful if you
-# want to use an already installed software package.
+# Ignoring packages: assume that some packages are present on disk. Unlike
+# exclude_packages, autoproj will not generate an error if a non-excluded
+# package depends on an ignored one, but it will not include the package and its
+# dependencies in the build.
+#
+# For instance, if one assumes that the 'rtt' package is already available on
+# the machine *and* you're confident that picking it outside of the workspace
+# won't create problems, then simply do:
 #
-# For instance, let's assume the orocos/rtt is already installed on your
-# machine. You would then simply do:
+# Note that using this obviously hinders repeatability of the build
 #
 # ignored_packages:
-#   - orocos/rtt
+# - rtt
 #
 

data/samples/autoproj/overrides.d/.gitattributes

@@ -0,0 +1 @@
+*.gemfile diff=rb

data/samples/manifest.xml

@@ -10,11 +10,6 @@
 
   <depend package="pkgname"/>
   <depend package="common"/>
-  <rosdep name="python" />
-  <versioncontrol type="svn" url="https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/player/trunk"/>
-  <export>
-    <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lros"/>
-    <cpp os="osx" cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,-L${prefix}lib -lrosthread -framework CoreServices"/>
-  </export>
-
+  <!-- depend can handle both source and osdep packages -->
+  <depend package="python" />
 </package>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0.a
+        version: 1.11.0.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0.a
+        version: 1.11.0.a
 - !ruby/object:Gem::Dependency
   name: utilrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -76,98 +82,122 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: tty-color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: flexmock
+  name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
+        version: 0.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '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: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -302,13 +332,11 @@ files:
 - lib/autoproj/version.rb
 - lib/autoproj/workspace.rb
 - manifest.xml
-- samples/autoproj/README.txt
+- samples/autoproj/README.md
 - samples/autoproj/init.rb
 - samples/autoproj/manifest
-- samples/autoproj/overrides.rb
-- samples/autoproj/overrides.yml
+- samples/autoproj/overrides.d/.gitattributes
 - samples/manifest.xml
-- samples/osdeps.yml
 - shell/autoproj_bash
 - shell/autoproj_sh
 - shell/autoproj_zsh
@@ -327,9 +355,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1