- simplify versioning

Eric013 · May 11, 2011 · 2b40c53 · 2b40c53
1 parent 36caf3d
commit 2b40c53
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,9 +1,8 @@
 require 'tempfile'
 require 'ftools' # fails in 1.9.2
 
-# TODO(sissel): load the gemspec and parse the version from it instead.
-LOGSTASH_VERSION = "1.0.5" 
-
+require File.join(File.dirname(__FILE__), "VERSION")  # For LOGSTASH_VERSION
+
 # Compile config grammar (ragel -> ruby)
 file "lib/logstash/config/grammar.rb" => ["lib/logstash/config/grammar.rl"] do
   sh "make -C lib/logstash/config grammar.rb"

diff --git a/VERSION.rb b/VERSION.rb
@@ -0,0 +1 @@
+LOGSTASH_VERSION = "1.0.5"
diff --git a/logstash.gemspec b/logstash.gemspec
@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), "VERSION")  # For LOGSTASH_VERSION
+
 Gem::Specification.new do |spec|
   files = []
   paths = %w{lib examples etc patterns}
@@ -16,7 +18,7 @@ Gem::Specification.new do |spec|
   #rev = %x{svn info}.split("\n").grep(/Revision:/).first.split(" ").last.to_i
   rev = Time.now.strftime("%Y%m%d%H%M%S")
   spec.name = "logstash"
-  spec.version = "1.0.5"
+  spec.version = LOGSTASH_VERSION
   spec.summary = "logstash - log and event management"
   spec.description = "scalable log and event management (search, archive, pipeline)"
   spec.license = "Apache License (2.0)"