autoproj 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,13 @@
+= Version 1.3.4
+ * Improve the RubyGems support
+   - a given osdeps name can refer to a mixture of RubyGems and OS packages
+   - the osdeps name can be different from the RubyGems package name
+ * Fix: Autobuild::Package#depends_on_os_package(name) was not taken into
+   account
+ * Fix: the autoproj/ directory was deleted if "autoproj switch-config" fails.
+   Fix that for the common case. It can still happen if the VCS is not
+   accessible.
+
 = Version 1.3.3
  * Fix: some configuration options were not properly saved
  * Fix: env.sh was messed up by partial builds (builds where a directory and/or

data/bin/autoproj

@@ -228,13 +228,18 @@ def switch_config(*args)
 
     if vcs && (vcs.type == args[0] && vcs.url == args[1])
         # Don't need to do much: simply change the options and save the config
-        # file, the VCS handler will take care of switching the options
+        # file, the VCS handler will take care of the actual switching
     else
         # We will have to delete the current autoproj directory. Ask the user.
-        opt = Autoproj::BuildOption.new("delete current config", "boolean", Hash[:default => "false", :doc => "delete the current configuration ? (required to switch)"], nil)
+        opt = Autoproj::BuildOption.new("delete current config", "boolean",
+                    Hash[:default => "false",
+                        :doc => "delete the current configuration ? (required to switch)"], nil)
+
         return if !opt.ask(nil)
-        FileUtils.rm_rf File.join(Autoproj.config_dir)
-        do_switch_config(*args)
+
+        Dir.chdir(Autoproj.root_dir) do
+            do_switch_config(true, *args)
+        end
     end
 
     # And now save the options: note that we keep the current option set even
@@ -254,7 +259,7 @@ def switch_config(*args)
     Autoproj.save_config
 end
 
-def do_switch_config(*args)
+def do_switch_config(delete_current, *args)
     vcs_def = Hash.new
     vcs_def[:type] = args.shift
     vcs_def[:url]  = args.shift
@@ -268,7 +273,13 @@ def do_switch_config(*args)
     # Install the OS dependencies required for this VCS
     osdeps = Autoproj::OSDependencies.load_default
     osdeps.install([vcs.type])
-    Autoproj::Manifest.update_source(vcs, "autoproj main configuration", 'autoproj_config', File.join(Dir.pwd, "autoproj"))
+
+    # Now check out the actual configuration
+    config_dir = File.join(Dir.pwd, "autoproj")
+    if delete_current
+        FileUtils.rm_rf config_dir
+    end
+    Autoproj::Manifest.update_source(vcs, "autoproj main configuration", 'autoproj_config', config_dir)
 
     # Now write it in the config file
     File.open(File.join(Autoproj.config_dir, "config.yml"), "a") do |io|
@@ -318,7 +329,7 @@ def do_bootstrap(*args)
         end
 
     elsif args.size >= 2 # is a VCS definition for the manifest itself ...
-        do_switch_config(*args)
+        do_switch_config(false, *args)
     end
 
     # Finally, generate an env.sh script

data/doc/guide/src/autoproj_bootstrap

@@ -59,12 +59,14 @@ module Autoproj
         end
         AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
         def self.load_default
-            OSDependencies.load(AUTOPROJ_OSDEPS)
+            @default_osdeps ||= OSDependencies.load(AUTOPROJ_OSDEPS)
         end
 
         attr_reader :definitions
+        attr_reader :gem_fetcher
         def initialize(defs = Hash.new)
             @definitions = defs.to_hash
+            @gem_fetcher = Gem::SpecFetcher.fetcher
         end
 
         def merge(info)
@@ -203,6 +205,8 @@ module Autoproj
                     raise ConfigError, msg
                 end
 
+                pkg_def = pkg_def.dup
+
                 if pkg_def.respond_to?(:to_str)
                     case(pkg_def.to_str)
                     when "ignore" then
@@ -212,7 +216,15 @@ module Autoproj
                         raise ConfigError, "unknown OS-independent package management type #{pkg_def} for #{name}"
                     end
                 else
-                    osdeps << name
+                    pkg_def.delete_if do |distrib_name, defs|
+                        if distrib_name == "gem"
+                            gems.concat([*defs])
+                            true
+                        end
+                    end
+                    if !pkg_def.empty?
+                        osdeps << name
+                    end
                 end
             end
             return osdeps, gems
@@ -249,21 +261,22 @@ module Autoproj
                 did_something ||= true
             end
 
-            # Don't install gems that are already there ...
-            gems.delete_if do |name|
-                version_requirements = Gem::Requirement.default
-                installed = Gem.source_index.find_name(name, version_requirements)
-                if !installed.empty? && Autobuild.do_update
-                    # Look if we can update the package ...
-                    dep = Gem::Dependency.new(name, version_requirements)
-                    remote   = Gem::SpecFetcher.fetcher
-                    available = remote.find_matching(dep)
-                    installed_version = installed.map(&:version).max
-                    available_version = available.map { |(name, v), source| v }.max
-                    needs_update = (available_version > installed_version)
-                    !needs_update
-                else
-                    !installed.empty?
+            if !gems.empty?
+                # Don't install gems that are already there ...
+                gems.delete_if do |name|
+                    version_requirements = Gem::Requirement.default
+                    installed = Gem.source_index.find_name(name, version_requirements)
+                    if !installed.empty? && Autobuild.do_update
+                        # Look if we can update the package ...
+                        dep = Gem::Dependency.new(name, version_requirements)
+                        available = @gem_fetcher.find_matching(dep)
+                        installed_version = installed.map(&:version).max
+                        available_version = available.map { |(name, v), source| v }.max
+                        needs_update = (available_version > installed_version)
+                        !needs_update
+                    else
+                        !installed.empty?
+                    end
                 end
             end
 

data/lib/autoproj/manifest.rb

@@ -145,6 +145,10 @@ module Autoproj
     end
 
     def self.single_expansion(data, definitions)
+        if !data.respond_to?(:to_str)
+            return data
+        end
+
         definitions.each do |name, expanded|
             data = data.gsub /\$#{Regexp.quote(name)}\b/, expanded
         end
@@ -922,16 +926,21 @@ module Autoproj
         end
 
         def install_os_dependencies(packages)
-
             required_os_packages = Set.new
             package_os_deps = Hash.new { |h, k| h[k] = Array.new }
             packages.each do |pkg_name|
                 if manifest = package_manifests[pkg_name]
-                    pkg_osdeps = manifest.each_os_dependency.to_set
-                    pkg_osdeps.each do |osdep_name|
+                    manifest.each_os_dependency.each do |osdep_name|
+                        package_os_deps[osdep_name] << pkg_name
+                        required_os_packages << osdep_name
+                    end
+                end
+
+                if pkg = Autobuild::Package[pkg_name]
+                    pkg.os_packages.each do |osdep_name|
                         package_os_deps[osdep_name] << pkg_name
+                        required_os_packages << osdep_name
                     end
-                    required_os_packages |= pkg_osdeps
                 end
             end
 

data/lib/autoproj/osdeps.rb

@@ -159,6 +159,8 @@ module Autoproj
                     raise ConfigError, msg
                 end
 
+                pkg_def = pkg_def.dup
+
                 if pkg_def.respond_to?(:to_str)
                     case(pkg_def.to_str)
                     when "ignore" then
@@ -168,7 +170,15 @@ module Autoproj
                         raise ConfigError, "unknown OS-independent package management type #{pkg_def} for #{name}"
                     end
                 else
-                    osdeps << name
+                    pkg_def.delete_if do |distrib_name, defs|
+                        if distrib_name == "gem"
+                            gems.concat([*defs])
+                            true
+                        end
+                    end
+                    if !pkg_def.empty?
+                        osdeps << name
+                    end
                 end
             end
             return osdeps, gems

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.3.3"
+    VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency