yolo 1.1.15 → 1.1.16

data/lib/yolo/tools/git.rb

@@ -120,11 +120,18 @@ module Yolo
       #
       # @return [String] The tag
       def latest_tag
-        match = log.scan(/tag:\s(.+?),\s/).first
-        if match.nil?
+        match = ""
+        matches = log.scan(/tag:\s(.+?),\s/)
+        if matches.nil?
           ""
         else
-          match.first
+          matches.each do |tag|
+            if !tag.first.include? "jenkins"
+              match = tag.first
+              break
+            end
+          end
+          return match
         end
       end
 

data/spec/tools/git_spec.rb

@@ -94,10 +94,16 @@ describe Yolo::Tools::Git do
     end
 
     it "should get the latest tag" do
-      @git.stub(:log){"tag: v1.0, head, tag: v1.3.1"}
+      @git.stub(:log){"tag: v1.0, head, tag: v1.3.1, master"}
       @git.instance_eval{latest_tag}.should eq("v1.0")
     end
 
+    it "should ignore jenkins tags" do
+      @git.stub(:log){"tag: jenkins-tag, head, tag: v1.3.1, master"}
+      @git.instance_eval{latest_tag}.should_not eq("jenkins-tag")
+      @git.instance_eval{latest_tag}.should eq("v1.3.1")
+    end
+
     it "should recognise invalid tags" do
       @git.stub(:log){"junk"}
       @git.instance_eval{latest_tag}.should eq("")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yolo
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.1.16
   prerelease: 
 platform: ruby
 authors:
@@ -155,3 +155,4 @@ signing_key:
 specification_version: 3
 summary: YOLO!
 test_files: []
+has_rdoc: