right_scraper 1.0.13 → 1.0.15

data/lib/right_scraper/scrapers/git_scraper.rb

@@ -61,16 +61,18 @@ module RightScale
             if !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
+                @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                
               end
             end
             if is_tag && is_branch
               @errors << 'Repository tag ambiguous: could be git tag or git branch'
-            elsif !on_branch
+            elsif is_branch && !on_branch
               res = `git checkout #{@repo.tag} 2>&1`
               if $? != 0
-                @callback.call("Failed to checkout #{tag}: #{res}, falling back to cloning", is_step=false) if @callback
+                @callback.call("Failed to checkout #{@repo.tag}: #{res}, falling back to cloning", is_step=false) if @callback
                 FileUtils.rm_rf(@current_repo_dir)
                 @incremental = false
               end
@@ -215,7 +217,7 @@ module RightScale
       if succeeded? && (!update || @incremental)
         is_tag = `git tag`.split("\n").include?(@repo.tag)
         is_branch = `git branch -r`.split("\n").map { |t| t.strip }.include?("origin/#{@repo.tag}")
-        on_branch = is_branch && !!(`git branch`.split("\n").include?("* #{@repo.tag}")
+        on_branch = is_branch && !!`git branch`.split("\n").include?("* #{@repo.tag}")
       end
       { :tag => is_tag, :branch => is_branch, :on_branch => on_branch }
     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.13'
+  spec.version   = '1.0.15'
   spec.authors   = ['Raphael Simon']
   spec.email     = 'raphael@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_scraper'

data/spec/__destdir/test

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_scraper
 version: !ruby/object:Gem::Version 
-  version: 1.0.13
+  version: 1.0.15
 platform: ruby
 authors: 
 - Raphael Simon
@@ -36,6 +36,7 @@ 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