autoproj 1.8.2.b14 → 1.8.2.b15

data/bin/autoproj_bootstrap

@@ -286,6 +286,31 @@ fi
             end
         end
 
+        # Package manager interface for systems that use yum
+        class YumManager < ShellScriptManager
+            def initialize
+                super(['yum'], true,
+                      "yum install '%s'",
+                      "yum install -y '%s'")
+            end
+
+            def filter_uptodate_packages(packages)
+                result = `LANG=C rpm -q '#{packages.join("' '")}'`
+                if $?.exitstatus != 0
+                    Autoproj.warn "cannot run rpm -q #{packages.join(", ")}. I am assuming that no packages are already installed"
+                    return packages
+                else
+                    result = []
+                    result.split("\n").each_with_index do |line, index|
+                        if line =~ /is not installed/
+                            result << packages[index]
+                        end
+                    end
+                    result
+                end
+            end
+        end
+
         # Package manager interface for systems that use APT and dpkg for
         # package management
         class AptDpkgManager < ShellScriptManager
@@ -574,11 +599,13 @@ fi
         PACKAGE_HANDLERS = [PackageManagers::AptDpkgManager,
             PackageManagers::GemManager,
             PackageManagers::EmergeManager,
-            PackageManagers::PacmanManager]
+            PackageManagers::PacmanManager,
+            PackageManagers::YumManager]
         OS_PACKAGE_HANDLERS = {
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
-            'arch' => 'pacman'
+            'arch' => 'pacman',
+            'fedora' => 'yum'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -784,6 +811,11 @@ fi
                             versions = codenames + ["unstable", "sid"]
                         end
                         [['debian'], versions]
+                    elsif File.exists?('/etc/fedora-release')
+                        release_string = File.read('/etc/fedora-release').strip
+                        release_string =~ /Fedora release (\d+)/
+                        version = $1
+                        [['fedora'], [version]]
                     elsif File.exists?('/etc/gentoo-release')
                         release_string = File.read('/etc/gentoo-release').strip
                         release_string =~ /^.*([^\s]+)$/
@@ -948,6 +980,7 @@ fi
         #
         def partition_osdep_entry(osdep_name, dep_def, handler_names, excluded, *keys)
             keys, *additional_keys = *keys
+            keys ||= []
             found = false
             nonexistent = false
             result = []
@@ -979,7 +1012,7 @@ fi
                         end
                         result.concat(rec_result)
                     end
-                elsif keys
+                else
                     if names.respond_to?(:to_str) # names could be an array already
                         names = names.split(',')
                     end

data/lib/autoproj/osdeps.rb

@@ -187,6 +187,31 @@ fi
             end
         end
 
+        # Package manager interface for systems that use yum
+        class YumManager < ShellScriptManager
+            def initialize
+                super(['yum'], true,
+                      "yum install '%s'",
+                      "yum install -y '%s'")
+            end
+
+            def filter_uptodate_packages(packages)
+                result = `LANG=C rpm -q '#{packages.join("' '")}'`
+                if $?.exitstatus != 0
+                    Autoproj.warn "cannot run rpm -q #{packages.join(", ")}. I am assuming that no packages are already installed"
+                    return packages
+                else
+                    result = []
+                    result.split("\n").each_with_index do |line, index|
+                        if line =~ /is not installed/
+                            result << packages[index]
+                        end
+                    end
+                    result
+                end
+            end
+        end
+
         # Package manager interface for systems that use APT and dpkg for
         # package management
         class AptDpkgManager < ShellScriptManager
@@ -475,11 +500,13 @@ fi
         PACKAGE_HANDLERS = [PackageManagers::AptDpkgManager,
             PackageManagers::GemManager,
             PackageManagers::EmergeManager,
-            PackageManagers::PacmanManager]
+            PackageManagers::PacmanManager,
+            PackageManagers::YumManager]
         OS_PACKAGE_HANDLERS = {
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
-            'arch' => 'pacman'
+            'arch' => 'pacman',
+            'fedora' => 'yum'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -685,6 +712,11 @@ fi
                             versions = codenames + ["unstable", "sid"]
                         end
                         [['debian'], versions]
+                    elsif File.exists?('/etc/fedora-release')
+                        release_string = File.read('/etc/fedora-release').strip
+                        release_string =~ /Fedora release (\d+)/
+                        version = $1
+                        [['fedora'], [version]]
                     elsif File.exists?('/etc/gentoo-release')
                         release_string = File.read('/etc/gentoo-release').strip
                         release_string =~ /^.*([^\s]+)$/
@@ -849,6 +881,7 @@ fi
         #
         def partition_osdep_entry(osdep_name, dep_def, handler_names, excluded, *keys)
             keys, *additional_keys = *keys
+            keys ||= []
             found = false
             nonexistent = false
             result = []
@@ -880,7 +913,7 @@ fi
                         end
                         result.concat(rec_result)
                     end
-                elsif keys
+                else
                     if names.respond_to?(:to_str) # names could be an array already
                         names = names.split(',')
                     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b14"
+    VERSION = "1.8.2.b15"
 end

data/test/test_os_dependencies.rb

@@ -342,6 +342,20 @@ class TC_OSDependencies < Test::Unit::TestCase
         assert_equal expected, osdeps.resolve_package('pkg')
     end
 
+    def test_resolve_mixed_os_and_osindep_dependencies
+        data = { 'pkg' =>
+                 { 'test' => { 'default' => ['ospkg', 'gem' => 'gempkg'] }
+                 }
+               }
+
+        osdeps = create_osdep(data)
+        expected = [
+            [osdeps.os_package_handler, FOUND_PACKAGES, ['ospkg']],
+            [osdeps.package_handlers['gem'], FOUND_PACKAGES, ['gempkg']]
+        ].to_set
+        assert_equal expected, osdeps.resolve_package('pkg').to_set
+    end
+
     def test_availability_of
         osdeps = flexmock(OSDependencies.new)
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
@@ -426,7 +440,7 @@ class TC_OSDependencies < Test::Unit::TestCase
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(nil)
         osdeps.should_receive(:resolve_package).with('pkg1').never
         osdeps.should_receive(:resolve_package).with('pkg2').never
-        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
 
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
             [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkg0']]])
@@ -437,13 +451,13 @@ class TC_OSDependencies < Test::Unit::TestCase
         expected =
             [[osdeps.os_package_handler, ['pkg0']],
              [osdeps.package_handlers['gem'], ['gempkg1', 'gempkg2']]]
-        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
 
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
             [[osdeps.os_package_handler, FOUND_NONEXISTENT, ['pkg0']]])
         osdeps.should_receive(:resolve_package).with('pkg1').never
         osdeps.should_receive(:resolve_package).with('pkg2').never
-        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
 
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
             [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkg0']]])
@@ -451,7 +465,7 @@ class TC_OSDependencies < Test::Unit::TestCase
             [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkg1']],
              [osdeps.package_handlers['gem'], FOUND_NONEXISTENT, ['gempkg1']]])
         osdeps.should_receive(:resolve_package).with('pkg2').never
-        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
     end
 
     def test_install

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.b14
+  version: 1.8.2.b15
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &10131280 !ruby/object:Gem::Requirement
+  requirement: &9121940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *10131280
+  version_requirements: *9121940
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &10130560 !ruby/object:Gem::Requirement
+  requirement: &9120560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *10130560
+  version_requirements: *9120560
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &10129760 !ruby/object:Gem::Requirement
+  requirement: &9119700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *10129760
+  version_requirements: *9119700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10128640 !ruby/object:Gem::Requirement
+  requirement: &9118900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +54,18 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *10128640
+  version_requirements: *9118900
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &10114260 !ruby/object:Gem::Requirement
+  requirement: &9118180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *10114260
+  version_requirements: *9118180
 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.