autobuild 1.10.0.b1 → 1.10.0.b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e42c625c20b8bfbb4fc824fc40a9b2a41f5d6bb6
-  data.tar.gz: c35720c6c894d3fb3337bafb17424b72c9b1e9e1
+  metadata.gz: 67c87629da5179c5b58f195daf8679f53bfc4054
+  data.tar.gz: af790ea0bf7210db55344839c79455b650d1e915
 SHA512:
-  metadata.gz: 728e7d5f5a968767e5d5bea8368bfda85c2601b6d66647f8d2f52ae7fe26019f1ef361ce3b0d9cf43b49e4ee71eb6c794c7b146eeb72c01543b495f83caefa2a
-  data.tar.gz: bc5181729cf2196ab580d175efcf411e0a79f9d3abc02e06280dda2bc15f595e0e8fa40b54cdcba1c11b6cec38ed316067f5de30d642049fdfb82785814ae340
+  metadata.gz: 504fec6fac6c095d815d7541ba6828dc55a62032ae8bfeea548e8c23ae3f29bb4dd2f945a80720fc8110ab0d3e3c2695e26fc3dd05729f94bf102c630cfd73ab
+  data.tar.gz: 20292807e5da7f402da75132e4ed808e1b89f05eda485b371b7b03c1156827d6886dc4cd31be4a6da46b079c01e7db941b5b74fe5f2ad2a67d37eecbff83bfde

data/lib/autobuild/environment.rb

@@ -531,6 +531,24 @@ module Autobuild
             add_prefix(newprefix, includes)
         end
 
+        # Returns the system-wide search path that is embedded in pkg-config
+        def default_pkgconfig_search_suffixes
+            found_path_rx = /Scanning directory '(.*\/)((?:lib|lib64|share)\/.*)'$/
+            nonexistent_path_rx = /Cannot open directory '.*\/((?:lib|lib64|share)\/.*)' in package search path:.*/
+
+            if !@default_pkgconfig_search_suffixes
+                output = `LANG=C PKG_CONFIG_PATH= #{Autobuild.tool("pkg-config")} --debug 2>&1`.split("\n")
+                found_paths = output.grep(found_path_rx).
+                    map { |l| l.gsub(found_path_rx, '\2') }.
+                    to_set
+                not_found = output.grep(nonexistent_path_rx).
+                    map { |l| l.gsub(nonexistent_path_rx, '\1') }.
+                    to_set
+                @default_pkgconfig_search_suffixes = found_paths | not_found
+            end
+            return @default_pkgconfig_search_suffixes
+        end
+
         # Updates the environment when a new prefix has been added
         def add_prefix(newprefix, includes = nil)
             if !includes || includes.include?('PATH')
@@ -540,8 +558,7 @@ module Autobuild
             end
 
             if !includes || includes.include?('PKG_CONFIG_PATH')
-                pkg_config_search = ['lib/pkgconfig', 'lib/ARCH/pkgconfig', 'libARCHSIZE/pkgconfig']
-                each_env_search_path(newprefix, pkg_config_search) do |path|
+                each_env_search_path(newprefix, default_pkgconfig_search_suffixes) do |path|
                     add_path('PKG_CONFIG_PATH', path)
                 end
             end

data/lib/autobuild/exceptions.rb

@@ -117,5 +117,12 @@ module Autobuild
             msg
         end
     end
+
+    # Exception raised in contexts where user interaction is forbidden but
+    # required by the import/build process
+    #
+    # This is for instance used during package import if the importer has to ask
+    # the user a question and allow_interactive is false
+    class InteractionRequired < RuntimeError; end
 end
 

data/lib/autobuild/import/archive.rb

@@ -288,7 +288,7 @@ module Autobuild
         #       also used to infer the mode
         # [:mode] The unpack mode: one of Zip, Bzip, Gzip or Plain, this is
         #       usually automatically inferred from the filename
-        def initialize(url, options)
+        def initialize(url, options = Hash.new)
             sourceopts, options = Kernel.filter_options options,
                 :source_id, :repository_id, :filename, :mode
             super(options)
@@ -304,13 +304,13 @@ module Autobuild
 
         # Changes the URL from which we should pick the archive
         def relocate(url, options = Hash.new)
-            parsed_url = URI.parse(url)
+            parsed_url = URI.parse(url).normalize
             @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
+            @repository_id = options[:repository_id] || parsed_url.to_s
+            @source_id = options[:source_id] || parsed_url.to_s
 
             @filename = options[:filename] || @filename || File.basename(url).gsub(/\?.*/, '')
 
@@ -334,7 +334,7 @@ module Autobuild
             end
 
             if needs_update || archive_changed?(package)
-                checkout(package)
+                checkout(package, allow_interactive: options[:allow_interactive])
             end
         rescue OpenURI::HTTPError
             raise Autobuild::Exception.new(package.name, :import)
@@ -357,7 +357,10 @@ module Autobuild
             checkout_digest != cachefile_digest
         end
 
-        def checkout(package) # :nodoc:
+        def checkout(package, options = Hash.new) # :nodoc:
+            options = Kernel.validate_options options,
+                allow_interactive: true
+
             update_cache(package)
 
             # Check whether the archive file changed, and if that is the case
@@ -365,7 +368,7 @@ module Autobuild
             if File.file?(checkout_digest_stamp(package)) && archive_changed?(package)
                 if ArchiveImporter.auto_update?
                     response = 'yes'
-                else
+                elsif options[:allow_interactive]
                     package.progress_done
                     package.message "The archive #{@url.to_s} is different from the one currently checked out at #{package.srcdir}", :bold
                     package.message "I will have to delete the current folder to go on with the update"
@@ -375,6 +378,8 @@ module Autobuild
                         q.default = 'yes'
                         q.case = :downcase
                     end
+                else
+                    raise Autobuild::InteractionRequired, "importing #{package.name} would have required user interaction and allow_interactive is false"
                 end
 
                 if response == "no"
@@ -428,7 +433,9 @@ module Autobuild
         rescue OpenURI::HTTPError
             raise Autobuild::PackageException.new(package.name, :import)
         rescue SubcommandFailed
-            FileUtils.rm_f cachefile
+            if cachefile != url.path
+                FileUtils.rm_f cachefile
+            end
             raise
         end
     end

data/lib/autobuild/import/cvs.rb

@@ -61,7 +61,7 @@ module Autobuild
                         retry: true, working_directory: package.importdir)
         end
 
-        def checkout(package) # :nodoc:
+        def checkout(package, options = Hash.new) # :nodoc:
             head, tail = File.split(package.srcdir)
             cvsroot = @root
                

data/lib/autobuild/import/darcs.rb

@@ -36,7 +36,7 @@ module Autobuild
 	       'pull', '--all', "--repodir=#{package.srcdir}", '--set-scripts-executable', @source, *@pull, retry: true)
         end
 
-        def checkout(package) # :nodoc:
+        def checkout(package, options = Hash.new) # :nodoc:
 	    basedir = File.dirname(package.srcdir)
 	    unless File.directory?(basedir)
 		FileUtils.mkdir_p(basedir)

data/lib/autobuild/import/git.rb

@@ -652,7 +652,9 @@ module Autobuild
         # @param [String] fetch_commit the state of the remote branch. This is
         #   used to avoid losing commits if HEAD is not included in
         #   target_commit
-        def reset_head_to_commit(package, target_commit, fetch_commit)
+        # @option options [Boolean] force (false) bypasses checks that verify
+        #   that some commits won't be lost by resetting
+        def reset_head_to_commit(package, target_commit, fetch_commit, options = Hash.new)
             current_head     = rev_parse(package, 'HEAD')
             head_to_target   = merge_status(package, target_commit, current_head)
             status_to_target = head_to_target.status
@@ -661,7 +663,7 @@ module Autobuild
                 return
             elsif status_to_target == Status::SIMPLE_UPDATE
                 run_git(package, 'merge', target_commit)
-            else
+            elsif !options[:force]
                 # Check whether the current HEAD is present on the remote
                 # repository. We'll refuse resetting if there are uncommitted
                 # changes
@@ -745,7 +747,7 @@ module Autobuild
 
             fetch_commit ||= current_remote_commit(package, options[:only_local])
             if options[:reset]
-                reset_head_to_commit(package, target_commit, fetch_commit)
+                reset_head_to_commit(package, target_commit, fetch_commit, force: (options[:reset] == :force))
             else
                 merge_if_simple(package, target_commit)
             end
@@ -774,7 +776,7 @@ module Autobuild
             nil
         end
 
-        def checkout(package)
+        def checkout(package, options = Hash.new)
             base_dir = File.expand_path('..', package.importdir)
             if !File.directory?(base_dir)
                 FileUtils.mkdir_p base_dir

data/lib/autobuild/import/hg.rb

@@ -59,7 +59,7 @@ module Autobuild
             package.run(:import, Autobuild.tool('hg'), 'update', branch, working_directory: package.importdir)
         end
 
-        def checkout(package)
+        def checkout(package, options = Hash.new)
             base_dir = File.expand_path('..', package.importdir)
             if !File.directory?(base_dir)
                 FileUtils.mkdir_p base_dir

data/lib/autobuild/import/svn.rb

@@ -212,7 +212,7 @@ module Autobuild
             run_svn(package, 'up', "--non-interactive", *options_up)
         end
 
-        def checkout(package) # :nodoc:
+        def checkout(package, options = Hash.new) # :nodoc:
             run_svn(package, 'co', "--non-interactive", *@options_co, svnroot, package.importdir,
                     working_directory: nil)
         end

data/lib/autobuild/importer.rb

@@ -72,6 +72,7 @@ class Importer
         @options = options.dup
         @options[:retry_count] = Integer(@options[:retry_count] || 0)
         @repository_id = options[:repository_id] || "#{self.class.name}:#{object_id}"
+        @interactive = options[:interactive]
         @source_id = options[:source_id] || @repository_id
     end
 
@@ -82,6 +83,7 @@ class Importer
     # two git importers that point to the same repository but different branches
     # would have the same repository_id but different source_id
     #
+    # @return [String]
     # @see source_id
     attr_reader :repository_id
 
@@ -92,9 +94,14 @@ class Importer
     # point to the same repository but different branches would have the same
     # repository_id but different source_id
     #
+    # @return [String]
     # @see repository_id
     attr_reader :source_id
 
+    # Whether this importer will need interaction with the user, for instance to
+    # give credentials
+    def interactive?; !!@interactive end
+
     # The number of times update / checkout should be retried before giving up.
     # The default is 0 (do not retry)
     #
@@ -204,11 +211,11 @@ class Importer
         fallback(e, package, :import, package)
     end
 
-    def perform_checkout(package)
+    def perform_checkout(package, options = Hash.new)
         package.progress_start "checking out %s", :done_message => 'checked out %s' do
             retry_count = 0
             begin
-                checkout(package)
+                checkout(package, options)
             rescue Interrupt
                 raise
             rescue ::Exception => original_error
@@ -268,7 +275,8 @@ class Importer
             only_local: false,
             reset: false,
             checkout_only: false,
-            ignore_errors: false
+            ignore_errors: false,
+            allow_interactive: true
         ignore_errors = options.delete(:ignore_errors)
 
         importdir = package.importdir
@@ -288,7 +296,7 @@ class Importer
             raise ConfigException.new(package, 'import'), "#{importdir} exists but is not a directory"
         else
             package.isolate_errors(mark_as_failed: true, ignore_errors: ignore_errors) do
-                perform_checkout(package)
+                perform_checkout(package, allow_interactive: options[:allow_interactive])
             end
         end
     end

data/lib/autobuild/parallel.rb

@@ -229,6 +229,7 @@ module Autobuild
         end
 
         def resolve_cycle(tasks)
+            cycle = tasks.dup
             chain = []
             next_task = tasks.first
             while true
@@ -244,7 +245,7 @@ module Autobuild
                     end
                 end
                 if !next_task
-                    raise "something fishy while resolving a cycle in #{tasks.map(&:name).join(", ")}. Some of these packages might have added new dependencies during the task resolution, which is forbidden"
+                    raise "something fishy while resolving a cycle in #{cycle.map(&:name).join(", ")}. Some of these packages might have added new dependencies during the task resolution, which is forbidden"
                 end
             end
             chain

data/lib/autobuild/reporting.rb

@@ -298,7 +298,13 @@ module Autobuild
 
             rescue Autobuild::Exception => e
                 error(e)
-                exit(1) if e.fatal?
+                if e.fatal?
+                    if Autobuild.debug
+                        raise
+                    else
+                        exit 1
+                    end
+                end
             end
         end
         

data/lib/autobuild/version.rb

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

data/test/import/test_tar.rb

@@ -25,6 +25,25 @@ class TC_TarImporter < Minitest::Test
         assert_equal(TarImporter::Bzip, TarImporter.filename_to_mode('tarfile.tar.bz2'))
     end
 
+    def test_it_sets_the_repository_id_to_the_normalized_URL
+        importer = TarImporter.new "FILE://test/file"
+        assert_equal "file://test/file", importer.repository_id.to_str
+    end
+
+    def test_it_sets_the_source_id_to_the_normalized_URL
+        importer = TarImporter.new "FILE://test/file"
+        assert_equal "file://test/file", importer.source_id.to_str
+    end
+
+    def test_it_does_not_delete_a_locally_specified_archive_on_error
+        dummy_tar = File.join(@datadir, "dummy.tar")
+        FileUtils.touch dummy_tar
+        importer = TarImporter.new "file://#{dummy_tar}"
+        pkg = Package.new 'tarimport'
+        assert_raises(Autobuild::SubcommandFailed) { importer.checkout(pkg) }
+        assert File.file?(dummy_tar)
+    end
+
     def test_tar_valid_url
         assert_raises(ConfigException) {
             TarImporter.new 'ccc://localhost/files/tarimport.tar.gz', :cachedir => @cachedir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.10.0.b1
+  version: 1.10.0.b2
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake