gitscape 1.6.5 → 1.6.6

data/.gitignore

@@ -1,3 +1,4 @@
+.idea
 *.gem
 .bundle
 Gemfile.lock

data/lib/gitscape/base.rb

@@ -44,7 +44,8 @@ class Gitscape::Base
   end
 
   def live_iteration
-    toRet = `git branch -a --merged origin/live`.split("\n").select{|b| /release\/i(\d+)$/.match b}.map{|b| b.scan(/release\/i(\d+)$/).flatten[0].to_i}.sort.last
+    live_iteration_tag_regex = /^live\/i(\d+)/
+    toRet = `git tag`.split("\n").select { |tag| live_iteration_tag_regex.match tag }.map { |tag| tag.scan(live_iteration_tag_regex).flatten[0].to_i }.sort.last
     toRet
   end
 
@@ -316,7 +317,7 @@ class Gitscape::Base
     # 1. starts with 'service/'
     # 2. starts with 'rollback-to/' or 'live/', and has an iteration number >= the live_iteration number - 3
     tags = `git tag`.split "\n" 
-    tags_to_delete = tags.select { |tag| !(!/^service\//.match(tag).nil? || /^(?:live|rollback-to)\/i(\d+)/.match(tag).to_a[1].to_i >= live_iteration - 3) }
+    tags_to_delete = tags.select { |tag| !(!/^service\//.match(tag).nil? || /^(?:live|rollback-to)\/i(\d+)/.match(tag).to_a[1].to_i >= live_iteration.to_i - 3) }
     
     puts "Deleting the following tags.\nThese changes #{options[:push] ? "will" : "will not"} be pushed to origin.\n"
     

data/lib/gitscape/version.rb

@@ -1,3 +1,3 @@
 module Gitscape
-  VERSION = '1.6.5'
+  VERSION = '1.6.6'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 5
-  version: 1.6.5
+  - 6
+  version: 1.6.6
 platform: ruby
 authors: 
 - Jon Botelho
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-16 00:00:00 -04:00
+date: 2013-05-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency