No longer need Gems.config.testing option, making gemspec so it can b…

…e built independently
winton · Dec 29, 2010 · a94936f · a94936f
1 parent 43db36d
commit a94936f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/gem_template.gemspec b/gem_template.gemspec
@@ -1,4 +1,10 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'gem_template/gems'
+GemTemplate::Gems.gemset ||= :default
+
 Gem::Specification.new do |s|
   GemTemplate::Gems.gemspec.hash.each do |key, value|
     unless %w(dependencies development_dependencies).include?(key)

diff --git a/lib/gem_template/gems.rb b/lib/gem_template/gems.rb
@@ -23,7 +23,6 @@ def initialize(hash)
         Gems.config = SimpleStruct.new(
           :gemsets => [ "#{File.expand_path('../../../', __FILE__)}/config/gemsets.yml" ],
           :gemspec => "#{File.expand_path('../../../', __FILE__)}/config/gemspec.yml",
-          :testing => false,
           :warn => true
         )
 

diff --git a/spec/gem_template/gems_spec.rb b/spec/gem_template/gems_spec.rb
@@ -9,7 +9,6 @@
     GemTemplate::Gems.config.gemsets = [
       "#{$root}/spec/fixtures/gemsets.yml"
     ]
-    GemTemplate::Gems.config.testing = true
     GemTemplate::Gems.config.warn = true
 
     GemTemplate::Gems.gemspec true