buildr 1.3.5-x86-mswin32 → 1.4.0-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.
Files changed (151) hide show
  1. data/CHANGELOG +153 -8
  2. data/README.rdoc +1 -1
  3. data/addon/buildr/antlr.rb +5 -5
  4. data/addon/buildr/drb.rb +18 -18
  5. data/addon/buildr/hibernate.rb +18 -14
  6. data/addon/buildr/javacc.rb +4 -4
  7. data/addon/buildr/jetty.rb +5 -5
  8. data/addon/buildr/nailgun.rb +23 -23
  9. data/addon/buildr/openjpa.rb +1 -1
  10. data/addon/buildr/org/apache/buildr/BuildrNail$Main.class +0 -0
  11. data/addon/buildr/org/apache/buildr/BuildrNail.class +0 -0
  12. data/addon/buildr/org/apache/buildr/JettyWrapper$1.class +0 -0
  13. data/addon/buildr/org/apache/buildr/JettyWrapper$BuildrHandler.class +0 -0
  14. data/addon/buildr/org/apache/buildr/JettyWrapper.class +0 -0
  15. data/addon/buildr/protobuf.rb +75 -0
  16. data/addon/buildr/xmlbeans.rb +5 -5
  17. data/buildr.buildfile +2 -2
  18. data/buildr.gemspec +8 -7
  19. data/doc/_layouts/default.html +2 -2
  20. data/doc/artifacts.textile +4 -4
  21. data/doc/building.textile +35 -3
  22. data/doc/contributing.textile +5 -0
  23. data/doc/download.textile +16 -5
  24. data/doc/extending.textile +38 -12
  25. data/doc/installing.textile +6 -5
  26. data/doc/languages.textile +182 -42
  27. data/doc/more_stuff.textile +2 -2
  28. data/doc/packaging.textile +14 -15
  29. data/doc/projects.textile +7 -2
  30. data/doc/quick_start.textile +4 -4
  31. data/doc/scripts/buildr-git.rb +63 -63
  32. data/doc/scripts/gitflow.rb +21 -21
  33. data/doc/settings_profiles.textile +9 -2
  34. data/doc/testing.textile +16 -5
  35. data/etc/KEYS +38 -0
  36. data/lib/buildr.rb +1 -1
  37. data/lib/buildr/core.rb +1 -0
  38. data/lib/buildr/core/application.rb +33 -27
  39. data/lib/buildr/core/build.rb +41 -28
  40. data/lib/buildr/core/cc.rb +172 -0
  41. data/lib/buildr/core/checks.rb +1 -1
  42. data/lib/buildr/core/common.rb +7 -6
  43. data/lib/buildr/core/compile.rb +7 -8
  44. data/lib/buildr/core/doc.rb +263 -0
  45. data/lib/buildr/core/environment.rb +6 -6
  46. data/lib/buildr/core/filter.rb +77 -35
  47. data/lib/buildr/core/generate.rb +7 -7
  48. data/lib/buildr/core/help.rb +1 -1
  49. data/lib/buildr/core/osx.rb +6 -6
  50. data/lib/buildr/core/progressbar.rb +4 -4
  51. data/lib/buildr/core/project.rb +144 -36
  52. data/lib/buildr/core/shell.rb +34 -34
  53. data/lib/buildr/core/test.rb +89 -20
  54. data/lib/buildr/core/transports.rb +8 -7
  55. data/lib/buildr/core/util.rb +77 -23
  56. data/lib/buildr/groovy/bdd.rb +5 -5
  57. data/lib/buildr/groovy/compiler.rb +19 -15
  58. data/lib/buildr/groovy/shell.rb +6 -6
  59. data/lib/buildr/ide/eclipse.rb +148 -75
  60. data/lib/buildr/ide/eclipse/java.rb +3 -3
  61. data/lib/buildr/ide/eclipse/plugin.rb +8 -5
  62. data/lib/buildr/ide/eclipse/scala.rb +4 -2
  63. data/lib/buildr/ide/idea.rb +2 -2
  64. data/lib/buildr/ide/idea7x.rb +23 -4
  65. data/lib/buildr/java.rb +1 -0
  66. data/lib/buildr/java/ant.rb +4 -4
  67. data/lib/buildr/java/bdd.rb +51 -54
  68. data/lib/buildr/java/cobertura.rb +57 -35
  69. data/lib/buildr/java/commands.rb +14 -5
  70. data/lib/buildr/java/compiler.rb +3 -217
  71. data/lib/buildr/java/deprecated.rb +4 -4
  72. data/lib/buildr/java/doc.rb +70 -0
  73. data/lib/buildr/java/emma.rb +22 -22
  74. data/lib/buildr/java/jruby.rb +4 -4
  75. data/lib/buildr/java/jtestr_runner.rb.erb +27 -25
  76. data/lib/buildr/java/org/apache/buildr/JavaTestFilter.class +0 -0
  77. data/lib/buildr/java/org/apache/buildr/JavaTestFilter.java +8 -3
  78. data/lib/buildr/java/packaging.rb +30 -29
  79. data/lib/buildr/java/pom.rb +4 -4
  80. data/lib/buildr/java/rjb.rb +6 -6
  81. data/lib/buildr/java/test_result.rb +61 -85
  82. data/lib/buildr/java/tests.rb +44 -27
  83. data/lib/buildr/java/version_requirement.rb +8 -8
  84. data/lib/buildr/packaging/archive.rb +55 -22
  85. data/lib/buildr/packaging/artifact.rb +75 -36
  86. data/lib/buildr/packaging/artifact_namespace.rb +90 -78
  87. data/lib/buildr/packaging/artifact_search.rb +5 -5
  88. data/lib/buildr/packaging/gems.rb +11 -7
  89. data/lib/buildr/packaging/package.rb +10 -7
  90. data/lib/buildr/packaging/tar.rb +14 -14
  91. data/lib/buildr/packaging/version_requirement.rb +30 -10
  92. data/lib/buildr/packaging/ziptask.rb +51 -13
  93. data/lib/buildr/scala.rb +1 -0
  94. data/lib/buildr/scala/bdd.rb +25 -20
  95. data/lib/buildr/scala/compiler.rb +87 -40
  96. data/lib/buildr/scala/doc.rb +106 -0
  97. data/lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.class +0 -0
  98. data/lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java +57 -0
  99. data/lib/buildr/scala/shell.rb +14 -9
  100. data/lib/buildr/scala/tests.rb +33 -26
  101. data/lib/buildr/shell.rb +33 -33
  102. data/rakelib/all-in-one.rake +113 -0
  103. data/rakelib/checks.rake +1 -1
  104. data/rakelib/doc.rake +7 -0
  105. data/rakelib/package.rake +1 -1
  106. data/rakelib/release.rake +9 -6
  107. data/rakelib/rspec.rake +26 -7
  108. data/rakelib/setup.rake +15 -3
  109. data/rakelib/stage.rake +18 -11
  110. data/spec/addon/drb_spec.rb +25 -25
  111. data/spec/core/application_spec.rb +111 -21
  112. data/spec/core/build_spec.rb +16 -15
  113. data/spec/core/cc_spec.rb +174 -0
  114. data/spec/core/checks_spec.rb +34 -34
  115. data/spec/core/common_spec.rb +51 -5
  116. data/spec/core/compile_spec.rb +89 -14
  117. data/spec/core/extension_spec.rb +127 -19
  118. data/spec/core/generate_spec.rb +2 -2
  119. data/spec/core/project_spec.rb +10 -10
  120. data/spec/core/test_spec.rb +144 -35
  121. data/spec/core/transport_spec.rb +8 -8
  122. data/spec/core/util_spec.rb +63 -5
  123. data/spec/groovy/bdd_spec.rb +5 -5
  124. data/spec/groovy/compiler_spec.rb +29 -18
  125. data/spec/ide/eclipse_spec.rb +185 -9
  126. data/spec/ide/idea7x_spec.rb +22 -10
  127. data/spec/java/ant_spec.rb +9 -5
  128. data/spec/java/bdd_spec.rb +29 -37
  129. data/spec/java/cobertura_spec.rb +12 -12
  130. data/spec/java/commands_spec.rb +34 -0
  131. data/spec/java/compiler_spec.rb +53 -53
  132. data/spec/java/emma_spec.rb +11 -11
  133. data/spec/java/java_spec.rb +10 -10
  134. data/spec/java/packaging_spec.rb +67 -20
  135. data/spec/java/test_coverage_helper.rb +18 -18
  136. data/spec/java/tests_spec.rb +13 -9
  137. data/spec/packaging/archive_spec.rb +187 -20
  138. data/spec/packaging/artifact_namespace_spec.rb +172 -83
  139. data/spec/packaging/artifact_spec.rb +83 -18
  140. data/spec/packaging/packaging_spec.rb +41 -14
  141. data/spec/sandbox.rb +23 -12
  142. data/spec/scala/bdd_spec.rb +13 -8
  143. data/spec/scala/compiler_spec.rb +18 -13
  144. data/spec/scala/scala.rb +3 -3
  145. data/spec/scala/tests_spec.rb +46 -24
  146. data/spec/spec_helpers.rb +28 -10
  147. data/spec/version_requirement_spec.rb +25 -11
  148. metadata +149 -133
  149. data/lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner$.class +0 -0
  150. data/lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.scala +0 -35
  151. data/rakelib/stage.rake~ +0 -213
@@ -15,12 +15,17 @@
15
15
 
16
16
 
17
17
  require File.join(File.dirname(__FILE__), '../spec_helpers')
18
- require 'buildr/scala'
19
18
 
20
19
  # need to test both with and without SCALA_HOME
21
20
  share_as :ScalacCompiler do
21
+
22
+ before(:each) do
23
+ # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
24
+ Buildr.settings.build['scala.version'] = "2.7.7"
25
+ end
26
+
22
27
  it 'should identify itself from source directories' do
23
- write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
28
+ write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
24
29
  define('foo').compile.compiler.should eql(:scalac)
25
30
  end
26
31
 
@@ -65,7 +70,7 @@ share_as :ScalacCompiler do
65
70
  package(:jar)
66
71
  end
67
72
  end
68
-
73
+
69
74
  it 'should compile a simple .scala file into a .class file' do
70
75
  define_test1_project
71
76
  task('test1:compile').invoke
@@ -115,24 +120,24 @@ describe 'scala compiler (installed in SCALA_HOME)' do
115
120
  it 'requires present SCALA_HOME' do
116
121
  ENV['SCALA_HOME'].should_not be_nil
117
122
  end
118
-
123
+
119
124
  it_should_behave_like ScalacCompiler
120
125
  end
121
126
 
122
127
 
123
128
  describe 'scala compiler (downloaded from repository)' do
124
129
  old_home = ENV['SCALA_HOME']
125
-
130
+
126
131
  before :all do
127
132
  ENV['SCALA_HOME'] = nil
128
133
  end
129
-
134
+
130
135
  it 'requires absent SCALA_HOME' do
131
136
  ENV['SCALA_HOME'].should be_nil
132
137
  end
133
-
138
+
134
139
  it_should_behave_like ScalacCompiler
135
-
140
+
136
141
  after :all do
137
142
  ENV['SCALA_HOME'] = old_home
138
143
  end
@@ -152,28 +157,28 @@ describe 'scalac compiler options' do
152
157
  compile_task.options.warnings.should be_false
153
158
  end
154
159
 
155
- it 'should set wranings option to true when running with --verbose option' do
160
+ it 'should set warnings option to true when running with --verbose option' do
156
161
  verbose true
157
162
  compile_task.options.warnings.should be_true
158
163
  end
159
164
 
160
165
  it 'should use -nowarn argument when warnings is false' do
161
166
  compile_task.using(:warnings=>false)
162
- scalac_args.should include('-nowarn')
167
+ scalac_args.should include('-nowarn')
163
168
  end
164
169
 
165
170
  it 'should not use -nowarn argument when warnings is true' do
166
171
  compile_task.using(:warnings=>true)
167
- scalac_args.should_not include('-nowarn')
172
+ scalac_args.should_not include('-nowarn')
168
173
  end
169
174
 
170
175
  it 'should not use -verbose argument by default' do
171
- scalac_args.should_not include('-verbose')
176
+ scalac_args.should_not include('-verbose')
172
177
  end
173
178
 
174
179
  it 'should use -verbose argument when running with --trace option' do
175
180
  trace true
176
- scalac_args.should include('-verbose')
181
+ scalac_args.should include('-verbose')
177
182
  end
178
183
 
179
184
  it 'should set debug option to true by default' do
data/spec/scala/scala.rb CHANGED
@@ -18,9 +18,9 @@ require File.join(File.dirname(__FILE__), '../spec_helpers')
18
18
 
19
19
  describe 'scala' do
20
20
  # Specific version of Scala required for specs
21
- required_version = '2.7.3'
22
- scala_version_str = "version 2.7.3.final"
23
-
21
+ required_version = '2.7.7'
22
+ scala_version_str = "2.7.7.final"
23
+
24
24
  it 'should automatically add the remote scala-tools.org repository' do
25
25
  # NOTE: the sandbox environment clears "repositories.remote" so we can't
26
26
  # test for this spec right now.
@@ -15,7 +15,6 @@
15
15
 
16
16
 
17
17
  require File.join(File.dirname(__FILE__), '../spec_helpers')
18
- require 'buildr/scala'
19
18
 
20
19
  # TODO's
21
20
  # -test passing System props
@@ -26,6 +25,12 @@ require 'buildr/scala'
26
25
 
27
26
 
28
27
  describe Buildr::Scala::ScalaTest do
28
+
29
+ before(:each) do
30
+ # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
31
+ Buildr.settings.build['scala.version'] = "2.7.7"
32
+ end
33
+
29
34
  it 'should be the default test framework when test cases are in Scala' do
30
35
  write 'src/test/scala/com/example/MySuite.scala', <<-SCALA
31
36
  package com.example
@@ -113,7 +118,7 @@ describe Buildr::Scala::ScalaTest do
113
118
  val sum = 1 + 1
114
119
  assert(sum === 2)
115
120
  }
116
-
121
+
117
122
  class InnerSuite extends FunSuite {
118
123
  test("addition") {
119
124
  val sum = 1 + 1
@@ -161,6 +166,21 @@ describe Buildr::Scala::ScalaTest do
161
166
  project('foo').test.failed_tests.should include('FailingSuite')
162
167
  end
163
168
 
169
+ it 'should report to reports/scalatest/TEST-TestSuiteName.xml' do
170
+ write 'src/test/scala/PassingSuite.scala', <<-SCALA
171
+ class PassingSuite extends org.scalatest.FunSuite {
172
+ test("passing") {
173
+ assert(true)
174
+ }
175
+ }
176
+ SCALA
177
+ define 'foo' do
178
+ test.report_to.should be(file('reports/scalatest'))
179
+ end
180
+ project('foo').test.invoke
181
+ project('foo').file('reports/scalatest/TEST-PassingSuite.xml').should exist
182
+ end
183
+
164
184
  it 'should report to reports/scalatest/TEST-TestSuiteName.txt' do
165
185
  write 'src/test/scala/PassingSuite.scala', <<-SCALA
166
186
  class PassingSuite extends org.scalatest.FunSuite {
@@ -180,15 +200,16 @@ describe Buildr::Scala::ScalaTest do
180
200
  write 'src/test/scala/PropertyTestSuite.scala', <<-SCALA
181
201
  import org.scalatest._
182
202
  class PropertyTestSuite extends FunSuite {
183
- var properties = Map[String, Any]()
203
+ var configMap = Map[String, Any]()
184
204
  test("testProperty") {
185
- assert(properties("name") === "value")
205
+ assert(configMap("name") === "value")
186
206
  }
187
-
207
+
188
208
  protected override def runTests(testName: Option[String], reporter: Reporter, stopper: Stopper,
189
- includes: Set[String], excludes: Set[String], properties: Map[String, Any]) {
190
- this.properties = properties;
191
- super.runTests(testName, reporter, stopper, includes, excludes, properties)
209
+ filter: Filter, configMap: Map[String, Any],
210
+ distributor: Option[Distributor], tracker: Tracker) {
211
+ this.configMap = configMap
212
+ super.runTests(testName, reporter, stopper, filter, configMap, distributor, tracker)
192
213
  }
193
214
  }
194
215
  SCALA
@@ -198,54 +219,55 @@ describe Buildr::Scala::ScalaTest do
198
219
 
199
220
  it 'should run with ScalaCheck automatic test case generation' do
200
221
  write 'src/test/scala/MySuite.scala', <<-SCALA
201
- import org.scalatest.prop.PropSuite
222
+ import org.scalatest.FunSuite
223
+ import org.scalatest.prop.Checkers
202
224
  import org.scalacheck.Arbitrary._
203
225
  import org.scalacheck.Prop._
204
-
205
- class MySuite extends PropSuite {
206
-
226
+
227
+ class MySuite extends FunSuite with Checkers {
228
+
207
229
  test("list concatenation") {
208
230
  val x = List(1, 2, 3)
209
231
  val y = List(4, 5, 6)
210
232
  assert(x ::: y === List(1, 2, 3, 4, 5, 6))
211
233
  check((a: List[Int], b: List[Int]) => a.size + b.size == (a ::: b).size)
212
234
  }
213
-
214
- test(
215
- "list concatenation using a test method",
216
- (a: List[Int], b: List[Int]) => a.size + b.size == (a ::: b).size
217
- )
235
+
236
+ test("list concatenation using a test method") {
237
+ check((a: List[Int], b: List[Int]) => a.size + b.size == (a ::: b).size)
238
+ }
218
239
  }
219
240
  SCALA
220
241
  define('foo')
221
242
  project('foo').test.invoke
222
243
  project('foo').test.passed_tests.should include('MySuite')
223
244
  end
224
-
245
+
225
246
  it 'should fail if ScalaCheck test case fails' do
226
247
  write 'src/test/scala/StringSuite.scala', <<-SCALA
227
- import org.scalatest.prop.PropSuite
248
+ import org.scalatest.FunSuite
249
+ import org.scalatest.prop.Checkers
228
250
  import org.scalacheck.Arbitrary._
229
251
  import org.scalacheck.Prop._
230
252
 
231
- class StringSuite extends PropSuite {
253
+ class StringSuite extends FunSuite with Checkers {
232
254
  test("startsWith") {
233
255
  check( (a: String, b: String) => (a+b).startsWith(a) )
234
256
  }
235
-
257
+
236
258
  test("endsWith") {
237
259
  check( (a: String, b: String) => (a+b).endsWith(b) )
238
260
  }
239
-
261
+
240
262
  // Is this really always true?
241
263
  test("concat") {
242
264
  check( (a: String, b: String) => (a+b).length > a.length && (a+b).length > b.length )
243
265
  }
244
-
266
+
245
267
  test("substring2") {
246
268
  check( (a: String, b: String) => (a+b).substring(a.length) == b )
247
269
  }
248
-
270
+
249
271
  test("substring3") {
250
272
  check( (a: String, b: String, c: String) =>
251
273
  (a+b+c).substring(a.length, a.length+b.length) == b )
data/spec/spec_helpers.rb CHANGED
@@ -22,8 +22,9 @@ unless defined?(SpecHelpers)
22
22
 
23
23
  # For testing we use the gem requirements specified on the buildr.gemspec
24
24
  spec = Gem::Specification.load(File.expand_path('../buildr.gemspec', File.dirname(__FILE__)))
25
- spec.dependencies.each { |dep| gem dep.name, dep.version_requirements.to_s }
26
-
25
+ # Dependency.version_requirements deprecated in rubygems 1.3.6
26
+ spec.dependencies.each { |dep| gem dep.name, (dep.respond_to?(:requirement) ? dep.requirement.to_s : dep.version_requirements.to_s) }
27
+
27
28
  # Make sure to load from these paths first, we don't want to load any
28
29
  # code from Gem library.
29
30
  $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__)),
@@ -40,7 +41,7 @@ unless defined?(SpecHelpers)
40
41
 
41
42
  # Give a chance for plugins to do a few things before requiring the sandbox.
42
43
  include SandboxHook if defined?(SandboxHook)
43
-
44
+
44
45
  require File.expand_path('sandbox', File.dirname(__FILE__))
45
46
 
46
47
  module SpecHelpers
@@ -56,7 +57,7 @@ unless defined?(SpecHelpers)
56
57
  end
57
58
  end
58
59
  end
59
-
60
+
60
61
  class << Buildr.application
61
62
  alias :deprecated_without_capture :deprecated
62
63
  def deprecated(message)
@@ -118,6 +119,23 @@ unless defined?(SpecHelpers)
118
119
  MessageWithSeverityMatcher.new :puts, message
119
120
  end
120
121
 
122
+ # Yields a block that should try exiting the application.
123
+ # Accepts
124
+ #
125
+ # For example:
126
+ # test_exit(1) { puts "Hello" ; exit(1) }.should show("Hello")
127
+ #
128
+ def test_exit(status = nil)
129
+ return lambda {
130
+ begin
131
+ yield
132
+ raise "Exit was not called!"
133
+ rescue SystemExit => e
134
+ raise "Exit status incorrect! Expected: #{status}, got #{e.status}" if status && (e.status != status)
135
+ end
136
+ }
137
+ end
138
+
121
139
  class ::Rake::Task
122
140
  alias :execute_without_a_record :execute
123
141
  def execute(args)
@@ -151,7 +169,7 @@ unless defined?(SpecHelpers)
151
169
  "Expected the tasks #{expected} to not run, but they all ran."
152
170
  else
153
171
  "Expected the tasks #{expected} to not run, and all but #{remaining} ran."
154
- end
172
+ end
155
173
  end
156
174
 
157
175
  def but_not(*tasks)
@@ -226,7 +244,7 @@ unless defined?(SpecHelpers)
226
244
  "URI with path matching #{@expression}"
227
245
  end
228
246
  end
229
-
247
+
230
248
  # Matches a parsed URI's path against the given regular expression
231
249
  def uri(re)
232
250
  UriPathMatcher.new(re)
@@ -256,16 +274,16 @@ unless defined?(SpecHelpers)
256
274
  AbsolutePathMatcher.new(path)
257
275
  end
258
276
 
259
-
277
+
260
278
  # Value covered by range. For example:
261
279
  # (1..5).should cover(3)
262
280
  def cover(value)
263
281
  simple_matcher :cover do |given|
264
- value >= given.min && value <= given.max
282
+ value >= given.min && value <= given.max
265
283
  end
266
284
  end
267
285
 
268
-
286
+
269
287
  def suppress_stdout
270
288
  stdout = $stdout
271
289
  $stdout = StringIO.new
@@ -308,7 +326,7 @@ unless defined?(SpecHelpers)
308
326
  yield
309
327
  ensure
310
328
  Buildr.application.instance_eval { @original_dir = original_dir }
311
- end
329
+ end
312
330
  end
313
331
 
314
332
 
@@ -20,8 +20,8 @@ describe Buildr::VersionRequirement, '.create' do
20
20
  def create(str)
21
21
  Buildr::VersionRequirement.create(str)
22
22
  end
23
-
24
- it 'should complain on invalid input' do
23
+
24
+ it 'should complain on invalid input' do
25
25
  lambda { create }.should raise_error(Exception)
26
26
  lambda { create('%') }.should raise_error(Exception, /invalid character/)
27
27
  lambda { create('1#{0}') }.should raise_error(Exception, /invalid character/)
@@ -30,16 +30,16 @@ describe Buildr::VersionRequirement, '.create' do
30
30
  lambda { create('1.0') }.should_not raise_error(Exception)
31
31
  lambda { create('1.0rc3') }.should_not raise_error(Exception)
32
32
  end
33
-
33
+
34
34
  it 'should allow versions using hyphen' do
35
35
  lambda { create('1.0-rc3') }.should_not raise_error(Exception)
36
36
  end
37
37
 
38
- it 'should create a single version requirement' do
38
+ it 'should create a single version requirement' do
39
39
  create('1.0').should_not be_composed
40
40
  end
41
41
 
42
- it 'should create a composed version requirement' do
42
+ it 'should create a composed version requirement' do
43
43
  create('1.0 | 2.1').should be_composed
44
44
  end
45
45
  end
@@ -61,13 +61,13 @@ describe Buildr::VersionRequirement, '#satisfied_by?' do
61
61
  should_satisfy '=1.0', %w(1 1.0), %w(1.1 0.1)
62
62
  should_satisfy '= 1.0', %w(1 1.0), %w(1.1 0.1)
63
63
  should_satisfy '!= 1.0', %w(0.9 1.1 2), %w(1 1.0 1.0.0)
64
-
64
+
65
65
  should_satisfy '>1.0', %w(1.0.1), %w(1 1.0 0.1)
66
66
  should_satisfy '>=1.0', %w(1.0.1 1 1.0), %w(0.9)
67
67
 
68
68
  should_satisfy '<1.0', %w(0.9 0.9.9), %w(1 1.0 1.1 2)
69
69
  should_satisfy '<=1.0', %w(0.9 0.9.9 1 1.0), %w(1.1 2)
70
-
70
+
71
71
  should_satisfy '~> 1.2.3', %w(1.2.3 1.2.3.4 1.2.4), %w(1.2.1 0.9 1.4 2)
72
72
  end
73
73
 
@@ -91,7 +91,7 @@ describe Buildr::VersionRequirement, '#satisfied_by?' do
91
91
  it 'should assume logic and if missing operator between expressions' do
92
92
  should_satisfy '>1.5 <2.0', %w(1.6 1.9), %w(1.5 2 2.0)
93
93
  end
94
-
94
+
95
95
  it 'should allow combining logic operators' do
96
96
  should_satisfy '>1.0 | <2.0 | =3.0', %w(1.5 3.0 1 2 4)
97
97
  should_satisfy '>1.0 & <2.0 | =3.0', %w(1.3 3.0), %w(1 2)
@@ -99,7 +99,7 @@ describe Buildr::VersionRequirement, '#satisfied_by?' do
99
99
  should_satisfy '~>1.1 | ~>1.3 | ~>1.5 | 2.0', %w(2 1.5.6 1.1.2 1.1.3), %w(1.0.9 0.5 2.2.1)
100
100
  should_satisfy 'not(2) | 1', %w(1 3), %w(2)
101
101
  end
102
-
102
+
103
103
  it 'should allow using parens to group logic expressions' do
104
104
  should_satisfy '(1.0)', %w(1 1.0), %w(0.9 1.1)
105
105
  should_satisfy '!( !(1.0) )', %w(1 1.0), %w(0.9 1.1)
@@ -110,13 +110,13 @@ end
110
110
  =end
111
111
 
112
112
  describe Buildr::VersionRequirement, '#default' do
113
- it 'should return nil if missing default requirement' do
113
+ it 'should return nil if missing default requirement' do
114
114
  Buildr::VersionRequirement.create('>1').default.should be_nil
115
115
  Buildr::VersionRequirement.create('<1').default.should be_nil
116
116
  Buildr::VersionRequirement.create('!1').default.should be_nil
117
117
  Buildr::VersionRequirement.create('!<=1').default.should be_nil
118
118
  end
119
-
119
+
120
120
  it 'should return the last version with a = requirement' do
121
121
  Buildr::VersionRequirement.create('1').default.should == '1'
122
122
  Buildr::VersionRequirement.create('=1').default.should == '1'
@@ -127,3 +127,17 @@ describe Buildr::VersionRequirement, '#default' do
127
127
  Buildr::VersionRequirement.create('1 & 2 | 3').default.should == '3'
128
128
  end
129
129
  end
130
+
131
+ describe Buildr::VersionRequirement, '#version?' do
132
+ it 'should identify valid versions' do
133
+ Buildr::VersionRequirement.version?('1').should be_true
134
+ Buildr::VersionRequirement.version?('1a').should be_true
135
+ Buildr::VersionRequirement.version?('1.0').should be_true
136
+ Buildr::VersionRequirement.version?('11.0').should be_true
137
+ Buildr::VersionRequirement.version?(' 11.0 ').should be_true
138
+ Buildr::VersionRequirement.version?('11.0-alpha').should be_true
139
+
140
+ Buildr::VersionRequirement.version?('a').should be_false
141
+ Buildr::VersionRequirement.version?('a1').should be_false
142
+ end
143
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: buildr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.5
4
+ version: 1.4.0
5
5
  platform: x86-mswin32
6
6
  authors:
7
7
  - Apache Buildr
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-10-07 00:00:00 -07:00
12
+ date: 2010-06-18 00:00:00 -07:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -72,6 +72,16 @@ dependencies:
72
72
  - !ruby/object:Gem::Version
73
73
  version: 1.5.1
74
74
  version:
75
+ - !ruby/object:Gem::Dependency
76
+ name: json_pure
77
+ type: :runtime
78
+ version_requirement:
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "="
82
+ - !ruby/object:Gem::Version
83
+ version: 1.4.0
84
+ version:
75
85
  - !ruby/object:Gem::Dependency
76
86
  name: rubyforge
77
87
  type: :runtime
@@ -80,7 +90,7 @@ dependencies:
80
90
  requirements:
81
91
  - - "="
82
92
  - !ruby/object:Gem::Version
83
- version: 1.0.5
93
+ version: 2.0.3
84
94
  version:
85
95
  - !ruby/object:Gem::Dependency
86
96
  name: hoe
@@ -100,7 +110,7 @@ dependencies:
100
110
  requirements:
101
111
  - - "="
102
112
  - !ruby/object:Gem::Version
103
- version: 1.1.6
113
+ version: 1.2.5
104
114
  version:
105
115
  - !ruby/object:Gem::Dependency
106
116
  name: Antwrap
@@ -118,9 +128,9 @@ dependencies:
118
128
  version_requirement:
119
129
  version_requirements: !ruby/object:Gem::Requirement
120
130
  requirements:
121
- - - "="
131
+ - - ">="
122
132
  - !ruby/object:Gem::Version
123
- version: 1.2.8
133
+ version: 1.2.9
124
134
  version:
125
135
  - !ruby/object:Gem::Dependency
126
136
  name: xml-simple
@@ -160,182 +170,188 @@ extra_rdoc_files:
160
170
  - LICENSE
161
171
  - NOTICE
162
172
  files:
163
- - addon/buildr/nailgun.rb
164
- - addon/buildr/openjpa.rb
165
- - addon/buildr/jibx.rb
166
- - addon/buildr/jdepend.rb
167
- - addon/buildr/emma.rb
168
- - addon/buildr/jetty.rb
173
+ - addon/buildr/antlr.rb
169
174
  - addon/buildr/cobertura.rb
170
- - addon/buildr/javacc.rb
175
+ - addon/buildr/drb.rb
176
+ - addon/buildr/emma.rb
171
177
  - addon/buildr/hibernate.rb
178
+ - addon/buildr/javacc.rb
179
+ - addon/buildr/jdepend.rb
180
+ - addon/buildr/jetty.rb
181
+ - addon/buildr/jibx.rb
182
+ - addon/buildr/nailgun.rb
183
+ - addon/buildr/openjpa.rb
172
184
  - addon/buildr/org/apache/buildr/BuildrNail$Main.class
173
- - addon/buildr/org/apache/buildr/JettyWrapper.java
174
- - addon/buildr/org/apache/buildr/JettyWrapper.class
175
- - addon/buildr/org/apache/buildr/JettyWrapper$BuildrHandler.class
185
+ - addon/buildr/org/apache/buildr/BuildrNail.class
176
186
  - addon/buildr/org/apache/buildr/BuildrNail.java
177
187
  - addon/buildr/org/apache/buildr/JettyWrapper$1.class
178
- - addon/buildr/org/apache/buildr/BuildrNail.class
179
- - addon/buildr/drb.rb
180
- - addon/buildr/antlr.rb
188
+ - addon/buildr/org/apache/buildr/JettyWrapper$BuildrHandler.class
189
+ - addon/buildr/org/apache/buildr/JettyWrapper.class
190
+ - addon/buildr/org/apache/buildr/JettyWrapper.java
191
+ - addon/buildr/protobuf.rb
181
192
  - addon/buildr/xmlbeans.rb
182
193
  - bin/buildr
183
- - doc/_layouts/preface.html
194
+ - doc/_config.yml
184
195
  - doc/_layouts/default.html
196
+ - doc/_layouts/preface.html
197
+ - doc/artifacts.textile
198
+ - doc/building.textile
185
199
  - doc/contributing.textile
186
- - doc/installing.textile
187
- - doc/languages.textile
188
- - doc/packaging.textile
189
- - doc/scripts/install-jruby.sh
190
- - doc/scripts/install-osx.sh
191
- - doc/scripts/gitflow.rb
192
- - doc/scripts/buildr-git.rb
193
- - doc/scripts/install-linux.sh
194
- - doc/_config.yml
195
- - doc/projects.textile
196
- - doc/preface.textile
197
- - doc/css/syntax.css
198
200
  - doc/css/default.css
199
201
  - doc/css/print.css
200
- - doc/index.textile
201
- - doc/settings_profiles.textile
202
+ - doc/css/syntax.css
203
+ - doc/download.textile
204
+ - doc/extending.textile
205
+ - doc/images/1442160941-frontcover.jpg
202
206
  - doc/images/asf-logo.gif
203
- - doc/images/growl-icon.tiff
204
- - doc/images/zbuildr.png
205
- - doc/images/buildr-hires.png
206
207
  - doc/images/asf-logo.png
208
+ - doc/images/buildr-hires.png
209
+ - doc/images/buildr.png
210
+ - doc/images/favicon.png
211
+ - doc/images/growl-icon.tiff
212
+ - doc/images/note.png
207
213
  - doc/images/project-structure.png
208
214
  - doc/images/tip.png
209
- - doc/images/favicon.png
215
+ - doc/images/zbuildr.png
210
216
  - doc/images/zbuildr.tif
211
- - doc/images/1442160941-frontcover.jpg
212
- - doc/images/note.png
213
- - doc/images/buildr.png
214
- - doc/extending.textile
215
- - doc/artifacts.textile
216
- - doc/testing.textile
217
- - doc/download.textile
218
- - doc/quick_start.textile
219
- - doc/building.textile
220
- - doc/more_stuff.textile
217
+ - doc/index.textile
218
+ - doc/installing.textile
219
+ - doc/languages.textile
221
220
  - doc/mailing_lists.textile
221
+ - doc/more_stuff.textile
222
+ - doc/packaging.textile
223
+ - doc/preface.textile
224
+ - doc/projects.textile
225
+ - doc/quick_start.textile
226
+ - doc/scripts/buildr-git.rb
227
+ - doc/scripts/gitflow.rb
228
+ - doc/scripts/install-jruby.sh
229
+ - doc/scripts/install-linux.sh
230
+ - doc/scripts/install-osx.sh
231
+ - doc/settings_profiles.textile
232
+ - doc/testing.textile
222
233
  - etc/KEYS
223
- - lib/buildr.rb
224
- - lib/buildr/scala.rb
225
- - lib/buildr/ide.rb
226
- - lib/buildr/resources/buildr.icns
234
+ - lib/buildr/core/application.rb
235
+ - lib/buildr/core/build.rb
236
+ - lib/buildr/core/cc.rb
237
+ - lib/buildr/core/checks.rb
238
+ - lib/buildr/core/common.rb
239
+ - lib/buildr/core/compile.rb
240
+ - lib/buildr/core/doc.rb
241
+ - lib/buildr/core/environment.rb
242
+ - lib/buildr/core/filter.rb
243
+ - lib/buildr/core/generate.rb
244
+ - lib/buildr/core/help.rb
245
+ - lib/buildr/core/osx.rb
246
+ - lib/buildr/core/progressbar.rb
247
+ - lib/buildr/core/project.rb
248
+ - lib/buildr/core/shell.rb
249
+ - lib/buildr/core/test.rb
250
+ - lib/buildr/core/transports.rb
251
+ - lib/buildr/core/util.rb
227
252
  - lib/buildr/core.rb
228
- - lib/buildr/groovy/compiler.rb
229
253
  - lib/buildr/groovy/bdd.rb
254
+ - lib/buildr/groovy/compiler.rb
230
255
  - lib/buildr/groovy/shell.rb
231
- - lib/buildr/java/version_requirement.rb
232
- - lib/buildr/java/test_result.rb
233
- - lib/buildr/java/deprecated.rb
234
- - lib/buildr/java/compiler.rb
235
- - lib/buildr/java/tests.rb
236
- - lib/buildr/java/pom.rb
256
+ - lib/buildr/groovy.rb
257
+ - lib/buildr/ide/eclipse/java.rb
258
+ - lib/buildr/ide/eclipse/plugin.rb
259
+ - lib/buildr/ide/eclipse/scala.rb
260
+ - lib/buildr/ide/eclipse.rb
261
+ - lib/buildr/ide/idea.ipr.template
262
+ - lib/buildr/ide/idea.rb
263
+ - lib/buildr/ide/idea7x.ipr.template
264
+ - lib/buildr/ide/idea7x.rb
265
+ - lib/buildr/ide.rb
237
266
  - lib/buildr/java/ant.rb
238
- - lib/buildr/java/jruby.rb
239
- - lib/buildr/java/emma.rb
240
- - lib/buildr/java/jtestr_runner.rb.erb
241
267
  - lib/buildr/java/bdd.rb
268
+ - lib/buildr/java/cobertura.rb
242
269
  - lib/buildr/java/commands.rb
270
+ - lib/buildr/java/compiler.rb
271
+ - lib/buildr/java/deprecated.rb
272
+ - lib/buildr/java/doc.rb
273
+ - lib/buildr/java/emma.rb
274
+ - lib/buildr/java/jruby.rb
275
+ - lib/buildr/java/jtestr_runner.rb.erb
276
+ - lib/buildr/java/org/apache/buildr/JavaTestFilter.class
277
+ - lib/buildr/java/org/apache/buildr/JavaTestFilter.java
243
278
  - lib/buildr/java/packaging.rb
244
- - lib/buildr/java/cobertura.rb
279
+ - lib/buildr/java/pom.rb
245
280
  - lib/buildr/java/rjb.rb
246
- - lib/buildr/java/org/apache/buildr/JavaTestFilter.java
247
- - lib/buildr/java/org/apache/buildr/JavaTestFilter.class
281
+ - lib/buildr/java/test_result.rb
282
+ - lib/buildr/java/tests.rb
283
+ - lib/buildr/java/version_requirement.rb
284
+ - lib/buildr/java.rb
248
285
  - lib/buildr/packaging/archive.rb
249
- - lib/buildr/packaging/version_requirement.rb
250
- - lib/buildr/packaging/tar.rb
251
- - lib/buildr/packaging/ziptask.rb
252
- - lib/buildr/packaging/artifact_namespace.rb
253
- - lib/buildr/packaging/zip.rb
254
286
  - lib/buildr/packaging/artifact.rb
287
+ - lib/buildr/packaging/artifact_namespace.rb
255
288
  - lib/buildr/packaging/artifact_search.rb
256
- - lib/buildr/packaging/package.rb
257
289
  - lib/buildr/packaging/gems.rb
258
- - lib/buildr/scala/compiler.rb
259
- - lib/buildr/scala/tests.rb
290
+ - lib/buildr/packaging/package.rb
291
+ - lib/buildr/packaging/tar.rb
292
+ - lib/buildr/packaging/version_requirement.rb
293
+ - lib/buildr/packaging/zip.rb
294
+ - lib/buildr/packaging/ziptask.rb
295
+ - lib/buildr/packaging.rb
296
+ - lib/buildr/resources/buildr.icns
260
297
  - lib/buildr/scala/bdd.rb
298
+ - lib/buildr/scala/compiler.rb
299
+ - lib/buildr/scala/doc.rb
261
300
  - lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.class
262
- - lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.scala
263
- - lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner$.class
301
+ - lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java
264
302
  - lib/buildr/scala/shell.rb
265
- - lib/buildr/core/generate.rb
266
- - lib/buildr/core/test.rb
267
- - lib/buildr/core/help.rb
268
- - lib/buildr/core/util.rb
269
- - lib/buildr/core/filter.rb
270
- - lib/buildr/core/environment.rb
271
- - lib/buildr/core/checks.rb
272
- - lib/buildr/core/build.rb
273
- - lib/buildr/core/application.rb
274
- - lib/buildr/core/osx.rb
275
- - lib/buildr/core/progressbar.rb
276
- - lib/buildr/core/common.rb
277
- - lib/buildr/core/project.rb
278
- - lib/buildr/core/compile.rb
279
- - lib/buildr/core/transports.rb
280
- - lib/buildr/core/shell.rb
281
- - lib/buildr/ide/eclipse/scala.rb
282
- - lib/buildr/ide/eclipse/plugin.rb
283
- - lib/buildr/ide/eclipse/java.rb
284
- - lib/buildr/ide/eclipse.rb
285
- - lib/buildr/ide/idea.ipr.template
286
- - lib/buildr/ide/idea7x.ipr.template
287
- - lib/buildr/ide/idea.rb
288
- - lib/buildr/ide/idea7x.rb
289
- - lib/buildr/packaging.rb
290
- - lib/buildr/groovy.rb
303
+ - lib/buildr/scala/tests.rb
304
+ - lib/buildr/scala.rb
291
305
  - lib/buildr/shell.rb
292
- - lib/buildr/java.rb
306
+ - lib/buildr.rb
307
+ - rakelib/all-in-one.rake
293
308
  - rakelib/checks.rake
294
- - rakelib/rspec.rake
295
- - rakelib/stage.rake~
296
- - rakelib/release.rake
309
+ - rakelib/doc.rake
297
310
  - rakelib/jekylltask.rb
298
311
  - rakelib/package.rake
299
- - rakelib/doc.rake
312
+ - rakelib/release.rake
313
+ - rakelib/rspec.rake
300
314
  - rakelib/setup.rake
301
315
  - rakelib/stage.rake
302
- - spec/version_requirement_spec.rb
316
+ - spec/addon/drb_spec.rb
317
+ - spec/core/application_spec.rb
318
+ - spec/core/build_spec.rb
319
+ - spec/core/cc_spec.rb
320
+ - spec/core/checks_spec.rb
321
+ - spec/core/common_spec.rb
322
+ - spec/core/compile_spec.rb
323
+ - spec/core/extension_spec.rb
324
+ - spec/core/generate_spec.rb
325
+ - spec/core/project_spec.rb
326
+ - spec/core/test_spec.rb
327
+ - spec/core/transport_spec.rb
328
+ - spec/core/util_spec.rb
303
329
  - spec/groovy/bdd_spec.rb
304
330
  - spec/groovy/compiler_spec.rb
305
- - spec/java/packaging_spec.rb
331
+ - spec/ide/eclipse_spec.rb
332
+ - spec/ide/idea7x_spec.rb
306
333
  - spec/java/ant_spec.rb
307
- - spec/java/emma_spec.rb
308
334
  - spec/java/bdd_spec.rb
309
- - spec/java/compiler_spec.rb
310
335
  - spec/java/cobertura_spec.rb
336
+ - spec/java/commands_spec.rb
337
+ - spec/java/compiler_spec.rb
338
+ - spec/java/emma_spec.rb
311
339
  - spec/java/java_spec.rb
312
- - spec/java/tests_spec.rb
340
+ - spec/java/packaging_spec.rb
313
341
  - spec/java/test_coverage_helper.rb
314
- - spec/addon/drb_spec.rb
315
- - spec/packaging/packaging_spec.rb
316
- - spec/packaging/packaging_helper.rb
317
- - spec/packaging/artifact_namespace_spec.rb
342
+ - spec/java/tests_spec.rb
318
343
  - spec/packaging/archive_spec.rb
344
+ - spec/packaging/artifact_namespace_spec.rb
319
345
  - spec/packaging/artifact_spec.rb
320
- - spec/spec_helpers.rb
321
- - spec/scala/scala.rb
346
+ - spec/packaging/packaging_helper.rb
347
+ - spec/packaging/packaging_spec.rb
348
+ - spec/sandbox.rb
322
349
  - spec/scala/bdd_spec.rb
323
350
  - spec/scala/compiler_spec.rb
351
+ - spec/scala/scala.rb
324
352
  - spec/scala/tests_spec.rb
325
- - spec/core/project_spec.rb
326
- - spec/core/util_spec.rb
327
- - spec/core/build_spec.rb
328
- - spec/core/compile_spec.rb
329
- - spec/core/application_spec.rb
330
- - spec/core/extension_spec.rb
331
- - spec/core/generate_spec.rb
332
- - spec/core/checks_spec.rb
333
- - spec/core/transport_spec.rb
334
- - spec/core/common_spec.rb
335
- - spec/core/test_spec.rb
336
- - spec/ide/idea7x_spec.rb
337
- - spec/ide/eclipse_spec.rb
338
- - spec/sandbox.rb
353
+ - spec/spec_helpers.rb
354
+ - spec/version_requirement_spec.rb
339
355
  - buildr.gemspec
340
356
  - buildr.buildfile
341
357
  - LICENSE
@@ -375,9 +391,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
375
391
  requirements: []
376
392
 
377
393
  rubyforge_project: buildr
378
- rubygems_version: 1.3.2
394
+ rubygems_version: 1.3.5
379
395
  signing_key:
380
396
  specification_version: 3
381
- summary: A build system that doesn't suck
397
+ summary: Build like you code
382
398
  test_files: []
383
399