autobuild 1.9.0.b1 → 1.9.0.b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ad5685bb460bc80765d7677953c83335bad861
-  data.tar.gz: 74b187763b5789e40f6f0dd7aae2d58cfca004cf
+  metadata.gz: 0a17e6033c3c9c0a0bf7ff4e8eeccbfcc777a914
+  data.tar.gz: ee6480b0e089711f67ba08a4361a1bd283f7992b
 SHA512:
-  metadata.gz: b3cf9d6af419fa355ec32fdde8c0c83ce8f41beb287eb9717a32f94b107fe7cbb9adc58e8bbce8bacbfb5b023ea087728b3af4b9889ad2d8e3bdd7337075d22b
-  data.tar.gz: f0445a03f3aff872a12e5b739388d37b5afcb87dddaf43ec5b658cc7aa9b580147c4d4c08101f0ed59f7b7b3e45e757cf2dfba71735fa843c2fa1c14eebb7eac
+  metadata.gz: cdbfc5c964b12cc5be90c9f18f8abc9264fa8a07296b75f323c751d3f2a1400bf0a98357f43eeaaed59a0d42313c3098926524adc32fc2d5ee852a2ddf143b7f
+  data.tar.gz: 247a8bbc07a21967916caf4c74b5daba7abfdbc797617b6f842f3d5be16be6fb09321d7883cb5469333fa3434f725d7592e2a72b1bfc532876de803e3d0744b1

data/lib/autobuild/import/git.rb

@@ -520,7 +520,10 @@ module Autobuild
             end
         end
 
-        def rev_parse(package, name)
+        def rev_parse(package, name, object_type = "commit")
+            if object_type
+                name = "#{name}^{#{object_type}}"
+            end
             run_git_bare(package, 'rev-parse', name).first
         rescue Autobuild::SubcommandFailed
             raise PackageException.new(package, 'import'), "failed to resolve #{name}. Are you sure this commit, branch or tag exists ?"
@@ -540,12 +543,15 @@ module Autobuild
         #   'commit' is present in the history of 'reference'
         #
         # @return [Boolean]
-        def commit_present_in?(package, commit, reference)
-            merge_base = run_git_bare(package, 'merge-base', commit, reference).first
-            merge_base == commit
-            
-        rescue Exception
-            raise PackageException.new(package, 'import'), "failed to find the merge-base between #{commit} and #{reference}. Are you sure these commits exist ?"
+        def commit_present_in?(package, rev, reference)
+            commit = rev_parse(package, rev)
+            begin
+                merge_base = run_git_bare(package, 'merge-base', commit, reference).first
+                merge_base == commit
+                
+            rescue Exception => e
+                raise PackageException.new(package, 'import'), "failed to find the merge-base between #{rev} and #{reference}. Are you sure these commits exist ?"
+            end
         end
 
         # Computes the update status to update a branch whose tip is at
@@ -740,7 +746,7 @@ module Autobuild
                 Autobuild.tool('git'), 'clone', '-o', remote_name, *clone_options, repository, package.importdir, retry: true)
 
             update_remotes_configuration(package)
-            update(package, only_local: true)
+            update(package, only_local: true, reset: true)
         end
 
         # Changes the repository this importer is pointing to

data/lib/autobuild/version.rb

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

data/test/import/test_git.rb

@@ -72,7 +72,7 @@ describe Autobuild::Git do
             assert !importer.has_commit?(pkg, 'blabla')
         end
         it "returns false if the specified commit is not present locally" do
-            assert !importer.has_commit?(pkg, '1ddb20665622279700770be09f9a291b37c9b631')
+            assert !importer.has_commit?(pkg, 'c8cf0798b1d53931314a86bdb3e2ad874eb8deb5')
         end
         it "raises for any other error" do
             flexmock(Autobuild::Subprocess).should_receive(:run).
@@ -205,9 +205,35 @@ describe Autobuild::Git do
         end
     end
 
+    describe "#commit_present_in?" do
+        attr_reader :commits
+        before do
+            importer.import(pkg)
+            @commits = [
+                importer.rev_parse(pkg, 'HEAD'),
+                importer.rev_parse(pkg, 'HEAD~1')]
+        end
+
+        it "returns true if the revision is in the provided branch" do
+            assert importer.commit_present_in?(pkg, 'HEAD', 'master')
+            assert importer.commit_present_in?(pkg, commits[0], 'master')
+            assert importer.commit_present_in?(pkg, 'HEAD~1', 'master')
+            assert importer.commit_present_in?(pkg, commits[1], 'master')
+        end
+        it "returns false if the revision is not in the provided branch" do
+            importer.run_git(pkg, 'branch', 'fork', 'autobuild/fork')
+            assert !importer.commit_present_in?(pkg, commits[0], "refs/heads/fork")
+        end
+        # git rev-parse return the tag ID for annotated tags instead of the
+        # commit ID. This was in turn breaking commit_present_in?
+        it "handles annotated tags properly" do
+            importer.run_git(pkg, 'tag', '-a', '-m', 'tag0', "tag0", "HEAD~1")
+            assert importer.commit_present_in?(pkg, 'tag0', 'master')
+        end
+    end
+
     describe "update" do
         def self.common_commit_and_tag_behaviour
-
             it "does not access the repository if the target is already merged and reset is false" do
                 importer.import(pkg)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.9.0.b1
+  version: 1.9.0.b2
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -178,5 +178,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms
-test_files:
-- test/suite.rb
+test_files: []