autoproj 1.9.6 → 1.9.7.rc1

data/lib/autoproj/system.rb

@@ -105,7 +105,7 @@ module Autoproj
 
     # Run the provided command as root, using sudo to gain root access
     def self.run_as_root(*args)
-        if !system('sudo', *args)
+        if !system(Autobuild.tool_in_path('sudo'), *args)
             raise "failed to run #{args.join(" ")} as root"
         end
     end

data/lib/autoproj/variable_expansion.rb

@@ -0,0 +1,107 @@
+module Autoproj
+    # Expand build options in +value+.
+    #
+    # The method will expand in +value+ patterns of the form $NAME, replacing
+    # them with the corresponding build option.
+    def self.expand_environment(value)
+        # Perform constant expansion on the defined environment variables,
+        # including the option set
+        options = Autoproj.option_set
+        options.each_key do |k|
+            options[k] = options[k].to_s
+        end
+        options = options.merge(option_overrides)
+
+        loop do
+            new_value = Autoproj.single_expansion(value, options)
+            if new_value == value
+                break
+            else
+                value = new_value
+            end
+        end
+        value
+    end
+
+    # Does a non-recursive expansion in +data+ of configuration variables
+    # ($VAR_NAME) listed in +definitions+
+    #
+    # If the values listed in +definitions+ also contain configuration
+    # variables, they do not get expanded
+    def self.single_expansion(data, definitions)
+        if !data.respond_to?(:to_str)
+            return data
+        end
+        definitions = { 'HOME' => ENV['HOME'] }.merge(definitions)
+
+        data = data.gsub /(.|^)\$(\w+)/ do |constant_name|
+            prefix = constant_name[0, 1]
+            if prefix == "\\"
+                next(constant_name[1..-1])
+            end
+            if prefix == "$"
+                prefix, constant_name = "", constant_name[1..-1]
+            else
+                constant_name = constant_name[2..-1]
+            end
+
+            if !(value = definitions[constant_name])
+                if !(value = Autoproj.user_config(constant_name))
+                    if !block_given? || !(value = yield(constant_name))
+                        raise ArgumentError, "cannot find a definition for $#{constant_name}"
+                    end
+                end
+            end
+            "#{prefix}#{value}"
+        end
+        data
+    end
+
+    # Expand constants within +value+
+    #
+    # The list of constants is given in +definitions+. It raises ConfigError if
+    # some values are not found
+    def self.expand(value, definitions = Hash.new)
+        if value.respond_to?(:to_hash)
+            value.dup.each do |name, definition|
+                value[name] = expand(definition, definitions)
+            end
+            value
+        elsif value.respond_to?(:to_ary)
+            value.map { |val| expand(val, definitions) }
+        else
+            value = single_expansion(value, definitions)
+            if contains_expansion?(value)
+                raise ConfigError.new, "some expansions are not defined in #{value.inspect}"
+            end
+            value
+        end
+    end
+
+    # True if the given string contains expansions
+    def self.contains_expansion?(string); string =~ /\$/ end
+
+    def self.resolve_one_constant(name, value, result, definitions)
+        result[name] = single_expansion(value, result) do |missing_name|
+            result[missing_name] = resolve_one_constant(missing_name, definitions.delete(missing_name), result, definitions)
+        end
+    end
+
+    # Resolves all possible variable references from +constants+
+    #
+    # I.e. replaces variables by their values, so that no value in +constants+
+    # refers to variables defined in +constants+
+    def self.resolve_constant_definitions(constants)
+        constants = constants.dup
+        constants['HOME'] = ENV['HOME']
+        
+        result = Hash.new
+        while !constants.empty?
+            name  = constants.keys.first
+            value = constants.delete(name)
+            resolve_one_constant(name, value, result, constants)
+        end
+        result
+    end
+end
+

data/lib/autoproj/vcs_definition.rb

@@ -0,0 +1,223 @@
+module Autoproj
+    # Representation of a VCS definition contained in a source.yml file or in
+    # autoproj/manifest
+    class VCSDefinition
+        attr_reader :type
+        attr_reader :url
+        attr_reader :options
+
+        # The original spec in hash form. Set if this VCSDefinition object has
+        # been created using VCSDefinition.from_raw
+        attr_reader :raw
+
+        def initialize(type, url, options, raw = nil)
+            if raw && !raw.respond_to?(:to_ary)
+                raise ArgumentError, "wrong format for the raw field (#{raw.inspect})"
+            end
+
+            @type, @url, @options = type, url, options
+            if type != "none" && type != "local" && !Autobuild.respond_to?(type)
+                raise ConfigError.new, "version control #{type} is unknown to autoproj"
+            end
+            @raw = raw
+        end
+
+        def local?
+            @type == 'local'
+        end
+
+        def to_hash
+            Hash[:type => type, :url => url].merge(options)
+        end
+
+        # Updates the VCS specification +old+ by the information contained in
+        # +new+
+        #
+        # Both +old+ and +new+ are supposed to be in hash form. It is assumed
+        # that +old+ has already been normalized by a call to
+        # Autoproj.vcs_definition_to_hash. +new+ can be in "raw" form.
+        def self.update_raw_vcs_spec(old, new)
+            new = vcs_definition_to_hash(new)
+            if new.has_key?(:type) && (old[:type] != new[:type])
+                # The type changed. We replace the old definition by the new one
+                # completely, and we make sure that the new definition is valid
+                from_raw(new)
+                new
+            else
+                old.merge(new)
+            end
+        end
+
+        # Normalizes a VCS definition contained in a YAML file into a hash
+        #
+        # It handles custom source handler expansion, as well as the bad habit
+        # of forgetting a ':' at the end of a line:
+        #
+        #   - package_name
+        #     branch: value
+        def self.vcs_definition_to_hash(spec)
+            options = Hash.new
+
+            plain = Array.new
+            filtered_spec = Hash.new
+            spec.each do |key, value|
+                keys = key.to_s.split(/\s+/)
+                plain.concat(keys[0..-2])
+                filtered_spec[keys[-1].to_sym] = value
+            end
+            spec = filtered_spec
+
+            if plain.size > 1
+                raise ConfigError.new, "invalid syntax"
+            elsif plain.size == 1
+                short_url = plain.first
+                vcs, *url = short_url.split(':')
+
+                # Check if VCS is a known version control system or source handler
+                # shortcut. If it is not, look for a local directory called
+                # short_url
+                if Autobuild.respond_to?(vcs)
+                    spec.merge!(:type => vcs, :url => url.join(':'))
+                elsif Autoproj.has_source_handler?(vcs)
+                    spec = Autoproj.call_source_handler(vcs, url.join(':'), spec)
+                else
+                    source_dir = File.expand_path(File.join(Autoproj.config_dir, short_url))
+                    if !File.directory?(source_dir)
+                        raise ConfigError.new, "'#{spec.inspect}' is neither a remote source specification, nor a local source definition"
+                    end
+                    spec.merge!(:type => 'local', :url => source_dir)
+                end
+            end
+
+            spec, vcs_options = Kernel.filter_options spec, :type => nil, :url => nil
+            spec.merge!(vcs_options)
+            if !spec[:url]
+                # Verify that none of the keys are source handlers. If it is the
+                # case, convert
+                filtered_spec = Hash.new
+                spec.dup.each do |key, value|
+                    if Autoproj.has_source_handler?(key)
+                        spec.delete(key)
+                        spec = Autoproj.call_source_handler(key, value, spec)
+                        break
+                    end
+                end
+            end
+
+            spec
+        end
+
+        # Autoproj configuration files accept VCS definitions in three forms:
+        #  * as a plain string, which is a relative/absolute path
+        #  * as a plain string, which is a vcs_type:url string
+        #  * as a hash
+        #
+        # This method returns the VCSDefinition object matching one of these
+        # specs. It raises ConfigError if there is no type and/or url
+        def self.from_raw(spec, raw_spec = [[nil, spec]])
+            spec = vcs_definition_to_hash(spec)
+            if !(spec[:type] && (spec[:type] == 'none' || spec[:url]))
+                raise ConfigError.new, "the source specification #{spec.inspect} misses either the VCS type or an URL"
+            end
+
+            spec, vcs_options = Kernel.filter_options spec, :type => nil, :url => nil
+            return VCSDefinition.new(spec[:type], spec[:url], vcs_options, raw_spec)
+        end
+
+        def ==(other_vcs)
+            return false if !other_vcs.kind_of?(VCSDefinition)
+            if local?
+                other_vcs.local? && url == other.url
+            elsif !other_vcs.local?
+                this_importer = create_autobuild_importer
+                other_importer = other_vcs.create_autobuild_importer
+                this_importer.repository_id == other_importer.repository_id
+            end
+        end
+
+        def self.to_absolute_url(url, root_dir = nil)
+            # NOTE: we MUST use nil as default argument of root_dir as we don't
+            # want to call Autoproj.root_dir unless completely necessary
+            # (to_absolute_url might be called on installations that are being
+            # bootstrapped, and as such don't have a root dir yet).
+            url = Autoproj.single_expansion(url, 'HOME' => ENV['HOME'])
+            if url && url !~ /^(\w+:\/)?\/|^[:\w]+\@|^(\w+\@)?[\w\.-]+:/
+                url = File.expand_path(url, root_dir || Autoproj.root_dir)
+            end
+            url
+        end
+
+        # Returns a properly configured instance of a subclass of
+        # Autobuild::Importer that match this VCS definition
+        #
+        # Returns nil if the VCS type is 'none'
+        def create_autobuild_importer
+            return if type == "none"
+
+            url = VCSDefinition.to_absolute_url(self.url)
+            Autobuild.send(type, url, options)
+        end
+
+        # Returns a pretty representation of this VCS definition
+        def to_s 
+            if type == "none"
+                "none"
+            else
+                desc = "#{type}:#{url}"
+                if !options.empty?
+                    desc = "#{desc} #{options.to_a.sort_by { |key, _| key.to_s }.map { |key, value| "#{key}=#{value}" }.join(" ")}"
+                end
+                desc
+            end
+        end
+    end
+
+    @custom_source_handlers = Hash.new
+
+    # Returns true if +vcs+ refers to a source handler name added by
+    # #add_source_handler
+    def self.has_source_handler?(vcs)
+        @custom_source_handlers.has_key?(vcs.to_s)
+    end
+
+    # Returns the source handlers associated with +vcs+
+    #
+    # Source handlers are added by Autoproj.add_source_handler. The returned
+    # value is an object that responds to #call(url, options) and return a VCS
+    # definition as a hash
+    def self.call_source_handler(vcs, url, options)
+        handler = @custom_source_handlers[vcs.to_s]
+        if !handler
+            raise ArgumentError, "there is no source handler for #{vcs}"
+        else
+            return handler.call(url, options)
+        end
+    end
+
+    # call-seq:
+    #   Autoproj.add_source_handler name do |url, options|
+    #     # build a hash that represent source configuration
+    #     # and return it
+    #   end
+    #
+    # Add a custom source handler named +name+
+    #
+    # Custom source handlers are shortcuts that can be used to represent VCS
+    # information. For instance, the gitorious_server_configuration method
+    # defines a source handler that allows to easily add new gitorious packages:
+    #
+    #   gitorious_server_configuration 'GITORIOUS', 'gitorious.org'
+    #
+    # defines the "gitorious" source handler, which allows people to write
+    #
+    #
+    #   version_control:
+    #       - tools/orocos.rb
+    #         gitorious: rock-toolchain/orocos-rb
+    #         branch: test
+    #
+    # 
+    def self.add_source_handler(name, &handler)
+        @custom_source_handlers[name.to_s] = lambda(&handler)
+    end
+end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.6"
+    VERSION = "1.9.7.rc1"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.6
-  prerelease: 
+  version: 1.9.7.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.12'
 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.
