Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into rails

  • Loading branch information...
commit d48370b93ca5fff33b46564b4c344e37a1cb48fa 2 parents e8e1fc3 + b1e78b3
Winton Welsh authored
Showing with 7 additions and 5 deletions.
  1. +4 −2 Rakefile
  2. +3 −3 gem_template.gemspec
6 Rakefile
View
@@ -26,11 +26,13 @@ end
desc "Build gem(s)"
task :gem do
old_gemset = ENV['GEMSET']
- pkg = "#{File.dirname(__FILE__)}/pkg"
+ root = File.expand_path('../', __FILE__)
+ pkg = "#{root}/pkg"
system "rm -Rf #{pkg}"
GemTemplate::Gems.gemset_names.each do |gemset|
ENV['GEMSET'] = gemset.to_s
- system "mkdir -p #{pkg} && cd #{pkg} && gem build ../gem_template.gemspec"
+ system "cd #{root} && gem build gem_template.gemspec"
+ system "mkdir -p #{pkg} && mv *.gem pkg"
end
ENV['GEMSET'] = old_gemset
end
6 gem_template.gemspec
View
@@ -1,5 +1,5 @@
# -*- encoding: utf-8 -*-
-root = File.dirname(__FILE__)
+root = File.expand_path('../', __FILE__)
lib = "#{root}/lib"
$:.unshift lib unless $:.include?(lib)
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
end
s.executables = `cd #{root} && git ls-files -- {bin}/*`.split("\n").collect { |f| File.basename(f) }
- s.files = `cd #{root} && git ls-files`.split("\n").collect { |f| "#{root}/#{f}" }
+ s.files = `cd #{root} && git ls-files`.split("\n")
s.require_paths = %w(lib)
- s.test_files = `cd #{root} && git ls-files -- {features,test,spec}/*`.split("\n").collect { |f| "#{root}/#{f}" }
+ s.test_files = `cd #{root} && git ls-files -- {features,test,spec}/*`.split("\n")
end
Please sign in to comment.
Something went wrong with that request. Please try again.