right_scraper 1.0.15 → 1.0.16

data/lib/right_scraper/scrapers/git_scraper.rb

@@ -58,21 +58,28 @@ module RightScale
             is_tag = analysis[:tag]
             is_branch = analysis[:branch]
             on_branch = analysis[:on_branch]
-            if !is_tag && !is_branch
+            checkout = is_tag && !is_branch
+            if is_tag && is_branch
+              @errors << 'Repository tag ambiguous: could be git tag or git branch'
+            elsif !is_tag && !is_branch
               current_sha = `git rev-parse HEAD`.chomp
               if current_sha == @repo.tag
                 @callback.call("Nothing to update: already using #{@repo.tag}", is_step=false) if @callback
                 return true
-              else
-                @callback.call("Current HEAD (#{current_sha}) differs from #{@repo.tag}, falling back to cloning", is_step=false) if @callback                
+              else 
+                checkout = true
               end
             end
-            if is_tag && is_branch
-              @errors << 'Repository tag ambiguous: could be git tag or git branch'
-            elsif is_branch && !on_branch
-              res = `git checkout #{@repo.tag} 2>&1`
+            if succeeded?
+              if checkout || is_branch && !on_branch
+                res = `git checkout #{@repo.tag} 2>&1`
+                action = 'checkout'
+              else # Pull latest commits on same branch
+                res = `git pull origin #{@repo.tag} 2>&1`
+                action = 'pull'
+              end
               if $? != 0
-                @callback.call("Failed to checkout #{@repo.tag}: #{res}, falling back to cloning", is_step=false) if @callback
+                @callback.call("Failed to #{action} #{@repo.tag}: #{res}, falling back to cloning", is_step=false) if @callback
                 FileUtils.rm_rf(@current_repo_dir)
                 @incremental = false
               end

data/right_scraper.gemspec

@@ -23,7 +23,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |spec|
   spec.name      = 'right_scraper'
-  spec.version   = '1.0.15'
+  spec.version   = '1.0.16'
   spec.authors   = ['Raphael Simon']
   spec.email     = 'raphael@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_scraper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_scraper
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors: 
 - Raphael Simon
@@ -36,7 +36,6 @@ files:
 - lib/right_scraper/watcher.rb
 - lib/right_scraper/win32/process_monitor.rb
 - right_scraper.gemspec
-- spec/__destdir/test
 - spec/download_scraper_spec.rb
 - spec/git_scraper_spec.rb
 - spec/rcov.opts

data/spec/__destdir/test

@@ -1 +0,0 @@
-MORE THAN 2 CHARS