From 79073734a1342b7cdcc534c2479ed88f93c07d9d Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Thu, 24 Feb 2011 14:39:17 -0800
Subject: [PATCH] [#221 Use git rev-parse to get the current sha for the
version string
---
lib/chili_project/version.rb | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/lib/chili_project/version.rb b/lib/chili_project/version.rb
index ebd90adca..eebf369af 100644
--- a/lib/chili_project/version.rb
+++ b/lib/chili_project/version.rb
@@ -37,24 +37,12 @@ module ChiliProject
end
def self.revision
- revision = nil
- entries_path = "#{RAILS_ROOT}/.svn/entries"
- if File.readable?(entries_path)
- begin
- f = File.open(entries_path, 'r')
- entries = f.read
- f.close
- if entries.match(%r{^\d+})
- revision = $1.to_i if entries.match(%r{^\d+\s+dir\s+(\d+)\s})
- else
- xml = REXML::Document.new(entries)
- revision = xml.elements['wc-entries'].elements[1].attributes['revision'].to_i
- end
- rescue
- # Could not find the current revision
- end
- end
- revision
+ revision = `git rev-parse HEAD`
+ if revision.present?
+ revision.strip[0..8]
+ else
+ nil
+ end
end
REVISION = self.revision
--
GitLab