autobuild 1.5.41 → 1.5.42

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.5.42
+* archive: fix support for using local files
+* git: make "switching branch" messages stand out a bit more
+* cvs: make the CVS support compatible with autoproj (should remain backward
+  compatible as well)
+
 == Version 1.5.41
 * git: properly handle push_to_branch at checkout (was working during updates)
 * cmake: more specific progress message for configuration

data/lib/autobuild/import/archive.rb

@@ -47,8 +47,13 @@ module Autobuild
                 cached_mtime = File.lstat(cachefile).mtime
 
                 size, mtime = nil
-                open @url, :content_length_proc => lambda { |size| } do |file| 
-                    mtime = file.last_modified
+                if @url.scheme == "file"
+                    size  = File.stat(@url.path).size
+                    mtime = File.stat(@url.path).mtime
+                else
+                    open @url, :content_length_proc => lambda { |size| } do |file| 
+                        mtime = file.last_modified
+                    end
                 end
 
                 if mtime && size
@@ -117,7 +122,9 @@ module Autobuild
             @options[:cachedir] ||= "#{Autobuild.prefix}/cache"
 
             @url = URI.parse(url)
-            raise ConfigException, "invalid URL #{@url}" unless VALID_URI_SCHEMES.include?(@url.scheme)
+            if !VALID_URI_SCHEMES.include?(@url.scheme)
+                raise ConfigException, "invalid URL #{@url} (local files must be prefixed with file://)" 
+            end
 
             filename = options[:filename] || File.basename(url).gsub(/\?.*/, '')
             @mode = options[:mode] || ArchiveImporter.filename_to_mode(filename)

data/lib/autobuild/import/cvs.rb

@@ -12,9 +12,13 @@ module Autobuild
 	# This importer uses the 'cvs' tool to perform the import. It defaults
 	# to 'cvs' and can be configured by doing 
 	#   Autobuild.programs['cvs'] = 'my_cvs_tool'
-        def initialize(root, name, options = {})
-            @root = root
-            @module = name
+        def initialize(root_name, options = {})
+            options = Kernel.validate_options options, :module => nil, :cvsup => '-dP', :cvsco => '-P'
+            @root   = root_name
+            @module = options[:module]
+            if !@module
+                raise ArgumentError, "no module given"
+            end
 
             @program    = Autobuild.tool('cvs')
             @options_up = options[:cvsup] || '-dP'
@@ -71,8 +75,13 @@ module Autobuild
 
     # Returns the CVS importer which will get the +name+ module in repository
     # +repo+. The allowed values in +options+ are described in CVSImporter.new.    
-    def self.cvs(repo, name, options = {})
-        CVSImporter.new(repo, name, options)
+    def self.cvs(module_name, options = {}, backward_compatibility = nil)
+        if backward_compatibility
+            backward_compatibility[:module] = options
+            CVSImporter.new(module_name, backward_compatibility)
+        else
+            CVSImporter.new(module_name, options)
+        end
     end
 end
 

data/lib/autobuild/import/git.rb

@@ -308,10 +308,10 @@ module Autobuild
                     # Check if the target branch already exists. If it is the
                     # case, check it out. Otherwise, create it.
                     if system("git", "show-ref", "--verify", "--quiet", "refs/heads/#{local_branch}")
-                        package.progress "switching branch of %s to %s" % [package.name, local_branch]
+                        package.progress "  switching branch of %s to %s" % [package.name, local_branch]
                         Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', local_branch)
                     else
-                        package.progress "checking out branch %s for %s" % [local_branch, package.name]
+                        package.progress "  checking out branch %s for %s" % [local_branch, package.name]
                         Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', '-b', local_branch, "FETCH_HEAD")
                     end
                 end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.41" unless defined? Autobuild::VERSION
+    VERSION = "1.5.42" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: 
   segments: 
   - 1
   - 5
-  - 41
-  version: 1.5.41
+  - 42
+  version: 1.5.42
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 Z
+date: 2011-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake