Author: boisvert
Date: Fri Dec 4 20:22:57 2009
New Revision: 887343
URL: http://svn.apache.org/viewvc?rev=887343&view=rev
Log:
Test dependencies should include test compile dependencies
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/test.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=887343&r1=887342&r2=887343&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri Dec 4 20:22:57 2009
@@ -34,6 +34,7 @@
even if mapping is provided
* Fixed: Fail-fast if package.with() or include() called with nil values
* Fixed: Failures not reported correctly for ScalaTest (Alex Eagle)
+* Fixed: Test dependencies should include test compile dependencies
1.3.5 (2009-10-05)
* Added: Interactive shell (REPL) support
Modified: buildr/trunk/lib/buildr/core/test.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/test.rb?rev=887343&r1=887342&r2=887343&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/test.rb (original)
+++ buildr/trunk/lib/buildr/core/test.rb Fri Dec 4 20:22:57 2009
@@ -596,6 +596,7 @@
test = project.test
# Dependency on compiled tests and resources. Dependencies added using with.
test.dependencies.concat [test.compile.target, test.resources.target].compact
+ test.dependencies.concat test.compile.dependencies
# Dependency on compiled code, its dependencies and resources.
test.with [project.compile.target, project.resources.target].compact
test.with project.compile.dependencies
Author: boisvert
Date: Fri Dec 4 20:18:43 2009
New Revision: 887341
URL: http://svn.apache.org/viewvc?rev=887341&view=rev
Log:
Fix typo
Modified:
buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java
Modified: buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java?rev=887341&r1=887340&r2=887341&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java (original)
+++ buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java Fri Dec 4 20:18:43
2009
@@ -123,7 +123,7 @@
Class cls = _loader.loadClass(names[i]);
if (isTest(cls)) { testCases.add(names[i]); }
} catch (Throwable e) {
- System.err.println("JavaTestFilter: Unable to load class "+names[i]+" to dertermine
testing ability");
+ System.err.println("JavaTestFilter: Unable to load class "+names[i]+" to determine
testing ability");
throw e;
}
}
Author: boisvert
Date: Fri Dec 4 20:16:24 2009
New Revision: 887340
URL: http://svn.apache.org/viewvc?rev=887340&view=rev
Log:
Improve error reporting if a class (or its dependencies) can't be loaded
Modified:
buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java
Modified: buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java?rev=887340&r1=887339&r2=887340&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java (original)
+++ buildr/trunk/lib/buildr/java/org/apache/buildr/JavaTestFilter.java Fri Dec 4 20:16:24
2009
@@ -116,11 +116,16 @@
}
- public String[] filter(String[] names) throws ClassNotFoundException {
+ public String[] filter(String[] names) throws Throwable {
Vector testCases = new Vector();
for (int i = names.length ; i-- > 0 ;) {
- Class cls = _loader.loadClass(names[i]);
- if (isTest(cls)) { testCases.add(names[i]); }
+ try {
+ Class cls = _loader.loadClass(names[i]);
+ if (isTest(cls)) { testCases.add(names[i]); }
+ } catch (Throwable e) {
+ System.err.println("JavaTestFilter: Unable to load class "+names[i]+" to dertermine
testing ability");
+ throw e;
+ }
}
String[] result = new String[testCases.size()];
testCases.toArray(result);
XMLBeans version number needs to be configurable
------------------------------------------------
Key: BUILDR-352
URL: https://issues.apache.org/jira/browse/BUILDR-352
Project: Buildr
Issue Type: Bug
Affects Versions: 1.2.10
Reporter: Kurt T Stam
When creating java files from schema using xmlbeans and buildr I found out that the version
of xmlbeans is hardcoded in
/Library/Ruby/Gems/1.8/gems/buildr-1.2.10/lib/buildr/xmlbeans.rb
For more details see:
http://www.jboss.org/community/wiki/buildriftsawfromsource
This should prob be configurable?
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-23?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12785995#action_12785995
]
Alex Eagle commented on BUILDR-23:
----------------------------------
Does this still exist on HEAD? Right now, the only code that has a ":mode" symbol is in packaging/tar.rb
Where is the API that should allow setting the mode?
> Support for setting file mode when packaging
> --------------------------------------------
>
> Key: BUILDR-23
> URL: https://issues.apache.org/jira/browse/BUILDR-23
> Project: Buildr
> Issue Type: Improvement
> Components: Packaging
> Affects Versions: 1.3
> Reporter: Assaf Arkin
> Fix For: 1.3.5
>
> Attachments: 0001-BUILDR-23-adding-spec-for-file-permissions-preserva.patch,
0002-BUILDR-23-preserving-file-permissions-when-zipping.patch
>
>
> For example:
> zip.include('script.sh', :mode=>755)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-345?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
peter schröder updated BUILDR-345:
----------------------------------
Attachment: artifacts.diff
minor artifacts improvement
> Improve documentation
> ---------------------
>
> Key: BUILDR-345
> URL: https://issues.apache.org/jira/browse/BUILDR-345
> Project: Buildr
> Issue Type: Improvement
> Components: Site/documentation
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Fix For: 1.4
>
> Attachments: artifacts.diff, building.diff, projects.diff
>
>
> Improvements for textile documentation.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Buildr's automatic gem installer does not work if gemcutter is a source
-----------------------------------------------------------------------
Key: BUILDR-351
URL: https://issues.apache.org/jira/browse/BUILDR-351
Project: Buildr
Issue Type: Bug
Components: Core features
Affects Versions: 1.3.5, 1.3.3
Environment: OS X 10.5, system ruby 1.8.6, rubygems 1.3.5 (does not seem environment-specific,
though)
Reporter: Rhett Sutphin
If you have gemcutter configured as a gem source and a reference to an non-installed gem in
build.yaml, buildr's automatic gem installer fails with this error:
$ buildr
Buildr aborted!
bad response Forbidden 403 (http://gemcutter.org/Marshal.4.8)
/Library/Ruby/Gems/1.8/gems/buildr-1.3.5/lib/buildr/core/application.rb:215:in `load_buildfile'
/Library/Ruby/Gems/1.8/gems/buildr-1.3.5/lib/buildr/core/application.rb:213:in `load_buildfile'
Workaround: manually install any required gems.
The page http://gemcutter.org/Marshal.4.8 says "please update your rubygems," but this happens
with the most recent rubygems installed.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-350?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Boisvert resolved BUILDR-350.
----------------------------------
Resolution: Fixed
Interesting, I couldn't reproduce this with our specs.
Anyhow, I apply the suggested fix.
Sending CHANGELOG
Sending lib/buildr/scala/tests.rb
Transmitting file data ..
Committed revision 884617.
> CLONE -Failures not reported correclty for ScalaTest (fix included)
> -------------------------------------------------------------------
>
> Key: BUILDR-350
> URL: https://issues.apache.org/jira/browse/BUILDR-350
> Project: Buildr
> Issue Type: Bug
> Components: Test frameworks
> Affects Versions: 1.3.4, 1.3.5
> Environment: all
> Reporter: Alex Eagle
> Assignee: Daniel Spiewak
> Fix For: 1.3.5
>
>
> Today when a ScalaTest fails Buildr doesn't report it correctly and just ends without
reporting the correct error or returning an error code.
> There is 2 problems:
> - The regexp used to now if a test failed is wrong
> - The loop reading the reportFile breaks too early, it breaks on the sentence 'Run completed.'
but 'TEST FAILED' is on the following line
> Here is a fix for it:
> Index: lib/buildr/scala/tests.rb
> ===================================================================
> --- lib/buildr/scala/tests.rb (revision 811837)
> +++ lib/buildr/scala/tests.rb (working copy)
> @@ -126,9 +126,9 @@
> while (!completed) do
> File.open(reportFile, "r") do |input|
> while (line = input.gets) do
> - failed = (line =~ /(TEST FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless
failed
> + failed = (line =~ /(TESTS? FAILED)|(RUN STOPPED)|(RUN ABORTED)/) unless
failed
> completed |= (line =~ /Run completed\./)
> - break if (failed || completed)
> + break if (failed)
> end
> end
> wait += 1
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-350?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Boisvert updated BUILDR-350:
---------------------------------
Fix Version/s: (was: 1.3.5)
1.4
> CLONE -Failures not reported correclty for ScalaTest (fix included)
> -------------------------------------------------------------------
>
> Key: BUILDR-350
> URL: https://issues.apache.org/jira/browse/BUILDR-350
> Project: Buildr
> Issue Type: Bug
> Components: Test frameworks
> Affects Versions: 1.3.4, 1.3.5
> Environment: all
> Reporter: Alex Eagle
> Assignee: Daniel Spiewak
> Fix For: 1.4
>
>
> Today when a ScalaTest fails Buildr doesn't report it correctly and just ends without
reporting the correct error or returning an error code.
> There is 2 problems:
> - The regexp used to now if a test failed is wrong
> - The loop reading the reportFile breaks too early, it breaks on the sentence 'Run completed.'
but 'TEST FAILED' is on the following line
> Here is a fix for it:
> Index: lib/buildr/scala/tests.rb
> ===================================================================
> --- lib/buildr/scala/tests.rb (revision 811837)
> +++ lib/buildr/scala/tests.rb (working copy)
> @@ -126,9 +126,9 @@
> while (!completed) do
> File.open(reportFile, "r") do |input|
> while (line = input.gets) do
> - failed = (line =~ /(TEST FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless
failed
> + failed = (line =~ /(TESTS? FAILED)|(RUN STOPPED)|(RUN ABORTED)/) unless
failed
> completed |= (line =~ /Run completed\./)
> - break if (failed || completed)
> + break if (failed)
> end
> end
> wait += 1
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Author: boisvert
Date: Thu Nov 26 16:06:12 2009
New Revision: 884617
URL: http://svn.apache.org/viewvc?rev=884617&view=rev
Log:
Failures not reported correctly for ScalaTest (Alex Eagle)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/scala/tests.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=884617&r1=884616&r2=884617&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Nov 26 16:06:12 2009
@@ -33,6 +33,7 @@
* Fixed: BUILDR-349 resources.filter should use defaults from profile.yaml
even if mapping is provided
* Fixed: Fail-fast if package.with() or include() called with nil values
+* Fixed: Failures not reported correctly for ScalaTest (Alex Eagle)
1.3.5 (2009-10-05)
* Added: Interactive shell (REPL) support
Modified: buildr/trunk/lib/buildr/scala/tests.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/tests.rb?rev=884617&r1=884616&r2=884617&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/tests.rb (original)
+++ buildr/trunk/lib/buildr/scala/tests.rb Thu Nov 26 16:06:12 2009
@@ -126,7 +126,7 @@
while (!completed) do
File.open(reportFile, "r") do |input|
while (line = input.gets) do
- failed = (line =~ /(TESTS? FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
+ failed = (line =~ /(TESTS? FAILED)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
completed |= (line =~ /Run completed/)
break if (failed)
end
[ https://issues.apache.org/jira/browse/BUILDR-350?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12782318#action_12782318
]
Alex Eagle commented on BUILDR-350:
-----------------------------------
Tried this again with 1.4.0 from head (built at 883980)
Still get an overall pass even when a test failed with scalatest.
As I commented on the issue I cloned, the fix is just to remove the extra hyphen after TESTS?
FAILED, which was applied incorrectly from Jeremie's patch.
> CLONE -Failures not reported correclty for ScalaTest (fix included)
> -------------------------------------------------------------------
>
> Key: BUILDR-350
> URL: https://issues.apache.org/jira/browse/BUILDR-350
> Project: Buildr
> Issue Type: Bug
> Components: Test frameworks
> Affects Versions: 1.3.4, 1.3.5
> Environment: all
> Reporter: Alex Eagle
> Assignee: Daniel Spiewak
> Fix For: 1.3.5
>
>
> Today when a ScalaTest fails Buildr doesn't report it correctly and just ends without
reporting the correct error or returning an error code.
> There is 2 problems:
> - The regexp used to now if a test failed is wrong
> - The loop reading the reportFile breaks too early, it breaks on the sentence 'Run completed.'
but 'TEST FAILED' is on the following line
> Here is a fix for it:
> Index: lib/buildr/scala/tests.rb
> ===================================================================
> --- lib/buildr/scala/tests.rb (revision 811837)
> +++ lib/buildr/scala/tests.rb (working copy)
> @@ -126,9 +126,9 @@
> while (!completed) do
> File.open(reportFile, "r") do |input|
> while (line = input.gets) do
> - failed = (line =~ /(TEST FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless
failed
> + failed = (line =~ /(TESTS? FAILED)|(RUN STOPPED)|(RUN ABORTED)/) unless
failed
> completed |= (line =~ /Run completed\./)
> - break if (failed || completed)
> + break if (failed)
> end
> end
> wait += 1
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
CLONE -Failures not reported correclty for ScalaTest (fix included)
-------------------------------------------------------------------
Key: BUILDR-350
URL: https://issues.apache.org/jira/browse/BUILDR-350
Project: Buildr
Issue Type: Bug
Components: Test frameworks
Affects Versions: 1.3.4, 1.3.5
Environment: all
Reporter: Alex Eagle
Assignee: Daniel Spiewak
Fix For: 1.3.5
Today when a ScalaTest fails Buildr doesn't report it correctly and just ends without reporting
the correct error or returning an error code.
There is 2 problems:
- The regexp used to now if a test failed is wrong
- The loop reading the reportFile breaks too early, it breaks on the sentence 'Run completed.'
but 'TEST FAILED' is on the following line
Here is a fix for it:
Index: lib/buildr/scala/tests.rb
===================================================================
--- lib/buildr/scala/tests.rb (revision 811837)
+++ lib/buildr/scala/tests.rb (working copy)
@@ -126,9 +126,9 @@
while (!completed) do
File.open(reportFile, "r") do |input|
while (line = input.gets) do
- failed = (line =~ /(TEST FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
+ failed = (line =~ /(TESTS? FAILED)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
completed |= (line =~ /Run completed\./)
- break if (failed || completed)
+ break if (failed)
end
end
wait += 1
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Author: boisvert
Date: Mon Nov 23 17:55:25 2009
New Revision: 883434
URL: http://svn.apache.org/viewvc?rev=883434&view=rev
Log:
Update documentation for change related to buildr.rb location
Modified:
buildr/trunk/doc/artifacts.textile
buildr/trunk/doc/more_stuff.textile
buildr/trunk/doc/settings_profiles.textile
Modified: buildr/trunk/doc/artifacts.textile
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/artifacts.textile?rev=883434&r1=883433&r2=883434&view=diff
==============================================================================
--- buildr/trunk/doc/artifacts.textile (original)
+++ buildr/trunk/doc/artifacts.textile Mon Nov 23 17:55:25 2009
@@ -125,7 +125,7 @@
repositories.local = '/usr/local/maven/repository'
{% endhighlight %}
-That's one change you don't want to commit into the Buildfile, so the best place to do it
is in your home directory's @buildr.rb@ file.
+That's one change you don't want to commit into the Buildfile, so the best place to do it
is in the @buildr.rb@ file in the @.buildr@ directory under your home directory.
Buildr downloads artifacts when it needs to use them, for example, to compile a project.
You don't need to download artifacts directly. Except when you do, for example, if you want
to download all the latest artifacts and then go off-line. It's as simple as:
Modified: buildr/trunk/doc/more_stuff.textile
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/more_stuff.textile?rev=883434&r1=883433&r2=883434&view=diff
==============================================================================
--- buildr/trunk/doc/more_stuff.textile (original)
+++ buildr/trunk/doc/more_stuff.textile Mon Nov 23 17:55:25 2009
@@ -280,7 +280,7 @@
end
{% endhighlight %}
-You can place this code inside @buildr.rb@ in your home directory.
+You can place this code inside @buildr.rb@ in the @.buildr@ directory under your home directory.
h2(#eclipse). Eclipse
@@ -390,7 +390,7 @@
require 'buildr/jdepend'
{% endhighlight %}
-You may want to add those to the Buildfile. Alternatively, you can use these tasks for all
your projects without modifying the Buildfile. One convenient method is to add these lines
to the @buildr.rb@ file in your home directory.
+You may want to add those to the Buildfile. Alternatively, you can use these tasks for all
your projects without modifying the Buildfile. One convenient method is to add these lines
to the @buildr.rb@ file in the @.buildr@ directory under your home directory.
Another option is to require it from the command line (@--require@ or @-r@), for example:
Modified: buildr/trunk/doc/settings_profiles.textile
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/settings_profiles.textile?rev=883434&r1=883433&r2=883434&view=diff
==============================================================================
--- buildr/trunk/doc/settings_profiles.textile (original)
+++ buildr/trunk/doc/settings_profiles.textile Mon Nov 23 17:55:25 2009
@@ -166,9 +166,9 @@
h2(#variable). Non constant settings
-Before loading the Buildfile, Buildr will attempt to load two other files: the @buildr.rb@
file it finds in your home directory, followed by the @buildr.rb@ file it finds in the build
directory.
+Before loading the Buildfile, Buildr will attempt to load two other files: the @buildr.rb@
file in the @.buildr@ directory under your home directory, followed by the @buildr.rb@ file
it finds in the build directory.
-The loading order allows you to place global settings that affect all your builds in your
home directory's @buildr.rb@, but also over-ride those with settings for a given project.
+The loading order allows you to place global settings that affect all your builds in your
@buildr.rb@, but also over-ride those with settings for a given project.
Here's an example @buildr.rb@:
@@ -180,6 +180,12 @@
repositories.remote << 'http://inside-the-firewall'
{% endhighlight %}
+p(note). Buildr 1.3 and earlier used the file @buildr.rb@ directly in your home directory.
Starting with version 1.4, Buildr loads @buildr.rb@ from the @.buildr@ directory under your
home directory in preference. If you use Buildr 1.3 and earlier and don't want to duplicate
your settings, you can move you existing @buildr.rb@ under the @.buildr@ directory and create
a new @buildr.rb@ in your home directory containing:
+
+{% highlight ruby %}
+# Backward compatibility: Buildr 1.4+ uses $HOME/.buildr/buildr.rb
+load File.expand_path('buildr.rb', Buildr.application.home_dir)
+{% endhighlight %}
h2(#environments). Environments
Author: boisvert
Date: Mon Nov 23 17:44:58 2009
New Revision: 883432
URL: http://svn.apache.org/viewvc?rev=883432&view=rev
Log:
Load buildr.rb from $HOME/.buildr instead of $HOME
($HOME/buildr.rb is still loaded with deprecation warning)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/application.rb
buildr/trunk/lib/buildr/packaging/artifact.rb
buildr/trunk/spec/core/application_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=883432&r1=883431&r2=883432&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Mon Nov 23 17:44:58 2009
@@ -15,6 +15,8 @@
* Change: Updated to JRuby 1.4.0
* Change: Updated to JtestR 0.5
* Change: Updated to JUnit 4.7
+* Change: Load buildr.rb from $HOME/.buildr instead of $HOME
+ ($HOME/buildr.rb is still loaded with deprecation warning)
* Fixed: BUILDR-223 Release Task: customizable commit message (Alexis Midon)
* Fixed: BUILDR-330 Install task should re-install artifact even if they
already exist (Alexis Midon)
Modified: buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=883432&r1=883431&r2=883432&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Mon Nov 23 17:44:58 2009
@@ -444,11 +444,17 @@
Buildr::ArtifactNamespace.load(:root => hash)
end
- # Loads buildr.rb files from users home directory and project directory.
+ # Loads buildr.rb files from home/.buildr directory and project directory.
# Loads custom tasks from .rake files in tasks directory.
def load_tasks #:nodoc:
# TODO: this might need to be split up, look for deprecated features, better method
name.
- files = [ File.expand_path('buildr.rb', ENV['HOME']), 'buildr.rb' ].select { |file|
File.exist?(file) }
+ old = File.expand_path('buildr.rb', ENV['HOME'])
+ new = File.expand_path('buildr.rb', home_dir)
+ if File.exist?(old) && !File.exist?(new)
+ warn "Deprecated: Please move buildr.rb from your home directory to the .buildr directory
in your home directory"
+ end
+ # Load home/.buildr/buildr.rb in preference
+ files = [ File.exist?(new) ? new : old, 'buildr.rb' ].select { |file| File.exist?(file)
}
files += [ File.expand_path('buildr.rake', ENV['HOME']), File.expand_path('buildr.rake')
].
select { |file| File.exist?(file) }.each { |file| warn "Please use '#{file.ext('rb')}'
instead of '#{file}'" }
files += (options.rakelib || []).collect { |rlib| Dir["#{rlib}/*.rake"] }.flatten
Modified: buildr/trunk/lib/buildr/packaging/artifact.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact.rb?rev=883432&r1=883431&r2=883432&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact.rb Mon Nov 23 17:44:58 2009
@@ -458,8 +458,9 @@
# Sets the path to the local repository.
#
# The best place to set the local repository path is from a buildr.rb file
- # located in your home directory. That way all your projects will share the same
- # path, without affecting other developers collaborating on these projects.
+ # located in the .buildr directory under your home directory. That way all
+ # your projects will share the same path, without affecting other developers
+ # collaborating on these projects.
def local=(dir)
@local = dir ? File.expand_path(dir) : nil
end
Modified: buildr/trunk/spec/core/application_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/application_spec.rb?rev=883432&r1=883431&r2=883432&view=diff
==============================================================================
--- buildr/trunk/spec/core/application_spec.rb (original)
+++ buildr/trunk/spec/core/application_spec.rb Mon Nov 23 17:44:58 2009
@@ -470,11 +470,18 @@
Buildr.application.buildfile.timestamp.should be_close(@buildfile_time, 1)
end
- it 'should have the same timestamp as build.rb in home dir if the latter is newer' do
+ it 'should have the same timestamp as build.rb in home dir if the latter is newer (until
version 1.6)' do
+ Buildr::VERSION.should < '1.6'
write 'home/buildr.rb'; File.utime(@buildfile_time + 5, @buildfile_time + 5, 'home/buildr.rb')
Buildr.application.send :load_tasks
Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
end
+
+ it 'should have the same timestamp as build.rb in home dir if the latter is newer' do
+ write 'home/.buildr/buildr.rb'; File.utime(@buildfile_time + 5, @buildfile_time + 5,
'home/buildr.rb')
+ Buildr.application.send :load_tasks
+ Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
+ end
end
end
Author: boisvert
Date: Sun Nov 22 17:14:14 2009
New Revision: 883103
URL: http://svn.apache.org/viewvc?rev=883103&view=rev
Log:
Fix Gem::Package argument
Modified:
buildr/trunk/lib/buildr/packaging/gems.rb
Modified: buildr/trunk/lib/buildr/packaging/gems.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/gems.rb?rev=883103&r1=883102&r2=883103&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/gems.rb (original)
+++ buildr/trunk/lib/buildr/packaging/gems.rb Sun Nov 22 17:14:14 2009
@@ -59,13 +59,17 @@
def create_from(file_map)
spec.mark_version
spec.validate
- Gem::Package.open(name, 'w', nil) do |pkg|
- pkg.metadata = spec.to_yaml
- file_map.each do |path, content|
- next if content.nil? || File.directory?(content.to_s)
- pkg.add_file_simple(path, File.stat(name).mode & 0777, File.size(content.to_s))
do |os|
- File.open(content.to_s, "rb") do |file|
- os.write file.read(4096) until file.eof?
+
+ File.open(name, 'w') do |io|
+ Gem::Package.open(io, 'w', nil) do |pkg|
+ pkg.metadata = spec.to_yaml
+ file_map.each do |path, content|
+ p "path #{path} content #{content}"
+ next if content.nil? || File.directory?(content.to_s)
+ pkg.add_file_simple(path, File.stat(content.to_s).mode & 0777, File.size(content.to_s))
do |os|
+ File.open(content.to_s, "rb") do |file|
+ os.write file.read(4096) until file.eof?
+ end
end
end
end
[ https://issues.apache.org/jira/browse/BUILDR-345?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
peter schröder updated BUILDR-345:
----------------------------------
Attachment: building.diff
minor filtering issues and typos
> Improve documentation
> ---------------------
>
> Key: BUILDR-345
> URL: https://issues.apache.org/jira/browse/BUILDR-345
> Project: Buildr
> Issue Type: Improvement
> Components: Site/documentation
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Fix For: 1.4
>
> Attachments: building.diff, projects.diff
>
>
> Improvements for textile documentation.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-345?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
peter schröder reopened BUILDR-345:
-----------------------------------
minor improvement for building
> Improve documentation
> ---------------------
>
> Key: BUILDR-345
> URL: https://issues.apache.org/jira/browse/BUILDR-345
> Project: Buildr
> Issue Type: Improvement
> Components: Site/documentation
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Fix For: 1.4
>
> Attachments: projects.diff
>
>
> Improvements for textile documentation.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Author: boisvert
Date: Sat Nov 21 02:19:16 2009
New Revision: 882827
URL: http://svn.apache.org/viewvc?rev=882827&view=rev
Log: (empty)
Modified:
buildr/trunk/CHANGELOG
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=882827&r1=882826&r2=882827&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sat Nov 21 02:19:16 2009
@@ -30,6 +30,7 @@
no compiler is set (Peter Schröder)
* Fixed: BUILDR-349 resources.filter should use defaults from profile.yaml
even if mapping is provided
+* Fixed: Fail-fast if package.with() or include() called with nil values
1.3.5 (2009-10-05)
* Added: Interactive shell (REPL) support
Author: boisvert
Date: Sat Nov 21 02:09:20 2009
New Revision: 882823
URL: http://svn.apache.org/viewvc?rev=882823&view=rev
Log:
Fail fast when trying to package/include nil values
Modified:
buildr/trunk/lib/buildr/java/packaging.rb
buildr/trunk/lib/buildr/packaging/archive.rb
buildr/trunk/spec/java/packaging_spec.rb
buildr/trunk/spec/packaging/archive_spec.rb
Modified: buildr/trunk/lib/buildr/java/packaging.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/packaging.rb?rev=882823&r1=882822&r2=882823&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/packaging.rb (original)
+++ buildr/trunk/lib/buildr/java/packaging.rb Sat Nov 21 02:09:20 2009
@@ -225,7 +225,8 @@
# package(:jar).with(:manifest=>'MANIFEST_MF')
def with(*args)
super args.pop if Hash === args.last
- include :from=>args
+ fail "package.with() should not contain nil values" if args.include? nil
+ include :from=>args if args.size > 0
self
end
Modified: buildr/trunk/lib/buildr/packaging/archive.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/archive.rb?rev=882823&r1=882822&r2=882823&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/archive.rb (original)
+++ buildr/trunk/lib/buildr/packaging/archive.rb Sat Nov 21 02:09:20 2009
@@ -62,6 +62,7 @@
def include(*args)
options = args.pop if Hash === args.last
files = args.flatten
+ raise 'AchiveTask.include() values should not include nil' if files.include? nil
if options.nil? || options.empty?
@includes.include *files.flatten
@@ -74,7 +75,8 @@
include_as files.first.to_s, options[:as]
elsif options[:from]
raise 'You can only use the :from option in combination with the :path option'
unless options.size == 1
- raise 'You canont use the :from option with file names' unless files.empty?
+ raise 'You cannot use the :from option with file names' unless files.empty?
+ fail 'AchiveTask.include() :from value should not be nil' if [options[:from]].flatten.include?
nil
[options[:from]].flatten.each { |path| include_as path.to_s, '.' }
elsif options[:merge]
raise 'You can only use the :merge option in combination with the :path option'
unless options.size == 1
@@ -172,7 +174,7 @@
protected
- def include_as(source, as)
+ def include_as(source, as)
@sources << proc { source }
@actions << proc do |file_map|
file = source.to_s
@@ -346,7 +348,8 @@
# zip(..).include('foo.zip', :merge=>true).include('bar.zip')
# You can also use the method #merge.
def include(*files)
- @paths[''].include *files
+ fail "AchiveTask.include() called with nil values" if files.include? nil
+ @paths[''].include *files if files.compact.size > 0
self
end
alias :add :include
Modified: buildr/trunk/spec/java/packaging_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/packaging_spec.rb?rev=882823&r1=882822&r2=882823&view=diff
==============================================================================
--- buildr/trunk/spec/java/packaging_spec.rb (original)
+++ buildr/trunk/spec/java/packaging_spec.rb Sat Nov 21 02:09:20 2009
@@ -454,6 +454,12 @@
jar.entries.map(&:to_s).sort.should include('empty/')
end
end
+
+ it 'should raise error when calling with() with nil value' do
+ lambda {
+ define('foo', :version=>'1.0') { package(:jar).with(nil) }
+ }.should raise_error
+ end
end
Modified: buildr/trunk/spec/packaging/archive_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/archive_spec.rb?rev=882823&r1=882822&r2=882823&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/archive_spec.rb (original)
+++ buildr/trunk/spec/packaging/archive_spec.rb Sat Nov 21 02:09:20 2009
@@ -59,6 +59,11 @@
inspect_archive { |archive| archive.should be_empty }
end
+ it 'should raise error when include() is called with nil values' do
+ lambda { archive(@archive).include(nil) }.should raise_error
+ lambda { archive(@archive).include([nil]) }.should raise_error
+ end
+
it 'should create empty archive if called #clean method' do
archive(@archive).include(@files).clean.invoke
inspect_archive { |archive| archive.should be_empty }
@@ -112,6 +117,12 @@
end
end
+ it 'should raise error when using :from with nil value' do
+ lambda {
+ archive(@archive).include(:from=>nil)
+ }.should raise_error
+ end
+
it 'should exclude entire directory and all its children' do
mkpath "#{@dir}/sub"
write "#{@dir}/sub/test"
[ https://issues.apache.org/jira/browse/BUILDR-349?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Boisvert closed BUILDR-349.
--------------------------------
Resolution: Fixed
Fixed.
Author: boisvert
Date: Fri Nov 20 19:04:53 2009
New Revision: 882676
URL: http://svn.apache.org/viewvc?rev=882676&view=rev
Log: BUILDR-349 resources.filter should use defaults from profile.yaml even if
mapping is provided
> resources.filter should use defaults from profile.yaml even if mapping is provided
> ----------------------------------------------------------------------------------
>
> Key: BUILDR-349
> URL: https://issues.apache.org/jira/browse/BUILDR-349
> Project: Buildr
> Issue Type: Bug
> Components: Core features
> Affects Versions: 1.3.5
> Reporter: Alex Boisvert
> Assignee: Alex Boisvert
> Fix For: 1.4
>
>
> Peter Schröder wrote:
> if i use a filter like this:
> resources.filter.using 'date'=>Time.new
> the filter defined in the yaml (which are static) wont get applied
> ( See thread http://markmail.org/message/lqmiglkh74nkyoo5 )
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Author: boisvert
Date: Fri Nov 20 19:04:53 2009
New Revision: 882676
URL: http://svn.apache.org/viewvc?rev=882676&view=rev
Log:
BUILDR-349 resources.filter should use defaults from profile.yaml even if
mapping is provided
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/filter.rb
buildr/trunk/spec/core/compile_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=882676&r1=882675&r2=882676&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri Nov 20 19:04:53 2009
@@ -28,6 +28,8 @@
* Fixed: BUILDR-346 Test classpath can not be set (Peter Schröder)
* Fixed: BUILDR-347 Compile.from does not work correctly with FileTask when
no compiler is set (Peter Schröder)
+* Fixed: BUILDR-349 resources.filter should use defaults from profile.yaml
+ even if mapping is provided
1.3.5 (2009-10-05)
* Added: Interactive shell (REPL) support
Modified: buildr/trunk/lib/buildr/core/filter.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/filter.rb?rev=882676&r1=882675&r2=882676&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/filter.rb (original)
+++ buildr/trunk/lib/buildr/core/filter.rb Fri Nov 20 19:04:53 2009
@@ -285,7 +285,8 @@
@config = configurer.call(*args, &block)
else
raise ArgumentError, "Missing hash argument after :#{mapper_type}" unless args.size
== 1 && Hash === args[0]
- @config = args.first
+ @config = {} unless Hash === @config
+ @config = @config.merge(args.first)
end
@mapper_type = mapper_type
end
Modified: buildr/trunk/spec/core/compile_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/compile_spec.rb?rev=882676&r1=882675&r2=882676&view=diff
==============================================================================
--- buildr/trunk/spec/core/compile_spec.rb (original)
+++ buildr/trunk/spec/core/compile_spec.rb Fri Nov 20 19:04:53 2009
@@ -592,4 +592,33 @@
define('foo').compile.invoke
file('target/resources/foo').should contain('bar')
end
+
+ it 'should use current profile as default for filtering' do
+ write 'profiles.yaml', <<-YAML
+ development:
+ filter:
+ foo: bar
+ YAML
+ write 'src/main/resources/foo', '${foo} ${baz}'
+ define('foo') do
+ resources.filter.using 'baz' => 'qux'
+ end
+ project('foo').compile.invoke
+ file('target/resources/foo').should contain('bar qux')
+ end
+
+ it 'should allow clearing default filter mapping' do
+ write 'profiles.yaml', <<-YAML
+ development:
+ filter:
+ foo: bar
+ YAML
+ write 'src/main/resources/foo', '${foo} ${baz}'
+ define('foo') do
+ resources.filter.mapping.clear
+ resources.filter.using 'baz' => 'qux'
+ end
+ project('foo').compile.invoke
+ file('target/resources/foo').should contain('${foo} qux')
+ end
end
[ https://issues.apache.org/jira/browse/BUILDR-349?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Boisvert updated BUILDR-349:
---------------------------------
Description:
Peter Schröder wrote:
if i use a filter like this:
resources.filter.using 'date'=>Time.new
the filter defined in the yaml (which are static) wont get applied
( See thread http://markmail.org/message/lqmiglkh74nkyoo5 )
was:
Peter Schröder wrote:
if i use a filter like this:
resources.filter.using 'date'=>Time.new
the filter defined in the yaml (which are static) wont get applied
(See thread http://markmail.org/message/lqmiglkh74nkyoo5)
> resources.filter should use defaults from profile.yaml even if mapping is provided
> ----------------------------------------------------------------------------------
>
> Key: BUILDR-349
> URL: https://issues.apache.org/jira/browse/BUILDR-349
> Project: Buildr
> Issue Type: Bug
> Components: Core features
> Affects Versions: 1.3.5
> Reporter: Alex Boisvert
> Assignee: Alex Boisvert
> Fix For: 1.4
>
>
> Peter Schröder wrote:
> if i use a filter like this:
> resources.filter.using 'date'=>Time.new
> the filter defined in the yaml (which are static) wont get applied
> ( See thread http://markmail.org/message/lqmiglkh74nkyoo5 )
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
resources.filter should use defaults from profile.yaml even if mapping is provided
----------------------------------------------------------------------------------
Key: BUILDR-349
URL: https://issues.apache.org/jira/browse/BUILDR-349
Project: Buildr
Issue Type: Bug
Components: Core features
Affects Versions: 1.3.5
Reporter: Alex Boisvert
Fix For: 1.4
Peter Schröder wrote:
if i use a filter like this:
resources.filter.using 'date'=>Time.new
the filter defined in the yaml (which are static) wont get applied
(See thread http://markmail.org/message/lqmiglkh74nkyoo5)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-349?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Boisvert reassigned BUILDR-349:
------------------------------------
Assignee: Alex Boisvert
> resources.filter should use defaults from profile.yaml even if mapping is provided
> ----------------------------------------------------------------------------------
>
> Key: BUILDR-349
> URL: https://issues.apache.org/jira/browse/BUILDR-349
> Project: Buildr
> Issue Type: Bug
> Components: Core features
> Affects Versions: 1.3.5
> Reporter: Alex Boisvert
> Assignee: Alex Boisvert
> Fix For: 1.4
>
>
> Peter Schröder wrote:
> if i use a filter like this:
> resources.filter.using 'date'=>Time.new
> the filter defined in the yaml (which are static) wont get applied
> (See thread http://markmail.org/message/lqmiglkh74nkyoo5)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-348?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Boisvert reopened BUILDR-348:
----------------------------------
Reopening until I apply this fix to trunk.
(Only seems to affect JRuby 1.4.0)
> Buildr fails on windows with jruby and ODE 1.X
> ----------------------------------------------
>
> Key: BUILDR-348
> URL: https://issues.apache.org/jira/browse/BUILDR-348
> Project: Buildr
> Issue Type: Bug
> Components: JRuby
> Affects Versions: 1.3.5
> Environment: Windows XP
> Reporter: Rafal Rusin
>
> Taking Apache ODE (rev. https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.X@881749)
> And running gives:
> buildr _1.3.5_ clean test=no
> C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/ffi.rb:113:in `create_invoker':
Function 'system' not found in [current process] (FFI::NotFoundError)
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:74:in `attach_function'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `each'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `attach_function'
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:410
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:31:in
`require'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:31:in
`require'
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:18
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:31:in
`require'
> ... 7 levels...
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:18
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:19:in
`load'
> On Linux, it works fine.
> Any ideas?
> Regards
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-348?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Rafal Rusin resolved BUILDR-348.
--------------------------------
Resolution: Fixed
Your outstanding fix worked :-)
Thanks Alex
> Buildr fails on windows with jruby and ODE 1.X
> ----------------------------------------------
>
> Key: BUILDR-348
> URL: https://issues.apache.org/jira/browse/BUILDR-348
> Project: Buildr
> Issue Type: Bug
> Components: JRuby
> Affects Versions: 1.3.5
> Environment: Windows XP
> Reporter: Rafal Rusin
>
> Taking Apache ODE (rev. https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.X@881749)
> And running gives:
> buildr _1.3.5_ clean test=no
> C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/ffi.rb:113:in `create_invoker':
Function 'system' not found in [current process] (FFI::NotFoundError)
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:74:in `attach_function'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `each'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `attach_function'
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:410
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:31:in
`require'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:31:in
`require'
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:18
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:31:in
`require'
> ... 7 levels...
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:18
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:19:in
`load'
> On Linux, it works fine.
> Any ideas?
> Regards
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-348?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12780094#action_12780094
]
Mateusz Nowakowski commented on BUILDR-348:
-------------------------------------------
It's working, thanks.
> Buildr fails on windows with jruby and ODE 1.X
> ----------------------------------------------
>
> Key: BUILDR-348
> URL: https://issues.apache.org/jira/browse/BUILDR-348
> Project: Buildr
> Issue Type: Bug
> Components: JRuby
> Affects Versions: 1.3.5
> Environment: Windows XP
> Reporter: Rafal Rusin
>
> Taking Apache ODE (rev. https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.X@881749)
> And running gives:
> buildr _1.3.5_ clean test=no
> C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/ffi.rb:113:in `create_invoker':
Function 'system' not found in [current process] (FFI::NotFoundError)
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:74:in `attach_function'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `each'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `attach_function'
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:410
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:31:in
`require'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:31:in
`require'
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:18
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:31:in
`require'
> ... 7 levels...
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:18
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:19:in
`load'
> On Linux, it works fine.
> Any ideas?
> Regards
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-348?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12780015#action_12780015
]
Alex Boisvert commented on BUILDR-348:
--------------------------------------
Edit ruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:
And comment out line 410:
module FileUtils
extend FFI::Library
alias_method :__jruby_system__, :system
#attach_function :system, [:string], :int
alias_method :__native_system__, :system
alias_method :system, :__jruby_system__
Does that work for you?
> Buildr fails on windows with jruby and ODE 1.X
> ----------------------------------------------
>
> Key: BUILDR-348
> URL: https://issues.apache.org/jira/browse/BUILDR-348
> Project: Buildr
> Issue Type: Bug
> Components: JRuby
> Affects Versions: 1.3.5
> Environment: Windows XP
> Reporter: Rafal Rusin
>
> Taking Apache ODE (rev. https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.X@881749)
> And running gives:
> buildr _1.3.5_ clean test=no
> C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/ffi.rb:113:in `create_invoker':
Function 'system' not found in [current process] (FFI::NotFoundError)
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:74:in `attach_function'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `each'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `attach_function'
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:410
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:31:in
`require'
> from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:31:in
`require'
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:18
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:31:in
`require'
> ... 7 levels...
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:18
> from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:19:in
`load'
> On Linux, it works fine.
> Any ideas?
> Regards
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Buildr fails on windows with jruby and ODE 1.X
----------------------------------------------
Key: BUILDR-348
URL: https://issues.apache.org/jira/browse/BUILDR-348
Project: Buildr
Issue Type: Bug
Components: JRuby
Affects Versions: 1.3.5
Environment: Windows XP
Reporter: Rafal Rusin
Taking Apache ODE (rev. https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.X@881749)
And running gives:
buildr _1.3.5_ clean test=no
C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/ffi.rb:113:in `create_invoker': Function
'system' not found in [current process] (FFI::NotFoundError)
from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:74:in `attach_function'
from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `each'
from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/shared/ffi/library.rb:72:in `attach_function'
from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:410
from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/util.rb:31:in
`require'
from C:/Programs/jruby-1.4.0/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:31:in
`require'
from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:18
from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/lib/buildr/core/common.rb:31:in
`require'
... 7 levels...
from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:18
from C:/Programs/jruby-1.4.0/lib/ruby/gems/1.8/gems/buildr-1.3.5-java/bin/buildr:19:in
`load'
On Linux, it works fine.
Any ideas?
Regards
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-346?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12779847#action_12779847
]
peter schröder commented on BUILDR-346:
---------------------------------------
CompileTask is allright.
I just saw the same pattern for the methods
self.dependencies = artifacts
which i changed to @dependencies in the diff
> Test Classpath/Dependencies can not be set
> ------------------------------------------
>
> Key: BUILDR-346
> URL: https://issues.apache.org/jira/browse/BUILDR-346
> Project: Buildr
> Issue Type: Bug
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Priority: Critical
> Fix For: 1.4
>
> Attachments: core_test.diff, test_spec.diff
>
>
> We ran into a test-problem where some log4j-jar is used that is outdated, so we tried
to reset the classpath of the test-task, but this is broken.
> I created a patch for this.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-346?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Boisvert closed BUILDR-346.
--------------------------------
Resolution: Fixed
Fix Version/s: 1.4
Applied applied,
Sending CHANGELOG
Sending lib/buildr/core/test.rb
Sending spec/core/test_spec.rb
Transmitting file data ...
Committed revision 881992.
I didn't see this issue in other places. The CompileTask for instance looks right:
# Compilation dependencies.
attr_accessor :dependencies
> Test Classpath/Dependencies can not be set
> ------------------------------------------
>
> Key: BUILDR-346
> URL: https://issues.apache.org/jira/browse/BUILDR-346
> Project: Buildr
> Issue Type: Bug
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Priority: Critical
> Fix For: 1.4
>
> Attachments: core_test.diff, test_spec.diff
>
>
> We ran into a test-problem where some log4j-jar is used that is outdated, so we tried
to reset the classpath of the test-task, but this is broken.
> I created a patch for this.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Author: boisvert
Date: Wed Nov 18 23:14:28 2009
New Revision: 881992
URL: http://svn.apache.org/viewvc?rev=881992&view=rev
Log:
BUILDR-346 Test classpath can not be set (Peter Schröder)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/test.rb
buildr/trunk/spec/core/test_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=881992&r1=881991&r2=881992&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed Nov 18 23:14:28 2009
@@ -25,6 +25,7 @@
* Fixed: BUILDR-344 Buildr::TestFramework::TestResult::YamlFormatter uses
deprecated form of example_pending (Rhett Sutphin)
* Fixed: BUILDR-345 Improve project documentation (Peter Schröder)
+* Fixed: BUILDR-346 Test classpath can not be set (Peter Schröder)
* Fixed: BUILDR-347 Compile.from does not work correctly with FileTask when
no compiler is set (Peter Schröder)
Modified: buildr/trunk/lib/buildr/core/test.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/test.rb?rev=881992&r1=881991&r2=881992&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/test.rb (original)
+++ buildr/trunk/lib/buildr/core/test.rb Wed Nov 18 23:14:28 2009
@@ -208,18 +208,18 @@
# The dependencies used for running the tests. Includes the compiled files (compile.target)
# and their dependencies. Will also include anything you pass to #with, shared between
the
# testing compile and run dependencies.
- attr_reader :dependencies
+ attr_accessor :dependencies
# *Deprecated*: Use dependencies instead.
def classpath
Buildr.application.deprecated 'Use dependencies instead.'
- dependencies
+ @dependencies
end
# *Deprecated*: Use dependencies= instead.
def classpath=(artifacts)
Buildr.application.deprecated 'Use dependencies= instead.'
- self.dependencies = artifacts
+ @dependencies = artifacts
end
def execute(args) #:nodoc:
Modified: buildr/trunk/spec/core/test_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/test_spec.rb?rev=881992&r1=881991&r2=881992&view=diff
==============================================================================
--- buildr/trunk/spec/core/test_spec.rb (original)
+++ buildr/trunk/spec/core/test_spec.rb Wed Nov 18 23:14:28 2009
@@ -109,7 +109,17 @@
test_task.compile.dependencies.should include(File.expand_path('test.jar'))
test_task.compile.dependencies.should include(artifact('acme:example:jar:1.0'))
end
-
+
+ it 'should respond to deprecated classpath' do
+ test_task.classpath = artifact('acme:example:jar:1.0')
+ test_task.classpath.should be(artifact('acme:example:jar:1.0'))
+ end
+
+ it 'should respond to dependencies' do
+ test_task.dependencies = artifact('acme:example:jar:1.0')
+ test_task.dependencies.should be(artifact('acme:example:jar:1.0'))
+ end
+
it 'should respond to :with and add artifacfs to task dependencies' do
test_task.with 'test.jar', 'acme:example:jar:1.0'
test_task.dependencies.should include(File.expand_path('test.jar'))
[ https://issues.apache.org/jira/browse/BUILDR-347?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Boisvert closed BUILDR-347.
--------------------------------
Resolution: Fixed
Fix Version/s: 1.4
Patch applied.
Sending CHANGELOG
Sending lib/buildr/core/compile.rb
Sending spec/core/compile_spec.rb
Transmitting file data ...
Committed revision 881989.
Thank you!
> Compile.from does not work correctly with FileTask when no compiler is set
> --------------------------------------------------------------------------
>
> Key: BUILDR-347
> URL: https://issues.apache.org/jira/browse/BUILDR-347
> Project: Buildr
> Issue Type: Bug
> Components: Compilers
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Priority: Minor
> Fix For: 1.4
>
> Attachments: core_compile.diff
>
>
> As described in the documentation
> compile.from apt
> will fail if no compiler is defined!
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Author: boisvert
Date: Wed Nov 18 23:06:49 2009
New Revision: 881989
URL: http://svn.apache.org/viewvc?rev=881989&view=rev
Log:
BUILDR-347 Compile.from does not work correctly with FileTask when no compiler
is set (Peter Schröder)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/compile.rb
buildr/trunk/spec/core/compile_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=881989&r1=881988&r2=881989&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed Nov 18 23:06:49 2009
@@ -25,6 +25,8 @@
* Fixed: BUILDR-344 Buildr::TestFramework::TestResult::YamlFormatter uses
deprecated form of example_pending (Rhett Sutphin)
* Fixed: BUILDR-345 Improve project documentation (Peter Schröder)
+* Fixed: BUILDR-347 Compile.from does not work correctly with FileTask when
+ no compiler is set (Peter Schröder)
1.3.5 (2009-10-05)
* Added: Interactive shell (REPL) support
Modified: buildr/trunk/lib/buildr/core/compile.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/compile.rb?rev=881989&r1=881988&r2=881989&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/compile.rb (original)
+++ buildr/trunk/lib/buildr/core/compile.rb Wed Nov 18 23:06:49 2009
@@ -264,7 +264,7 @@
# compile.from('src/java').into('classes').with('module1.jar')
def from(*sources)
@sources |= sources.flatten
- guess_compiler if @compiler.nil? && sources.flatten.any? { |source| File.exist?(source)
}
+ guess_compiler if @compiler.nil? && sources.flatten.any? { |source| File.exist?(source.to_s)
}
self
end
Modified: buildr/trunk/spec/core/compile_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/compile_spec.rb?rev=881989&r1=881988&r2=881989&view=diff
==============================================================================
--- buildr/trunk/spec/core/compile_spec.rb (original)
+++ buildr/trunk/spec/core/compile_spec.rb Wed Nov 18 23:06:49 2009
@@ -21,6 +21,14 @@
def compile_task
@compile_task ||= define('foo').compile.using(:javac)
end
+
+ def compile_task_without_compiler
+ @compile_task ||= define('foo').compile
+ end
+
+ def file_task
+ @file_taks ||= define('bar').file('src')
+ end
def sources
@sources ||= ['Test1.java', 'Test2.java'].map { |f| File.join('src/main/java/thepackage',
f) }.
@@ -47,6 +55,10 @@
compile_task.from(sources).should be(compile_task)
end
+ it 'should respond to from() with FileTask having no compiler set and return self' do
+ compile_task_without_compiler.from(file_task).should be(compile_task)
+ end
+
it 'should respond to from() and add sources' do
compile_task.from sources, File.dirname(sources.first)
compile_task.sources.should == sources + [File.dirname(sources.first)]
Author: boisvert
Date: Wed Nov 18 22:48:37 2009
New Revision: 881978
URL: http://svn.apache.org/viewvc?rev=881978&view=rev
Log:
"buildr test=only" will only run tests explicitly specified on the command line
(and ignore transitive test dependencies)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/doc/testing.textile
buildr/trunk/lib/buildr/core/test.rb
buildr/trunk/spec/core/test_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=881978&r1=881977&r2=881978&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed Nov 18 22:48:37 2009
@@ -10,6 +10,8 @@
eclipse.exclude_libs += ['/path/to/some/library.jar']
* Added: Environment variable IGNORE_BUILDFILE can be set to "yes" or
"true" to ignore changes in Buildfile when running tests.
+* Added: "buildr test=only" will only run tests explicitly specified on the
+ command line (and ignore transitive test dependencies)
* Change: Updated to JRuby 1.4.0
* Change: Updated to JtestR 0.5
* Change: Updated to JUnit 4.7
Modified: buildr/trunk/doc/testing.textile
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/testing.textile?rev=881978&r1=881977&r2=881978&view=diff
==============================================================================
--- buildr/trunk/doc/testing.textile (original)
+++ buildr/trunk/doc/testing.textile Wed Nov 18 22:48:37 2009
@@ -106,6 +106,11 @@
We're using @package@ and not @build@ above. When using a continuous build system, you want
to make sure that packages are created, contain the right files, and also run the integration
tests.
+One last note on running tests. By default when you run tests, Buildr will automatically
run all transitive test dependencies. This mean if you run "buildr test" inside project @bar@
and @bar@ depends on project @foo@, Buildr will first run tests in project @foo@ if there
have been any changes affecting @foo@ that haven't been taken into account yet. This behavior
often surprises people, especially when they are trying to get things done and only care about
tests in @bar@ at that moment. For those times when you'd like to focus your testing on specific
projects, Buildr has the @only@ option that will only run tests for projects specified on
the command line,
+
+{% highlight sh %}
+$ buildr test=only bar:test
+{% endhighlight %}
h2(#integration). Integration Tests
Modified: buildr/trunk/lib/buildr/core/test.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/test.rb?rev=881978&r1=881977&r2=881978&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/test.rb (original)
+++ buildr/trunk/lib/buildr/core/test.rb Wed Nov 18 22:48:37 2009
@@ -602,7 +602,7 @@
# Picking up the test frameworks adds further dependencies.
test.framework
- project.build test unless test.options[:integration]
+ project.build test unless test.options[:integration] || Buildr.options.test == :only
project.clean do
rm_rf test.compile.target.to_s if test.compile.target
@@ -687,6 +687,8 @@
false
when /^all$/i
:all
+ when /^only$/i
+ :only
when /^(yes|on|true)$/i, nil
true
else
Modified: buildr/trunk/spec/core/test_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/test_spec.rb?rev=881978&r1=881977&r2=881978&view=diff
==============================================================================
--- buildr/trunk/spec/core/test_spec.rb (original)
+++ buildr/trunk/spec/core/test_spec.rb Wed Nov 18 22:48:37 2009
@@ -268,6 +268,14 @@
mkpath project('foo').test.report_to.to_s
lambda { task('clean').invoke }.should change { File.exist?(project('foo').test.report_to.to_s)
}.to(false)
end
+
+ it 'should only run tests explicitly specified if options.test is :only' do
+ Buildr.options.test = :only
+ write 'bar/src/main/java/Bar.java', 'public class Bar {}'
+ define('bar', :version=>'1.0', :base_dir=>'bar') { package :jar }
+ define('foo') { compile.with project('bar') }
+ lambda { task('foo:test').invoke rescue nil }.should_not run_tasks('bar:test')
+ end
end
Author: boisvert
Date: Wed Nov 18 22:21:21 2009
New Revision: 881966
URL: http://svn.apache.org/viewvc?rev=881966&view=rev
Log:
Upgrade to JtestR 0.5 and JUnit 4.7
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/java/bdd.rb
buildr/trunk/lib/buildr/java/jtestr_runner.rb.erb
buildr/trunk/lib/buildr/java/test_result.rb
buildr/trunk/lib/buildr/java/tests.rb
buildr/trunk/spec/java/bdd_spec.rb
buildr/trunk/spec/sandbox.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=881966&r1=881965&r2=881966&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed Nov 18 22:21:21 2009
@@ -11,6 +11,8 @@
* Added: Environment variable IGNORE_BUILDFILE can be set to "yes" or
"true" to ignore changes in Buildfile when running tests.
* Change: Updated to JRuby 1.4.0
+* Change: Updated to JtestR 0.5
+* Change: Updated to JUnit 4.7
* Fixed: BUILDR-223 Release Task: customizable commit message (Alexis Midon)
* Fixed: BUILDR-330 Install task should re-install artifact even if they
already exist (Alexis Midon)
Modified: buildr/trunk/lib/buildr/java/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/bdd.rb?rev=881966&r1=881965&r2=881966&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/bdd.rb (original)
+++ buildr/trunk/lib/buildr/java/bdd.rb Wed Nov 18 22:21:21 2009
@@ -201,14 +201,10 @@
runner.gems ||= {}
runner.rspec ||= ['--format', 'progress', '--format', "html:#{runner.html_report}"]
runner.format.each { |format| runner.rspec << '--format' << format } if
runner.format
- runner.rspec.push '--format', "#{runner_formatter}:#{runner.result}"
+ runner.rspec.push '--format', "Buildr::TestFramework::TestResult::YamlFormatter:#{runner.result}"
runner
end
- def runner_formatter
- "Buildr::TestFramework::TestResult::YamlFormatter"
- end
-
end
# <a href="http://rspec.info">RSpec</a> is the defacto BDD framework for ruby.
@@ -222,7 +218,7 @@
# * :requires -- A list of ruby files to require before running the specs
# Mainly used if an rspec format needs to require some file.
# * :format -- A list of valid Rspec --format option values. (defaults to 'progress')
- # * :output -- File path to output dump. @false@ to supress output
+ # * :output -- File path to output dump. @false@ to suppress output
# * :fork -- Create a new JavaVM to run the tests on
# * :properties -- Hash of properties passed to the test suite.
# * :java_args -- Arguments passed to the JVM.
@@ -304,7 +300,7 @@
include TestFramework::JRubyBased
- VERSION = '0.3.1'
+ VERSION = '0.5'
# pattern for rspec stories
STORY_PATTERN = /_(steps|story)\.rb$/
@@ -383,10 +379,6 @@
Filter::Mapper.new(:erb, binding).transform(File.read(runner_erb), runner_erb)
end
- def runner_formatter
- 'Buildr::TestFramework::TestResult::JtestRYamlFormatter'
- end
-
end
Modified: buildr/trunk/lib/buildr/java/jtestr_runner.rb.erb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/jtestr_runner.rb.erb?rev=881966&r1=881965&r2=881966&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/jtestr_runner.rb.erb (original)
+++ buildr/trunk/lib/buildr/java/jtestr_runner.rb.erb Wed Nov 18 22:21:21 2009
@@ -78,7 +78,7 @@
end # config
fake_out = StringIO.new
-
+
<% if runner.output == false %>
output = fake_out
<% elsif runner.output.kind_of?(String) %>
@@ -89,10 +89,11 @@
args = [ '<%= spec_dir %>', # the directory to search for jtestr files
- JtestR::SimpleLogger::ERR, # log level
- JtestR::GenericResultHandler::QUIET, #output level
+ JtestR::SimpleLogger::ERR, # log level (DEBUG/WARN/ERR)
+ JtestR::GenericResultHandler::QUIET, #output level (QUIET/VERBOSE)
fake_out, # output STDOUT
[], # groups to run
+ # Use JtestR::GenericResultHandler for debugging
Buildr::TestFramework::TestResult::RSpecResultHandler, # result handler
[] # classpath
]
@@ -100,6 +101,7 @@
argv = <%= runner.rspec.inspect %> || []
argv.push *<%= tests.inspect %>
Buildr::TestFramework::TestResult::RSpecResultHandler.init(argv, output, output)
+ Buildr::TestFramework::TestResult::RSpecResultHandler.test_files = <%= tests.inspect
%>
jtestr.run *args
Modified: buildr/trunk/lib/buildr/java/test_result.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/test_result.rb?rev=881966&r1=881965&r2=881966&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/test_result.rb (original)
+++ buildr/trunk/lib/buildr/java/test_result.rb Wed Nov 18 22:21:21 2009
@@ -16,8 +16,8 @@
require 'fileutils'
module Buildr #:nodoc:
module TestFramework
-
- # A class used by buildr for jruby based frameworks, so that buildr can know
+
+ # A class used by buildr for jruby based frameworks, so that buildr can know
# which tests succeeded/failed.
class TestResult
@@ -35,14 +35,14 @@
end
def self.guard(file)
- begin
+ begin
yield
rescue => e
dump_yaml(file, e)
end
end
end
-
+
attr_accessor :failed, :succeeded
def initialize
@@ -54,7 +54,7 @@
attr_reader :result
attr_accessor :example_group, :options, :where
-
+
def initialize(options, where)
@options = options
@where = where
@@ -62,7 +62,7 @@
@result[:succeeded] = []
@result[:failed] = []
end
-
+
%w[ example_started
start_dump dump_failure dump_summary dump_pending ].each do |meth|
module_eval "def #{meth}(*args); end"
@@ -73,15 +73,15 @@
end
def example_passed(example)
- result.succeeded << example_group.location.gsub(/:\d+$/, '')
+ result.succeeded << example_name(example)
end
def example_pending(example, counter)
- result.succeeded << example_group.location.gsub(/:\d+$/, '')
+ result.succeeded << example_name(example)
end
def example_failed(example, counter, failure)
- result.failed << example_group.location.gsub(/:\d+$/, '')
+ result.failed << example_name(example)
end
def start(example_count)
@@ -93,69 +93,16 @@
FileUtils.mkdir_p File.dirname(where)
File.open(where, 'w') { |f| f.puts YAML.dump(result) }
end
- end # YamlFormatter
-
- # Rspec formatter used for JtestR
- # (JtestR provides its own version of rspec)
- class JtestRYamlFormatter
- attr_reader :result
-
- attr_accessor :example_group, :options, :where
-
- def initialize(options, where)
- @options = options
- @where = where
- @result = Hash.new
- @result[:succeeded] = []
- @result[:failed] = []
- end
-
- %w[ example_started
- start_dump dump_failure dump_summary dump_pending ].each do |meth|
- module_eval "def #{meth}(*args); end"
- end
-
- def add_example_group(example_group)
- @example_group = example_group
- end
- def example_passed(example)
- end
-
- def example_pending(example, counter, failure)
- end
-
- def example_failed(example, counter, failure)
- if example_group.respond_to?(:spec_path)
- result.failed << example_group.spec_path.gsub(/:\d+$/, '')
+ private
+ def example_name(example)
+ if Spec::Example::ExampleProxy === example
+ example_group.location.gsub(/:\d+$/, '')
else
- path = path_from_bt(failure.exception.backtrace)
- result.failed << path if path
+ example.name.gsub(/(.+)(\..+\(\))/, '\1')
end
end
-
- def start(example_count)
- @result = TestResult.new
- end
-
- def path_from_bt(ary)
- files = options.files
- test = nil
- ary.find do |bt|
- bt = bt.split(':').first.strip
- test = bt if files.include?(bt)
- end
- test
- end
-
- def close
- files = options.files
- result.succeeded = files - result.failed
-
- FileUtils.mkdir_p File.dirname(where)
- File.open(where, 'w') { |f| f.puts YAML.dump(result) }
- end
- end # JtestRYamlFormatter
+ end # YamlFormatter
# A JtestR ResultHandler
# Using this handler we can use RSpec formatters, like html/ci_reporter with JtestR
@@ -177,7 +124,7 @@
ignore_patterns << /org\.jruby\.javasupport\.JavaMethod\./
ignore_patterns << /jtestr.*\.jar!/i << /runner\.rb/
end
-
+
def clean_up_double_slashes(line)
line.gsub!('//','/')
end
@@ -197,10 +144,11 @@
error.backtrace.compact!
end
end
-
+
class << self
# an rspec reporter used to proxy events to rspec formatters
attr_reader :reporter
+ attr_accessor :test_files
def init(argv = [], out = STDOUT, err = STDERR)
::JtestR::TestNGResultHandler.module_eval { include TestNGResultHandlerMixin
}
@@ -218,10 +166,11 @@
reporter.end
reporter.dump
end
+
end
module ExampleMethods
- attr_accessor :name, :description, :__full_description
+ attr_accessor :name, :description, :__full_description, :location
end
def reporter
@@ -239,9 +188,10 @@
else
example_group.description = name.to_s
end
- reporter.add_example_group(example_group)
+ reporter.example_group_started(example_group)
end
+
def starting
end
@@ -261,8 +211,8 @@
current_example.extend ::Spec::Example::ExampleMethods
current_example.extend ExampleMethods
name = name.to_s
- name[/\((pen?ding|error|failure|success)\)?$/]
- name = $`
+ current_example.location = name.to_s
+ current_example.name = name.gsub(/(.*)\((.+)\)/, '\2')
current_example.description = name
if example_group.name[/Spec/]
current_example.__full_description = "#{example_group.description} #{name}"
@@ -270,31 +220,56 @@
current_example.__full_description = "#{example_group.name}: #{name}"
end
reporter.example_started(current_example)
- #puts "STARTED #{name} #{current_example.__full_description}"
end
def succeed_single(name = nil)
- #puts "SUCC SINGLE #{name}"
reporter.example_finished(current_example, nil)
end
-
+
def fail_single(name = nil)
- #puts "FAIL SINGLE #{name}"
+ current_example.name = current_name
reporter.example_finished(current_example, current_error)
end
def error_single(name = nil)
- #puts "ERR SINGLE #{name}"
+ current_example.name = current_name
reporter.example_finished(current_example, current_error)
end
def pending_single(name = nil)
- #puts "PEND SINGLE #{name}"
error = ::Spec::Example::ExamplePendingError.new(name)
reporter.example_finished(current_example, error)
end
private
+ def detect_file(trace)
+ # find first matching test file in stacktrace
+ file = nil
+ first_pos = nil
+ RSpecResultHandler.test_files.each do |f|
+ pos = trace.index(f)
+ if pos && (first_pos.nil? || pos < first_pos)
+ file = f
+ first_pos = pos
+ end
+ end
+ file || fail("RSpecResultHandler.detect_file failed: #{trace}")
+ end
+
+ def current_name(example = current_example, fault = current_failure)
+ return example.name unless fault
+ case fault
+ when Test::Unit::Error
+ detect_file(fault.long_display)
+ when Test::Unit::Failure
+ detect_file(fault.location.to_s)
+ when Spec::Runner::Reporter::Failure
+ detect_file(fault.exception.backtrace.to_s)
+ else
+ example.name
+ end
+ end
+
def current_error(fault = current_failure)
case fault
when nil
@@ -314,8 +289,7 @@
fault.exception
when Spec::Runner::Reporter::Failure
ex = fault.exception
- fault.example.instance_variable_get(:@_implementation).to_s =~ /@(.+:\d+)/
- Error.new(ex.message, [$1.to_s] + ex.backtrace)
+ Error.new(ex.message, ex.backtrace)
when Expectations::Results
file = fault.file
line = fault.line
@@ -326,7 +300,7 @@
test_cls, test_meth = $1.to_s, $`.to_s
exception = fault.exception
(class << exception; self; end).module_eval do
- define_method(:backtrace) do
+ define_method(:backtrace) do
(["#{test_cls}:in `#{test_meth}'"] + stackTrace).map { |s| s.to_s }
end
end
@@ -335,7 +309,7 @@
test_cls, test_meth = fault.method.test_class.name, fault.method.method_name
exception = fault.throwable
(class << exception; self; end).module_eval do
- define_method(:backtrace) do
+ define_method(:backtrace) do
(["#{test_cls}:in `#{test_meth}'"] + stackTrace).map { |s| s.to_s }
end
end
Modified: buildr/trunk/lib/buildr/java/tests.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/tests.rb?rev=881966&r1=881965&r2=881966&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/tests.rb (original)
+++ buildr/trunk/lib/buildr/java/tests.rb Wed Nov 18 22:21:21 2009
@@ -167,7 +167,7 @@
end
# JUnit version number.
- VERSION = '4.5'
+ VERSION = '4.7'
class << self
# :call-seq:
Modified: buildr/trunk/spec/java/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/bdd_spec.rb?rev=881966&r1=881965&r2=881966&view=diff
==============================================================================
--- buildr/trunk/spec/java/bdd_spec.rb (original)
+++ buildr/trunk/spec/java/bdd_spec.rb Wed Nov 18 22:21:21 2009
@@ -61,9 +61,6 @@
describe Buildr::JtestR do
before do
- # JtestR currently requires JUnit 4.4
- Buildr.settings.build['junit'] = '4.4'
-
# clear cached dependencies
Buildr::JUnit.instance_eval { @dependencies = nil }
Buildr::JtestR.instance_eval { @dependencies = nil }
Modified: buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/sandbox.rb?rev=881966&r1=881965&r2=881966&view=diff
==============================================================================
--- buildr/trunk/spec/sandbox.rb (original)
+++ buildr/trunk/spec/sandbox.rb Wed Nov 18 22:21:21 2009
@@ -29,8 +29,6 @@
artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef).each
do |path|
file(path).invoke
end
-# JtestR currently requires JUnit 4.4
-file(artifact("junit:junit:jar:4.4")).invoke
ENV['HOME'] = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'home'))
[ https://issues.apache.org/jira/browse/BUILDR-347?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
peter schröder updated BUILDR-347:
----------------------------------
Attachment: core_compile.diff
provide simple fix and add spec
> Compile.from does not work correctly with FileTask when no compiler is set
> --------------------------------------------------------------------------
>
> Key: BUILDR-347
> URL: https://issues.apache.org/jira/browse/BUILDR-347
> Project: Buildr
> Issue Type: Bug
> Components: Compilers
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Priority: Minor
> Attachments: core_compile.diff
>
>
> As described in the documentation
> _compile.from apt_
> will fail if no compiler is defined!
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-347?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
peter schröder updated BUILDR-347:
----------------------------------
Component/s: Compilers
Description:
As described in the documentation
compile.from apt
will fail if no compiler is defined!
was:
As described in the documentation
_compile.from apt_
will fail if no compiler is defined!
> Compile.from does not work correctly with FileTask when no compiler is set
> --------------------------------------------------------------------------
>
> Key: BUILDR-347
> URL: https://issues.apache.org/jira/browse/BUILDR-347
> Project: Buildr
> Issue Type: Bug
> Components: Compilers
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Priority: Minor
> Attachments: core_compile.diff
>
>
> As described in the documentation
> compile.from apt
> will fail if no compiler is defined!
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Compile.from does not work correctly with FileTask when no compiler is set
--------------------------------------------------------------------------
Key: BUILDR-347
URL: https://issues.apache.org/jira/browse/BUILDR-347
Project: Buildr
Issue Type: Bug
Affects Versions: 1.3.5
Reporter: peter schröder
Priority: Minor
As described in the documentation
_compile.from apt_
will fail if no compiler is defined!
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/BUILDR-346?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12779653#action_12779653
]
peter schröder commented on BUILDR-346:
---------------------------------------
I think that this problem can be found in CompileTask too!
Maybe its a copy-and-paste problem in even more tasks...
> Test Classpath/Dependencies can not be set
> ------------------------------------------
>
> Key: BUILDR-346
> URL: https://issues.apache.org/jira/browse/BUILDR-346
> Project: Buildr
> Issue Type: Bug
> Affects Versions: 1.3.5
> Reporter: peter schröder
> Priority: Critical
> Attachments: core_test.diff, test_spec.diff
>
>
> We ran into a test-problem where some log4j-jar is used that is outdated, so we tried
to reset the classpath of the test-task, but this is broken.
> I created a patch for this.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.