ivy4r 0.9.12 → 0.9.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/History.txt +177 -172
- data/Rakefile +39 -34
- data/bin/ivy4r +3 -3
- data/lib/buildr/ivy_extension.rb +6 -2
- data/lib/ivy/target.rb +131 -128
- data/lib/ivy4r.rb +234 -234
- data/test/test_ivy4r.rb +196 -194
- metadata +2 -2
data/History.txt
CHANGED
|
@@ -1,172 +1,177 @@
|
|
|
1
|
-
=== 0.9.
|
|
2
|
-
|
|
3
|
-
* Fix
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
=== 0.9.
|
|
7
|
-
|
|
8
|
-
* Fix
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
=== 0.9.
|
|
35
|
-
|
|
36
|
-
*
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
*
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
*
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
*
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
=== 0.
|
|
95
|
-
|
|
96
|
-
*
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
=== 0.7.
|
|
109
|
-
|
|
110
|
-
* Fix bug
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
*
|
|
134
|
-
|
|
135
|
-
=== 0.
|
|
136
|
-
|
|
137
|
-
*
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
*
|
|
147
|
-
|
|
148
|
-
=== 0.5.
|
|
149
|
-
|
|
150
|
-
*
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
=== 0.
|
|
154
|
-
|
|
155
|
-
*
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
*
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
*
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
1
|
+
=== 0.9.13 / 2010-02-16
|
|
2
|
+
|
|
3
|
+
* Fix problems with Facets and ActiveSupport. We now only include the required core extensions,
|
|
4
|
+
not all of them.
|
|
5
|
+
|
|
6
|
+
=== 0.9.12 / 2010-01-21
|
|
7
|
+
|
|
8
|
+
* Fix the problem with creation of packages where the additional ivy information has not been added
|
|
9
|
+
if "package :file 'x.type'" was used instead of "package :type".
|
|
10
|
+
|
|
11
|
+
=== 0.9.11 / 2009-12-22
|
|
12
|
+
|
|
13
|
+
* Fix of the ivy:clean target to clean the ivy cache via the cleancache task.
|
|
14
|
+
|
|
15
|
+
=== 0.9.10 / 2009-12-21
|
|
16
|
+
|
|
17
|
+
* Better support for Rake targets using the deps mechanism from buildr support.
|
|
18
|
+
|
|
19
|
+
=== 0.9.9 / 2009-12-10
|
|
20
|
+
|
|
21
|
+
* Fixed setting of ant properties, properties are really sets and cannot be overwritten afterwards.
|
|
22
|
+
|
|
23
|
+
=== 0.9.7 / 2009-12-10
|
|
24
|
+
|
|
25
|
+
* Fixed missing files in gem.
|
|
26
|
+
|
|
27
|
+
=== 0.9.6 / 2009-12-09
|
|
28
|
+
|
|
29
|
+
* Support for JRuby access to underlying java objects of ivy. Require 'ivy4r_java_extensions'
|
|
30
|
+
instead of 'ivy4r'. The Ivy4r#ivy_instance returns a new ivy instance configured with the same
|
|
31
|
+
settings file as used in the underlying ant process. Note that configuration via URL is not
|
|
32
|
+
supported.
|
|
33
|
+
|
|
34
|
+
=== 0.9.5 / 2009-12-01
|
|
35
|
+
|
|
36
|
+
* Bugfix for manifest handling in packages. The custom set manifest informations are not lost,
|
|
37
|
+
ivy informations for manifest are merged into the configured manifest.
|
|
38
|
+
|
|
39
|
+
=== 0.9.4 / 2009-12-01
|
|
40
|
+
|
|
41
|
+
* ivy.deps for buildr supports three argument types:
|
|
42
|
+
1. if an Hash is given :conf is used for confs and :type is used for types
|
|
43
|
+
2. if exactly two arrays are given args[0] is used for confs and args[1] is used for types
|
|
44
|
+
3. if not exactly two arrays all args are used as confs
|
|
45
|
+
|
|
46
|
+
=== 0.9.3 / 2009-11-18
|
|
47
|
+
|
|
48
|
+
* Sorting of compile and test dependencies to prevent problems with old jars that are added by
|
|
49
|
+
buildr automatically, i.e. log4j-1.2.9 for cobertura or JUnit 4.4 if tests are using a newer version.
|
|
50
|
+
The sort order:
|
|
51
|
+
1. all project dependencies as classes, resources and this like in the order the are contained in path
|
|
52
|
+
2. all ivy dependencies
|
|
53
|
+
3. all dependencies added by buildr to the targets
|
|
54
|
+
* Deleted 'to_ivy_file' functionality because it was not working as expected. The function used the
|
|
55
|
+
wrong ivy context and was not able to resolve all variables within the file from the correct ivy context.
|
|
56
|
+
|
|
57
|
+
=== 0.9.2 / 2009-11-16
|
|
58
|
+
|
|
59
|
+
* Added new method to generate an ivy file from a resolved module descriptor, via the java
|
|
60
|
+
method ModuleDescriptor.toIvyFile(java.io.File). This is only working in jruby, because
|
|
61
|
+
the method is not called via Antwrap!
|
|
62
|
+
* Added support for buildr configuration to call 'to_ivy_file' to generate ivy file from resolved
|
|
63
|
+
module descriptor, i.e. using 'ivy.to_ivy_file :file => 'output.file', :overwrite => true'
|
|
64
|
+
|
|
65
|
+
=== 0.9.1 / 2009-11-16
|
|
66
|
+
|
|
67
|
+
* Fixed bug that 'type' was not working for EAR
|
|
68
|
+
|
|
69
|
+
=== 0.9.0 / 2009-11-16
|
|
70
|
+
|
|
71
|
+
* Add a new configuration option for compile, test and package with name 'type'. The type can
|
|
72
|
+
be used as defined in ivy to only get artifacts of given type(s). One or more types can be
|
|
73
|
+
set as an array to this option. If no type is given all artifacts are retrieved.
|
|
74
|
+
|
|
75
|
+
=== 0.8.1 / 2009-11-12
|
|
76
|
+
|
|
77
|
+
* the project version is NOT set anymore by the the 'before_define' of the extension. The reason
|
|
78
|
+
for this are problems with ivy files that contain external references (i.e. include within the conf
|
|
79
|
+
block). The info task used for this needs more configuration information to work properly so this
|
|
80
|
+
feature is removed and the user must do it herself.
|
|
81
|
+
* In our projects we just moved the defintion to a different extension that configures more stuff
|
|
82
|
+
before setting the version and group:
|
|
83
|
+
before_define do |project|
|
|
84
|
+
if project.parent.nil? && project.ivy.enabled?
|
|
85
|
+
# do more configuration here prior setting the versions
|
|
86
|
+
info = project.ivy.info
|
|
87
|
+
project.version = info['ivy.revision']
|
|
88
|
+
project.group = "#{info['ivy.organisation']}.#{info['ivy.module']}"
|
|
89
|
+
end
|
|
90
|
+
end
|
|
91
|
+
* As an alternative you can set the group and version manually in the build file as it is usally done
|
|
92
|
+
in buildr.
|
|
93
|
+
|
|
94
|
+
=== 0.8.0 / 2009-10-19
|
|
95
|
+
|
|
96
|
+
* Moved to gemcutter for hosting of gems 'gem install gemcutter' add it as primary location and you
|
|
97
|
+
can install gems as before
|
|
98
|
+
|
|
99
|
+
=== 0.7.3 / 2009-09-15
|
|
100
|
+
|
|
101
|
+
* Renamed +ant+ to +ivy4r+ in buildr extension to make more clear what this object does. It is accesible
|
|
102
|
+
via call to +project.ivy.ivy4r+, use it in post_resolve or other places where the low level
|
|
103
|
+
ivy functions are needed in any way.
|
|
104
|
+
* Added access to buildr_extension to get the configured mappings for artifacts to ivy publish names.
|
|
105
|
+
I.e. configured +ivy.publish package(:jar) => 'name.jar'
|
|
106
|
+
access this hash via +ivy.publish_mappings+
|
|
107
|
+
|
|
108
|
+
=== 0.7.2 / 2009-09-08
|
|
109
|
+
|
|
110
|
+
* Fix bug for creating EARs. The package dependencies are added into the root directory
|
|
111
|
+
of the EAR.
|
|
112
|
+
|
|
113
|
+
=== 0.7.1 / 2009-08-24
|
|
114
|
+
|
|
115
|
+
* Fix bug that manual added dependencies are overwritten for package task
|
|
116
|
+
issue 1: http://github.com/klaas1979/ivy4r/issues#issue/1
|
|
117
|
+
* possible to add manual dependencies for compile and test as for package
|
|
118
|
+
|
|
119
|
+
=== 0.7.0 / 2009-07-20
|
|
120
|
+
|
|
121
|
+
* It is possible to register +post_resolve+ actions via blocks:
|
|
122
|
+
ivy.post_resolve {...}
|
|
123
|
+
* support for generic configuration syntax via +method_missing+:
|
|
124
|
+
Any method combination of TARGETS [:compile, :test, :package] and TYPES [:conf, :include, :exclude] is valid.
|
|
125
|
+
It is possible to set all confs at once:
|
|
126
|
+
+ivy.conf :compile => 'conf', :package => 'other', :test => ['still', 'other']
|
|
127
|
+
Or to set the complete package options:
|
|
128
|
+
+ivy.package :conf => 'prod', :include => /includepattern/, :exclude => /excludepattern/+
|
|
129
|
+
Or to set a specific value via a complete call like:
|
|
130
|
+
+ivy.compile_conf [...] or ivy.conf_test [...] or ivy.package.include [...]
|
|
131
|
+
* more include/exclude possibilities, support to include and exclude for compile and test targets using
|
|
132
|
+
+ivy.include :compile => [pattern list]+ or +ivy.exclude+
|
|
133
|
+
* small refactorings
|
|
134
|
+
|
|
135
|
+
=== 0.6.0 / 2009-07-08
|
|
136
|
+
|
|
137
|
+
* added support for the +ide+ targets +eclipse+, +idea+ and +idea7x+
|
|
138
|
+
* gem needs +facets+
|
|
139
|
+
|
|
140
|
+
=== 0.5.3 / 2009-06-24
|
|
141
|
+
|
|
142
|
+
* bugfixes
|
|
143
|
+
|
|
144
|
+
=== 0.5.2 / 2009-06-24
|
|
145
|
+
|
|
146
|
+
* bugfixes
|
|
147
|
+
|
|
148
|
+
=== 0.5.1 / 2009-06-24
|
|
149
|
+
|
|
150
|
+
* small improvements in rakefile (execute test for some targets)
|
|
151
|
+
* publish to rubyforge "hamburg.rb"
|
|
152
|
+
|
|
153
|
+
=== 0.5.0 / 2009-06-23
|
|
154
|
+
|
|
155
|
+
* use ivy4r-jars to get needed jars from to separate the ruby source from the dependencies
|
|
156
|
+
and make the gem smaller.
|
|
157
|
+
|
|
158
|
+
=== 0.4.0 / 2009-06-23
|
|
159
|
+
|
|
160
|
+
* added rake/ivy_extension similar to buildr/ivy_extension to help use ivy4r in rake
|
|
161
|
+
|
|
162
|
+
=== 0.3.0 / 2009-06-20
|
|
163
|
+
|
|
164
|
+
* added ant*.jar to gem so that user does not need to have a local ant installation
|
|
165
|
+
|
|
166
|
+
=== 0.2.0 / 2009-06-18
|
|
167
|
+
|
|
168
|
+
* added the Buildr ivy_extension to include ivy in buildr for dependency managment
|
|
169
|
+
* small improvements in documentation
|
|
170
|
+
|
|
171
|
+
|
|
172
|
+
=== 0.1.0 / 2009-06-17
|
|
173
|
+
|
|
174
|
+
* initial release
|
|
175
|
+
* support for nearly all basic IVY Ant targets
|
|
176
|
+
* basic validation of parameters
|
|
177
|
+
|
data/Rakefile
CHANGED
|
@@ -1,34 +1,39 @@
|
|
|
1
|
-
# -*- ruby -*-
|
|
2
|
-
$:.unshift File.join(File.dirname(__FILE__), 'lib')
|
|
3
|
-
|
|
4
|
-
require 'rubygems'
|
|
5
|
-
require 'hoe'
|
|
6
|
-
require 'ivy4r'
|
|
7
|
-
|
|
8
|
-
hoe = Hoe.spec 'ivy4r' do |p|
|
|
9
|
-
self.rubyforge_name = 'hamburgrb'
|
|
10
|
-
p.developer('Klaas Prause', 'klaas.prause@googlemail.com')
|
|
11
|
-
p.remote_rdoc_dir = 'ivy4r'
|
|
12
|
-
p.extra_deps << ['Antwrap', '>=0.7.0']
|
|
13
|
-
p.extra_deps << ['ivy4r-jars', '>=1.0.0']
|
|
14
|
-
p.extra_deps << ['facets', '>=2.5.2']
|
|
15
|
-
#p.extra_deps << ['thoughtbot-shoulda', '>=2.5.2']
|
|
16
|
-
#p.extra_deps << ['rr', '>=0.10.0']
|
|
17
|
-
File.open(File.join(File.dirname(__FILE__), 'VERSION'), 'w') do |file|
|
|
18
|
-
file.puts Ivy4r::VERSION
|
|
19
|
-
end
|
|
20
|
-
end
|
|
21
|
-
|
|
22
|
-
begin
|
|
23
|
-
require 'jeweler'
|
|
24
|
-
Jeweler::Tasks.new(hoe.spec)
|
|
25
|
-
rescue LoadError
|
|
26
|
-
puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
|
|
27
|
-
end
|
|
28
|
-
|
|
29
|
-
task :gemspec => :test
|
|
30
|
-
|
|
31
|
-
desc "Tests, releases and publishs docs to rubyforge"
|
|
32
|
-
task :release_and_publish => [:test, :release, :publish_docs]
|
|
33
|
-
|
|
34
|
-
|
|
1
|
+
# -*- ruby -*-
|
|
2
|
+
$:.unshift File.join(File.dirname(__FILE__), 'lib')
|
|
3
|
+
|
|
4
|
+
require 'rubygems'
|
|
5
|
+
require 'hoe'
|
|
6
|
+
require 'ivy4r'
|
|
7
|
+
|
|
8
|
+
hoe = Hoe.spec 'ivy4r' do |p|
|
|
9
|
+
self.rubyforge_name = 'hamburgrb'
|
|
10
|
+
p.developer('Klaas Prause', 'klaas.prause@googlemail.com')
|
|
11
|
+
p.remote_rdoc_dir = 'ivy4r'
|
|
12
|
+
p.extra_deps << ['Antwrap', '>=0.7.0']
|
|
13
|
+
p.extra_deps << ['ivy4r-jars', '>=1.0.0']
|
|
14
|
+
p.extra_deps << ['facets', '>=2.5.2']
|
|
15
|
+
#p.extra_deps << ['thoughtbot-shoulda', '>=2.5.2']
|
|
16
|
+
#p.extra_deps << ['rr', '>=0.10.0']
|
|
17
|
+
File.open(File.join(File.dirname(__FILE__), 'VERSION'), 'w') do |file|
|
|
18
|
+
file.puts Ivy4r::VERSION
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
begin
|
|
23
|
+
require 'jeweler'
|
|
24
|
+
Jeweler::Tasks.new(hoe.spec)
|
|
25
|
+
rescue LoadError
|
|
26
|
+
puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
|
|
27
|
+
end
|
|
28
|
+
|
|
29
|
+
task :gemspec => :test
|
|
30
|
+
|
|
31
|
+
desc "Tests, releases and publishs docs to rubyforge"
|
|
32
|
+
task :release_and_publish => [:test, :release, :publish_docs]
|
|
33
|
+
|
|
34
|
+
desc "Build gem and publish to gem server"
|
|
35
|
+
task :build_and_publish => :build do
|
|
36
|
+
exec "gem push_to_blau"
|
|
37
|
+
end
|
|
38
|
+
|
|
39
|
+
# vim: syntax=ruby
|
data/bin/ivy4r
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
#!/usr/bin/env ruby
|
|
2
|
-
|
|
3
|
-
abort "makes no sense for ivy4r!"
|
|
1
|
+
#!/usr/bin/env ruby
|
|
2
|
+
|
|
3
|
+
abort "makes no sense for ivy4r!"
|
data/lib/buildr/ivy_extension.rb
CHANGED
|
@@ -300,7 +300,7 @@ module Buildr
|
|
|
300
300
|
# for publishing use a hash with the +package+ as key and the newly mapped name as value. I.e.
|
|
301
301
|
# <tt>ivy.name(package(:jar) => 'new_name_without_version_number.jar')</tt>
|
|
302
302
|
# Note that this method is additive, a second call adds the names to the first.
|
|
303
|
-
def
|
|
303
|
+
def publish(*publish_mappings)
|
|
304
304
|
if publish_mappings.empty?
|
|
305
305
|
@publish_mappings ||= {}
|
|
306
306
|
else
|
|
@@ -309,7 +309,11 @@ module Buildr
|
|
|
309
309
|
self
|
|
310
310
|
end
|
|
311
311
|
end
|
|
312
|
-
|
|
312
|
+
|
|
313
|
+
def name(*args)
|
|
314
|
+
puts "name(*args) is deprecated use publish(*args)!"
|
|
315
|
+
publish(*args)
|
|
316
|
+
end
|
|
313
317
|
|
|
314
318
|
# Sets the directory to publish artifacts from.
|
|
315
319
|
def publish_from(*publish_dir)
|