Skip to content

Commit 5fd87b0

Browse files
committed
clean up pom, Rakefilem gemspec
1 parent 99d6a83 commit 5fd87b0

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

Rakefile

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@ task :clean do
1313
FileUtils.rm_rf(build_dir)
1414
end
1515

16-
desc 'package as a gem.'
16+
desc 'Package as a gem.'
1717
task :package do
1818
require 'fileutils'
1919
gemspec = Dir['*.gemspec'].first
20-
sh "gem build #{gemspec}"
20+
Kernel.system("#{RUBY} -S gem build #{gemspec}")
2121
FileUtils.mkdir_p(build_dir)
2222
gem = Dir['*.gem'].first
2323
FileUtils.mv(gem, File.join(build_dir,"#{gem}"))
24+
puts File.join(build_dir,"#{gem}")
2425
end
2526

2627
desc 'Install the package as a gem.'
2728
task :install => [:package] do
2829
gem = Dir[File.join(build_dir, '*.gem')].first
29-
sh "gem install --local #{gem} --no-ri --no-rdoc"
30+
extra = ENV['GEM_HOME'].nil? && ENV['GEM_PATH'].nil? ? "--user-install" : ""
31+
Kernel.system("#{RUBY} -S gem install --local #{gem} --no-ri --no-rdoc #{extra}")
3032
end
3133

3234
desc 'Run specifications'

gemspec_to_pom.rb

-9
This file was deleted.

pom.xml

+6-12
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,14 @@
9292
<version>${jruby.plugins.version}</version>
9393
<extensions>true</extensions>
9494
<configuration>
95+
<date>2010-06-13</date>
96+
<extraRdocFiles>History.txt,README.txt</extraRdocFiles>
97+
<rdocOptions>--main,README.txt</rdocOptions>
98+
<rubyforgeProject>rack-datamapper</rubyforgeProject>
99+
<extraFiles>Rakefile</extraFiles>
95100
<gemspecOverwrite>true</gemspecOverwrite>
96101
</configuration>
97-
<executions>
98-
<execution>
99-
<id>gemspec</id>
100-
<goals><goal>package</goal></goals>
101-
<configuration>
102-
<date>2010-06-13</date>
103-
<extraRdocFiles>History.txt,README.txt</extraRdocFiles>
104-
<rdocOptions>--main,README.txt</rdocOptions>
105-
<rubyforgeProject>rack-datamapper</rubyforgeProject>
106-
<extra_files>Rakefile</extra_files>
107-
</configuration>
108-
</execution>
102+
<executions>
109103
<execution>
110104
<id>version</id>
111105
<phase>compile</phase>

rack-datamapper.gemspec

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ Gem::Specification.new do |s|
1212

1313
s.files = Dir['MIT-LICENSE']
1414
s.licenses << 'MIT-LICENSE'
15+
s.date = '2010-06-13'
16+
s.rubyforge_project = 'rack-datamapper'
17+
s.files += Dir['History.txt']
18+
s.files += Dir['README.txt']
19+
s.extra_rdoc_files = ['History.txt','README.txt']
20+
s.files += Dir['Rakefile']
21+
s.rdoc_options = ['--main','README.txt']
1522
s.files += Dir['lib/**/*']
1623
s.files += Dir['spec/**/*']
1724
s.test_files += Dir['spec/**/*_spec.rb']

0 commit comments

Comments
 (0)