From 1b77c140270a910710a2d918f74cc71eeb611fd4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 6 Dec 2014 01:09:10 -0500 Subject: d: track changes to sisu_version info --- lib/sisu/develop/se_version.rb | 48 +++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 10 deletions(-) (limited to 'lib/sisu/develop/se_version.rb') diff --git a/lib/sisu/develop/se_version.rb b/lib/sisu/develop/se_version.rb index 04c61c32..2ace68ce 100644 --- a/lib/sisu/develop/se_version.rb +++ b/lib/sisu/develop/se_version.rb @@ -85,6 +85,9 @@ module SiSU_Info_Version if File.exist?(SiSU_is[:version_info_path]) version=YAML::load(File::open(SiSU_is[:version_info_path])) end + version[:branch_version]=SiSU_is[:branch_version] + version[:branch_number]=/^v([0-9]+)/.match(version[:branch_version])[1] + version[:branch_name]=SiSU_is[:branch_name] version[:install_method]=if SiSU_is[:run_from]==:gem_install spec = Gem::Specification.find_by_name("sisu") gem_root = spec.gem_dir @@ -92,10 +95,35 @@ module SiSU_Info_Version ? ' (ruby gem install)' : '' else '' end - version[:branch_name]=SiSU_is[:branch_name] - version[:branch_version]=SiSU_is[:branch_version] - version[:branch_number]=/^v([0-9]+)$/.match(version[:branch_version])[1] - version + @version=version + def version_details_hash + @version + end + def project + version_details_hash[:project] + end + def date + version_details_hash[:date] + end + def date_stamp + version_details_hash[:date_stamp] + end + def version + version_details_hash[:version] + end + def branch_version + version_details_hash[:branch_version] + end + def branch_number + version_details_hash[:branch_number] + end + def branch_name + version_details_hash[:branch_name] + end + def install_method + version_details_hash[:install_method] + end + self end def rbversion %x{ruby -v}.strip @@ -118,7 +146,7 @@ module SiSU_Info_About def sisu_version version=SiSU_Env::InfoVersion.instance.get_version rb_ver=SiSU_Env::InfoVersion.instance.rbversion - if version[:version] + if version.version opt_cmd=if defined? @color.cmd \ and @color.cmd =~/[ck]/ @color.cmd @@ -126,11 +154,11 @@ module SiSU_Info_About end SiSU_Screen::Ansi.new( opt_cmd, - version[:project], - version[:version], - version[:date_stamp], - version[:date], - version[:install_method], + version.project, + version.version, + version.date_stamp, + version.date, + version.install_method, rb_ver ).version else puts 'SiSU (version information not available)' -- cgit v1.2.3