Better handling of the Compass::VERSION scheme.

This commit is contained in:
Chris Eppstein 2010-04-26 21:52:23 -07:00
parent 9ab44866bb
commit d1a155b59a
2 changed files with 18 additions and 22 deletions

View File

@ -7,7 +7,12 @@ end
module Compass
extend Compass::Version
VERSION = "#{version[:major]}.#{version[:minor]}.#{version[:patch]}"
def self.const_missing(const)
# This avoid reading from disk unless the VERSION is requested.
if const == :VERSION
version[:string]
end
end
def base_directory
File.expand_path(File.join(File.dirname(__FILE__), '..'))
end

View File

@ -6,18 +6,12 @@ module Compass
# The :rev key will have the current revision hash.
#
# This method swiped from Haml and then modified, some credit goes to Nathan Weizenbaum
attr_writer :version
def version
return @version if defined?(@version)
read_version_file
if r = revision
@version[:rev] = r
@version[:string] << " [#{r[0...7]}]"
end
if defined?(@version)
@version
else
read_version
end
end
protected
@ -26,22 +20,20 @@ module Compass
File.join(File.dirname(__FILE__), '..', '..', file)
end
def read_version_file
def read_version
require 'yaml'
@version = YAML::load(File.read(scope('VERSION.yml')))
@version[:string] = "#{@version[:major]}.#{@version[:minor]}.#{@version[:patch]}"
@version[:teeny] = @version[:patch]
@version[:string] = "#{@version[:major]}.#{@version[:minor]}.#{@version[:patch]}"
@version[:string] << ".#{@version[:build]}" if @version[:build]
if !ENV['OFFICIAL'] && r = revision
@version[:string] << ".dev.#{r[0..6]}"
end
@version
end
def revision
revision_from_git || revision_from_file
end
def revision_from_file
if File.exists?(scope('REVISION'))
rev = File.read(scope('REVISION')).strip
rev if rev =~ /[a-f0-9]+/
end
revision_from_git
end
def revision_from_git
@ -52,6 +44,5 @@ module Compass
end
end
end
end
end