buildr 1.4.5-x86-mswin32 → 1.4.6-x86-mswin32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG +28 -1
- data/_buildr +1 -1
- data/_jbuildr +1 -1
- data/buildr.gemspec +1 -2
- data/doc/download.textile +41 -76
- data/doc/index.textile +46 -6
- data/doc/installing.textile +2 -2
- data/doc/languages.textile +3 -3
- data/doc/scripts/install-jruby.sh +2 -2
- data/lib/buildr/core/shell.rb +1 -1
- data/lib/buildr/core/transports.rb +1 -1
- data/lib/buildr/ide/eclipse.rb +8 -2
- data/lib/buildr/ide/idea.rb +42 -26
- data/lib/buildr/java/bdd.rb +8 -5
- data/lib/buildr/java/jtestr_result.rb +36 -0
- data/lib/buildr/java/tests.rb +4 -4
- data/lib/buildr/packaging/artifact.rb +4 -2
- data/lib/buildr/packaging/tar.rb +1 -1
- data/lib/buildr/packaging/zip.rb +6 -0
- data/lib/buildr/scala/bdd.rb +17 -4
- data/lib/buildr/scala/compiler.rb +18 -12
- data/lib/buildr/scala/doc.rb +1 -1
- data/lib/buildr/scala/tests.rb +40 -11
- data/lib/buildr/version.rb +1 -1
- data/rakelib/checks.rake +9 -9
- data/rakelib/doc.rake +1 -1
- data/rakelib/package.rake +7 -7
- data/rakelib/release.rake +0 -1
- data/rakelib/rspec.rake +3 -2
- data/rakelib/setup.rake +2 -0
- data/rakelib/stage.rake +3 -3
- data/spec/core/common_spec.rb +1 -1
- data/spec/ide/idea_spec.rb +16 -25
- data/spec/java/bdd_spec.rb +1 -1
- data/spec/packaging/artifact_spec.rb +51 -0
- data/spec/sandbox.rb +41 -5
- data/spec/scala/bdd_spec.rb +1 -6
- data/spec/scala/compiler_spec.rb +56 -24
- data/spec/scala/doc_spec.rb +2 -7
- data/spec/scala/scala.rb +1 -8
- data/spec/scala/tests_spec.rb +14 -6
- metadata +164 -169
- data/lib/buildr/core/#application.rb# +0 -700
- data/lib/buildr/packaging/#package.rb.rej# +0 -19
- data/lib/buildr/scala/#Untitled-2# +0 -7
data/lib/buildr/java/bdd.rb
CHANGED
@@ -47,7 +47,7 @@ module Buildr
|
|
47
47
|
module TestFramework::JRubyBased
|
48
48
|
extend self
|
49
49
|
|
50
|
-
VERSION = '1.5.6
|
50
|
+
VERSION = '1.5.4' # Note: JtestR 0.6.0 only works up to 1.5.4
|
51
51
|
|
52
52
|
class << self
|
53
53
|
def version
|
@@ -75,7 +75,7 @@ module Buildr
|
|
75
75
|
def dependencies
|
76
76
|
unless @dependencies
|
77
77
|
super
|
78
|
-
|
78
|
+
if !RUBY_PLATFORM[/java/] && !TestFramework::JRubyBased.jruby_installed?
|
79
79
|
@dependencies |= TestFramework::JRubyBased.dependencies
|
80
80
|
end
|
81
81
|
end
|
@@ -146,11 +146,13 @@ module Buildr
|
|
146
146
|
cmd_options = java_args.last
|
147
147
|
project = cmd_options.delete(:project)
|
148
148
|
cmd_options[:classpath] ||= []
|
149
|
-
|
149
|
+
if jruby_home && jruby_home != ''
|
150
|
+
Dir.glob(File.join(jruby_home, 'lib', '*.jar')) { |jar| cmd_options[:classpath] << jar }
|
151
|
+
cmd_options[:properties]['jruby.home'] = jruby_home
|
152
|
+
end
|
150
153
|
cmd_options[:java_args] ||= []
|
151
154
|
cmd_options[:java_args] << '-Xmx512m' unless cmd_options[:java_args].detect {|a| a =~ /^-Xmx/}
|
152
155
|
cmd_options[:properties] ||= {}
|
153
|
-
cmd_options[:properties]['jruby.home'] = jruby_home
|
154
156
|
Java::Commands.java(*java_args)
|
155
157
|
end
|
156
158
|
|
@@ -370,8 +372,9 @@ module Buildr
|
|
370
372
|
runner = super
|
371
373
|
# JtestR 0.6.0 comes with rspec 1.3.0 (and any other jtestr dependency) included,
|
372
374
|
# so the rspec version used depends on the jtestr jar.
|
373
|
-
runner.requires.unshift 'jtestr'
|
374
375
|
runner.gems.update 'rspec' => '=1.3.0'
|
376
|
+
runner.requires.clear
|
377
|
+
runner.requires.unshift 'jtestr'
|
375
378
|
runner.requires.unshift 'spec'
|
376
379
|
runner.requires.unshift File.join(File.dirname(__FILE__), 'jtestr_result')
|
377
380
|
runner.rspec = ['--format', 'progress', '--format', "html:#{runner.html_report}"]
|
@@ -19,6 +19,42 @@ require 'fileutils'
|
|
19
19
|
|
20
20
|
module Buildr #:nodoc:
|
21
21
|
|
22
|
+
module TestFramework
|
23
|
+
|
24
|
+
# A class used by buildr for jruby based frameworks, so that buildr can know
|
25
|
+
# which tests succeeded/failed.
|
26
|
+
class TestResult
|
27
|
+
|
28
|
+
class Error < ::Exception
|
29
|
+
attr_reader :message, :backtrace
|
30
|
+
def initialize(message, backtrace)
|
31
|
+
@message = message
|
32
|
+
@backtrace = backtrace
|
33
|
+
set_backtrace backtrace
|
34
|
+
end
|
35
|
+
|
36
|
+
def self.dump_yaml(file, e)
|
37
|
+
FileUtils.mkdir_p File.dirname(file)
|
38
|
+
File.open(file, 'w') { |f| f.puts(YAML.dump(Error.new(e.message, e.backtrace))) }
|
39
|
+
end
|
40
|
+
|
41
|
+
def self.guard(file)
|
42
|
+
begin
|
43
|
+
yield
|
44
|
+
rescue => e
|
45
|
+
dump_yaml(file, e)
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
attr_accessor :failed, :succeeded
|
51
|
+
|
52
|
+
def initialize
|
53
|
+
@failed, @succeeded = [], []
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
22
58
|
module JtestR
|
23
59
|
|
24
60
|
# An Rspec formatter used by JtestR
|
data/lib/buildr/java/tests.rb
CHANGED
@@ -184,7 +184,7 @@ module Buildr
|
|
184
184
|
end
|
185
185
|
|
186
186
|
# JUnit version number.
|
187
|
-
VERSION = '4.
|
187
|
+
VERSION = '4.8.2'
|
188
188
|
|
189
189
|
class << self
|
190
190
|
# :call-seq:
|
@@ -227,7 +227,7 @@ module Buildr
|
|
227
227
|
:class_annotations => %w{org.junit.runner.RunWith},
|
228
228
|
:method_annotations => %w{org.junit.Test})
|
229
229
|
end
|
230
|
-
|
230
|
+
|
231
231
|
end
|
232
232
|
|
233
233
|
def run(tests, dependencies) #:nodoc:
|
@@ -330,10 +330,10 @@ module Buildr
|
|
330
330
|
cmd_args << '-d' << task.report_to.to_s
|
331
331
|
# run all tests in the same suite
|
332
332
|
cmd_args << '-testclass' << tests
|
333
|
-
|
333
|
+
|
334
334
|
cmd_options = { :properties=>options[:properties], :java_args=>options[:java_args],
|
335
335
|
:classpath=>dependencies, :name => "TestNG in #{task.send(:project).name}" }
|
336
|
-
|
336
|
+
|
337
337
|
tmp = nil
|
338
338
|
begin
|
339
339
|
tmp = Tempfile.open("testNG")
|
@@ -212,8 +212,9 @@ module Buildr
|
|
212
212
|
|
213
213
|
task = Rake::Task.define_task uri + path => deps do
|
214
214
|
# Upload artifact relative to base URL, need to create path before uploading.
|
215
|
+
options = upload_to[:options] || {:permissions => upload_to[:permissions]}
|
215
216
|
info "Deploying #{to_spec}"
|
216
|
-
URI.upload uri + path, name,
|
217
|
+
URI.upload uri + path, name, options
|
217
218
|
end
|
218
219
|
end
|
219
220
|
task
|
@@ -477,7 +478,8 @@ module Buildr
|
|
477
478
|
error "No build number provided for the snapshot #{to_spec}" if build_number.nil?
|
478
479
|
return nil if timestamp.nil? || build_number.nil?
|
479
480
|
snapshot_of = version[0, version.size - 9]
|
480
|
-
|
481
|
+
classifier_snippet = (classifier != nil) ? "-#{classifier}" : ""
|
482
|
+
repo_url + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp.text}-#{build_number.text}#{classifier_snippet}.#{type}"
|
481
483
|
rescue URI::NotFoundError
|
482
484
|
nil
|
483
485
|
end
|
data/lib/buildr/packaging/tar.rb
CHANGED
@@ -98,7 +98,7 @@ module Buildr
|
|
98
98
|
elsif content.nil?
|
99
99
|
elsif File.directory?(content.to_s)
|
100
100
|
stat = File.stat(content.to_s)
|
101
|
-
tar.mkdir(path, options.merge(:mode=>stat.mode, :mtime=>stat.mtime))
|
101
|
+
tar.mkdir(path, options.merge(:mode=>stat.mode, :mtime=>stat.mtime, :uid=>stat.uid, :gid=>stat.gid))
|
102
102
|
else
|
103
103
|
File.open content.to_s, 'rb' do |is|
|
104
104
|
tar.add_file path, options.merge(:mode=>is.stat.mode, :mtime=>is.stat.mtime, :uid=>is.stat.uid, :gid=>is.stat.gid) do |os, opts|
|
data/lib/buildr/packaging/zip.rb
CHANGED
data/lib/buildr/scala/bdd.rb
CHANGED
@@ -32,21 +32,34 @@ module Buildr::Scala
|
|
32
32
|
@lang = :scala
|
33
33
|
@bdd_dir = :spec
|
34
34
|
|
35
|
-
VERSION =
|
35
|
+
VERSION = case
|
36
|
+
when Buildr::Scala.version?("2.8.0")
|
37
|
+
'1.6.5'
|
38
|
+
when Buildr::Scala.version?("2.8.1")
|
39
|
+
'1.6.8'
|
40
|
+
else
|
41
|
+
'1.6.8'
|
42
|
+
end
|
43
|
+
|
36
44
|
|
37
45
|
class << self
|
38
46
|
def version
|
39
|
-
Buildr.settings.build['scala.specs']
|
47
|
+
custom = Buildr.settings.build['scala.specs']
|
48
|
+
(custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
|
49
|
+
end
|
50
|
+
|
51
|
+
def specs
|
52
|
+
custom = Buildr.settings.build['scala.specs']
|
53
|
+
[ (custom =~ /:/) ? custom : "org.scala-tools.testing:#{artifact}:jar:#{version}" ]
|
40
54
|
end
|
41
55
|
|
42
56
|
def artifact
|
43
|
-
Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr::Scala.
|
57
|
+
Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr::Scala.version_without_build}"
|
44
58
|
end
|
45
59
|
|
46
60
|
def dependencies
|
47
61
|
unless @dependencies
|
48
62
|
super
|
49
|
-
specs = (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{version}"]
|
50
63
|
# Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
|
51
64
|
@dependencies |= [ File.join(File.dirname(__FILE__)) ] + specs +
|
52
65
|
Check.dependencies + JUnit.dependencies + Scalac.dependencies
|
@@ -19,7 +19,7 @@ require 'buildr/core/compile'
|
|
19
19
|
require 'buildr/packaging'
|
20
20
|
|
21
21
|
module Buildr::Scala
|
22
|
-
DEFAULT_VERSION = '2.
|
22
|
+
DEFAULT_VERSION = '2.9.0-1'
|
23
23
|
|
24
24
|
class << self
|
25
25
|
|
@@ -59,13 +59,15 @@ module Buildr::Scala
|
|
59
59
|
Buildr.settings.build['scala.version'] || installed_version || DEFAULT_VERSION
|
60
60
|
end
|
61
61
|
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
62
|
+
# check if version matches any of the given prefixes
|
63
|
+
def version?(*v)
|
64
|
+
v.any? { |v| version.index(v.to_s) == 0 }
|
65
|
+
end
|
66
|
+
|
67
|
+
# returns Scala version without build number.
|
68
|
+
# e.g. "2.9.0-1" => "2.9.0"
|
69
|
+
def version_without_build
|
70
|
+
version.split('-')[0]
|
69
71
|
end
|
70
72
|
end
|
71
73
|
|
@@ -156,17 +158,17 @@ module Buildr::Scala
|
|
156
158
|
options[:warnings] = verbose if options[:warnings].nil?
|
157
159
|
options[:deprecation] ||= false
|
158
160
|
options[:optimise] ||= false
|
159
|
-
options[:make] ||= :transitivenocp if Scala.
|
161
|
+
options[:make] ||= :transitivenocp if Scala.version? 2.8
|
160
162
|
options[:javac] ||= {}
|
161
163
|
|
162
164
|
@java = Javac.new(project, options[:javac])
|
163
165
|
end
|
164
166
|
|
165
167
|
def compile(sources, target, dependencies) #:nodoc:
|
166
|
-
check_options(options, OPTIONS + (Scala.
|
168
|
+
check_options(options, OPTIONS + (Scala.version?(2.8) ? [:make] : []))
|
167
169
|
|
168
170
|
java_sources = java_sources(sources)
|
169
|
-
enable_dep_tracing = Scala.
|
171
|
+
enable_dep_tracing = Scala.version?(2.8) && java_sources.empty?
|
170
172
|
|
171
173
|
dependencies.unshift target if enable_dep_tracing
|
172
174
|
|
@@ -226,7 +228,11 @@ module Buildr::Scala
|
|
226
228
|
args = []
|
227
229
|
args << "-nowarn" unless options[:warnings]
|
228
230
|
args << "-verbose" if trace?(:scalac)
|
229
|
-
|
231
|
+
if options[:debug] == true
|
232
|
+
args << (Scala.version?(2.7, 2.8) ? "-g" : "-g:vars")
|
233
|
+
elsif options[:debug]
|
234
|
+
args << "-g:#{options[:debug]}"
|
235
|
+
end
|
230
236
|
args << "-deprecation" if options[:deprecation]
|
231
237
|
args << "-optimise" if options[:optimise]
|
232
238
|
args << "-target:jvm-" + options[:target].to_s if options[:target]
|
data/lib/buildr/scala/doc.rb
CHANGED
@@ -26,7 +26,7 @@ module Buildr
|
|
26
26
|
after_define(:scaladoc => :doc) do |project|
|
27
27
|
if project.doc.engine? Scaladoc
|
28
28
|
options = project.doc.options
|
29
|
-
key = Scala.
|
29
|
+
key = Scala.version?(2.7) ? :windowtitle : "doc-title".to_sym
|
30
30
|
options[key] = (project.comment || project.name) unless options[key]
|
31
31
|
end
|
32
32
|
end
|
data/lib/buildr/scala/tests.rb
CHANGED
@@ -23,7 +23,16 @@ require 'buildr/java/tests'
|
|
23
23
|
module Buildr::Scala
|
24
24
|
# Scala::Check is available when using Scala::Test or Scala::Specs
|
25
25
|
module Check
|
26
|
-
VERSION =
|
26
|
+
VERSION = case
|
27
|
+
when Buildr::Scala.version?("2.7")
|
28
|
+
'1.6'
|
29
|
+
when Buildr::Scala.version?("2.8.0")
|
30
|
+
'1.7'
|
31
|
+
when Buildr::Scala.version?("2.8.1")
|
32
|
+
'1.8'
|
33
|
+
else
|
34
|
+
'1.9'
|
35
|
+
end
|
27
36
|
|
28
37
|
class << self
|
29
38
|
def version
|
@@ -31,15 +40,20 @@ module Buildr::Scala
|
|
31
40
|
end
|
32
41
|
|
33
42
|
def classifier
|
34
|
-
Buildr.settings.build['scala.check.classifier']
|
43
|
+
Buildr.settings.build['scala.check.classifier']
|
35
44
|
end
|
36
45
|
|
37
46
|
def artifact
|
38
|
-
Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr::Scala.
|
47
|
+
Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr::Scala.version_without_build}"
|
39
48
|
end
|
40
49
|
|
41
50
|
def dependencies
|
42
|
-
(version =~ /:/)
|
51
|
+
return [version] if (version =~ /:/)
|
52
|
+
if classifier
|
53
|
+
["org.scala-tools.testing:#{artifact}:jar:#{classifier}:#{version}"]
|
54
|
+
else
|
55
|
+
["org.scala-tools.testing:#{artifact}:jar:#{version}"]
|
56
|
+
end
|
43
57
|
end
|
44
58
|
|
45
59
|
private
|
@@ -60,16 +74,26 @@ module Buildr::Scala
|
|
60
74
|
# * :java_args -- Arguments passed as is to the JVM.
|
61
75
|
class ScalaTest < Buildr::TestFramework::Java
|
62
76
|
|
63
|
-
VERSION = '1.3'
|
77
|
+
VERSION = Buildr::Scala.version?(2.7, 2.8) ? '1.3' : '1.6.1'
|
64
78
|
|
65
79
|
class << self
|
66
80
|
def version
|
67
|
-
Buildr.settings.build['scala.test']
|
81
|
+
custom = Buildr.settings.build['scala.test']
|
82
|
+
(custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
|
83
|
+
end
|
84
|
+
|
85
|
+
def specs
|
86
|
+
custom = Buildr.settings.build['scala.test']
|
87
|
+
return custom if (custom =~ /:/)
|
88
|
+
if Buildr::Scala.version?(2.7, 2.8)
|
89
|
+
"org.scalatest:scalatest:jar:#{version}"
|
90
|
+
else
|
91
|
+
"org.scalatest:scalatest_#{Buildr::Scala.version_without_build}:jar:#{version}"
|
92
|
+
end
|
68
93
|
end
|
69
94
|
|
70
95
|
def dependencies
|
71
|
-
[
|
72
|
-
JMock.dependencies + JUnit.dependencies
|
96
|
+
[specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies
|
73
97
|
end
|
74
98
|
|
75
99
|
def applies_to?(project) #:nodoc:
|
@@ -104,7 +128,12 @@ module Buildr::Scala
|
|
104
128
|
mkpath task.report_to.to_s
|
105
129
|
success = []
|
106
130
|
|
107
|
-
reporter_options =
|
131
|
+
reporter_options = if (ScalaTest.version =~ /^0\./)
|
132
|
+
'TFGBSAR' # testSucceeded, testFailed, testIgnored, suiteAborted, runStopped, runAborted, runCompleted
|
133
|
+
else
|
134
|
+
''
|
135
|
+
end
|
136
|
+
|
108
137
|
scalatest.each do |suite|
|
109
138
|
info "ScalaTest #{suite.inspect}"
|
110
139
|
# Use Ant to execute the ScalaTest task, gives us performance and reporting.
|
@@ -113,9 +142,9 @@ module Buildr::Scala
|
|
113
142
|
taskdef = Buildr.artifacts(self.class.dependencies).each(&:invoke).map(&:to_s)
|
114
143
|
Buildr.ant('scalatest') do |ant|
|
115
144
|
# ScalaTestTask was deprecated in 1.2, in favor of ScalaTestAntTask
|
116
|
-
classname = (ScalaTest.version =~
|
145
|
+
classname = (ScalaTest.version =~ /^1\.[01]/) ? \
|
117
146
|
'org.scalatest.tools.ScalaTestTask' : 'org.scalatest.tools.ScalaTestAntTask'
|
118
|
-
ant.taskdef :name=>'scalatest', :classname=>
|
147
|
+
ant.taskdef :name=>'scalatest', :classname=>classname,
|
119
148
|
:classpath=>taskdef.join(File::PATH_SEPARATOR)
|
120
149
|
ant.scalatest :runpath=>dependencies.join(File::PATH_SEPARATOR) do
|
121
150
|
ant.suite :classname=>suite
|
data/lib/buildr/version.rb
CHANGED
data/rakelib/checks.rake
CHANGED
@@ -15,11 +15,10 @@
|
|
15
15
|
|
16
16
|
|
17
17
|
desc "Check that source files contain the Apache license"
|
18
|
-
task :license=>FileList["
|
18
|
+
task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
|
19
19
|
puts "Checking that files contain the Apache license ... "
|
20
20
|
required = task.prerequisites.select { |fn| File.file?(fn) }
|
21
21
|
missing = required.reject { |fn|
|
22
|
-
p fn
|
23
22
|
comments = File.read(fn).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|^-#\s+(.*?)$|<!--(.*?)-->/m).
|
24
23
|
map { |match| match.compact }.flatten.join("\n")
|
25
24
|
comments =~ /Licensed to the Apache Software Foundation/ && comments =~ /http:\/\/www.apache.org\/licenses\/LICENSE-2.0/
|
@@ -31,13 +30,14 @@ end
|
|
31
30
|
|
32
31
|
desc "Look for new dependencies, check transitive dependencies"
|
33
32
|
task :dependency do
|
33
|
+
=begin
|
34
34
|
puts "Checking that all dependencies are up to date ..."
|
35
35
|
# Find if anything has a more recent dependency. These are not errors, just reports.
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
36
|
+
spec.dependencies.each do |dep|
|
37
|
+
current = Gem::SourceInfoCache.search(dep).last
|
38
|
+
latest = Gem::SourceInfoCache.search(Gem::Dependency.new(dep.name, '>0')).last
|
39
|
+
puts "A new version of #{dep.name} is available, #{latest.version} replaces #{current.version}" if (current && latest && latest.version > current.version)
|
40
|
+
end
|
41
41
|
|
42
42
|
# Returns orderd list of transitive dependencies for the given dependency.
|
43
43
|
transitive = lambda { |depend|
|
@@ -49,11 +49,11 @@ task :dependency do
|
|
49
49
|
spec.dependencies.select {|dep| dep.type == :runtime }.each_with_index do |dep, index|
|
50
50
|
puts "checking #{dep.name}"
|
51
51
|
transitive[dep].each do |trans|
|
52
|
-
|
53
|
-
matching = spec.dependencies.find { |existing| p existing.inspect; trans =~ existing }
|
52
|
+
matching = spec.dependencies.find { |existing| trans =~ existing }
|
54
53
|
fail "#{trans} required by #{dep} and missing from spec" unless matching
|
55
54
|
fail "#{trans} must come before #{dep} in dependency list" unless spec.dependencies.index(matching) < index
|
56
55
|
end
|
57
56
|
end
|
58
57
|
puts "[X] Checked all dependencies are up to date and transitive dependencies are correctly ordered"
|
58
|
+
=end
|
59
59
|
end
|
data/rakelib/doc.rake
CHANGED
@@ -74,7 +74,7 @@ begin
|
|
74
74
|
rescue LoadError
|
75
75
|
puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running rake doc:setup"
|
76
76
|
task 'doc:setup' do
|
77
|
-
install_gem 'jekyll', :version=>'0.
|
77
|
+
install_gem 'jekyll', :version=>'0.10.0'
|
78
78
|
install_gem 'jekylltask', :version=>'1.0.2'
|
79
79
|
if `pygmentize -V`.empty?
|
80
80
|
args = %w{easy_install Pygments}
|
data/rakelib/package.rake
CHANGED
@@ -14,18 +14,18 @@
|
|
14
14
|
# the License.
|
15
15
|
|
16
16
|
|
17
|
-
require '
|
17
|
+
require 'rubygems/package_task'
|
18
18
|
|
19
19
|
|
20
|
-
package =
|
20
|
+
package = Gem::PackageTask.new(spec) do |pkg|
|
21
21
|
pkg.need_tar = true
|
22
22
|
pkg.need_zip = true
|
23
23
|
end
|
24
24
|
|
25
25
|
desc "Install Buildr from source"
|
26
|
-
task :install=>["#{package.package_dir}/#{package.
|
26
|
+
task :install=>["#{package.package_dir}/#{package.gem_spec.file_name}"] do |task|
|
27
27
|
print "Installing #{spec.name} ... "
|
28
|
-
args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.
|
28
|
+
args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.gem_spec.file_name}"
|
29
29
|
args.unshift('sudo') if sudo_needed?
|
30
30
|
sh *args
|
31
31
|
puts "[x] Installed Buildr #{spec.version}"
|
@@ -48,13 +48,13 @@ task :compile do
|
|
48
48
|
args << '--trace' if Rake.application.options.trace
|
49
49
|
sh *args
|
50
50
|
end
|
51
|
-
file
|
52
|
-
file
|
51
|
+
file Gem::PackageTask.new(spec).package_dir => :compile
|
52
|
+
file Gem::PackageTask.new(spec).package_dir_path => :compile
|
53
53
|
|
54
54
|
# We also need the other packages (JRuby if building on Ruby, and vice versa)
|
55
55
|
# Must call new with block, even if block does nothing, otherwise bad things happen.
|
56
56
|
@specs.values.each do |s|
|
57
|
-
|
57
|
+
Gem::PackageTask.new(s) { |task| }
|
58
58
|
end
|
59
59
|
|
60
60
|
|