autoproj 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,8 @@
+= Version 1.1.2
+ * fix version detection on Debian, lsb-release cannot be trusted there.
+ * update already installed Gem
+ * update autobuild and autoproj themselves if needed
+
 = Version 1.1.1
  * better general error reporting
  * small fixes w.r.t. bootstrapping

data/Rakefile

@@ -25,6 +25,16 @@ begin
                 ['rdoc', '>= 2.4.0']
         end
 
+        Rake.clear_tasks(/dist:publish_docs/)
+        task 'publish_docs' => 'doc' do
+            if !system('doc/update_github')
+                raise "cannot update the gh-pages branch for GitHub"
+            end
+            if !system('git', 'push', 'origin', 'gh-pages')
+                raise "cannot push the documentation"
+            end
+        end
+
         desc "generate the bootstrap script"
         task 'bootstrap' do
             osdeps_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'osdeps.rb'))

data/bin/autoproj

@@ -297,6 +297,13 @@ begin
         Autobuild::Reporting << MailReporter.new(mail_config)
     end
 
+    # First things first, see if we need to update ourselves
+    osdeps = Autoproj::OSDependencies.load_default
+    if osdeps.install(%w{autobuild autoproj})
+        # We updated autobuild or autoproj themselves ... Restart !
+        exec($0, *ARGV)
+    end
+
     manifest_path = File.join(Autoproj.config_dir, 'manifest')
     # Load the installation's manifest a first time, to check if we should
     # update it ... We assume that the OS dependencies for this VCS is already

data/doc/guide/src/autoproj_bootstrap

@@ -63,8 +63,14 @@ module Autoproj
             if @operating_system
                 return @operating_system
             elsif data = os_from_lsb
-                @operating_system = data
-            else
+                if data[0] != "debian"
+                    # Fall back to reading debian_version, as
+                    # sid is listed as lenny by lsb-release
+                    @operating_system = data
+                end
+            end
+
+            if !@operating_system
                 # Need to do some heuristics unfortunately
                 @operating_system =
                     if File.exists?('/etc/debian_version')
@@ -84,9 +90,9 @@ module Autoproj
         def os_from_lsb
             distributor = `lsb_release -i -s`
             return unless $?.success?
-            distributor = distributor.chomp
-            codename    = `lsb_release -c -s`.chomp
-            version     = `lsb_release -r -s`.chomp
+            distributor = distributor.chomp.downcase
+            codename    = `lsb_release -c -s`.chomp.downcase
+            version     = `lsb_release -r -s`.chomp.downcase
 
             return [distributor, [codename, version]]
         end
@@ -184,6 +190,8 @@ module Autoproj
         def install(packages)
             osdeps, gems = partition_packages(packages)
 
+            did_something = false
+
             # Ideally, we would feed the OS dependencies to rosdep.
             # Unfortunately, this is C++ code and I don't want to install the
             # whole ROS stack just for rosdep ...
@@ -200,18 +208,31 @@ module Autoproj
                 File.open('osdeps.sh', 'w') do |file|
                     file.write shell_script
                 end
+                Autobuild.progress "installing/updating OS dependencies: #{osdeps.join(", ")}"
                 begin
                     Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
                 ensure
                     FileUtils.rm_f 'osdeps.sh'
                 end
+                did_something ||= true
             end
 
             # Don't install gems that are already there ...
             gems.delete_if do |name|
                 version_requirements = Gem::Requirement.default
-                available = Gem.source_index.find_name(name, version_requirements)
-                !available.empty?
+                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?
+                end
             end
 
             # Now install what is left
@@ -220,8 +241,12 @@ module Autoproj
                     STDERR.puts "Installing rubygems dependencies with"
                     STDERR.puts "gem install #{gems.join(" ")}"
                 end
+                Autobuild.progress "installing/updating RubyGems dependencies: #{gems.join(", ")}"
                 Autobuild::Subprocess.run 'autoproj', 'osdeps', 'gem', 'install', *gems
+                did_something ||= true
             end
+
+            did_something
         end
     end
 end
@@ -232,45 +257,46 @@ DEFS = <<EODEFS
 # The following definitions are needed to bootstrap autoproj
 ruby:
     debian,ubuntu:
-        9.04,lenny:
+        9.04,squeeze/sid:
             - ruby1.8-dev
             - ruby1.8
             - libopenssl-ruby1.8
 
 build-essential:
     debian,ubuntu:
-        9.04,lenny: build-essential
+        9.04,squeeze/sid: build-essential
 
 libxml2:
     debian,ubuntu:
-        9.04,lenny: libxml2-dev
+        9.04,squeeze/sid: libxml2-dev
 libxslt:
     debian,ubuntu:
-        9.04,lenny: libxslt1-dev
+        9.04,squeeze/sid: libxslt1-dev
 
+autobuild: gem
 autoproj: gem
 
 # The following definitions are for the VCS and build systems
 git:
