autobuild 1.7.12.b1 → 1.7.12.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b751fdd16c5fd714935d5c171f4d9e409205d81
-  data.tar.gz: 7a1e3aed96af604c30b08fb5072221d0da304251
+  metadata.gz: 471798bd185dc3139ce68a4c7af01ed7362e1aa9
+  data.tar.gz: 2f50cd8d1df428914ceba5004c22c2d41b9d6aae
 SHA512:
-  metadata.gz: e4d025a0012ab19085301c0fe8796ded4b68e05b49a2f0a25c9bedc4a177f954af446a5ae17afc1c3699ef894dd11b5d426b7dbf8a976c7fddbf5610cac97b24
-  data.tar.gz: dc15319a8e9348b41a70f771567f0cca92f3553cda9d2d099f54bf8f8ebe49eeed3733b98ca1200cc93c18ba9266d9dbe16add9f463a7ec598f526a8e4371e16
+  metadata.gz: 6f9928f0e06d4d8d4d41c034af96d2d729ff78adb1fbe2f8ada7b669d4efc674d9ba5ebce07fdbe4ce6bca514c1e1155f1dadef7f87aeb6d6903daee44555474
+  data.tar.gz: d5a3e1fdb7d8bba6a62bab49acede13af5cde51215269a8a355e1bb369358342deb792e8e6ec24f6bf7aaa2d6021b02b5bcdf34e5adfcd6ba560c9d85abfb505

data/lib/autobuild/import/archive.rb

@@ -205,13 +205,6 @@ module Autobuild
         # is the same than the source dir
         def archive_dir; @options[:archive_dir] || tardir end
 
-        # Returns a string that identifies the remote repository uniquely
-        #
-        # This is meant for display purposes
-        def repository_id
-            url.dup
-        end
-
 	# Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
 	# are allowed:
 	# [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"
@@ -221,6 +214,7 @@ 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)
             super(options)
             if !@options.has_key?(:update_cached_file)
                 @options[:update_cached_file] = false

data/lib/autobuild/import/git.rb

@@ -60,7 +60,9 @@ module Autobuild
                 Autobuild.warn "   Autobuild.git 'git://gitorious.org/rock/buildconf.git', :branch => 'master'"
             end
 
-            gitopts, common = Kernel.filter_options options, :push_to => nil, :branch => nil, :tag => nil, :commit => nil, :with_submodules => false
+            gitopts, common = Kernel.filter_options options,
+                :push_to => nil, :branch => nil, :tag => nil, :commit => nil, :with_submodules => false,
+                :repository_id => "git:#{@repository}"
             if gitopts[:branch] && branch
                 raise ConfigException, "git branch specified with both the option hash and the explicit parameter"
             end
@@ -74,14 +76,7 @@ module Autobuild
             @tag    = tag
             @commit = commit
             @remote_name = 'autobuild'
-            super(common)
-        end
-
-        # Returns a string that identifies the remote repository uniquely
-        #
-        # This is meant for display purposes
-        def repository_id
-            "git:#{repository}"
+            super(common.merge(repository_id: gitopts[:repository_id]))
         end
 
         # The name of the remote that should be set up by the importer

data/lib/autobuild/import/hg.rb

@@ -18,16 +18,11 @@ module Autobuild
         def initialize(repository, options = {})
             @repository = repository.to_str
 
-            hgopts, common = Kernel.filter_options options, :branch => 'default'
+            hgopts, common = Kernel.filter_options options,
+                :branch => 'default',
+                :repository_id => "hg:#{repository}"
             @branch = hgopts[:branch]
-            super(common)
-        end
-
-        # Returns a string that identifies the remote repository uniquely
-        #
-        # This is meant for display purposes
-        def repository_id
-            "hg:#{repository}"
+            super(common.merge(repository_id: hgopts[:repository_id]))
         end
 
         # The remote repository URL.

data/lib/autobuild/import/svn.rb

@@ -12,10 +12,11 @@ module Autobuild
 	# to 'svn' and can be configured by doing 
 	#   Autobuild.programs['svn'] = 'my_svn_tool'
         def initialize(source, options = {})
-            svnopts, common = Kernel.filter_options options,
-                :svnup => [], :svnco => [], :revision => nil
 
             @source = [*source].join("/")
+            svnopts, common = Kernel.filter_options options,
+                :svnup => [], :svnco => [], :revision => nil,
+                :repository_id => "svn:#{@source}"
             @program    = Autobuild.tool('svn')
             @options_up = [*svnopts[:svnup]]
             @options_co = [*svnopts[:svnco]]
@@ -23,14 +24,7 @@ module Autobuild
                 @options_up << "--revision" << rev
                 @options_co << "--revision" << rev
             end
-            super(common)
-        end
-
-        # Returns a string that identifies the remote repository uniquely
-        #
-        # This is meant for display purposes
-        def repository_id
-            @source.dup
+            super(common.merge(repository_id: svnopts[:repository_id]))
         end
 
         private

data/lib/autobuild/importer.rb

@@ -71,8 +71,15 @@ class Importer
     def initialize(options)
         @options = options.dup
         @options[:retry_count] = Integer(@options[:retry_count] || 0)
+        @repository_id = options[:repository_id] || "#{self.class.name}:#{object_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
+    attr_reader :repository_id
+
     # The number of times update / checkout should be retried before giving up.
     # The default is 0 (do not retry)
     #

data/lib/autobuild/reporting.rb

@@ -312,6 +312,10 @@ module Autobuild
             @@reporters << reporter
         end
 
+        def self.clear_reporters
+            @@reporters.clear
+        end
+
 	def self.each_reporter(&iter)
 	    @@reporters.each(&iter)
 	end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.12.b1" unless defined? Autobuild::VERSION
+    VERSION = "1.7.12.rc1" 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.b1
+  version: 1.7.12.rc1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake