autobuild 1.9.0.b2 → 1.9.0.b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a17e6033c3c9c0a0bf7ff4e8eeccbfcc777a914
-  data.tar.gz: ee6480b0e089711f67ba08a4361a1bd283f7992b
+  metadata.gz: 97d91fdc5b06cf57bc85a29436b8ae83de8bf188
+  data.tar.gz: 366b4196e75cb245ba30e241d3b3b2d57b18919e
 SHA512:
-  metadata.gz: cdbfc5c964b12cc5be90c9f18f8abc9264fa8a07296b75f323c751d3f2a1400bf0a98357f43eeaaed59a0d42313c3098926524adc32fc2d5ee852a2ddf143b7f
-  data.tar.gz: 247a8bbc07a21967916caf4c74b5daba7abfdbc797617b6f842f3d5be16be6fb09321d7883cb5469333fa3434f725d7592e2a72b1bfc532876de803e3d0744b1
+  metadata.gz: 87f2e924550b4c3568e195e065b8e152091d452c177f5409f27ae637019e6e0643a15fde769f124954f23547981c7ef864fb9944659bd849cc20e35ab3f56d79
+  data.tar.gz: cb5e7f5c663ab02bad5c3d1ade8e1090ab2db8e87056af6d33fdd10fc75fa7f37b6e738c05abe81f0582cd4cc5480a47d204398855335ef1c6733dbb92ab7056

data/lib/autobuild/import/archive.rb

@@ -262,6 +262,16 @@ module Autobuild
         # It defaults to the global ArchiveImporter.timeout
         attr_accessor :timeout
 
+        # Tests whether the archive's content is stored within a subdirectory or
+        # not
+        #
+        # If it has a subdirectory, its name is assumed to be the package's
+        # basename, or the value returned by {archive_dir} if the archive_dir
+        # option was given to {initialize}
+        def has_subdirectory?
+            !@options[:no_subdirectory]
+        end
+
 	# Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
 	# are allowed:
 	# [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"

data/lib/autobuild/import/git.rb

@@ -671,25 +671,21 @@ module Autobuild
                 update_alternates(package)
             end
 
-            # Check whether we are already at the requested state
-            pinned_state = (commit || tag)
-            if pinned_state && has_commit?(package, pinned_state)
-                pinned_state = rev_parse(package, pinned_state)
-                current_head = rev_parse(package, 'HEAD')
-                if options[:reset]
-                    if current_head == pinned_state
-                        return
-                    end
-                elsif commit_present_in?(package, pinned_state, current_head)
-                    return
+            pinned_state =
+                if commit then commit
+                elsif tag then "refs/tags/#{tag}"
+                end
+
+            if pinned_state
+                if !has_commit?(package, pinned_state)
+                    fetch_commit = current_remote_commit(package, options[:only_local])
                 end
+                pinned_state = rev_parse(package, pinned_state)
             end
-            fetch_commit = current_remote_commit(package, options[:only_local])
 
             target_commit =
-                if commit then commit
-                elsif tag then "refs/tags/#{tag}"
-                else fetch_commit
+                if pinned_state then pinned_state
+                else fetch_commit ||= current_remote_commit(package, options[:only_local])
                 end
 
             # If we are tracking a commit/tag, just check it out and return
@@ -699,21 +695,43 @@ module Autobuild
                 return
             end
 
-            if !on_target_branch?(package)
+            if !on_local_branch?(package)
                 package.message "%%s: switching to branch %s" % [local_branch]
                 run_git(package, 'checkout', local_branch)
             end
 
+            # Check whether we are already at the requested state
+            if pinned_state
+                current_head = rev_parse(package, 'HEAD')
+                if options[:reset]
+                    if current_head == pinned_state
+                        return
+                    elsif merge_if_simple(package, pinned_state)
+                        return
+                    end
+                elsif commit_present_in?(package, pinned_state, current_head)
+                    return
+                elsif merge_if_simple(package, pinned_state)
+                    return
+                end
+            end
+
+            fetch_commit ||= current_remote_commit(package, options[:only_local])
             if options[:reset]
                 commit_pinning(package, target_commit, fetch_commit)
             else
-                status = merge_status(package, target_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.importdir} and either reset the local branch or merge the remote changes"
-                    end
-                    run_git(package, 'merge', target_commit)
+                merge_if_simple(package, target_commit)
+            end
+        end
+
+        def merge_if_simple(package, target_commit)
+            status = merge_status(package, target_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.importdir} and either reset the local branch or merge the remote changes"
                 end
+                run_git(package, 'merge', target_commit)
+                true
             end
         end
 

data/lib/autobuild/importer.rb

@@ -242,6 +242,8 @@ class Importer
     #
     # @raises ConfigException if package.importdir exists and is not a directory
     #
+    # @option options [Boolean] :checkout_only (false) if true, the importer
+    #   will not update an already checked-out package.
     # @option options [Boolean] :only_local (false) if true, will only perform
     #   actions that do not require network access. Importers that do not
     #   support this mode will simply do nothing

data/lib/autobuild/version.rb

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

data/test/import/test_git.rb

@@ -317,6 +317,17 @@ describe Autobuild::Git do
                     importer.import(pkg)
                 end
             end
+            it "switches to the local branch regardless of the presence of the tag or commit" do
+                importer.import(pkg)
+                head = importer.rev_parse(pkg, 'HEAD')
+                importer.run_git(pkg, 'reset', '--hard', 'master~1')
+                importer.run_git(pkg, 'branch', 'local')
+                importer.local_branch = 'local'
+                importer.relocate(importer.repository, tag: 'third_commit')
+                importer.update(pkg)
+                assert_equal 'refs/heads/local', importer.current_branch(pkg)
+                assert_equal head, importer.rev_parse(pkg, 'refs/remotes/autobuild/master')
+            end
         end
         describe "with a specific commit given" do
             def assert_on_commit(id)

metadata

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