-    debian,ubuntu:
-        9.04,lenny: git-core
+    debian,ubuntu: git-core
 
 svn:
-    debian,ubuntu:
-        9.04,lenny: svn
+    debian,ubuntu: svn
 
 cmake:
-    debian,ubuntu:
-        9.04,lenny: cmake
+    debian,ubuntu: cmake
 
 autotools:
-    debian,ubuntu:
-        9.04,lenny: [automake1.9, autoconf]
+    debian,ubuntu: [automake1.9, autoconf]
+
+lsb_release:
+    debian,ubuntu: lsb-release
+    
 
 
 EODEFS
 
-PACKAGES      = %w{ruby libxml2 libxslt build-essential}
+PACKAGES      = %w{ruby libxml2 libxslt build-essential lsb_release}
 USER_PACKAGES = %w{autoproj}
 
 packages = PACKAGES.dup

data/lib/autoproj/default.osdeps

@@ -1,38 +1,39 @@
 # The following definitions are needed to bootstrap autoproj
 ruby:
     debian,ubuntu:
-        9.04,lenny:
+        9.04,squeeze/sid:
             - ruby1.8-dev
             - ruby1.8
             - libopenssl-ruby1.8
 
 build-essential:
     debian,ubuntu:
-        9.04,lenny: build-essential
+        9.04,squeeze/sid: build-essential
 
 libxml2:
     debian,ubuntu:
-        9.04,lenny: libxml2-dev
+        9.04,squeeze/sid: libxml2-dev
 libxslt:
     debian,ubuntu:
-        9.04,lenny: libxslt1-dev
+        9.04,squeeze/sid: libxslt1-dev
 
+autobuild: gem
 autoproj: gem
 
 # The following definitions are for the VCS and build systems
 git:
-    debian,ubuntu:
-        9.04,lenny: git-core
+    debian,ubuntu: git-core
 
 svn:
-    debian,ubuntu:
-        9.04,lenny: svn
+    debian,ubuntu: svn
 
 cmake:
-    debian,ubuntu:
-        9.04,lenny: cmake
+    debian,ubuntu: cmake
 
 autotools:
-    debian,ubuntu:
-        9.04,lenny: [automake1.9, autoconf]
+    debian,ubuntu: [automake1.9, autoconf]
+
+lsb_release:
+    debian,ubuntu: lsb-release
+    
 

data/lib/autoproj/osdeps.rb

@@ -29,8 +29,14 @@ module Autoproj
             if @operating_system
                 return @operating_system
             elsif data = os_from_lsb
-                @operating_system = data
-            else
+                if data[0] != "debian"
+                    # Fall back to reading debian_version, as
+                    # sid is listed as lenny by lsb-release
+                    @operating_system = data
+                end
+            end
+
+            if !@operating_system
                 # Need to do some heuristics unfortunately
                 @operating_system =
                     if File.exists?('/etc/debian_version')
@@ -50,9 +56,9 @@ module Autoproj
         def os_from_lsb
             distributor = `lsb_release -i -s`
             return unless $?.success?
-            distributor = distributor.chomp
-            codename    = `lsb_release -c -s`.chomp
-            version     = `lsb_release -r -s`.chomp
+            distributor = distributor.chomp.downcase
+            codename    = `lsb_release -c -s`.chomp.downcase
+            version     = `lsb_release -r -s`.chomp.downcase
 
             return [distributor, [codename, version]]
         end
@@ -150,6 +156,8 @@ module Autoproj
         def install(packages)
             osdeps, gems = partition_packages(packages)
 
+            did_something = false
+
             # Ideally, we would feed the OS dependencies to rosdep.
             # Unfortunately, this is C++ code and I don't want to install the
             # whole ROS stack just for rosdep ...
@@ -166,18 +174,31 @@ module Autoproj
                 File.open('osdeps.sh', 'w') do |file|
                     file.write shell_script
                 end
+                Autobuild.progress "installing/updating OS dependencies: #{osdeps.join(", ")}"
                 begin
                     Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
                 ensure
                     FileUtils.rm_f 'osdeps.sh'
                 end
+                did_something ||= true
             end
 
             # Don't install gems that are already there ...
             gems.delete_if do |name|
                 version_requirements = Gem::Requirement.default
-                available = Gem.source_index.find_name(name, version_requirements)
-                !available.empty?
+                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?
+                end
             end
 
             # Now install what is left
@@ -186,8 +207,12 @@ module Autoproj
                     STDERR.puts "Installing rubygems dependencies with"
                     STDERR.puts "gem install #{gems.join(" ")}"
                 end
+                Autobuild.progress "installing/updating RubyGems dependencies: #{gems.join(", ")}"
                 Autobuild::Subprocess.run 'autoproj', 'osdeps', 'gem', 'install', *gems
+                did_something ||= true
             end
+
+            did_something
         end
     end
 end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 +02:00
+date: 2009-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency