autobuild 1.2.13 → 1.2.14

data/Changes.txt

@@ -1,5 +1,9 @@
+== Version 1.2.14
+* fix git importer's handling of branch names: the importer now always works on
+  a local branch that has the same name than the remote branch.
+
 == Version 1.2.12
-* reconfigure orogen packages if orogen itself is newer
+* reconfigure orogen packages if orogen itself has been updated
 
 == Version 1.2.11
 * fix small issues with CMake

data/Rakefile

@@ -7,7 +7,7 @@ Hoe.new('autobuild', Autobuild::VERSION) do |p|
 
     p.summary = 'Rake-based utility to build and install multiple packages with dependencies'
     p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-    p.url         = p.paragraphs_of('README.txt', 1).first.split(/\n/)[1..-1]
+    p.url         = p.paragraphs_of('README.txt', 1).first.split(/\n/)[1..-1].map { |s| s.gsub('* ', '') }
     p.changes     = p.paragraphs_of('Changes.txt', 0).join("\n\n")
 
     p.extra_deps << ['rake', '>= 0.7.0']

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "1.2.13" unless defined? Autobuild::VERSION
+    VERSION = "1.2.14" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/import/git.rb

@@ -34,25 +34,33 @@ module Autobuild
                     raise ConfigException, "#{package.srcdir} is not a git repository"
                 end
 
-                # Fetch and merge if the merge leads to a fast-forward
+                # Fetch the remote reference
                 Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch', repository, branch)
                 if !File.readable?( File.join('.git', 'FETCH_HEAD') )
                     return
                 end
 
-                fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
-                    delete_if { |l| l =~ /not-for-merge/ }
-                return if fetch_commit.empty?
-                fetch_commit = fetch_commit.first.split(/\s+/).first
+                # Check that we are on the right branch, and if not simply
+                # create it from FETCH_HEAD
+                current_branch = `git symbolic-ref HEAD`.chomp
+                if current_branch != "refs/heads/#{branch}"
+                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', '-b', branch, "FETCH_HEAD")
+                else
+                    # Otherwise, check that the merge is a fast-forward
+                    fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
+                        delete_if { |l| l =~ /not-for-merge/ }
+                    return if fetch_commit.empty?
+                    fetch_commit = fetch_commit.first.split(/\s+/).first
 
-                common_commit = `git merge-base HEAD #{fetch_commit}`.chomp
-                head_commit   = `git rev-parse HEAD`.chomp
+                    common_commit = `git merge-base HEAD #{fetch_commit}`.chomp
+                    head_commit   = `git rev-parse #{current_branch}`.chomp
 
-                if common_commit != fetch_commit
-                    if merge? || common_commit == head_commit
-                        Subprocess.run(package.name, :import, Autobuild.tool('git'), 'merge', fetch_commit)
-                    else
-                        raise "importing the current version would lead to a non fast-forward"
+                    if common_commit != fetch_commit
+                        if merge? || common_commit == head_commit
+                            Subprocess.run(package.name, :import, Autobuild.tool('git'), 'merge', fetch_commit)
+                        else
+                            raise "importing the current version would lead to a non fast-forward"
+                        end
                     end
                 end
             end
@@ -69,8 +77,14 @@ module Autobuild
                 repository, package.srcdir)
 
             Dir.chdir(package.srcdir) do
-                Subprocess.run(package.name, :import, Autobuild.tool('git'),
-                    'reset', '--hard', "autobuild/#{branch}")
+                current_branch = `git symbolic-ref HEAD`.chomp
+                if current_branch == "refs/heads/#{branch}"
+                    Subprocess.run(package.name, :import, Autobuild.tool('git'),
+                        'reset', '--hard', "autobuild/#{branch}")
+                else
+                    Subprocess.run(package.name, :import, Autobuild.tool('git'),
+                        'checkout', '-b', branch, "autobuild/#{branch}")
+                end
             end
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.13
+  version: 1.2.14
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-03 00:00:00 +02:00
+date: 2009-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,9 +50,26 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.1
+        version: 1.12.2
     version: 
-description: This work is licensed under the GPLv2 license. See License.txt for details  == What's autobuild ? Autobuild imports, configures, builds and installs various kinds of software packages. It can be used in software development to make sure that nothing is broken in the  build process of a set of packages, or can be used as an automated installation tool.  Autobuild config files are Ruby scripts which configure rake to * imports the package from a SCM or (optionnaly) updates it * configures it. This phase can handle code generation, configuration (for instance for autotools-based packages), ... * build * install  It takes the dependencies between packages into account in its build process, updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+, +LD_LIBRARY_PATH+, ...)
+description: |-
+  This work is licensed under the GPLv2 license. See License.txt for details
+  
+  == What's autobuild ?
+  Autobuild imports, configures, builds and installs various kinds of software packages.
+  It can be used in software development to make sure that nothing is broken in the 
+  build process of a set of packages, or can be used as an automated installation tool.
+  
+  Autobuild config files are Ruby scripts which configure rake to
+  * imports the package from a SCM or (optionnaly) updates it
+  * configures it. This phase can handle code generation, configuration (for
+    instance for autotools-based packages), ...
+  * build
+  * install
+  
+  It takes the dependencies between packages into account in its build process,
+  updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+,
+  +LD_LIBRARY_PATH+, ...)
 email: sylvain.joyeux@m4x.org
 executables: 
 - autobuild
@@ -101,7 +118,9 @@ files:
 - test/test_subcommand.rb
 - test/tools.rb
 has_rdoc: true
-homepage: "* http://autobuild.rubyforge.org/autobuild"
+homepage: http://autobuild.rubyforge.org/autobuild
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -123,9 +142,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.2.0
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Rake-based utility to build and install multiple packages with dependencies
 test_files: 
 - test/test_import_tar.rb