autoproj 1.8.5 → 1.9.0.rc1

data/lib/autoproj/osdeps.rb

@@ -29,12 +29,17 @@ module Autoproj
         # Dummy package manager used for unknown OSes. It simply displays a
         # message to the user when packages are needed
         class UnknownOSManager < Manager
+            def initialize
+                super(['unknown'])
+                @installed_osdeps = Set.new
+            end
+
             def osdeps_interaction_unknown_os(osdeps)
                 puts <<-EOMSG
-                #{Autoproj.color("The build process requires some other software packages to be installed on our operating system", :bold)}
-                #{Autoproj.color("If they are already installed, simply ignore this message", :red)}
+  #{Autoproj.color("The build process requires some other software packages to be installed on our operating system", :bold)}
+  #{Autoproj.color("If they are already installed, simply ignore this message", :red)}
 
-                #{osdeps.join("\n    ")}
+    #{osdeps.to_a.sort.join("\n    ")}
 
                 EOMSG
                 print Autoproj.color("Press ENTER to continue", :bold)
@@ -44,12 +49,17 @@ module Autoproj
                 nil
             end
 
-
             def install(osdeps)
                 if silent?
                     return false
                 else
-                    return osdeps_interaction_unknown_os(osdeps)
+                    osdeps = osdeps.to_set
+                    osdeps -= @installed_osdeps
+                    if !osdeps.empty?
+                        result = osdeps_interaction_unknown_os(osdeps)
+                    end
+                    @installed_osdeps |= osdeps
+                    return result
                 end
             end
         end
@@ -167,6 +177,16 @@ fi
             end
         end
 
+        # Package manager interface for systems that use port (i.e. MacPorts/Darwin) as
+        # their package manager
+        class PortManager < ShellScriptManager
+            def initialize
+                super(['port'], true,
+                        "port '%s'",
+                        "port '%s'")
+            end
+        end
+
         # Package manager interface for systems that use pacman (i.e. arch) as
         # their package manager
         class PacmanManager < ShellScriptManager
@@ -530,12 +550,14 @@ fi
             PackageManagers::GemManager,
             PackageManagers::EmergeManager,
             PackageManagers::PacmanManager,
