Skip to content

Commit

Permalink
Fixing rake gem
Browse files Browse the repository at this point in the history
  • Loading branch information
winton committed Jan 2, 2011
1 parent b3f7765 commit 347be43
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ task :gem do
old_gemset = ENV['GEMSET']
pkg = "#{File.dirname(__FILE__)}/pkg"
system "rm -Rf #{pkg}"
(GemTemplate::Gems.gemspecs.keys + %w(default nodep)).each do |gemset|
ENV['GEMSET'] = gemset
GemTemplate::Gems.gemset_names.each do |gemset|
ENV['GEMSET'] = gemset.to_s
system "mkdir -p #{pkg} && cd #{pkg} && gem build ../gem_template.gemspec"
end
ENV['GEMSET'] = old_gemset
Expand Down
2 changes: 2 additions & 0 deletions gem_template.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Gem::Specification.new do |s|
GemTemplate::Gems.gemspec.hash.each do |key, value|
if key == 'name' && GemTemplate::Gems.gemset != :default
s.name = "#{value}-#{GemTemplate::Gems.gemset}"
elsif key == 'summary' && GemTemplate::Gems.gemset == :solo
s.summary = value + " (no dependencies)"
elsif !%w(dependencies development_dependencies).include?(key)
s.send "#{key}=", value
end
Expand Down
7 changes: 7 additions & 0 deletions lib/gem_template/gems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ def gemset=(gemset)
end
end

def gemset_names
[ :default, :solo ] + @gemsets[gemspec.name.to_sym].inject([]) { |array, (key, value)|
array.push(key) if value.is_a?(::Hash)
array
}
end

def gemspec(reload=false)
if @gemspec && !reload
@gemspec
Expand Down

0 comments on commit 347be43

Please sign in to comment.