Added a check for the gemspec/rakefile included VERSION constant so bundler does not puke warnings.

2 files changed, 5 insertions, 9 deletions

diff --git a/axlsx.gemspec b/axlsx.gemspec
index 622b6a0f..f8b0d464 100644
--- a/axlsx.gemspec
+++ b/axlsx.gemspec
@@ -1,13 +1,6 @@
 # This will recursively require rake when using rake 0.9.2.2 and bundler
 #require 'rake'
-
-begin
-  require File.expand_path(File.dirname(__FILE__) + '/lib/axlsx/version.rb') unless Axlsx::VERSION
-rescue NameError=>e
-  # As far as I can tell, when a consuming application points to github, bundler runs the Gemfile, which in turn 
-  # kicks this and then includes axlsx. As we are defining Axlsx::VERSION here, we see a 
-  #   warning: already initialized constant VERSION
-end
+require File.expand_path(File.dirname(__FILE__) + '/lib/axlsx/version.rb')
 
 Gem::Specification.new do |s|
   s.name        = 'axlsx'
diff --git a/lib/axlsx/version.rb b/lib/axlsx/version.rb
index 72bb6e99..7d217c22 100644
--- a/lib/axlsx/version.rb
+++ b/lib/axlsx/version.rb
@@ -1,4 +1,7 @@
 module Axlsx
   # version
-  VERSION="1.0.14"
+  # When using bunle exec rake and referencing the gem on github or locally
+  # it will use the gemspec, which preloads this constant for the gem's version.
+  # We check to make sure that it has not already been loaded
+  VERSION="1.0.14" unless Axlsx.const_defined? :VERSION
 end