autobuild 1.7.12.rc4 → 1.7.12.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc3f6aff781506f808467b86427876aa95da6b2
-  data.tar.gz: b3b5a5e470d9ff71dfae78123ddca8498532ecf3
+  metadata.gz: 9a4395f370d1e1c38b7e5b47ee51c44c21c4cf50
+  data.tar.gz: 2fbb94fa41c844eb6f883c89e82707bd5d11cee9
 SHA512:
-  metadata.gz: da1ba8dd3ed2dba2ce0c7b2a0acffa82f02bd74b79dbc03163319d03df1721b0e6c50f2e17c1ea40cf894490162ba1d083cdef4476a58610ce466c65133ec6f0
-  data.tar.gz: acb3603694fb136516bfe12300c16f7c57b0c0167dc0e6013168a94ddad5bacbef8adf3cfae9e4b32b89f92156dc77bc5bbbf286b5d76b6fd76adbdbbc5e36da
+  metadata.gz: ffc19e8cf7505968892cbb0428f4e24bc4bd77c29cb5e9b6837e23fab111ab8ad1c53fffd2560a47d475f8e8d142f176c249939bb8dbf3b9ccf5b0d759de993b
+  data.tar.gz: 2084cca9a550f9176f793f22a96040ce1cc0ba0be484d8463f6593b9c810fe160a094079081bb8b62f0bf832852b070b463e5390f7372bf82de70032639495a0

data/lib/autobuild/import/archive.rb

@@ -250,24 +250,28 @@ module Autobuild
         # [:no_subdirectory] the archive does not have the custom archive
         #       subdirectory.
         def initialize(url, options)
-            options = Hash[repository_id: URI.parse(url)].merge(options)
+            sourceopts, options = Kernel.filter_options options,
+                :source_id, :repository_id
             super(options)
+
             if !@options.has_key?(:update_cached_file)
                 @options[:update_cached_file] = false
             end
             @cachedir = @options[:cachedir] || ArchiveImporter.cachedir
             @retries = @options[:retries] || ArchiveImporter.retries
             @timeout = @options[:timeout] || ArchiveImporter.timeout
-
-            relocate(url)
+            relocate(url, sourceopts)
         end
 
         # Changes the URL from which we should pick the archive
         def relocate(url, options = Hash.new)
-            @url = URI.parse(url)
+            parsed_url = URI.parse(url)
+            @url = parsed_url
             if !VALID_URI_SCHEMES.include?(@url.scheme)
                 raise ConfigException, "invalid URL #{@url} (local files must be prefixed with file://)" 
             end
+            @repository_id = options[:repository_id] || parsed_url
+            @source_id = options[:source_id] || parsed_url
 
             filename = options[:filename] || File.basename(url).gsub(/\?.*/, '')
 

data/lib/autobuild/import/cvs.rb

@@ -21,7 +21,7 @@ module Autobuild
             @options_up = Array[*@options_up]
             @options_co = cvsopts[:cvsco] || '-P'
             @options_co = Array[*@options_co]
-            super(common)
+            super(common.merge(repository_id: "cvs:#{@root}:#{@module}"))
         end
 
 	# Array of options to give to 'cvs checkout'

data/lib/autobuild/import/darcs.rb

@@ -15,7 +15,7 @@ module Autobuild
         def initialize(source, options = {})
             @source   = source
             @program  = Autobuild.tool('darcs')
-            super(options)
+            super(options.merge(repository_id: source))
 	    @pull = [*options[:pull]]
 	    @get  = [*options[:get]]
         end

data/lib/autobuild/import/git.rb

@@ -43,7 +43,6 @@ module Autobuild
         # doing 
 	#   Autobuild.programs['git'] = 'my_git_tool'
         def initialize(repository, branch = nil, options = {})
-            @repository = repository.to_str
             @alternates = Git.default_alternates.dup
             @git_dir_cache = Array.new
 
@@ -61,11 +60,20 @@ module Autobuild
             end
 
             gitopts, common = Kernel.filter_options options,
-                :push_to => nil, :branch => nil, :tag => nil, :commit => nil, :with_submodules => false,
-                :repository_id => "git:#{@repository}"
+                push_to: nil,
+                branch: nil,
+                tag: nil,
+                commit: nil,
+                with_submodules: false
             if gitopts[:branch] && branch
                 raise ConfigException, "git branch specified with both the option hash and the explicit parameter"
             end
+
+            sourceopts, common = Kernel.filter_options common,
+                :repository_id, :source_id
+
+            super(common)
+
             @push_to = gitopts[:push_to]
             @with_submodules = gitopts[:with_submodules]
             branch = gitopts[:branch] || branch
@@ -76,7 +84,7 @@ module Autobuild
             @tag    = tag
             @commit = commit
             @remote_name = 'autobuild'
-            super(common.merge(repository_id: gitopts[:repository_id]))
+            relocate(repository, sourceopts)
         end
 
         # The name of the remote that should be set up by the importer
@@ -622,8 +630,12 @@ module Autobuild
         end
 
         # Changes the repository this importer is pointing to
-        def relocate(repository)
-            @repository = repository
+        def relocate(repository, options = Hash.new)
+            @repository = repository.to_str
+            @repository_id = options[:repository_id] ||
+                "git:#{@repository}"
+            @source_id = options[:source_id] ||
+                "#{@repository_id} branch=#{self.branch} tag=#{self.tag} commit=#{self.commit}"
         end
 
         # Tests whether the given directory is a git repository

data/lib/autobuild/import/hg.rb

@@ -16,13 +16,23 @@ module Autobuild
         # @param [String] repository the repository URL
         # @option options [String] :branch (default) the branch to track
         def initialize(repository, options = {})
-            @repository = repository.to_str
-
             hgopts, common = Kernel.filter_options options,
-                :branch => 'default',
-                :repository_id => "hg:#{repository}"
+                branch: 'default'
+            sourceopts, common = Kernel.filter_options options,
+                :repository_id, :source_id
+
+            super(common)
             @branch = hgopts[:branch]
-            super(common.merge(repository_id: hgopts[:repository_id]))
+            relocate(repository, sourceopts)
+        end
+
+        # Changes the repository this importer is pointing to
+        def relocate(repository, options = Hash.new)
+            @repository = repository
+            @repository_id = options[:repository_id] ||
+                "hg:#{@repository}"
+            @source_id = options[:source_id] ||
+                "#{self.repository_id} branch=#{self.branch}"
         end
 
         # The remote repository URL.
@@ -60,11 +70,6 @@ module Autobuild
             Subprocess.run(package, :import,
                 Autobuild.tool('hg'), 'clone', '-u', branch, repository, package.importdir)
         end
-
-        # Changes the repository this importer is pointing to
-        def relocate(repository)
-            @repository = repository
-        end
     end
 
     # Creates a hg importer which gets the source for the given repository and branch

data/lib/autobuild/importer.rb

@@ -72,14 +72,29 @@ class Importer
         @options = options.dup
         @options[:retry_count] = Integer(@options[:retry_count] || 0)
         @repository_id = options[:repository_id] || "#{self.class.name}:#{object_id}"
+        @source_id = options[:source_id] || @repository_id
     end
 
     # Returns a string that identifies the remote repository uniquely
     #
     # This can be used to check whether two importers are pointing to the same
-    # repository, regardless of e.g. the access protocol used
+    # repository, regardless of e.g. the access protocol used.  For instance,
+    # two git importers that point to the same repository but different branches
+    # would have the same repository_id but different source_id
+    #
+    # @see source_id
     attr_reader :repository_id
 
+    # Returns a string that identifies the remote source uniquely
+    #
+    # This can be used to check whether two importers are pointing to the same
+    # code base inside the same repository. For instance, two git importers that
+    # point to the same repository but different branches would have the same
+    # repository_id but different source_id
+    #
+    # @see repository_id
+    attr_reader :source_id
+
     # The number of times update / checkout should be retried before giving up.
     # The default is 0 (do not retry)
     #

data/lib/autobuild/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.12.rc4
+  version: 1.7.12.rc5
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake