autoproj 1.7.13 → 1.7.14.rc1

data/History.txt

@@ -1,3 +1,23 @@
+= Version 1.7.14
+ * fix support for local package sets, i.e. package sets that are saved in
+   autoproj/directory_name and are part of the main configuration VCS.
+ * fix behavior of autoproj when adding a remote package set in
+   autoproj/manifest and calling amake my/package right away. Until now,
+   autoproj was yelling with a criptic message. It will now behave and check out
+   the new package set.
+ * add support for sourcing shell scripts from env.sh:
+   Autoproj.env_source_file(path)
+ * fix a Ruby 1.9 incompatibility
+ * better performance in e.g. autoproj query and autoproj locate (this speeds up
+   acd)
+ * accept amake --rebuild the same way than amake --force was accepted until now
+ * add support for including manifest.xml files in the package sets. This is
+   meant to be used for external packages that do not provide a manifest.
+   The manifests are listed in the package set's manifests/ subdirectory and
+   must match the package name, as e.g.
+      rock.git/external/yaml-cpp.xml
+   The package set's manifest takes precedence over the package one.
+
 = Version 1.7.13
  * bugfix release: fix HTTP fallback mechanism for gitorious servers
 

data/Rakefile

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift File.join(Dir.pwd, 'lib')
 
+task 'default'
 begin
     require 'hoe'
     namespace 'dist' do

data/bin/amake

@@ -3,7 +3,7 @@
 require 'optparse'
 
 build_all = false
-force = false
+mode = "build"
 
 parser = OptionParser.new do |opt|
     opt.banner = "amake [options] [dir_or_package]
@@ -17,7 +17,10 @@ Accepts all options from autoproj build plus the following options:
         build_all = true
     end
     opt.on('--force', 'runs autoproj force-build instead of autoproj build') do
-        force = true
+        mode = "force-build"
+    end
+    opt.on('--rebuild', 'runs autoproj force-build instead of autoproj build') do
+        mode = "rebuild"
     end
     opt.on('--help', 'shows this help message') do
         puts parser
@@ -45,11 +48,7 @@ if remaining.grep(/^-/).size == remaining.size && !build_all
     remaining.push '.'
 end
 
-if force
-    remaining.unshift "force-build"
-else
-    remaining.unshift "build"
-end
+remaining.unshift mode
 ARGV.clear
 ARGV.concat(remaining)
 load File.expand_path('autoproj', File.dirname(__FILE__))

data/bin/autoproj

@@ -52,7 +52,16 @@ Autoproj::OSDependencies.autodetect_ruby
 prefix = File.expand_path(__FILE__)
 if File.file?("#{prefix}-#{ARGV.first}")
     binary = "#{prefix}-#{ARGV.shift}"
-    exec(binary, *ARGV)
+    # RubyGems have a BIG performance problem when $LOADED_PATH starts to be
+    # big. 
+    #
+    # So, if the sub-script is Ruby-based, just load it and exit
+    if File.readlines(binary).first =~ /ruby/
+        load binary
+        exit
+    else
+        exec(binary, *ARGV)
+    end
 end
 
 # Find the autoproj root dir
@@ -97,6 +106,14 @@ EOTEXT
     if selected_packages.empty?
         Autoproj::CmdLine.update_myself
         Autoproj::CmdLine.update_configuration
+    else
+        begin
+            old_value = Autobuild.do_update
+            Autobuild.do_update = false
+            Autoproj::CmdLine.update_configuration
+        ensure
+            Autobuild.do_update = old_value
+        end
     end
     Autoproj::CmdLine.load_configuration
     manifest = Autoproj.manifest

data/bin/autoproj_bootstrap

@@ -686,7 +686,12 @@ fi
             gems = gems.dup
             gems.delete_if do |name, version|
                 version_requirements = Gem::Requirement.new(version || '>= 0')
-                installed = Gem.source_index.find_name(name, version_requirements)
+                installed =
+                    if Gem.source_index.respond_to?(:find_by_name)
+                        Gem.source_index.find_by_name(name, version_requirements)
+                    else
+                        Gem.source_index.find_name(name, version_requirements)
+                    end
                 if !installed.empty? && Autobuild.do_update
                     # Look if we can update the package ...
                     dep = Gem::Dependency.new(name, version_requirements)
@@ -1370,37 +1375,22 @@ module Autoproj
                        File.join(Autoproj.root_dir, "env.sh")
                    end
 
-        File.open(filename, "w") do |io|
-            variables = []
-            Autobuild.environment.each do |name, value|
-                variables << name
-                shell_line = "#{name}=#{value.join(":")}"
-                if Autoproj.env_inherit?(name)
-                    if value.empty?
-                        next
-                    else
-                        shell_line << ":$#{name}"
-                    end
+        shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
+        if Autoproj.shell_helpers? && shell = ENV['SHELL']
+            shell_kind = File.basename(shell)
+            if shell_kind =~ /^\w+$/
+                shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
+                if File.exists?(shell_file)
+                    Autoproj.progress
+                    Autoproj.progress "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
+                    Autoproj.progress "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
+                    Autobuild.env_source_file(shell_file)
                 end
