autoproj 1.13.2 → 1.13.3.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df56aa856088b064dd5018e79767be3ef8f475f
-  data.tar.gz: 4010bbafbf52b45645d306f0901857ce5b9cc7fc
+  metadata.gz: 32d36fd8dc2934a49ac40b7a7be7518415e1766c
+  data.tar.gz: 901f39312dbc0af904a6b14fc7f550ef3521d888
 SHA512:
-  metadata.gz: 0c999cfbf4b8627b222f4c31e8bc2601d93f19765950ae8b208a57bae3c98dc24d180bccf0125b2176367c8072d0ae24a91e53ec18010c91b0a68dd7b66b1cc2
-  data.tar.gz: 5e55b9559faa7731084c4f598626e8a807258d650626a9a387acb026404ba11e4f3eea1ee7460f3565af5d22eff6bd505f40c415cae22d4d1af964235e4c5032
+  metadata.gz: 600aff44ad46893c53be513b3076aa6c6161ee866ca20475f95705cbae99532721568d45f3a8c03bda4becb5a4185af692b8721c602a46d46459a05c94673801
+  data.tar.gz: a321d7d4f205f5a689ad5a507caa45aa9ee2fef18ebab43c92f7f90d337964909a5b87704e3e6f18c4e178bb949916df0b1fb2d391362f8326c65fda82bf3af2

data/Rakefile

@@ -18,9 +18,9 @@ Utilrb::Rake.hoe do
             license 'BSD'
 
             extra_deps << 
-                ['autobuild',   '~> 1.9', '>= 1.9.0'] <<
-                ['utilrb', '~> 2.0', '>= 2.0.0'] <<
-                ['highline', '~> 1.7', '>= 1.7.0']
+                ['autobuild', '~> 1.9.0'] <<
+                ['utilrb', '~> 2.0.0'] <<
+                ['highline', '>= 1.5.0']
         end
     end
 end

data/bin/autoproj_bootstrap

@@ -878,6 +878,15 @@ fi
                         "emerge --noreplace '%s'")
             end
         end
+	# Package manager interface for systems that use pkg (i.e. FreeBSD) as
+        # their package manager
+        class PkgManager < ShellScriptManager
+            def initialize
+                super(['pkg'], true,
+                        "pkg install -y '%s'",
+                        "pkg install -y '%s'")
+            end
+        end
 
         #Package manger for OpenSuse and Suse (untested)
         class ZypperManager < ShellScriptManager
@@ -1491,7 +1500,8 @@ fi
             PackageManagers::YumManager,
             PackageManagers::PortManager,
             PackageManagers::ZypperManager,
-            PackageManagers::PipManager]
+            PackageManagers::PipManager ,
+            PackageManagers::PkgManager]
         
         # Mapping from OS name to package manager name
         #
@@ -1511,7 +1521,8 @@ fi
             'fedora' => 'yum',
             'macos-port' => 'macports',
             'macos-brew' => 'brew',
-            'opensuse' => 'zypper'
+            'opensuse' => 'zypper',
+            'freebsd' => 'pkg'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -1718,6 +1729,9 @@ fi
                 version =~/.*VERSION\s+=\s+([^\s]+)/
                 version = $1
                 [['opensuse'], [version.strip]]
+            elsif Autobuild.freebsd? 
+		version = `uname -r`.strip.split("-")[0]
+		[['freebsd'],[version]]
             end
         end
 
@@ -1866,6 +1880,20 @@ fi
 
         class InvalidRecursiveStatement < Autobuild::Exception; end
 
+        # Return the path to the osdeps name for a given package name while
+        # accounting for package aliases
+        #
+        # returns an array contain the path starting with name and
+        # ending at the resolved name
+        def self.resolve_name(name)
+            path = [ name ]
+            while OSDependencies.aliases.has_key?(name)
+                name = OSDependencies.aliases[name]
+                path << name
+            end
+            path
+        end
+
         # Return the list of packages that should be installed for +name+
         #
         # The following two simple return values are possible:
@@ -1884,9 +1912,8 @@ fi
         # name and version. The package list might be empty even if status ==
         # FOUND_PACKAGES, for instance if the ignore keyword is used.
         def resolve_package(name)
-            while OSDependencies.aliases.has_key?(name)
-                name = OSDependencies.aliases[name]
-            end
+            path = OSDependencies.resolve_name(name)
+            name = path.last
 
             os_names, os_versions = OSDependencies.operating_system
             os_names = os_names.dup
@@ -2107,7 +2134,8 @@ fi
             dependencies.each do |name|
                 result = resolve_package(name)
                 if !result
-                    raise MissingOSDep.new, "there is no osdeps definition for #{name}"
+                    path = OSDependencies.resolve_name(name)
+                    raise MissingOSDep.new, "there is no osdeps definition for #{path.last} (search tree: #{path.join("->")})"
                 end
 
                 if result.empty?
@@ -2937,11 +2965,12 @@ build-essential:
   opensuse:
   - "@devel_C_C++"
   - gcc-c++
+  default: clang
 autobuild:
-- gem: autobuild
+- gem: autobuild~>1.10.0
 - osdep: readline
 autoproj:
-- gem: autoproj
+- gem: autoproj~>1.13.0
 - osdep: readline
 readline:
   debian,ubuntu: libreadline-dev
@@ -2958,9 +2987,10 @@ git:
   gentoo: dev-vcs/git
   arch: git
   fedora: git
-  macos-port: git-core
+  macos-port: git
   macos-brew: git
   opensuse: git
+  freebsd: git
 hg:
   debian,ubuntu: mercurial
   gentoo: dev-vcs/mercurial
@@ -2968,6 +2998,7 @@ hg:
   fedora: mercurial
   darwin: mercurial
   opensuse: mercurial
+  freebsd: mercurial
 svn:
   debian,ubuntu: subversion
   gentoo: dev-util/subversion
@@ -2975,6 +3006,7 @@ svn:
   fedora: subversion
   darwin: subversion
   opensuse: subversion
+  freebsd: subversion
 cmake:
   debian,ubuntu: cmake
   gentoo: dev-util/cmake
@@ -2982,6 +3014,7 @@ cmake:
   fedora: cmake
   darwin: cmake
   opensuse: cmake
+  freebsd: cmake
 autotools:
   debian,ubuntu:
   - automake
@@ -3001,6 +3034,9 @@ autotools:
   opensuse:
   - automake
   - autoconf
+  freebsd:
+  - automake
+  - autoconf
 archive:
   debian,ubuntu:
   - tar
@@ -3022,18 +3058,22 @@ archive:
   opensuse:
   - tar
   - unzip
+  default: ignore
 cvs:
   debian,ubuntu: cvs
   fedora: cvs
   darwin: cvs
   arch: cvs
   opensuse: cvs
+  freebsd: cvs
 pip:
   debian,ubuntu: python-pip
   arch: python2-pip
   opensuse: python-pip
   fedora: python-pip
+  freebsd: pip
 sudo:
+  macos-brew: ignore
   default: sudo
 
 EODEFS

data/lib/autoproj/cmdline.rb

@@ -537,6 +537,16 @@ module Autoproj
         # Returns the set of packages that are actually selected based on what
         # the user gave on the command line
         def self.resolve_user_selection(selected_packages, options = Hash.new)
+            if all_known_package?
+                result = PackageSelection.new
+                names = manifest.all_packages
+                names.delete_if { |pkg_name| manifest.excluded?(pkg_name) || manifest.ignored?(pkg_name) }
+                names.each do |pkg_name|
+                    result.select(pkg_name, pkg_name)
+                end
+                return result
+                #return manifest.metapackages#.collect {|m| m[0] }
+            end
             if selected_packages.empty?
                 return manifest.default_packages
             end
@@ -830,6 +840,7 @@ module Autoproj
         def self.manifest; Autoproj.manifest end
         def self.only_status?; !!@only_status end
         def self.only_local?; !!@only_local end
+        def self.all_known_package?; !!@all_known_package end
         def self.reset?; !!@reset end
         def self.check?; !!@check end
         def self.manifest_update?; !!@manifest_update end
@@ -886,6 +897,7 @@ module Autoproj
         def self.parse_arguments(args, with_mode = true, &additional_options)
             @only_status = false
             @only_local  = false
+            @all_known_package = false
             @show_osdeps = false
             @status_exit_code = false
             @revshow_osdeps = false
@@ -1053,6 +1065,9 @@ where 'mode' is one of:
                 opts.on("--local", "in status and update modes, do not access the network") do
                     @only_local = true
                 end
+                opts.on("--all-known-packages", "handle all known packages that are defined by package-sets") do
+                    @all_known_package = true
+                end
                 opts.on("--reset", "in update mode, reset the repositories to the state requested by the VCS configuration") do
                     @reset = true
                 end

data/lib/autoproj/default.osdeps

@@ -87,12 +87,13 @@ build-essential:
   fedora: ["gcc-c++", make, glibc-devel]
   darwin: ignore
   opensuse: ["@devel_C_C++", "gcc-c++"]
+  default: clang
 
 autobuild:
-  - gem: autobuild
+  - gem: autobuild~>1.10.0
   - osdep: readline
 autoproj:
-  - gem: autoproj
+  - gem: autoproj~>1.13.0
   - osdep: readline
 
 readline:
@@ -112,9 +113,10 @@ git:
   gentoo: dev-vcs/git
   arch: git
   fedora: git
-  macos-port: git-core
+  macos-port: git
   macos-brew: git
   opensuse: git
+  freebsd: git
 
 hg:
   debian,ubuntu: mercurial
@@ -123,6 +125,7 @@ hg:
   fedora: mercurial
   darwin: mercurial
   opensuse: mercurial
+  freebsd: mercurial
 
 svn:
   debian,ubuntu: subversion
@@ -131,6 +134,7 @@ svn:
   fedora: subversion
   darwin: subversion
   opensuse: subversion
+  freebsd: subversion
 
 cmake:
   debian,ubuntu: cmake
@@ -139,6 +143,7 @@ cmake:
   fedora: cmake
   darwin: cmake
   opensuse: cmake
+  freebsd: cmake
 
 autotools:
   debian,ubuntu:
@@ -159,6 +164,9 @@ autotools:
   opensuse:
   - automake
   - autoconf
+  freebsd:
+  - automake
+  - autoconf
 
 archive:
   debian,ubuntu:
@@ -181,6 +189,7 @@ archive:
   opensuse:
   - tar
   - unzip
+  default: ignore
 
 cvs:
   debian,ubuntu: cvs
@@ -188,15 +197,17 @@ cvs:
   darwin: cvs
   arch: cvs
   opensuse: cvs
+  freebsd: cvs
 
 pip:
   debian,ubuntu: python-pip
   arch: python2-pip
   opensuse: python-pip
   fedora: python-pip
+  freebsd: pip
 
 sudo:
+  macos-brew: ignore
   default: sudo
 
 # vim: expandtab
-

data/lib/autoproj/gitorious.rb

@@ -52,7 +52,7 @@ module Autoproj
             elsif !access_methods.has_key?(value)
                 raise Autoproj::InputError, "#{value} is not a known access method"
             elsif disabled_methods.include?(value)
-                raise Autoproj::InputError, "#{method} is disabled on #{base_url}"
+                raise Autoproj::InputError, "#{value} is disabled on #{base_url}"
             end
 
             value

data/lib/autoproj/ops/configuration.rb

@@ -209,6 +209,9 @@ module Autoproj
             by_repository_id = Hash.new
             by_name = Hash.new
 
+            required_remotes_dirs = Array.new
+            required_user_dirs = Array.new
+
             queue = queue_auto_imports_if_needed(Array.new, root_pkg_set, root_pkg_set)
             while !queue.empty?
                 vcs, options, imported_from = queue.shift
@@ -227,17 +230,28 @@ module Autoproj
                 end
                 by_repository_id[repository_id] = [vcs, imported_from]
 
+                # Make sure the package set has been already checked out to
+                # retrieve the actual name of the package set
                 if !vcs.local?
                     update_remote_package_set(vcs, only_local)
-                    create_remote_set_user_dir(vcs)
+                    raw_local_dir = PackageSet.raw_local_dir_of(vcs)
+                    required_remotes_dirs << raw_local_dir
                 end
-
                 name = PackageSet.name_of(manifest, vcs)
+
+                required_user_dirs = by_name.collect { |k,v| k }
+                Autoproj.debug "Trying to load package_set: #{name} from definition #{repository_id}"
+                Autoproj.debug "Already loaded package_sets are: #{required_user_dirs}"
+
                 if already_loaded = by_name[name]
                     already_loaded_pkg_set, already_loaded_vcs = *already_loaded
                     if already_loaded_vcs != vcs
                         if imported_from
-                            Autoproj.warn "#{imported_from.name} auto-imports a package set from #{vcs}, but a package set with the same name (#{name}) has already been imported from #{already_loaded_vcs}, I am skipping this one"
+                            Autoproj.warn "redundant auto-import by #{imported_from.name} for package set '#{name}'."
+                            Autoproj.warn "    A package set with the same name (#{name}) has already been imported from"
+                            Autoproj.warn "        #{already_loaded_vcs}"
+                            Autoproj.warn "    Skipping the following one: "
+                            Autoproj.warn "        #{vcs}"
                         else
                             Autoproj.warn "the manifest refers to a package set from #{vcs}, but a package set with the same name (#{name}) has already been imported from #{already_loaded_vcs}, I am skipping this one"
                         end
@@ -248,6 +262,8 @@ module Autoproj
                         imported_from.imports << already_loaded_pkg_set
                     end
                     next
+                else
+                    create_remote_set_user_dir(vcs)
                 end
 
                 pkg_set = load_package_set(vcs, options, imported_from)
@@ -260,18 +276,20 @@ module Autoproj
                 queue_auto_imports_if_needed(queue, pkg_set, root_pkg_set)
             end
 
-            cleanup_remotes_dir(package_sets)
-            cleanup_remotes_user_dir(package_sets)
+            cleanup_remotes_dir(package_sets, required_remotes_dirs)
+            cleanup_remotes_user_dir(package_sets, required_user_dirs)
             package_sets
         end
 
         # Removes from {remotes_dir} the directories that do not match a package
         # set
