autoproj 1.12.4 → 1.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fa89159dba1e3e5b0b0172970d60c23d6164f21
-  data.tar.gz: 0131d4b49f214fbd8df37f7383bdbb743266cac2
+  metadata.gz: de1b737b5a26bac3eafe2394e7a9d57032321935
+  data.tar.gz: c09ff63617a7bc670e9608c4d06a245cdd112ba6
 SHA512:
-  metadata.gz: 2724ec5bfb1f6c088a11f04ceca2151d2d1e46df749c706ea2c38903eddcd8bee6e928c1d00abbe88dce1ea77e1acaa12e2891042202f44d6f5a41f3ffd848f4
-  data.tar.gz: 1f86d09aa74d3680e4e632a159dadd31252e8966999b7bea0cdcc29ac997ba92609d848065579ccef15855693c626f1305b007f22619e1da4d214ed356a900de
+  metadata.gz: e4e68ed38d8a6b2588053fdb5bf38955600ebfeb825e3ab67d8834b37e1c21fb8723a503267c6c9400eb5f4a5a0f85838dfe6dd4f0656b4ccd3a84acad669b1e
+  data.tar.gz: 49c225e45df8256da2d3e90d1da139d4766be1e1d2454637a19b5e67991dff729968b83cd594fc99cd70f55cea93003937000986d22c61c9465baed342d64cf4

data/bin/autoproj

@@ -75,7 +75,7 @@ Autoproj::CmdLine.report do
             exit 0
         end
     elsif selected_packages.empty?
-        Autoproj::CmdLine.update_myself(force: true)
+        Autoproj::CmdLine.update_myself
         Autoproj::CmdLine.update_configuration
     else
         begin

data/bin/autoproj-show

@@ -2,13 +2,6 @@
 
 require 'autoproj'
 require 'autoproj/cmdline'
-Autoproj.silent = true
-Autoproj::CmdLine.initialize_root_directory
-Autoproj::CmdLine.initialize_and_load(ARGV)
-
-require 'pp'
-default_packages = Autoproj.manifest.default_packages
-revdeps = Autoproj.manifest.compute_revdeps
 
 user_selection = ARGV.map do |arg|
     if File.directory?(arg)
@@ -16,6 +9,14 @@ user_selection = ARGV.map do |arg|
     else arg
     end
 end
+
+Autoproj.silent = true
+Autoproj::CmdLine.initialize_root_directory
+Autoproj::CmdLine.initialize_and_load(ARGV)
+
+default_packages = Autoproj.manifest.default_packages
+revdeps = Autoproj.manifest.compute_revdeps
+
 resolved_selection = Autoproj::CmdLine.resolve_user_selection(user_selection, :filter => false)
 packages = resolved_selection.selection.keys
 

data/bin/autoproj_bootstrap

@@ -1006,6 +1006,26 @@ fi
 
                 # Now, reset the directories in our own RubyGems instance
                 Gem.paths = ENV
+
+                # If there is a cache directory, make sure .gems/cache points to
+                # it (there are no programmatic ways to override this)
+                if cache = cache_dir
+                    gem_cache_dir = File.join(gem_home, 'cache')
+                    if !File.symlink?(gem_cache_dir) || File.readlink(gem_cache_dir) != cache
+                        FileUtils.rm_rf gem_cache_dir
+                        Autoproj.create_symlink(cache, gem_cache_dir)
+                    end
+                end
+            end
+
+            # A global cache directory that should be used to avoid
+            # re-downloading gems
+            def self.cache_dir
+                if dir = ENV['AUTOBUILD_CACHE_DIR']
+                    dir = File.join(dir, 'gems')
+                    FileUtils.mkdir_p dir
+                    dir
+                end
             end
 
             # Return the directory in which RubyGems package should be installed

data/lib/autoproj/cmdline.rb

@@ -799,7 +799,6 @@ module Autoproj
         end
         def self.display_configuration?; !!@display_configuration end
         def self.force_re_build_with_depends?; !!@force_re_build_with_depends end
-        def self.partial_build?; !!@partial_build end
         def self.mail_config; @mail_config || Hash.new end
         def self.update_packages?; @mode == "update" || @mode == "envsh" || build? end
         def self.update_envsh?; @mode == "envsh" || build? || @mode == "update" end
@@ -847,7 +846,6 @@ module Autoproj
             @force_re_build_with_depends = false
             force_re_build_with_depends = nil
             @only_config = false
-            @partial_build = false
             @color = true
             Autobuild.color = true
             Autobuild.do_update = nil
@@ -1055,7 +1053,6 @@ where 'mode' is one of:
             end
 
             selection = args.dup
-            @partial_build = !selection.empty?
             @force_re_build_with_depends = force_re_build_with_depends if !force_re_build_with_depends.nil?
             Autobuild.do_update = do_update if !do_update.nil?
             selection

data/lib/autoproj/ops/configuration.rb

@@ -89,7 +89,7 @@ module Autoproj
 
                 # Then move the importer there if possible
                 if fake_package.importer.respond_to?(:pick_from_autoproj_root)
