autobuild 1.7.2 → 1.7.3.rc1

data/lib/autobuild/environment.rb

@@ -12,7 +12,7 @@ module Autobuild
         @windows
     end
 
-    @macos =  RbConfig::CONFIG["host_os"] = ~%r!([Dd]arwin)!
+    @macos =  RbConfig::CONFIG["host_os"] =~%r!([Dd]arwin)!
     def self.macos?
         @macos
     end
@@ -212,6 +212,13 @@ module Autobuild
         end
     end
 
+    def self.env_remove_path(name, *paths)
+        paths.each do |p|
+            environment[name].delete(p)
+        end
+        env_update_var(name)
+    end
+
     def self.env_push_path(name, *values)
         if current = environment[name]
             current = current.dup
@@ -385,7 +392,3 @@ module Autobuild
     end
 end
 
-Autobuild.update_environment '/', ['PKG_CONFIG_PATH']
-Autobuild.update_environment '/usr', ['PKG_CONFIG_PATH']
-Autobuild.update_environment '/usr/local', ['PKG_CONFIG_PATH']
-

data/lib/autobuild/import/archive.rb

@@ -1,4 +1,5 @@
 require 'autobuild/importer'
+require 'digest/sha1'
 require 'open-uri'
 require 'fileutils'
 
@@ -47,44 +48,42 @@ module Autobuild
 
 		
 	def get_url_on_windows(url, filename)
-		uri = URI(url)		
-		STDOUT.puts("Host: #{uri.host} Port: #{uri.port} url: #{url}")
-		
-		http = Net::HTTP.new(uri.host,uri.port)
-		http.use_ssl = true if uri.port == 443
-		http.verify_mode = OpenSSL::SSL::VERIFY_NONE  #Unsure, critical?, Review this
-		resp = http.get(uri.request_uri)
-		
-		if resp.code == "301" or resp.code == "302"
-			get_url_on_windows(resp.header['location'],filename)
-		else
-			if(resp.message != 'OK')
-				raise "Could not get File from url \"#{url}\", got response #{resp.message} (#{resp.code})"
-			end
-			open(filename, "wb") do |file|
-				file.write(resp.body)
-			end
-		end
+            uri = URI(url)		
+
+            http = Net::HTTP.new(uri.host,uri.port)
+            http.use_ssl = true if uri.port == 443
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE  #Unsure, critical?, Review this
+            resp = http.get(uri.request_uri)
+
+            if resp.code == "301" or resp.code == "302"
+                get_url_on_windows(resp.header['location'],filename)
+            else
+                if resp.message != 'OK'
+                    raise "Could not get File from url \"#{url}\", got response #{resp.message} (#{resp.code})"
+                end
+                open(filename, "wb") do |file|
+                    file.write(resp.body)
+                end
+            end
 	end
 	
-	def extract_tar_on_windows(filename,target)
-	
-		Gem::Package::TarReader.new(Zlib::GzipReader.open(filename)).each do |entry|
-			newname = File.join(target,entry.full_name.slice(entry.full_name.index('/'),entry.full_name.size))
-			if(entry.directory?)
-				FileUtils.mkdir_p(newname)
-			end
-			if(entry.file?)
-				dir = newname.slice(0,newname.rindex('/'))
-				if(!File.directory?(dir))
-					FileUtils.mkdir_p(dir)
-				end
-				open(newname, "wb") do |file|
-					file.write(entry.read)
-				end
-			end
-		end
-	end
+        def extract_tar_on_windows(filename,target)
+            Gem::Package::TarReader.new(Zlib::GzipReader.open(filename)).each do |entry|
+                newname = File.join(target,entry.full_name.slice(entry.full_name.index('/'),entry.full_name.size))
+                if(entry.directory?)
+                    FileUtils.mkdir_p(newname)
+                end
+                if(entry.file?)
+                    dir = newname.slice(0,newname.rindex('/'))
+                    if(!File.directory?(dir))
+                        FileUtils.mkdir_p(dir)
+                    end
+                    open(newname, "wb") do |file|
+                        file.write(entry.read)
+                    end
+                end
+            end
+        end
 	
 	# Updates the downloaded file in cache only if it is needed
         def update_cache(package)