-        def cleanup_remotes_dir(package_sets = manifest.package_sets)
+        def cleanup_remotes_dir(package_sets = manifest.package_sets, required_remotes_dirs = Array.new)
             # Cleanup the .remotes and remotes_symlinks_dir directories
             Dir.glob(File.join(remotes_dir, '*')).each do |dir|
                 dir = File.expand_path(dir)
-                if File.directory?(dir) && !package_sets.find { |pkg| pkg.raw_local_dir == dir }
+                # Once a package set has been checked out during the process,
+                # keep it -- so that it won't be checked out again
+                if File.directory?(dir) && !required_remotes_dirs.include?(dir)
                     FileUtils.rm_rf dir
                 end
             end
@@ -279,10 +297,11 @@ module Autoproj
 
         # Removes from {remotes_user_dir} the directories that do not match a
         # package set
-        def cleanup_remotes_user_dir(package_sets = manifest.package_sets)
+        def cleanup_remotes_user_dir(package_sets = manifest.package_sets, required_user_dirs = Array.new)
             Dir.glob(File.join(remotes_user_dir, '*')).each do |file|
                 file = File.expand_path(file)
-                if File.symlink?(file) && !package_sets.find { |pkg_set| pkg_set.user_local_dir == file }
+                user_dir = File.basename(file)
+                if File.symlink?(file) && !required_user_dirs.include?(user_dir)
                     FileUtils.rm_f file
                 end
             end

data/lib/autoproj/osdeps.rb

@@ -355,6 +355,15 @@ fi
                         "emerge --noreplace '%s'")
             end
         end
+	# Package manager interface for systems that use pkg (i.e. FreeBSD) as
+        # their package manager
+        class PkgManager < ShellScriptManager
+            def initialize
+                super(['pkg'], true,
+                        "pkg install -y '%s'",
+                        "pkg install -y '%s'")
+            end
+        end
 
         #Package manger for OpenSuse and Suse (untested)
         class ZypperManager < ShellScriptManager
@@ -968,7 +977,8 @@ fi
             PackageManagers::YumManager,
             PackageManagers::PortManager,
             PackageManagers::ZypperManager,
-            PackageManagers::PipManager]
+            PackageManagers::PipManager ,
+            PackageManagers::PkgManager]
         
         # Mapping from OS name to package manager name
         #
@@ -988,7 +998,8 @@ fi
             'fedora' => 'yum',
             'macos-port' => 'macports',
             'macos-brew' => 'brew',
-            'opensuse' => 'zypper'
+            'opensuse' => 'zypper',
+            'freebsd' => 'pkg'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -1195,6 +1206,9 @@ fi
                 version =~/.*VERSION\s+=\s+([^\s]+)/
                 version = $1
                 [['opensuse'], [version.strip]]
+            elsif Autobuild.freebsd? 
+		version = `uname -r`.strip.split("-")[0]
+		[['freebsd'],[version]]
             end
         end
 
@@ -1343,6 +1357,20 @@ fi
 
         class InvalidRecursiveStatement < Autobuild::Exception; end
 
+        # Return the path to the osdeps name for a given package name while
+        # accounting for package aliases
+        #
+        # returns an array contain the path starting with name and
+        # ending at the resolved name
+        def self.resolve_name(name)
+            path = [ name ]
+            while OSDependencies.aliases.has_key?(name)
+                name = OSDependencies.aliases[name]
+                path << name
+            end
+            path
+        end
+
         # Return the list of packages that should be installed for +name+
         #
         # The following two simple return values are possible:
@@ -1361,9 +1389,8 @@ fi
         # name and version. The package list might be empty even if status ==
         # FOUND_PACKAGES, for instance if the ignore keyword is used.
         def resolve_package(name)
-            while OSDependencies.aliases.has_key?(name)
-                name = OSDependencies.aliases[name]
-            end
+            path = OSDependencies.resolve_name(name)
+            name = path.last
 
             os_names, os_versions = OSDependencies.operating_system
             os_names = os_names.dup
@@ -1584,7 +1611,8 @@ fi
             dependencies.each do |name|
                 result = resolve_package(name)
                 if !result
-                    raise MissingOSDep.new, "there is no osdeps definition for #{name}"
+                    path = OSDependencies.resolve_name(name)
+                    raise MissingOSDep.new, "there is no osdeps definition for #{path.last} (search tree: #{path.join("->")})"
                 end
 
                 if result.empty?

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.13.2"
+    VERSION = "1.13.3.b1"
 end

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3.b1
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
 - !ruby/object:Gem::Dependency
@@ -35,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
@@ -45,31 +36,22 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -253,9 +235,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2