-                    if !fake_package.importer.pick_from_autoproj_root(fake_package, other_root)
+                    if !fake_package.importer.pick_from_autoproj_root(fake_package, update_from)
                         fake_package.update = false
                     end
                 else
@@ -187,6 +187,10 @@ module Autoproj
         end
 
         def repository_id_of(vcs)
+            if vcs.local?
+                return "local:#{vcs.url}"
+            end
+
             name = PackageSet.name_of(manifest, vcs)
             raw_local_dir = PackageSet.raw_local_dir_of(vcs)
             fake_package = Tools.create_autobuild_package(vcs, name, raw_local_dir)
@@ -289,9 +293,12 @@ module Autoproj
             # We do not consider the 'standalone' package sets while sorting.
             # They are taken care of later, as we need to maintain the order the
             # user defined in the package_sets section of the manifest
-            queue = package_sets.find_all do |pkg_set|
-                (!pkg_set.imports.empty? || !pkg_set.explicit?) && !(pkg_set == root_pkg_set)
-            end
+            queue = package_sets.flat_map do |pkg_set|
+                if (!pkg_set.imports.empty? || !pkg_set.explicit?) && !(pkg_set == root_pkg_set)
+                    [pkg_set] + pkg_set.imports.to_a
+                else []
+                end
+            end.to_set.to_a
 
             sorted = Array.new
             while !queue.empty?

data/lib/autoproj/osdeps.rb

@@ -543,6 +543,26 @@ fi
 
                 # Now, reset the directories in our own RubyGems instance
                 Gem.paths = ENV
+
+                # If there is a cache directory, make sure .gems/cache points to
+                # it (there are no programmatic ways to override this)
+                if cache = cache_dir
+                    gem_cache_dir = File.join(gem_home, 'cache')
+                    if !File.symlink?(gem_cache_dir) || File.readlink(gem_cache_dir) != cache
+                        FileUtils.rm_rf gem_cache_dir
+                        Autoproj.create_symlink(cache, gem_cache_dir)
+                    end
+                end
+            end
+
+            # A global cache directory that should be used to avoid
+            # re-downloading gems
+            def self.cache_dir
+                if dir = ENV['AUTOBUILD_CACHE_DIR']
+                    dir = File.join(dir, 'gems')
+                    FileUtils.mkdir_p dir
+                    dir
+                end
             end
 
             # Return the directory in which RubyGems package should be installed

data/lib/autoproj/package_set.rb

@@ -332,9 +332,9 @@ module Autoproj
             @name = source_definition['name']
             @provides = (source_definition['provides'] || Set.new).to_set
             @imports_vcs  = Array(source_definition['imports'] || Array.new).map do |set_def|
-                if !set_def.kind_of?(Hash)
+                if !set_def.kind_of?(Hash) && !set_def.respond_to?(:to_str)
                     raise ConfigError.new(source_file),
-                        "in #{source_file}: wrong format for 'imports' section. Expected an array of maps (e.g. - github: my/url)."
+                        "in #{source_file}: wrong format for 'imports' section. Expected an array of maps or strings (e.g. - github: my/url)."
                 end
 
                 Autoproj.in_file(source_file) do

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.12.4"
+    VERSION = "1.12.5"
 end

data/test/ops/test_configuration.rb

@@ -0,0 +1,20 @@
+require 'autoproj/test'
+require 'autoproj/ops/configuration'
+
+describe Autoproj::Ops::Configuration do
+    describe "#sort_package_sets_by_import_order" do
+        attr_reader :ops
+
+        before do
+            @ops = Autoproj::Ops::Configuration.new(nil, nil)
+        end
+
+        it "should handle standalone package sets that are both explicit and dependencies of other package sets gracefully (issue#30)" do
+            pkg_set0 = flexmock('set0', imports: [], explicit?: true)
+            pkg_set1 = flexmock('set1', imports: [pkg_set0], explicit?: true)
+            root_pkg_set = flexmock('root', imports: [pkg_set0, pkg_set1], explicit?: true)
+            assert_equal [pkg_set0, pkg_set1, root_pkg_set],
+                ops.sort_package_sets_by_import_order([pkg_set1, pkg_set0], root_pkg_set)
+        end
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.5
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -190,6 +190,7 @@ files:
 - test/data/test_manifest/autoproj/local_set/local.autobuild
 - test/data/test_manifest/autoproj/local_set/source.yml
 - test/data/test_manifest/autoproj/manifest
+- test/ops/test_configuration.rb
 - test/package_managers/apt-dpkg-status
 - test/package_managers/apt-dpkg-status.installed-last
 - test/package_managers/apt-dpkg-status.noninstalled-last
@@ -230,5 +231,6 @@ test_files:
 - test/package_managers/test_gem.rb
 - test/package_managers/test_pip.rb
 - test/test_manifest.rb
-- test/test_os_dependencies.rb
 - test/test_package_manifest.rb
+- test/test_os_dependencies.rb
+- test/ops/test_configuration.rb