@@ -123,24 +122,32 @@ module Autobuild
             if do_update
                 FileUtils.mkdir_p(cachedir)
                 begin
-					if(WINDOWS)
-						get_url_on_windows(@url, "#{cachefile}.partial")
-					else
-						Subprocess.run(package, :import, Autobuild.tool('wget'), '-q', '-P', cachedir, @url, '-O', "#{cachefile}.partial")
-					end
+                    if(WINDOWS)
+                        get_url_on_windows(@url, "#{cachefile}.partial")
+                    else
+                        Subprocess.run(package, :import, Autobuild.tool('wget'), '-q', '-P', cachedir, @url, '-O', "#{cachefile}.partial")
+                    end
                 rescue Exception
                     FileUtils.rm_f "#{cachefile}.partial"
                     raise
                 end
                 FileUtils.mv "#{cachefile}.partial", cachefile
-                true
             end
+
+            @cachefile_digest = Digest::SHA1.hexdigest File.read(cachefile)
+
+            do_update
         end
 
 	# The source URL
         attr_reader :url
 	# The local file (either a downloaded file if +url+ is not local, or +url+ itself)
 	attr_reader :cachefile
+        # The SHA1 digest of the current cachefile. It is updated only once the
+        # cachefile has been downloaded
+        #
+        # @return [String] hexadecimal SHA1 digest of the file
+        attr_reader :cachefile_digest
 	# The unpack mode. One of Zip, Bzip, Gzip or Plain
 	attr_reader :mode
 	# The directory in which remote files are cached
@@ -190,15 +197,61 @@ module Autobuild
         end
 
         def update(package) # :nodoc:
-            if update_cache(package)
+            needs_update = update_cache(package)
+
+            if !File.file?(checkout_digest_stamp(package))
+                write_checkout_digest_stamp(package)
+            end
+
+            if needs_update || archive_changed?(package)
                 checkout(package)
             end
         rescue OpenURI::HTTPError
             raise Autobuild::Exception.new(package.name, :import)
         end
 
+        def checkout_digest_stamp(package)
+            File.join(package.srcdir, "archive-autobuild-stamp")
+        end
+
+        def write_checkout_digest_stamp(package)
+            File.open(checkout_digest_stamp(package), 'w') do |io|
+                io.write cachefile_digest
+            end
+        end
+
+        # Returns true if the archive that has been used to checkout this
+        # package is different from the one we are supposed to checkout now
+        def archive_changed?(package)
+            checkout_digest = File.read(checkout_digest_stamp(package)).strip
+            checkout_digest != cachefile_digest
+        end
+
         def checkout(package) # :nodoc:
             update_cache(package)
+
+            # Check whether the archive file changed, and if that is the case
+            # then ask the user about deleting the folder
+            if File.file?(checkout_digest_stamp(package)) && archive_changed?(package)
+                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"
+                response = HighLine.new.ask "  Continue (yes or no) ? If no, this update will be ignored, which can lead to build problems.", String do |q|
+                    q.overwrite = true
+                    q.in = ['yes', 'no']
+                    q.default = 'yes'
+                    q.case = :downcase
+                end
+                if response == "no"
+                    package.message "  Not updating #{package.srcdir}"
+                    return
+                else
+                    package.message "  Deleting #{package.srcdir}"
+                    FileUtils.rm_rf package.srcdir
+                    package.progress "checking out %s"
+                end
+            end
+
             # Un-apply any existing patch so that, when the files get
             # overwritten by the new checkout, the patch are re-applied
             patch(package, [])
@@ -227,17 +280,18 @@ module Autobuild
                     cmd << '--strip-components=1'
                 end
 				
-				if(WINDOWS)
-					extract_tar_on_windows(cachefile,package.srcdir)
-				else
-					Subprocess.run(package, :import, Autobuild.tool('tar'), *cmd)
-				end
+                if(WINDOWS)
+                    extract_tar_on_windows(cachefile,package.srcdir)
+                else
+                    Subprocess.run(package, :import, Autobuild.tool('tar'), *cmd)
+                end
             end
+            write_checkout_digest_stamp(package)
 
         rescue OpenURI::HTTPError
             raise Autobuild::Exception.new(package.name, :import)
         rescue SubcommandFailed
-			FileUtils.rm_f cachefile
+            FileUtils.rm_f cachefile
             raise
         end
     end

data/lib/autobuild/import/git.rb

@@ -111,9 +111,9 @@ module Autobuild
 
         # Raises ConfigException if the current directory is not a git
         # repository
-        def validate_srcdir(package)
-            if !File.directory?(File.join(package.srcdir, '.git'))
-                raise ConfigException.new(package, 'import'), "while importing #{package.name}, #{package.srcdir} is not a git repository"
+        def validate_importdir(package)
+            if !File.directory?(File.join(package.importdir, '.git'))
+                raise ConfigException.new(package, 'import'), "while importing #{package.name}, #{package.importdir} is not a git repository"
             end
         end
 
@@ -121,8 +121,8 @@ module Autobuild
         # ID on success, nil on failure. Expects the current directory to be the
         # package's source directory.
         def fetch_remote(package)
-            validate_srcdir(package)
-            Dir.chdir(package.srcdir) do
+            validate_importdir(package)
+            Dir.chdir(package.importdir) do
                 # If we are checking out a specific commit, we don't know which
                 # branch to refer to in git fetch. So, we have to set up the
                 # remotes and call git fetch directly (so that all branches get
@@ -186,8 +186,8 @@ module Autobuild
         # Returns a Importer::Status object that represents the status of this
         # package w.r.t. the root repository
         def status(package, only_local = false)
-            Dir.chdir(package.srcdir) do
-                validate_srcdir(package)
+            Dir.chdir(package.importdir) do
+                validate_importdir(package)
                 remote_commit = nil
                 if only_local
                     remote_commit = `git show-ref -s refs/remotes/autobuild/#{remote_branch}`.chomp
@@ -316,8 +316,8 @@ module Autobuild
         end
 
         def update(package)
-            validate_srcdir(package)
-            Dir.chdir(package.srcdir) do
+            validate_importdir(package)
+            Dir.chdir(package.importdir) do
                 fetch_commit = fetch_remote(package)
 
                 # If we are tracking a commit/tag, just check it out and return
@@ -376,7 +376,7 @@ module Autobuild
                 status = merge_status(package, fetch_commit)
                 if status.needs_update?
                     if !merge? && status.status == Status::NEEDS_MERGE
-                        raise PackageException.new(package, 'import'), "the local branch '#{local_branch}' and the remote branch #{branch} of #{package.name} have diverged, and I therefore refuse to update automatically. Go into #{package.srcdir} and either reset the local branch or merge the remote changes"
+                        raise PackageException.new(package, 'import'), "the local branch '#{local_branch}' and the remote branch #{branch} of #{package.name} have diverged, and I therefore refuse to update automatically. Go into #{package.importdir} and either reset the local branch or merge the remote changes"
                     end
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'merge', fetch_commit)
                 end
@@ -384,15 +384,15 @@ module Autobuild
         end
 
         def checkout(package)
-            base_dir = File.expand_path('..', package.srcdir)
+            base_dir = File.expand_path('..', package.importdir)
             if !File.directory?(base_dir)
                 FileUtils.mkdir_p base_dir
             end
 
             Subprocess.run(package, :import,
-                Autobuild.tool('git'), 'clone', '-o', 'autobuild', repository, package.srcdir)
+                Autobuild.tool('git'), 'clone', '-o', 'autobuild', repository, package.importdir)
 
-            Dir.chdir(package.srcdir) do
+            Dir.chdir(package.importdir) do
                 if push_to
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                    "--replace-all", "remote.autobuild.pushurl", push_to)

data/lib/autobuild/import/svn.rb

@@ -36,28 +36,28 @@ module Autobuild
         private
 
         def update(package) # :nodoc:
-            Dir.chdir(package.srcdir) {
+            Dir.chdir(package.importdir) {
 		old_lang, ENV['LC_ALL'] = ENV['LC_ALL'], 'C'
 		svninfo = IO.popen("svn info") { |io| io.readlines }
 		ENV['LC_ALL'] = old_lang
 		unless url = svninfo.grep(/^URL: /).first
 		    if svninfo.grep(/is not a working copy/).empty?
-			raise ConfigException.new(package, 'import'), "#{package.srcdir} is not a Subversion working copy"
+			raise ConfigException.new(package, 'import'), "#{package.importdir} is not a Subversion working copy"
 		    else
-			raise ConfigException.new(package, 'import'), "Bug: cannot get SVN information for #{package.srcdir}"
+			raise ConfigException.new(package, 'import'), "Bug: cannot get SVN information for #{package.importdir}"
 		    end
 		end
 		url.chomp =~ /URL: (.+)/
 		source = $1
 		if source != @source
-		    raise ConfigException.new(package, 'import'), "current checkout found at #{package.srcdir} is from #{source}, was expecting #{@source}"
+		    raise ConfigException.new(package, 'import'), "current checkout found at #{package.importdir} is from #{source}, was expecting #{@source}"
 		end
                 Subprocess.run(package, :import, @program, 'up', "--non-interactive", *@options_up)
             }
         end
 
         def checkout(package) # :nodoc:
-            options = [ @program, 'co', "--non-interactive" ] + @options_co + [ @source, package.srcdir ]
+            options = [ @program, 'co', "--non-interactive" ] + @options_co + [ @source, package.importdir ]
             Subprocess.run(package, :import, *options)
         end
     end

data/lib/autobuild/importer.rb

@@ -67,6 +67,7 @@ class Importer
     # More options are specific to each importer type.
     def initialize(options)
         @options = options.dup
+        @options[:retry_count] = Integer(@options[:retry_count] || 0)
     end
 
     # The number of times update / checkout should be retried before giving up.
@@ -83,7 +84,7 @@ class Importer
     #
     # See also #retry_count
     def retry_count=(count)
-        @options[:retry_count] = count
+        @options[:retry_count] = Integer(count)
     end
 
     def patches
@@ -152,7 +153,7 @@ class Importer
             if retry_count > self.retry_count
                 raise
             end
-            package.message "update failed in #{package.srcdir}, retrying (#{retry_count}/#{self.retry_count})"
+            package.message "update failed in #{package.importdir}, retrying (#{retry_count}/#{self.retry_count})"
             retry
         ensure
             package.progress_done "updated %s"
@@ -178,8 +179,8 @@ class Importer
                 if retry_count > self.retry_count
                     raise
                 end
-                package.message "checkout of %s failed, deleting the source directory #{package.srcdir} and retrying (#{retry_count}/#{self.retry_count})"
-                FileUtils.rm_rf package.srcdir
+                package.message "checkout of %s failed, deleting the source directory #{package.importdir} and retrying (#{retry_count}/#{self.retry_count})"
+                FileUtils.rm_rf package.importdir
                 retry
             end
         end
@@ -189,18 +190,18 @@ class Importer
     rescue Interrupt
         raise
     rescue ::Exception
-        package.message "checkout of %s failed, deleting the source directory #{package.srcdir}"
-        FileUtils.rm_rf package.srcdir
+        package.message "checkout of %s failed, deleting the source directory #{package.importdir}"
+        FileUtils.rm_rf package.importdir
         raise
     rescue Autobuild::Exception => e
-        FileUtils.rm_rf package.srcdir
+        FileUtils.rm_rf package.importdir
         fallback(e, package, :import, package)
     end
 
     # Performs the import of +package+
     def import(package)
-        srcdir = package.srcdir
-        if File.directory?(srcdir)
+        importdir = package.importdir
+        if File.directory?(importdir)
             package.isolate_errors(false) do
                 if Autobuild.do_update
                     perform_update(package)
@@ -212,8 +213,8 @@ class Importer
                 end
             end
 
-        elsif File.exists?(srcdir)
-            raise ConfigException.new(package, 'import'), "#{srcdir} exists but is not a directory"
+        elsif File.exists?(importdir)
+            raise ConfigException.new(package, 'import'), "#{importdir} exists but is not a directory"
         else
             perform_checkout(package)
         end
@@ -236,15 +237,15 @@ class Importer
 
     private
     
-    # We assume that package.srcdir already exists (checkout is supposed to
+    # We assume that package.importdir already exists (checkout is supposed to
     # have been called)
     def patchlist(package)
-        File.join(package.srcdir, "patches-autobuild-stamp")
+        File.join(package.importdir, "patches-autobuild-stamp")
     end
 
     def call_patch(package, reverse, file, patch_level)
         patch = Autobuild.tool('patch')
-        Dir.chdir(package.srcdir) do
+        Dir.chdir(package.importdir) do
             Subprocess.run(package, :patch, patch, "-p#{patch_level}", (reverse ? '-R' : nil), '--forward', :input => file)
         end
     end

data/lib/autobuild/package.rb

@@ -53,6 +53,10 @@ module Autobuild
 	# set the source directory. If a relative path is given,
 	# it is relative to Autobuild.srcdir. Defaults to #name
 	attr_writer     :srcdir
+        # set the importdir, this can be different than the sourcedir
+        # if the source-root is in an subfolder of the package itself
+        # then the importdir will be the root
+        attr_writer     :importdir
 	# set the installation directory. If a relative path is given,
 	# it is relative to Autobuild.prefix. Defaults to ''
 	attr_writer :prefix
@@ -81,6 +85,8 @@ module Autobuild
 
 	# Absolute path to the source directory. See #srcdir=
 	def srcdir; File.expand_path(@srcdir || name, Autobuild.srcdir) end
+	# Absolute path to the import directory. See #importdir=
+	def importdir; File.expand_path(@importdir || srcdir, Autobuild.srcdir) end
 	# Absolute path to the installation directory. See #prefix=
 	def prefix; File.expand_path(@prefix || '', Autobuild.prefix) end
         # Absolute path to the log directory for this package. See #logdir=

data/lib/autobuild/reporting.rb

@@ -83,8 +83,8 @@ module Autobuild
     end
 
     # Displays a warning message
-    def self.warn(message)
-        Autobuild.message("  WARN: #{message}", :magenta)
+    def self.warn(message, *style)
+        Autobuild.message("  WARN: #{message}", :magenta, *style)
     end
 
 

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.2" unless defined? Autobuild::VERSION
+    VERSION = "1.7.3.rc1" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.2
-  prerelease: 
+  version: 1.7.3.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19781840 !ruby/object:Gem::Requirement
+  requirement: &13319080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *19781840
+  version_requirements: *13319080
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &20807120 !ruby/object:Gem::Requirement
+  requirement: &13318200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *20807120
+  version_requirements: *13318200
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &20806420 !ruby/object:Gem::Requirement
+  requirement: &13317360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20806420
+  version_requirements: *13317360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20805740 !ruby/object:Gem::Requirement
+  requirement: &13316460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *20805740
+  version_requirements: *13316460
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20804820 !ruby/object:Gem::Requirement
+  requirement: &13315640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.5'
   type: :development
   prerelease: false
-  version_requirements: *20804820
+  version_requirements: *13315640
 description: Collection of classes to handle build systems (CMake, autotools, ...)
   and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
   to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
@@ -140,9 +140,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: autobuild
 rubygems_version: 1.8.11
@@ -150,8 +150,8 @@ signing_key:
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
 test_files:
+- test/test_import_cvs.rb
 - test/test_reporting.rb
 - test/test_subcommand.rb
 - test/test_import_svn.rb
-- test/test_import_cvs.rb
 - test/test_import_tar.rb