attempt to fix recursive rake require

1 files changed, 16 insertions, 16 deletions

diff --git a/axlsx.gemspec b/axlsx.gemspec
index a552d39e..264e4f73 100644
--- a/axlsx.gemspec
+++ b/axlsx.gemspec
@@ -1,4 +1,5 @@
-require 'rake'
+# This will recursively require rake when using rake 0.9.2.2
+#require 'rake'
 require File.expand_path(File.dirname(__FILE__) + '/lib/axlsx/version.rb')
 Gem::Specification.new do |s|
   s.name        = 'axlsx'
@@ -13,29 +14,28 @@ Gem::Specification.new do |s|
   s.description = <<-eof
     xlsx generation with charts, images, automated column width, customizable styles and full schema validation. Axlsx excels at helping you generate beautiful Office Open XML Spreadsheet documents without having to understand the entire ECMA specification. Check out the README for some examples of how easy it is. Best of all, you can validate your xlsx file before serialization so you know for sure that anything generated is going to load on your client's machine.
   eof
-  # s.files 	= Dir.glob("{doc,lib,test,schema,examples}/**/*") + %w{ LICENSE README.md Rakefile CHANGELOG.md }
+  s.files 	= Dir.glob("{doc,lib,test,schema,examples}/**/*") + %w{ LICENSE README.md Rakefile CHANGELOG.md }
 
-  s.files = FileList.new('*', 'lib/**/*', 'doc/**/*', 'schema/**/*', 'examples/**/*') do |fl|
-    fl.exclude("*.*~")
-    fl.exclude(".*")
-    fl.exclude("todo")
-    fl.exclude("*.gem")
-    fl.exclude("*.xlsx")
-  end
+  # s.files = FileList.new('*', 'lib/**/*', 'doc/**/*', 'schema/**/*', 'examples/**/*') do |fl|
+  #   fl.exclude("*.*~")
+  #   fl.exclude(".*")
+  #   fl.exclude("todo")
+  #   fl.exclude("*.gem")
+  #   fl.exclude("*.xlsx")
+  # end
 
-  s.test_files = FileList.new('test/**/*') do |fl|
-      fl.exclude("*.*~")
-  end	       
+  # s.test_files = FileList.new('test/**/*') do |fl|
+  #     fl.exclude("*.*~")
+  # end	       
 
   s.add_runtime_dependency 'nokogiri', '>= 1.4.1'
   s.add_runtime_dependency 'activesupport', '>= 2.3.9'
   s.add_runtime_dependency 'i18n', '>= 0.6.0'
   s.add_runtime_dependency 'rmagick', '>= 2.12.2'
   s.add_runtime_dependency 'zip', '>= 2.0.2'
-
-  # pinning rake to see if it solves some bundler exec rake problems with recursive includes
-  s.add_development_dependency 'rake', "0.8.7" # if RUBY_VERSION == "1.9.2"
-  #s.add_development_dependency 'rake', "~> 0.9" if ["1.9.3", "1.8.7"].include?(RUBY_VERSION)
+  
+  s.add_development_dependency 'rake', "0.8.7"  if RUBY_VERSION == "1.9.2"
+  s.add_development_dependency 'rake', "~> 0.9" if ["1.9.3", "1.8.7"].include?(RUBY_VERSION)
   s.add_development_dependency 'bundler'
 
   s.required_ruby_version = '>= 1.8.7'