-                io.puts shell_line
-            end
-            variables.each do |var|
-                io.puts "export #{var}"
             end
+        end
 
-            shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
-            if Autoproj.shell_helpers? && shell = ENV['SHELL']
-                shell_kind = File.basename(shell)
-                if shell_kind =~ /^\w+$/
-                    shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
-                    if File.exists?(shell_file)
-                        Autoproj.progress
-                        Autoproj.progress "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
-                        Autoproj.progress "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
-                        io.puts "source \"#{shell_file}\""
-                    end
-                end
-            end
+        File.open(filename, "w") do |io|
+            Autobuild.export_env_sh(io)
         end
     end
 

data/lib/autoproj/cmdline.rb

@@ -493,7 +493,7 @@ module Autoproj
                         sel = File.expand_path(sel)
                         relative_to_root = Pathname.new(sel).relative_path_from(Pathname.new(Autoproj.root_dir))
                         pkg = Autoproj.in_package_set(manifest.local_package_set, manifest.file) do
-                            send(handler, relative_to_root)
+                            send(handler, relative_to_root.to_s)
                         end
                         setup_package_directories(pkg)
                         selected_packages << pkg.name
@@ -1660,9 +1660,7 @@ export PATH=$GEM_HOME/bin:$PATH
 
             Autoproj::CmdLine.update_os_dependencies = false
             Autoproj::CmdLine.initialize
-            if Autobuild.do_update
-                Autoproj::CmdLine.update_configuration
-            end
+            Autoproj::CmdLine.update_configuration
             Autoproj::CmdLine.load_configuration
             Autoproj::CmdLine.setup_all_package_directories
             Autoproj::CmdLine.finalize_package_setup

data/lib/autoproj/manifest.rb

@@ -119,6 +119,12 @@ module Autoproj
         Autobuild.env_add_path(name, *value)
     end
 
+    # Requests that autoproj source the given shell script in its own env.sh
+    # script
+    def self.env_source_file(file)
+        Autobuild.env_source_file(file)
+    end
+
     # Representation of a VCS definition contained in a source.yml file or in
     # autoproj/manifest
     class VCSDefinition
@@ -495,6 +501,12 @@ module Autoproj
         # Create a PackageSet instance from its description as found in YAML
         # configuration files
         def self.from_spec(manifest, raw_spec, load_description)
+            if raw_spec.respond_to?(:to_str)
+                local_path = File.join(Autoproj.config_dir, raw_spec)
+                if File.directory?(local_path)
+                    raw_spec = { :type => 'local', :url => local_path }
+                end
+            end
             spec = VCSDefinition.vcs_definition_to_hash(raw_spec)
             options, vcs_spec = Kernel.filter_options spec, :auto_imports => true
 
@@ -1782,17 +1794,21 @@ module Autoproj
         def load_package_manifest(pkg_name)
             pkg = packages.values.
                 find { |pkg| pkg.autobuild.name == pkg_name }
-            package, source, file = pkg.autobuild, pkg.package_set, pkg.file
+            package, package_set, file = pkg.autobuild, pkg.package_set, pkg.file
 
             if !pkg_name
                 raise ArgumentError, "package #{pkg_name} is not defined"
             end
 
-            manifest_path = File.join(package.srcdir, "manifest.xml")
-            if !File.directory?(package.srcdir)
-                return
-            elsif !File.file?(manifest_path)
-                Autoproj.warn "#{package.name} from #{source.name} does not have a manifest"
+            manifest_paths =
+                [File.join(package_set.local_dir, "manifests", package.name + ".xml"), File.join(package.srcdir, "manifest.xml")]
+            manifest_path = manifest_paths.find do |path|
+                File.directory?(File.dirname(path)) &&
+                    File.file?(path)
+            end
+
+            if !manifest_path
+                Autoproj.warn "#{package.name} from #{package_set.name} does not have a manifest"
                 return
             end
 
@@ -1809,10 +1825,10 @@ module Autoproj
                     end
                 rescue Autobuild::ConfigException => e
                     raise ConfigError.new(manifest_path),
-                        "manifest #{manifest_path} of #{package.name} from #{source.name} lists '#{name}' as dependency, which is listed in the layout of #{file} but has no autobuild definition", e.backtrace
+                        "manifest #{manifest_path} of #{package.name} from #{package_set.name} lists '#{name}' as dependency, which is listed in the layout of #{file} but has no autobuild definition", e.backtrace
                 rescue ConfigError => e
                     raise ConfigError.new(manifest_path),
-                        "manifest #{manifest_path} of #{package.name} from #{source.name} lists '#{name}' as dependency, but it is neither a normal package nor an osdeps package. osdeps reports: #{e.message}", e.backtrace
+                        "manifest #{manifest_path} of #{package.name} from #{package_set.name} lists '#{name}' as dependency, but it is neither a normal package nor an osdeps package. osdeps reports: #{e.message}", e.backtrace
                 end
             end
         end

data/lib/autoproj/osdeps.rb

@@ -587,7 +587,12 @@ fi
             gems = gems.dup
             gems.delete_if do |name, version|
                 version_requirements = Gem::Requirement.new(version || '>= 0')
-                installed = Gem.source_index.find_name(name, version_requirements)
+                installed =
+                    if Gem.source_index.respond_to?(:find_by_name)
+                        Gem.source_index.find_by_name(name, version_requirements)
+                    else
+                        Gem.source_index.find_name(name, version_requirements)
+                    end
                 if !installed.empty? && Autobuild.do_update
                     # Look if we can update the package ...
                     dep = Gem::Dependency.new(name, version_requirements)

data/lib/autoproj/query.rb

@@ -1,4 +1,32 @@
 module Autoproj
+    # Match class for the query system.
+    #
+    # This class allows to create a query object based on a textual
+    # representation, and then match packages using this query object.
+    #
+    # The queries are of the form
+    #
+    #   FIELD=VALUE:FIELD~VALUE:FIELD=VALUE
+    #
+    # The F=V form requires an exact match while F~V allows partial
+    # matches. The different matches are combined with AND (i.e. only packages
+    # matching all criterias will be returned)
+    #
+    # The following fields are allowed:
+    #   * autobuild.name: the package name
+    #   * autobuild.srcdir: the package source directory
+    #   * autobuild.class.name: the package class
+    #   * vcs.type: the VCS type (as used in the source.yml files)
+    #   * vcs.url: the URL from the VCS. The exact semantic of it depends on the
+    #     VCS type
+    #   * package_set.name: the name of the package set that defines the package
+    #
+    # Some fields have shortcuts:
+    #   * 'name' can be used instead of 'autobuild.name'
+    #   * 'class' can be used instead of 'autobuild.class.name'
+    #   * 'vcs' can be used instead of 'vcs.url'
+    #   * 'package_set' can be used instead of 'package_set.name'
+    #
     class Query
         ALLOWED_FIELDS = [
             'autobuild.name',
@@ -9,8 +37,8 @@ module Autoproj
             'package_set.name'
         ]
         DEFAULT_FIELDS = {
+            'name' => 'autobuild.name',
             'class' => 'autobuild.class.name',
-            'autobuild' => 'autobuild.name',
             'vcs' => 'vcs.url',
             'package_set' => 'package_set.name'
         }
@@ -24,11 +52,13 @@ module Autoproj
         attr_reader :fields
         attr_reader :value
         attr_predicate :use_dir_prefix?
+        attr_predicate :partial?
 
-        def initialize(fields, value)
+        def initialize(fields, value, partial)
             @fields = fields
             @value = value
             @value_rx = Regexp.new(Regexp.quote(value), true)
+            @partial = partial
 
             directories = value.split('/')
             if !directories.empty?
@@ -47,13 +77,41 @@ module Autoproj
             end
         end
 
+        # Checks if +pkg+ matches the query
+        #
+        # Returns false if +pkg+ does not match the query and a true value
+        # otherwise.
+        #
+        # If the package matches, the returned value can be one of:
+        #
+        # EXACT:: this is an exact match
+        # PARTIAL::
+        #   the expected value can be found in the package field. The
+        #   match is done in a case-insensitive way
+        # DIR_PREFIX_STRONG::
+        #   if the expected value contains '/' (directory
+        #   marker), the package matches the following regular
+        #   expression: /el\w+/el2\w+/el3$
+        # DIR_PREFIX_WEAK::
+        #   if the expected value contains '/' (directory
+        #   marker), the package matches the following regular
+        #   expression: /el\w+/el2\w+/el3\w+
+        #
+        # If partial? is not set (i.e. if FIELD=VALUE was used), then only EXACT
+        # or false can be returned.
         def match(pkg)
             pkg_value = fields.inject(pkg) { |v, field_name| v.send(field_name) }
             pkg_value = pkg_value.to_s
 
             if pkg_value == value
                 return EXACT
-            elsif pkg_value =~ @value_rx
+            end
+
+            if !partial?
+                return
+            end
+
+            if pkg_value =~ @value_rx
                 return PARTIAL
             end
 
@@ -67,8 +125,14 @@ module Autoproj
             end
         end
 
+        # Parse a single field in a query (i.e. a FIELD[=~]VALUE string)
         def self.parse(str)
             field, value = str.split('=')
+            if !value
+                partial = true
+                field, value = str.split('~')
+            end
+
             if DEFAULT_FIELDS[field]
                 field = DEFAULT_FIELDS[field]
             end
@@ -79,15 +143,16 @@ module Autoproj
             end
 
             fields = field.split('.')
-            new(fields, value)
+            new(fields, value, partial)
         end
 
+        # Parse a complete query
         def self.parse_query(query)
             query = query.split(':')
             query = query.map do |str|
-                if str !~ /=/
-                    match_name = Query.parse("autobuild.name=#{str}")
-                    match_dir  = Query.parse("autobuild.srcdir=#{str}")
+                if str !~ /[=~]/
+                    match_name = Query.parse("autobuild.name~#{str}")
+                    match_dir  = Query.parse("autobuild.srcdir~#{str}")
                     Or.new([match_name, match_dir])
                 else
                     Query.parse(str)
@@ -95,29 +160,31 @@ module Autoproj
             end
             And.new(query)
         end
-    end
 
-    class Or
-        def initialize(submatches)
-            @submatches = submatches
-        end
-        def match(pkg)
-            @submatches.map { |m| m.match(pkg) }.compact.max
+        # Match object that combines multiple matches using a logical OR
+        class Or
+            def initialize(submatches)
+                @submatches = submatches
+            end
+            def match(pkg)
+                @submatches.map { |m| m.match(pkg) }.compact.max
+            end
         end
-    end
 
-    class And
-        def initialize(submatches)
-            @submatches = submatches
-        end
-        def match(pkg)
-            matches = @submatches.map do |m|
-                if p = m.match(pkg)
-                    p
-                else return
+        # Match object that combines multiple matches using a logical AND
+        class And
+            def initialize(submatches)
+                @submatches = submatches
+            end
+            def match(pkg)
+                matches = @submatches.map do |m|
+                    if p = m.match(pkg)
+                        p
+                    else return
+                    end
                 end
+                matches.min
             end
-            matches.min
         end
     end
 end

data/lib/autoproj/system.rb

@@ -126,37 +126,22 @@ module Autoproj
                        File.join(Autoproj.root_dir, "env.sh")
                    end
 
-        File.open(filename, "w") do |io|
-            variables = []
-            Autobuild.environment.each do |name, value|
-                variables << name
-                shell_line = "#{name}=#{value.join(":")}"
-                if Autoproj.env_inherit?(name)
-                    if value.empty?
-                        next
-                    else
-                        shell_line << ":$#{name}"
-                    end
+        shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
+        if Autoproj.shell_helpers? && shell = ENV['SHELL']
+            shell_kind = File.basename(shell)
+            if shell_kind =~ /^\w+$/
+                shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
+                if File.exists?(shell_file)
+                    Autoproj.progress
+                    Autoproj.progress "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
+                    Autoproj.progress "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
+                    Autobuild.env_source_file(shell_file)
                 end
-                io.puts shell_line
-            end
-            variables.each do |var|
-                io.puts "export #{var}"
             end
+        end
 
-            shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
-            if Autoproj.shell_helpers? && shell = ENV['SHELL']
-                shell_kind = File.basename(shell)
-                if shell_kind =~ /^\w+$/
-                    shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
-                    if File.exists?(shell_file)
-                        Autoproj.progress
-                        Autoproj.progress "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
-                        Autoproj.progress "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
-                        io.puts "source \"#{shell_file}\""
-                    end
-                end
-            end
+        File.open(filename, "w") do |io|
+            Autobuild.export_env_sh(io)
         end
     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.13"
+    VERSION = "1.7.14.rc1"
 end

data/shell/autoproj_bash

@@ -1,6 +1,6 @@
 function acd {
     local pkg_path
-    pkg_path=$(autoproj locate $1)
+    pkg_path=$(autoproj locate $1 | tail -1)
 
     if [ $? != 0 ]; then
       return 1

data/shell/autoproj_zsh

@@ -1,6 +1,6 @@
 function acd {
     local pkg_path
-    pkg_path=$(autoproj locate $1)
+    pkg_path=$(autoproj locate $1 | tail -1)
 
     if [ $? != 0 ]; then
       return 1

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 15424055
+  prerelease: 7
   segments: 
   - 1
   - 7
-  - 13
-  version: 1.7.13
+  - 14
+  - rc
+  - 1
+  version: 1.7.14.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 Z
+date: 2011-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -135,14 +137,13 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 27
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id008
 description: |-
@@ -226,6 +227,7 @@ files:
 - test/data/test_manifest/autoproj/manifest
 - test/test_debian.rb
 - test/test_manifest.rb
+- .gemtest
 homepage: http://doudou.github.com/autoproj
 licenses: []
 
@@ -247,16 +249,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of robotics software