autobuild 1.7.11 → 1.7.12.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e7f1a52a67ee2553cf29bac1291e1584eff58ac
-  data.tar.gz: f86cb0d5abd152e4cb1dbb58ba03b4d548fc35ce
+  metadata.gz: 3b751fdd16c5fd714935d5c171f4d9e409205d81
+  data.tar.gz: 7a1e3aed96af604c30b08fb5072221d0da304251
 SHA512:
-  metadata.gz: d1edbe06538c2e3ee89c5479f23e2d637a895c8dfeccf20848c22d3340a98126d0de72e1b06d818033bdf38a5197d7a38996404df50e37a0311c9513f16f7fb8
-  data.tar.gz: 006ffa82653a9a49257d37c649411e7af8cffd14ee15684e388e8f1c188fe2320a6a58a414a26596f79ab72e504e9df193c0b835a991c77f3f0025dbd8b328f9
+  metadata.gz: e4d025a0012ab19085301c0fe8796ded4b68e05b49a2f0a25c9bedc4a177f954af446a5ae17afc1c3699ef894dd11b5d426b7dbf8a976c7fddbf5610cac97b24
+  data.tar.gz: dc15319a8e9348b41a70f771567f0cca92f3553cda9d2d099f54bf8f8ebe49eeed3733b98ca1200cc93c18ba9266d9dbe16add9f463a7ec598f526a8e4371e16

data/lib/autobuild/import/git.rb

@@ -29,7 +29,7 @@ module Autobuild
                 elsif cache_dir = ENV['AUTOBUILD_GIT_CACHE_DIR']
                     @default_alternates = cache_dir.split(':').map { |path| File.expand_path(path) }
                 elsif cache_dir = ENV['AUTOBUILD_CACHE_DIR']
-                    @default_alternates = cache_dir.split(':').map { |path| File.join(File.expand_path(path), 'git') }
+                    @default_alternates = cache_dir.split(':').map { |path| File.join(File.expand_path(path), 'git', '%s') }
                 else Array.new
                 end
             end
@@ -474,7 +474,7 @@ module Autobuild
                 else Array.new
                 end
 
-            alternates = self.alternates.map do |path|
+            alternates = each_alternate_path(package).map do |path|
                 File.join(path, 'objects')
             end
 
@@ -567,6 +567,18 @@ module Autobuild
             end
         end
 
+        def each_alternate_path(package)
+            return enum_for(__method__, package) if !block_given?
+
+            alternates.each do |path|
+                path = path % [package.name]
+                if File.directory?(path)
+                    yield(path)
+                end
+            end
+            nil
+        end
+
         def checkout(package)
             base_dir = File.expand_path('..', package.importdir)
             if !File.directory?(base_dir)
@@ -578,7 +590,7 @@ module Autobuild
             if with_submodules?
                 clone_options << '--recurse-submodules'
             end
-            alternates.each do |path|
+            each_alternate_path(package) do |path|
                 clone_options << '--reference' << path
             end
             Subprocess.run(package, :import,

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.11" unless defined? Autobuild::VERSION
+    VERSION = "1.7.12.b1" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.7.12.b1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,9 +161,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
@@ -171,9 +171,9 @@ signing_key:
 specification_version: 4
 summary: Library to handle build systems and import mechanisms
 test_files:
-- test/test_import_svn.rb
-- test/test_subcommand.rb
+- test/test_import_tar.rb
 - test/test_config.rb
-- test/test_import_cvs.rb
+- test/test_subcommand.rb
 - test/test_reporting.rb
-- test/test_import_tar.rb
+- test/test_import_svn.rb
+- test/test_import_cvs.rb