autoproj 1.8.4 → 1.8.5

data/History.txt

@@ -1,3 +1,8 @@
+= Version 1.8.5
+ * osdeps: the apt-dpkg was interpreting removed-but-not-purged as installed.
+   Fix.
+ * osdeps: fix autoproj osdeps --show
+
 = Version 1.8.4
  * fix wrong order for application of overrides.rb (was: most specific to more
    general).

data/bin/autoproj_bootstrap

@@ -322,7 +322,10 @@ fi
         # Package manager interface for systems that use APT and dpkg for
         # package management
         class AptDpkgManager < ShellScriptManager
-            def initialize
+            attr_accessor :status_file
+
+            def initialize(status_file = "/var/lib/dpkg/status")
+                @status_file = status_file
                 super(['apt-dpkg'], true,
                       "apt-get install '%s'",
                       "export DEBIAN_FRONTEND=noninteractive; apt-get install -y '%s'")
@@ -333,7 +336,8 @@ fi
             def installed?(package_name)
                 if !@installed_packages
                     @installed_packages = Set.new
-                    dpkg_status = File.readlines('/var/lib/dpkg/status')
+                    dpkg_status = File.readlines(status_file)
+                    dpkg_status << ""
 
                     current_packages = []
                     is_installed = false
@@ -344,9 +348,9 @@ fi
                                 current_packages.each do |pkg|
                                     @installed_packages << pkg
                                 end
-                                current_packages.clear
                                 is_installed = false
                             end
+                            current_packages.clear
                         elsif line =~ /Package: (.*)$/
                             current_packages << $1
                         elsif line =~ /Provides: (.*)$/

data/lib/autoproj/cmdline.rb

@@ -1664,26 +1664,17 @@ export PATH=$GEM_HOME/bin:$PATH
                     next
                 end
 
-                osdeps, gems = Autoproj.osdeps.
-                    partition_packages(pkg_osdeps)
-
-                puts "  #{pkg_name}:"
-                if !gems.empty?
-                    puts "    RubyGem packages: #{gems.to_a.sort.join(", ")}"
-                end
-
-                # If we are on a supported OS, convert the osdeps name to plain
-                # package name
-                if Autoproj::OSDependencies.supported_operating_system?
-                    pkg_osdeps = Autoproj.osdeps.
-                        resolve_os_dependencies(osdeps)
-
-                    if !pkg_osdeps.empty?
-                        puts "    OS packages:      #{pkg_osdeps.to_a.sort.join(", ")}"
-                    end
-                else
-                    if !os_packages.empty?
-                        puts "    OS dependencies:  #{os_packages.to_a.sort.join(", ")}"
+                packages = Autoproj.osdeps.resolve_os_dependencies(pkg_osdeps)
+                puts pkg_name
+                packages.each do |handler, packages|
+                    puts "  #{handler.name}: #{packages.sort.join(", ")}"
+                    needs_update = handler.filter_uptodate_packages(packages)
+                    if needs_update.to_set != packages.to_set
+                        if needs_update.empty?
+                            puts "    all packages are up to date"
+                        else
+                            puts "    needs updating: #{needs_update.sort.join(", ")}"
+                        end
                     end
                 end
             end

data/lib/autoproj/manifest.rb

@@ -1660,9 +1660,12 @@ module Autoproj
             result
         end
 
-        # Resolves all the source-based dependencies of this package (excluding
-        # the OS dependencies). The result is returned as a set of package
-        # names.
+        # Resolves all the source package dependencies for given packages
+        #
+        # @param [Set<String>] the set of package names of which we want to
+        #   discover the dependencies
+        # @return [Set<String>] the set of all package names that the packages designed
+        #   by root_names depend on
         def resolve_packages_dependencies(*root_names)
             result = Set.new
             queue = root_names.dup

data/lib/autoproj/osdeps.rb

@@ -223,7 +223,10 @@ fi
         # Package manager interface for systems that use APT and dpkg for
         # package management
         class AptDpkgManager < ShellScriptManager
-            def initialize
+            attr_accessor :status_file
+
+            def initialize(status_file = "/var/lib/dpkg/status")
+                @status_file = status_file
                 super(['apt-dpkg'], true,
                       "apt-get install '%s'",
                       "export DEBIAN_FRONTEND=noninteractive; apt-get install -y '%s'")
@@ -234,7 +237,8 @@ fi
             def installed?(package_name)
                 if !@installed_packages
                     @installed_packages = Set.new
-                    dpkg_status = File.readlines('/var/lib/dpkg/status')
+                    dpkg_status = File.readlines(status_file)
+                    dpkg_status << ""
 
                     current_packages = []
                     is_installed = false
@@ -245,9 +249,9 @@ fi
                                 current_packages.each do |pkg|
                                     @installed_packages << pkg
                                 end
-                                current_packages.clear
                                 is_installed = false
                             end
+                            current_packages.clear
                         elsif line =~ /Package: (.*)$/
                             current_packages << $1
                         elsif line =~ /Provides: (.*)$/

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.4"
+    VERSION = "1.8.5"
 end

data/test/package_managers/test_apt_dpkg_manager.rb

@@ -0,0 +1,32 @@
+$LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
+require 'test/unit'
+require 'autoproj'
+require 'flexmock/test_unit'
+
+class TC_OSDependencies_AptDpkgManager < Test::Unit::TestCase
+    def test_status_file_parsing
+        file = File.expand_path("apt-dpkg-status", File.dirname(__FILE__))
+        mng = Autoproj::PackageManagers::AptDpkgManager.new(file)
+        assert mng.installed?('installed-package')
+        assert !mng.installed?('noninstalled-package')
+    end
+
+    def test_status_file_parsing_last_entry_installed
+        file = File.expand_path("apt-dpkg-status.installed-last", File.dirname(__FILE__))
+        mng = Autoproj::PackageManagers::AptDpkgManager.new(file)
+        assert mng.installed?('installed-package')
+    end
+
+    def test_status_file_parsing_last_entry_not_installed
+        file = File.expand_path("apt-dpkg-status.noninstalled-last", File.dirname(__FILE__))
+        mng = Autoproj::PackageManagers::AptDpkgManager.new(file)
+        assert !mng.installed?('noninstalled-package')
+    end
+
+    def test_status_file_parsing_not_there_means_not_installed
+        file = File.expand_path("apt-dpkg-status.noninstalled-last", File.dirname(__FILE__))
+        mng = Autoproj::PackageManagers::AptDpkgManager.new(file)
+        assert !mng.installed?('non-existent-package')
+    end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &8808800 !ruby/object:Gem::Requirement
+  requirement: &4950240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *8808800
+  version_requirements: *4950240
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &8807920 !ruby/object:Gem::Requirement
+  requirement: &4949280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *8807920
+  version_requirements: *4949280
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &8806520 !ruby/object:Gem::Requirement
+  requirement: &4948160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *8806520
+  version_requirements: *4948160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &8805840 !ruby/object:Gem::Requirement
+  requirement: &4947120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *8805840
+  version_requirements: *4947120
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &8804940 !ruby/object:Gem::Requirement
+  requirement: &4946340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *8804940
+  version_requirements: *4946340
 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.
@@ -139,6 +139,7 @@ files:
 - test/test_manifest.rb
 - test/test_os_dependencies.rb
 - test/test_package_manifest.rb
+- test/package_managers/test_apt_dpkg_manager.rb
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
 licenses: []
@@ -171,4 +172,5 @@ test_files:
 - test/test_package_manifest.rb
 - test/test_os_dependencies.rb
 - test/test_debian.rb
+- test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb