autobuild 1.5.24 → 1.5.25

data/Changes.txt

@@ -1,3 +1,6 @@
+== Version 1.5.25
+* small bugfixes
+
 == Version 1.5.24
 * fix bug with git importer and the push_to option. The pushurl configuration
   option was not set in just-cloned repositories

data/lib/autobuild/import/git.rb

@@ -76,6 +76,15 @@ module Autobuild
         # If set, both commit and tag have to be nil.
         attr_accessor :branch
 
+        # The branch that should be used on the local clone
+        #
+        # If not set, it defaults to #branch
+        attr_writer :local_branch
+
+        def local_branch
+            @local_branch || branch
+        end
+
         # The tag we are pointing to. It is a tag name.
         #
         # If set, both branch and commit have to be nil.
@@ -117,11 +126,11 @@ module Autobuild
                 end
                 Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                "--replace-all", "remote.autobuild.fetch",  "+refs/heads/*:refs/remotes/autobuild/*")
-                if branch
+                if local_branch
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "branch.#{branch}.remote",  "autobuild")
+                                   "--replace-all", "branch.#{local_branch}.remote",  "autobuild")
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "branch.#{branch}.merge", "refs/heads/#{branch}")
+                                   "--replace-all", "branch.#{local_branch}.merge", "refs/heads/#{branch}")
                 end
 
                 # We are checking out a specific commit. We just call git fetch
@@ -159,7 +168,7 @@ module Autobuild
                 remote_commit = nil
                 if only_local
                     Dir.chdir(package.srcdir) do
-                        remote_commit = `git show-ref -s refs/heads/#{branch}`.chomp
+                        remote_commit = `git show-ref -s refs/heads/#{local_branch}`.chomp
                     end
                 else	
                     remote_commit = fetch_remote(package)
@@ -181,7 +190,7 @@ module Autobuild
         # current directory is the package's directory
         def on_target_branch?
             current_branch = `git symbolic-ref HEAD`.chomp
-            current_branch == "refs/heads/#{branch}"
+            current_branch == "refs/heads/#{local_branch}"
         end
 
         class Status < Importer::Status
@@ -230,7 +239,7 @@ module Autobuild
 
         def merge_status(fetch_commit)
             common_commit = `git merge-base HEAD #{fetch_commit}`.chomp
-            head_commit   = `git rev-parse #{branch}`.chomp
+            head_commit   = `git rev-parse #{local_branch}`.chomp
 
             status = if common_commit != fetch_commit
                          if common_commit == head_commit
@@ -266,19 +275,19 @@ module Autobuild
                 if !on_target_branch?
                     # 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/#{branch}")
-                        package.progress "switching branch of %s to %s" % [package.name, branch]
-                        Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', branch)
+                    if system("git", "show-ref", "--verify", "--quiet", "refs/heads/#{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" % [branch, package.name]
-                        Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', '-b', branch, "FETCH_HEAD")
+                        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
 
                 status = merge_status(fetch_commit)
                 if status.needs_update?
                     if !merge? && status.status == Status::NEEDS_MERGE
-                        raise PackageException, "the local and remote branches #{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, "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"
                     end
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'merge', fetch_commit)
                 end
@@ -308,12 +317,12 @@ module Autobuild
                 end
 
                 current_branch = `git symbolic-ref HEAD`.chomp
-                if current_branch == "refs/heads/#{branch}"
+                if current_branch == "refs/heads/#{local_branch}"
                     Subprocess.run(package, :import, Autobuild.tool('git'),
-                    'reset', '--hard', "autobuild/#{branch}")
+                        'reset', '--hard', "autobuild/#{branch}")
                 else
                     Subprocess.run(package, :import, Autobuild.tool('git'),
-                    'checkout', '-b', branch, "autobuild/#{branch}")
+                        'checkout', '-b', local_branch, "autobuild/#{branch}")
                 end
             end
         end

data/lib/autobuild/package.rb

@@ -376,6 +376,18 @@ module Autobuild
 	    end
 	end
 
+        # Returns the name of all the packages +self+ depends on
+        def all_dependencies(result = Set.new)
+            dependencies.each do |pkg_name|
+                pkg = Autobuild::Package[pkg_name]
+                if !result.include?(pkg.name)
+                    result << pkg.name
+                    pkg.all_dependencies(result)
+                end
+            end
+            result
+        end
+
         # Returns true if this package depends on +package_name+ and false
         # otherwise.
         def depends_on?(package_name)

data/lib/autobuild/packages/dummy.rb

@@ -1,6 +1,6 @@
 module Autobuild
     def self.dummy(spec)
-        ImporterPackage.new(spec)
+        DummyPackage.new(spec)
     end
 
     class DummyPackage < Package
@@ -17,11 +17,11 @@ module Autobuild
 
         def prepare
             %w{import prepare build doc}.each do |phase|
-                Rake.task("#{name}-#{phase}")
+                task "#{name}-#{phase}"
                 t = Rake::Task["#{name}-#{phase}"]
                 def t.needed?; false end
             end
-            Rake.task(installstamp)
+            task(installstamp)
             t = Rake::Task[installstamp]
             def t.needed?; false end
 

data/lib/autobuild/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 1
   - 5
-  - 24
-  version: 1.5.24
+  - 25
+  version: 1.5.25
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +01:00
+date: 2010-11-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency