autobuild 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aa8495a7fa559f22d689834414b45c31f51fb5b
-  data.tar.gz: 8e4d55676e5c79de59a77157501aa7e2f3c7af8a
+  metadata.gz: c2ce3568c8ac2227a5496cedd32858be2b6b9771
+  data.tar.gz: 5ab665b1155ffa2f15490eaeca333a4b82c82e14
 SHA512:
-  metadata.gz: aedbeb75280b0ec1bae6a57bb2c35268d47709af81823f7e06e706ee36046f83433e66745a2bbe3546078daed1769c5997019353677275edb12653706ef1ddf9
-  data.tar.gz: 9bbcf11269f27b6939cd4641e56f7db9eefbce5a292b9888a5422c875a8e504ab1933c70b70263b05147df450858aca136d00e6c7b3d982fa87e0a9ff97b1e37
+  metadata.gz: 186dda2d01191d23ca7ab44da613c71f1d772ac27192029691284748044c92d72c41dd5e7e741307f3f1dcb073c68d2975a5bf2f05cfb6d70a237b0920084e7e
+  data.tar.gz: adbc3984308b9a06cd15851859944dd1a2f67ef625a56459f20b2876fcba4e480a9e9af82710e9ebe957fa4da2eb0449ad916de6f57649fefa772a0573ad464b

data/lib/autobuild/import/archive.rb

@@ -333,6 +333,7 @@ def update(package, options = Hash.new) # :nodoc:
             if needs_update || archive_changed?(package)
                 checkout(package, allow_interactive: options[:allow_interactive])
             end
+            (needs_update || archive_changed?(package))
         rescue OpenURI::HTTPError
             raise Autobuild::Exception.new(package.name, :import)
         end

data/lib/autobuild/import/cvs.rb

@@ -36,7 +36,7 @@ def modulename; @module end
         def update(package, options = Hash.new) # :nodoc:
             if options[:only_local]
                 package.warn "%s: the CVS importer does not support local updates, skipping"
-                return
+                return false
             end
 
             if !File.exist?("#{package.srcdir}/CVS/Root")
@@ -59,6 +59,7 @@ def update(package, options = Hash.new) # :nodoc:
             end
             package.run(:import, Autobuild.tool(:cvs), 'up', *@options_up,
                         retry: true, working_directory: package.importdir)
+            true # no easy way to check if package was updated, keep previous behavior and consider updated
         end
 
         def checkout(package, options = Hash.new) # :nodoc:

data/lib/autobuild/import/darcs.rb

@@ -25,7 +25,7 @@ def initialize(source, options = {})
         def update(package, options = Hash.new) # :nodoc:
             if options[:only_local]
                 package.warn "%s: the darcs importer does not support local updates, skipping"
-                return
+                return false
             end
 	    if !File.directory?( File.join(package.srcdir, '_darcs') )
 		raise ConfigException.new(package, 'import'),
@@ -34,6 +34,7 @@ def update(package, options = Hash.new) # :nodoc:
 
 	    package.run(:import, @program, 
 	       'pull', '--all', "--repodir=#{package.srcdir}", '--set-scripts-executable', @source, *@pull, retry: true)
+            true # no easy to know if package was updated, keep previous behavior
         end
 
         def checkout(package, options = Hash.new) # :nodoc:

data/lib/autobuild/import/git.rb

@@ -926,7 +926,7 @@ def reset_head_to_commit(package, target_commit, fetch_commit, options = Hash.ne
             status_to_target = head_to_target.status
 
             if status_to_target == Status::UP_TO_DATE
-                return
+                return false
             elsif status_to_target == Status::SIMPLE_UPDATE
                 run_git(package, 'merge', target_commit)
             elsif !options[:force]
@@ -956,6 +956,7 @@ def reset_head_to_commit(package, target_commit, fetch_commit, options = Hash.ne
                 run_git(package, 'checkout', local_branch)
                 raise
             end
+            true
         end
 
         def determine_target_state(package, only_local: false)
@@ -1000,7 +1001,7 @@ def update(package, options = Hash.new)
             if !has_local_branch?(package)
                 package.message "%%s: checking out branch %s" % [local_branch]
                 run_git(package, 'checkout', '-b', local_branch, target_commit)
-                return
+                return false
             end
 
             if !on_local_branch?(package)
@@ -1013,26 +1014,29 @@ def update(package, options = Hash.new)
                 current_head = rev_parse(package, 'HEAD')
                 if reset
                     if current_head == pinned_state
-                        return
+                        return false
                     end
                 elsif commit_present_in?(package, pinned_state, current_head)
-                    return
+                    return false
                 elsif merge_if_simple(package, pinned_state)
-                    return
+                    return true
                 end
             end
 
+            did_update = false
             fetch_commit ||= current_remote_commit(
                 package, only_local: only_local, refspec: [remote_branch, tag])
             if reset
-                reset_head_to_commit(package, target_commit, fetch_commit, force: (reset == :force))
+                did_update = reset_head_to_commit(package, target_commit, fetch_commit, force: (reset == :force))
             else
-                merge_if_simple(package, target_commit)
+                did_update = merge_if_simple(package, target_commit)
             end
 
             if with_submodules?
                 run_git(package, "submodule", "update", '--init')
+                did_update = true
             end
+            did_update
         end
 
         # @api private
@@ -1043,8 +1047,9 @@ def merge_if_simple(package, target_commit)
                     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
+                return true
             end
+            false
         end
 
         def each_alternate_path(package)

data/lib/autobuild/import/hg.rb

@@ -52,11 +52,12 @@ def validate_importdir(package)
         def update(package, options = Hash.new)
             if options[:only_local]
                 package.warn "%s: the Mercurial importer does not support local updates, skipping"
-                return
+                return false
             end
             validate_importdir(package)
             package.run(:import, Autobuild.tool('hg'), 'pull', repository, retry: true, working_directory: package.importdir)
             package.run(:import, Autobuild.tool('hg'), 'update', branch, working_directory: package.importdir)
+            true # no easy to know if package was updated, keep previous behavior
         end
 
         def checkout(package, options = Hash.new)

data/lib/autobuild/import/svn.rb

@@ -197,7 +197,7 @@ def svn_info(package)
         def update(package, options = Hash.new) # :nodoc:
             if options[:only_local]
                 package.warn "%s: the svn importer does not support local updates, skipping"
-                return
+                return false
             end
 
             url = svn_url(package)
@@ -212,11 +212,12 @@ def update(package, options = Hash.new) # :nodoc:
                 elsif revision
                     # Don't update if the current revision is greater-or-equal
                     # than the target revision
-                    return
+                    return false
                 end
             end
 
             run_svn(package, 'up', "--non-interactive", *options_up)
+            true
         end
 
         def checkout(package, options = Hash.new) # :nodoc:

data/lib/autobuild/importer.rb

@@ -301,14 +301,22 @@ def perform_update(package,only_local=false)
         retry_count = 0
         package.progress_start "updating %s"
         begin
-            update(package,only_local)
+            did_update = update(package,only_local)
             execute_post_hooks(package)
+            message = if did_update == false
+                          Autobuild.color('already up-to-date', :green)
+                      else
+                          Autobuild.color('updated', :yellow)
+                      end
+
         rescue Interrupt
+            message = Autobuild.color('interrupted', :red)
             if last_error
                 raise last_error
             else raise
             end
         rescue ::Exception => original_error
+            message = Autobuild.color('update failed', :red)
             last_error = original_error
             # If the package is patched, it might be that the update
             # failed because we needed to unpatch first. Try it out
@@ -336,13 +344,11 @@ def perform_update(package,only_local=false)
             package.message "update failed in #{package.importdir}, retrying (#{retry_count}/#{self.retry_count})"
             retry
         ensure
-            package.progress_done "updated %s"
+            package.progress_done "#{message} %s"
         end
 
         patch(package)
         package.updated = true
-    rescue Interrupt
-        raise
     rescue Autobuild::Exception => e
         fallback(e, package, :import, package)
     end

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.12.0" unless defined? Autobuild::VERSION
+    VERSION = "1.12.1" unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake