Simplified build script

julianghionoiu · Oct 16, 2015 · cad9282 · cad9282
1 parent 96ed9de
commit cad9282
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lib/tdl/version.rb b/lib/tdl/version.rb
@@ -2,11 +2,4 @@ module TDL
   PREVIOUS_VERSION = '0.1.2'
   # the current MAJOR.MINOR version is dynamically computed from the version of the Spec
   CURRENT_PATCH_VERSION = '3'
-
-  def TDL.version
-    spec_folder = File.expand_path('../../../features/spec',__FILE__).to_s
-    # puts "Spec folder is: #{spec_folder}"
-    major_minor_version = `git --git-dir #{spec_folder}/.git describe --all | cut -d '/' -f 2 | tr -d 'v'`.strip
-    "#{major_minor_version}.#{TDL::CURRENT_PATCH_VERSION}"
-  end
 end
diff --git a/tdl-client-ruby.gemspec b/tdl-client-ruby.gemspec
@@ -3,9 +3,14 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tdl/version'
 
+SPEC_FOLDER = File.expand_path('../features/spec',__FILE__).to_s
+puts "Spec folder is: #{SPEC_FOLDER}"
+MAJOR_MINOR_VERSION = `git --git-dir #{SPEC_FOLDER}/.git describe --all | cut -d '/' -f 2 | tr -d 'v'`.strip
+VERSION = "#{MAJOR_MINOR_VERSION}.#{TDL::CURRENT_PATCH_VERSION}"
+
 Gem::Specification.new do |spec|
   spec.name          = 'tdl-client-ruby'
-  spec.version       = TDL.version
+  spec.version       = VERSION
   spec.authors       = ['Julian Ghionoiu']
   spec.email         = ['iulian.ghionoiu@gmail.com']