autoproj 1.7.12.rc2 → 1.7.12

data/History.txt

@@ -3,6 +3,22 @@
  * fixed error if config.yml is empty
  * fixed issues with implicitly selecting ignored or excluded packages on the
    command line
+ * fixed handling of overrides that change the VCS type
+   If a package 'A' is normally under git and has an explicit branch, as e.g.
+     
+     - test:
+        type: git
+        url: my/url.git
+        branch: master
+
+   Then an override of
+
+     - test:
+        type: archive
+        url: http://other/url.tar.bz2
+
+   would fail as the 'branch' git option was passed to the archive importer.
+   This is handled well now.
  * added metapackage support. One can now "group" packages under a certain name,
    said name being used in the manifest' layout, exclude_packgaes and/or
    ignore_packages.

data/Manifest.txt

@@ -6,6 +6,8 @@ bin/amake
 bin/aup
 bin/autolocate
 bin/autoproj
+bin/autoproj-locate
+bin/autoproj-query
 bin/autoproj_bootstrap
 bin/autoproj_stress_test
 lib/autoproj.rb
@@ -17,6 +19,7 @@ lib/autoproj/gitorious.rb
 lib/autoproj/manifest.rb
 lib/autoproj/options.rb
 lib/autoproj/osdeps.rb
+lib/autoproj/query.rb
 lib/autoproj/system.rb
 lib/autoproj/version.rb
 samples/autoproj/README.txt

data/bin/autoproj-locate

@@ -0,0 +1,84 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+Autoproj.silent = true
+root_dir  = Autoproj::CmdLine.initialize_root_directory
+selection = Autoproj::CmdLine.initialize_and_load(ARGV)
+if selection.empty?
+    puts root_dir
+    exit 0
+elsif selection.size > 1
+    STDERR.puts Autoproj.console.color("more than one name given on the command line", :red)
+    exit 1
+end
+selection = selection.first
+
+selection_rx = Regexp.new(Regexp.quote(selection))
+candidates = []
+Autoproj.manifest.each_package do |pkg|
+    name = pkg.name
+    next if !Autoproj.manifest.package_enabled?(name)
+
+    srcdir = Autobuild::Package[name].srcdir
+    if name == selection
+        puts srcdir
+        exit(0)
+    elsif name =~ selection_rx
+        candidates << srcdir
+    end
+end
+
+if candidates.empty?
+    # Try harder. Match directory prefixes
+    directories = selection.split('/')
+    rx = directories.
+        map { |d| "#{Regexp.quote(d)}\\w*" }.
+        join("/")
+    rx = Regexp.new(rx)
+
+    rx_strict = directories[0..-2].
+        map { |d| "#{Regexp.quote(d)}\\w*" }.
+        join("/")
+    rx_strict = Regexp.new("#{rx_strict}/#{Regexp.quote(directories.last)}$")
+
+    candidates_strict = []
+    Autoproj.manifest.each_package do |pkg|
+        name = pkg.name
+        next if !Autoproj.manifest.package_enabled?(name)
+
+        srcdir = Autobuild::Package[name].srcdir
+        if name =~ rx
+            candidates << srcdir
+        end
+        if name =~ rx_strict
+            candidates_strict << srcdir
+        end
+    end
+
+    if candidates.size > 1 && candidates_strict.size == 1
+        candidates = candidates_strict
+    end
+end
+
+if candidates.size > 1
+    # If there is more than one candidate, check if there are some that are not
+    # present on disk
+    present = candidates.find_all { |dir| File.directory?(dir) }
+    if present.size == 1
+        candidates = present
+    end
+end
+
+if candidates.empty?
+    STDERR.puts Autoproj.console.color("cannot find #{selection} in the current autoproj installation", :bold, :red)
+    exit 1
+elsif candidates.size > 1
+    STDERR.puts Autoproj.console.color("multiple packages match #{selection} in the current autoproj installation: #{candidates.join(", ")}", :bold, :red)
+    exit 1
+else
+    puts candidates.first
+    exit(0)
+end
+

data/bin/autoproj-query

@@ -0,0 +1,73 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+Autoproj.silent = true
+display_all = false
+display_format = "$NAME"
+search_all = false
+
+parser = OptionParser.new do |opt|
+    opt.banner = "autoproj query <query_string>
+  Finds packages that match query_string and displays information about them (one per line)
+  By default, only the package name is displayed. It can be customized with the --format option
+
+  FORMAT SPECIFICATION
+
+  The format is a string in which special values can be expanded using a $VARNAME format. The following variables are accepted:
+    NAME: the package name
+    SRCDIR: the full path to the package source directory
+    PREFIX: the full path to the package installation directory"
+
+    opt.on('--search-all', "search in all defined packages instead of only in those selected selected in the layout") do
+        search_all = true
+    end
+    opt.on('--format FORMAT', String, "customize what should be displayed. See FORMAT SPECIFICATION above") do |format|
+        display_format = format
+    end
+end
+remaining = parser.parse(ARGV)
+
+root_dir  = Autoproj::CmdLine.initialize_root_directory
+selection = Autoproj::CmdLine.initialize_and_load(remaining)
+if selection.empty?
+    STDERR.puts Autoproj.console.color("no query given on the command line", :red)
+    exit 1
+elsif selection.size > 1
+    STDERR.puts Autoproj.console.color("more than one query given on the command line", :red)
+    exit 1
+end
+selection = selection.first
+query = Autoproj::Query.parse_query(selection)
+
+packages =
+    if search_all
+        Autoproj.manifest.packages.find_all do |name, pkg_def|
+            !Autoproj.manifest.package_selected?(name)
+        end
+    else
+        Autoproj.manifest.all_selected_packages.map do |pkg_name|
+            [pkg_name, Autoproj.manifest.packages[pkg_name]]
+        end
+    end
+
+matches = packages.map do |name, pkg_def|
+    if priority = query.match(pkg_def)
+        [priority, name]
+    end
+end.compact
+
+fields = Hash.new
+matches = matches.sort
+matches.each do |priority, name|
+    pkg = Autobuild::Package[name]
+    fields['SRCDIR'] = pkg.srcdir
+    fields['PREFIX'] = pkg.prefix
+    fields['NAME'] = name
+    fields['PRIORITY'] = priority
+
+    value = Autoproj.expand(display_format, fields)
+    puts value
+end
+

data/lib/autoproj/manifest.rb

@@ -411,7 +411,6 @@ module Autoproj
     # dependencies that are provided by the operating system (.osdeps file).
     class PackageSet
         attr_reader :manifest
-
         # The VCSDefinition object that defines the version control holding
         # information for this source. Local package sets (i.e. the ones that are not
         # under version control) use the 'local' version control name. For them,

data/lib/autoproj/query.rb

@@ -0,0 +1,124 @@
+module Autoproj
+    class Query
+        ALLOWED_FIELDS = [
+            'autobuild.name',
+            'autobuild.srcdir',
+            'autobuild.class.name',
+            'vcs.type',
+            'vcs.url',
+            'package_set.name'
+        ]
+        DEFAULT_FIELDS = {
+            'class' => 'autobuild.class.name',
+            'autobuild' => 'autobuild.name',
+            'vcs' => 'vcs.url',
+            'package_set' => 'package_set.name'
+        }
+
+        # Match priorities
+        EXACT = 4
+        PARTIAL = 3
+        DIR_PREFIX_STRONG = 2
+        DIR_PREFIX_WEAK = 1
+
+        attr_reader :fields
+        attr_reader :value
+        attr_predicate :use_dir_prefix?
+
+        def initialize(fields, value)
+            @fields = fields
+            @value = value
+            @value_rx = Regexp.new(Regexp.quote(value), true)
+
+            directories = value.split('/')
+            if !directories.empty?
+                @use_dir_prefix = true
+                rx = directories.
+                    map { |d| "#{Regexp.quote(d)}\\w*" }.
+                    join("/")
+                rx = Regexp.new(rx, true)
+                @dir_prefix_weak_rx = rx
+
+                rx_strict = directories[0..-2].
+                    map { |d| "#{Regexp.quote(d)}\\w*" }.
+                    join("/")
+                rx_strict = Regexp.new("#{rx_strict}/#{Regexp.quote(directories.last)}$", true)
+                @dir_prefix_strong_rx = rx_strict
+            end
+        end
+
+        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
+                return PARTIAL
+            end
+
+            # Special match for directories: match directory prefixes
+            if use_dir_prefix?
+                if pkg_value =~ @dir_prefix_strong_rx
+                    return DIR_PREFIX_STRONG
+                elsif pkg_value =~ @dir_prefix_weak_rx
+                    return DIR_PREFIX_WEAK
+                end
+            end
+        end
+
+        def self.parse(str)
+            field, value = str.split('=')
+            if DEFAULT_FIELDS[field]
+                field = DEFAULT_FIELDS[field]
+            end
+
+            # Validate the query key
+            if !ALLOWED_FIELDS.include?(field)
+                raise ArgumentError, "#{field} is not a known query key"
+            end
+
+            fields = field.split('.')
+            new(fields, value)
+        end
+
+        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}")
+                    Or.new([match_name, match_dir])
+                else
+                    Query.parse(str)
+                end
+            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
+        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
+                end
+            end
+            matches.min
+        end
+    end
+end
+

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.12.rc2"
+    VERSION = "1.7.12"
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 15424033
-  prerelease: 7
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 7
   - 12
-  - rc
-  - 2
-  version: 1.7.12.rc2
+  version: 1.7.12
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 Z
+date: 2011-08-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -179,6 +177,8 @@ executables:
 - aup
 - autolocate
 - autoproj
+- autoproj-locate
+- autoproj-query
 - autoproj_bootstrap
 - autoproj_stress_test
 extensions: []
@@ -197,6 +197,8 @@ files:
 - bin/aup
 - bin/autolocate
 - bin/autoproj
+- bin/autoproj-locate
+- bin/autoproj-query
 - bin/autoproj_bootstrap
 - bin/autoproj_stress_test
 - lib/autoproj.rb
@@ -208,6 +210,7 @@ files:
 - lib/autoproj/manifest.rb
 - lib/autoproj/options.rb
 - lib/autoproj/osdeps.rb
+- lib/autoproj/query.rb
 - lib/autoproj/system.rb
 - lib/autoproj/version.rb
 - samples/autoproj/README.txt
@@ -244,14 +247,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: autobuild