-            PackageManagers::YumManager]
+            PackageManagers::YumManager,
+            PackageManagers::PortManager]
         OS_PACKAGE_HANDLERS = {
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
             'arch' => 'pacman',
-            'fedora' => 'yum'
+            'fedora' => 'yum',
+            'darwin' => 'port'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -753,6 +775,11 @@ fi
                         [['gentoo'], [version]]
                     elsif File.exists?('/etc/arch-release')
                         [['arch'], []]
+                    elsif Autobuild.macos? 
+                        version=`sw_vers | head -2 | tail -1`.split(":")[1]
+                        [['darwin'], [version.strip]]
+                    elsif Autobuild.windows?
+                        [['windows'], []]
                     end
             end
 
@@ -774,8 +801,14 @@ fi
         end
 
         def self.os_from_lsb
-            has_lsb_release = `which lsb_release`
-            return unless $?.success?
+            has_lsb_release = nil
+            begin
+                has_lsb_release = `which lsb_release`
+                return unless $?.success?
+            rescue Exception => e
+                #seems which is not installes (e.g. on windows)
+                return
+            end
 
             distributor = `lsb_release -i -s`
             distributor = distributor.strip.downcase
@@ -841,6 +874,14 @@ fi
                 end
             end
 
+            # Recursive resolutions
+            found, pkg = partition_osdep_entry(name, dep_def, ['osdep'], [], os_names, os_versions)
+            if found
+                pkg.each do |pkg_name|
+                    result.concat(resolve_package(pkg_name))
+                end
+            end
+
             result.map do |handler, status, entries|
                 if handler.respond_to?(:parse_package_entry)
                     [handler, status, entries.map { |s| handler.parse_package_entry(s) }]
@@ -1009,19 +1050,24 @@ fi
                 result = resolve_package(name)
                 if !result
                     raise MissingOSDep.new, "there is no osdeps definition for #{name}"
-                elsif result.empty?
-                    os_names, os_versions = OSDependencies.operating_system
-                    raise MissingOSDep.new, "there is an osdeps definition for #{name}, but not for this operating system and version (resp. #{os_names.join(", ")} and #{os_versions.join(", ")})"
-                else
-                    result.each do |handler, status, packages|
-                        if status == FOUND_NONEXISTENT
-                            raise MissingOSDep.new, "there is an osdep definition for #{name}, and it explicitely states that this package does not exist on your OS"
-                        end
-                        if entry = all_packages.find { |h, _| h == handler }
-                            entry[1].concat(packages)
-                        else
-                            all_packages << [handler, packages]
-                        end
+                end
+
+                if result.empty?
+                    if OSDependencies.supported_operating_system?
+                        os_names, os_versions = OSDependencies.operating_system
+                        raise MissingOSDep.new, "there is an osdeps definition for #{name}, but not for this operating system and version (resp. #{os_names.join(", ")} and #{os_versions.join(", ")})"
+                    end
+                    result = [[os_package_handler, FOUND_PACKAGES, [name]]]
+                end
+
+                result.each do |handler, status, packages|
+                    if status == FOUND_NONEXISTENT
+                        raise MissingOSDep.new, "there is an osdep definition for #{name}, and it explicitely states that this package does not exist on your OS"
+                    end
+                    if entry = all_packages.find { |h, _| h == handler }
+                        entry[1].concat(packages)
+                    else
+                        all_packages << [handler, packages]
                     end
                 end
             end
@@ -1079,8 +1125,9 @@ fi
             if resolved.empty?
                 if !OSDependencies.operating_system
                     return UNKNOWN_OS
-                else
-                    return WRONG_OS
+                elsif !OSDependencies.supported_operating_system?
+                    return AVAILABLE
+                else return WRONG_OS
                 end
             end
 
@@ -1192,7 +1239,7 @@ So, what do you want ? (all, ruby, os or none)
         end
 
         def self.osdeps_mode_string_to_value(string)
-            string = string.downcase
+            string = string.to_s.downcase
             case string
             when 'all'  then HANDLE_ALL
             when 'ruby' then HANDLE_RUBY
@@ -1278,7 +1325,14 @@ So, what do you want ? (all, ruby, os or none)
 
         # Requests the installation of the given set of packages
         def install(packages, package_osdeps = Hash.new)
+            #not sure here, simply show that it is installed even we dont install anything,
+            #because this functions seems to called sometimes even --no-osdeps is given or the installs_os_packages? return false
+            #it seems its not checked everywhere, so add this sainty check here
+            return true if not installs_os_packages?
+			
+			
             os_package_handler.enabled = installs_os_packages?
+            os_package_handler.silent = self.silent?
             package_handlers['gem'].enabled = installs_ruby_packages?
             package_handlers.each_value do |v|
                 v.silent = self.silent?

data/lib/autoproj/system.rb

@@ -1,6 +1,16 @@
 module Autoproj
     class UserError < RuntimeError; end
 
+    # OS-independent creation of symbolic links. Note that on windows, it only
+    # works for directories
+    def create_symlink(from, to)
+        if Autobuild.windows?
+            Dir.create_junction(to, from)
+        else
+            FileUtils.ln_sf from, to
+        end
+    end
+
     # Returns true if +path+ is part of an autoproj installation
     def self.in_autoproj_installation?(path)
         root_dir(File.expand_path(path))
@@ -18,12 +28,22 @@ module Autoproj
             return @root_dir
         end
 
-        while dir != "/" && !File.directory?(File.join(dir, "autoproj"))
+        root_dir_rx =
+            if Autobuild.windows? then /^[a-zA-Z]:\\\\$/
+            else /^\/$/
+            end
+
+        while root_dir_rx !~ dir && !File.directory?(File.join(dir, "autoproj"))
             dir = File.dirname(dir)
         end
-        if dir == "/"
+        if root_dir_rx =~ dir
             raise UserError, "not in a Autoproj installation"
         end
+
+        #Preventing backslashed in path, that might be confusing on some path compares
+        if Autobuild.windows?
+            dir = dir.gsub(/\\/,'/')
+        end
         dir
     end
 
@@ -93,12 +113,16 @@ module Autoproj
         ENV['AUTOPROJ_GEM_HOME'] || File.join(root_dir, ".gems")
     end
 
+    def self.env_inherit(*names)
+        Autobuild.env_inherit(*names)
+    end
+
     # Find the given program in PATH. It raises ArgumentError if the program
     # can't be found
     def self.find_in_path(name)
         result = ENV['PATH'].split(':').find { |dir| File.file?(File.join(dir, name)) }
         if !result
-            raise ArgumentError, "#{name} can not be found in PATH"
+            raise ArgumentError, "#{name} can not be found in PATH (#{ENV['PATH']})"
         end
         File.join(result, name)
     end
@@ -108,13 +132,10 @@ module Autoproj
     # Use this in autoproj/init.rb to make sure that the environment will not
     # get polluted during the build.
     def self.set_initial_env
+        Autobuild.env_inherit = false
         Autoproj.env_set 'RUBYOPT', "-rubygems"
-        Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
-        Autoproj.env_add_path 'GEM_PATH', Autoproj.gem_home
-        Autoproj.env_set_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
-        Autoproj.env_set 'PKG_CONFIG_PATH'
-        Autoproj.env_set 'RUBYLIB'
-        Autoproj.env_set 'LD_LIBRARY_PATH'
+        Autobuild.env_push_path 'GEM_PATH', Autoproj.gem_home
+        Autobuild.env_push_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
     end
 
     class << self
@@ -131,10 +152,10 @@ module Autoproj
         end
 
         filename = if subdir
-                       File.join(Autoproj.root_dir, subdir, "env.sh")
-                   else
-                       File.join(Autoproj.root_dir, "env.sh")
-                   end
+               File.join(Autoproj.root_dir, subdir, ENV_FILENAME)
+           else
+               File.join(Autoproj.root_dir, ENV_FILENAME)
+           end
 
         shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
         if Autoproj.shell_helpers? && shell = ENV['SHELL']

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.5"
+    VERSION = "1.9.0.rc1"
 end

data/test/test_os_dependencies.rb

@@ -486,5 +486,29 @@ class TC_OSDependencies < Test::Unit::TestCase
         osdeps.osdeps_mode = 'all'
         osdeps.install(['pkg0', 'pkg1', 'pkg2'])
     end
+
+    def test_resolve_os_dependencies_unsupported_os_non_existent_dependency
+        osdeps = create_osdep(Hash.new)
+        flexmock(OSDependencies).should_receive(:supported_operating_system?).and_return(false)
+        assert_raises(OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['a_package']) }
+    end
+
+    def test_resolve_package_availability_unsupported_os_non_existent_dependency
+        osdeps = create_osdep(Hash.new)
+        flexmock(OSDependencies).should_receive(:supported_operating_system?).and_return(false)
+        assert_equal OSDependencies::NO_PACKAGE, osdeps.availability_of('a_package')
+    end
+
+    def test_resolve_package_availability_unsupported_os_existent_dependency
+        osdeps = create_osdep({ 'a_package' => { 'an_os' => 'bla' }})
+        flexmock(OSDependencies).should_receive(:supported_operating_system?).and_return(false)
+        assert_equal OSDependencies::AVAILABLE, osdeps.availability_of('a_package')
+    end
+
+    def test_resolve_os_dependencies_unsupported_os_existent_dependency
+        osdeps = create_osdep({ 'a_package' => { 'an_os' => 'bla' }})
+        flexmock(OSDependencies).should_receive(:supported_operating_system?).and_return(false)
+        assert_equal [[osdeps.os_package_handler, ['a_package']]], osdeps.resolve_os_dependencies(['a_package'])
+    end
 end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.5
-  prerelease: 
+  version: 1.9.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Rock Core Developers
@@ -13,7 +13,7 @@ date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &4950240 !ruby/object:Gem::Requirement
+  requirement: &18094640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *4950240
+  version_requirements: *18094640
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &4949280 !ruby/object:Gem::Requirement
+  requirement: &18093700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *4949280
+  version_requirements: *18093700
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &4948160 !ruby/object:Gem::Requirement
+  requirement: &18092320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *4948160
+  version_requirements: *18092320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &4947120 !ruby/object:Gem::Requirement
+  requirement: &18091440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *4947120
+  version_requirements: *18091440
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &4946340 !ruby/object:Gem::Requirement
+  requirement: &18089940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *4946340
+  version_requirements: *18089940
 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.
@@ -158,9 +158,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: autobuild
 rubygems_version: 1.8.11