@@ -102,13 +102,17 @@ executables:
 - autolocate
 - autoproj
 - autoproj-bootstrap
+- autoproj-cache
 - autoproj-clean
 - autoproj-create-set
+- autoproj-doc
 - autoproj-envsh
 - autoproj-list
 - autoproj-locate
 - autoproj-query
 - autoproj-show
+- autoproj-snapshot
+- autoproj-test
 - autoproj_bootstrap
 - autoproj_bootstrap.in
 - autoproj_stress_test
@@ -129,13 +133,17 @@ files:
 - bin/autolocate
 - bin/autoproj
 - bin/autoproj-bootstrap
+- bin/autoproj-cache
 - bin/autoproj-clean
 - bin/autoproj-create-set
+- bin/autoproj-doc
 - bin/autoproj-envsh
 - bin/autoproj-list
 - bin/autoproj-locate
 - bin/autoproj-query
 - bin/autoproj-show
+- bin/autoproj-snapshot
+- bin/autoproj-test
 - bin/autoproj_bootstrap
 - bin/autoproj_bootstrap.in
 - bin/autoproj_stress_test
@@ -144,14 +152,24 @@ files:
 - lib/autoproj/base.rb
 - lib/autoproj/cmdline.rb
 - lib/autoproj/default.osdeps
+- lib/autoproj/environment.rb
 - lib/autoproj/gitorious.rb
+- lib/autoproj/installation_manifest.rb
+- lib/autoproj/loader.rb
 - lib/autoproj/manifest.rb
+- lib/autoproj/metapackage.rb
 - lib/autoproj/options.rb
 - lib/autoproj/osdeps.rb
+- lib/autoproj/package_definition.rb
+- lib/autoproj/package_manifest.rb
+- lib/autoproj/package_selection.rb
+- lib/autoproj/package_set.rb
 - lib/autoproj/query.rb
 - lib/autoproj/system.rb
 - lib/autoproj/templates/create-set/packages.autobuild
 - lib/autoproj/templates/create-set/source.yml
+- lib/autoproj/variable_expansion.rb
+- lib/autoproj/vcs_definition.rb
 - lib/autoproj/version.rb
 - samples/autoproj/README.txt
 - samples/autoproj/init.rb
@@ -172,11 +190,11 @@ files:
 - 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_debian.rb
 - test/test_manifest.rb
 - test/test_os_dependencies.rb
 - test/test_package_manifest.rb
-- test/package_managers/test_pip.rb
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
 licenses:
@@ -192,15 +210,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: autobuild
+rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3