buildr 1.4.16 → 1.4.17

Sign up to get free protection for your applications and to get access to all the features.
Files changed (82) hide show
  1. checksums.yaml +8 -8
  2. data/CHANGELOG +20 -0
  3. data/addon/buildr/bnd.rb +158 -158
  4. data/addon/buildr/checkstyle-report.xsl +87 -0
  5. data/addon/buildr/checkstyle.rb +213 -205
  6. data/addon/buildr/css_lint-report.xsl +83 -0
  7. data/addon/buildr/css_lint.rake +196 -0
  8. data/addon/buildr/custom_pom.rb +282 -0
  9. data/addon/buildr/drb.rb +0 -1
  10. data/addon/buildr/git_auto_version.rb +34 -34
  11. data/addon/buildr/gwt.rb +171 -171
  12. data/addon/buildr/hibernate.rb +8 -8
  13. data/addon/buildr/javancss.rb +155 -155
  14. data/addon/buildr/jaxb_xjc.rb +74 -74
  15. data/addon/buildr/jibx.rb +0 -1
  16. data/addon/buildr/org/apache/buildr/BuildrNail.java +2 -2
  17. data/addon/buildr/org/apache/buildr/JettyWrapper.java +3 -3
  18. data/addon/buildr/package_as_nsis.rb +2 -2
  19. data/addon/buildr/pmd.rb +166 -166
  20. data/addon/buildr/scss_lint-report.xsl +79 -0
  21. data/addon/buildr/scss_lint.rb +199 -0
  22. data/addon/buildr/wsgen.rb +4 -0
  23. data/doc/building.textile +3 -3
  24. data/doc/css/default.css +3 -3
  25. data/doc/css/print.css +1 -1
  26. data/doc/download.textile +18 -7
  27. data/doc/index.textile +8 -1
  28. data/doc/installing.textile +3 -3
  29. data/doc/languages.textile +0 -1
  30. data/doc/mailing_lists.textile +0 -4
  31. data/doc/more_stuff.textile +127 -3
  32. data/doc/preface.textile +1 -1
  33. data/doc/projects.textile +6 -6
  34. data/doc/releasing.textile +0 -1
  35. data/lib/buildr/clojure/shell.rb +0 -1
  36. data/lib/buildr/core/build.rb +16 -16
  37. data/lib/buildr/core/filter.rb +3 -3
  38. data/lib/buildr/core/jrebel.rb +0 -1
  39. data/lib/buildr/core/linux.rb +0 -1
  40. data/lib/buildr/core/run.rb +0 -1
  41. data/lib/buildr/core/shell.rb +0 -1
  42. data/lib/buildr/groovy/doc.rb +0 -1
  43. data/lib/buildr/ide/eclipse.rb +0 -2
  44. data/lib/buildr/ide/idea.rb +44 -8
  45. data/lib/buildr/java/bdd.rb +0 -1
  46. data/lib/buildr/java/commands.rb +2 -3
  47. data/lib/buildr/java/jruby.rb +2 -2
  48. data/lib/buildr/java/org/apache/buildr/JavaTestFilter.java +5 -5
  49. data/lib/buildr/java/tests.rb +0 -1
  50. data/lib/buildr/packaging/artifact_namespace.rb +0 -2
  51. data/lib/buildr/resources/icons-license.txt +14 -17
  52. data/lib/buildr/scala/bdd.rb +0 -1
  53. data/lib/buildr/scala/compiler.rb +0 -1
  54. data/lib/buildr/scala/org/apache/buildr/Specs2Runner.class +0 -0
  55. data/lib/buildr/scala/org/apache/buildr/Specs2Runner.java +0 -2
  56. data/lib/buildr/version.rb +1 -1
  57. data/rakelib/metrics.rake +3 -3
  58. data/rakelib/release.rake +8 -2
  59. data/spec/addon/bnd_spec.rb +383 -383
  60. data/spec/addon/custom_pom_spec.rb +149 -0
  61. data/spec/addon/drb_spec.rb +0 -1
  62. data/spec/addon/jaxb_xjc_spec.rb +130 -130
  63. data/spec/core/application_spec.rb +0 -1
  64. data/spec/core/build_spec.rb +1 -1
  65. data/spec/core/console_spec.rb +0 -1
  66. data/spec/core/doc_spec.rb +0 -1
  67. data/spec/core/extension_spec.rb +0 -1
  68. data/spec/core/generate_from_eclipse_spec.rb +9 -9
  69. data/spec/core/run_spec.rb +2 -3
  70. data/spec/core/shell_spec.rb +0 -1
  71. data/spec/ide/idea_spec.rb +1979 -1941
  72. data/spec/java/cobertura_spec.rb +6 -6
  73. data/spec/java/commands_spec.rb +11 -11
  74. data/spec/java/compiler_spec.rb +0 -1
  75. data/spec/java/doc_spec.rb +0 -1
  76. data/spec/java/ecj_spec.rb +1 -3
  77. data/spec/java/external_spec.rb +0 -2
  78. data/spec/java/java_spec.rb +3 -3
  79. data/spec/java/run_spec.rb +0 -1
  80. data/spec/java/tests_spec.rb +15 -0
  81. data/spec/xpath_matchers.rb +121 -120
  82. metadata +10 -2
@@ -1,155 +1,155 @@
1
- # Licensed to the Apache Software Foundation (ASF) under one or more
2
- # contributor license agreements. See the NOTICE file distributed with this
3
- # work for additional information regarding copyright ownership. The ASF
4
- # licenses this file to you under the Apache License, Version 2.0 (the
5
- # "License"); you may not use this file except in compliance with the License.
6
- # You may obtain a copy of the License at
7
- #
8
- # http://www.apache.org/licenses/LICENSE-2.0
9
- #
10
- # Unless required by applicable law or agreed to in writing, software
11
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
- # License for the specific language governing permissions and limitations under
14
- # the License.
15
-
16
- module Buildr
17
- # Provides the <code>javancss:html</code> and <code>javancss:xml</code> tasks.
18
- # Require explicitly using <code>require "buildr/javancss"</code>.
19
- module JavaNCSS
20
-
21
- class << self
22
-
23
- # The specs for requirements
24
- def dependencies
25
- [
26
- 'org.codehaus.javancss:javancss:jar:32.53',
27
- 'javancss:ccl:jar:29.50',
28
- 'javancss:jhbasic:jar:29.50'
29
- ]
30
- end
31
-
32
- def javancss(output_file, source_paths, options = {})
33
- dependencies = (options[:dependencies] || []) + self.dependencies
34
- cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
35
-
36
- args = []
37
- args << "-all"
38
- args << "-xml"
39
- args << "-out"
40
- args << output_file
41
- args << "-recursive"
42
- source_paths.each do |source_path|
43
- args << source_path
44
- end
45
-
46
- begin
47
- Java::Commands.java 'javancss.Main', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
48
- rescue => e
49
- raise e if options[:fail_on_error]
50
- end
51
- end
52
- end
53
-
54
- class Config
55
- def enabled?
56
- !!@enabled
57
- end
58
-
59
- attr_writer :enabled
60
-
61
- def html_enabled?
62
- File.exist?(self.style_file)
63
- end
64
-
65
- attr_writer :config_directory
66
-
67
- def config_directory
68
- @config_directory || project._(:source, :main, :etc, :javancss)
69
- end
70
-
71
- attr_writer :report_dir
72
-
73
- def report_dir
74
- @report_dir || project._(:reports, :javancss)
75
- end
76
-
77
- attr_writer :fail_on_error
78
-
79
- def fail_on_error?
80
- @fail_on_error.nil? ? false : @fail_on_error
81
- end
82
-
83
- attr_writer :xml_output_file
84
-
85
- def xml_output_file
86
- @xml_output_file || "#{self.report_dir}/javancss.xml"
87
- end
88
-
89
- attr_writer :html_output_file
90
-
91
- def html_output_file
92
- @html_output_file || "#{self.report_dir}/javancss.html"
93
- end
94
-
95
- attr_writer :style_file
96
-
97
- def style_file
98
- @style_file || "#{self.config_directory}/javancss2html.xsl"
99
- end
100
-
101
- def source_paths
102
- @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
103
- end
104
-
105
- protected
106
-
107
- def initialize(project)
108
- @project = project
109
- end
110
-
111
- attr_reader :project
112
-
113
- end
114
-
115
- module ProjectExtension
116
- include Extension
117
-
118
- def javancss
119
- @javancss ||= Buildr::JavaNCSS::Config.new(project)
120
- end
121
-
122
- after_define do |project|
123
- if project.javancss.enabled?
124
- desc "Generate JavaNCSS xml report."
125
- project.task("javancss:xml") do
126
- puts "JavaNCSS: Analyzing source code..."
127
- mkdir_p File.dirname(project.javancss.xml_output_file)
128
- Buildr::JavaNCSS.javancss(project.javancss.xml_output_file,
129
- project.javancss.source_paths.flatten.compact,
130
- :fail_on_error => project.javancss.fail_on_error?)
131
- end
132
-
133
- if project.javancss.html_enabled?
134
- xml_task = project.task("javancss:xml")
135
- desc "Generate JavaNCSS html report."
136
- project.task("javancss:html" => xml_task) do
137
- puts "JavaNCSS: Generating report"
138
- mkdir_p File.dirname(project.javancss.html_output_file)
139
- Buildr.ant "javancss" do |ant|
140
- ant.xslt :in => project.javancss.xml_output_file,
141
- :out => project.javancss.html_output_file,
142
- :style => project.javancss.style_file
143
- end
144
- end
145
-
146
- end
147
- end
148
- end
149
- end
150
- end
151
- end
152
-
153
- class Buildr::Project
154
- include Buildr::JavaNCSS::ProjectExtension
155
- end
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with this
3
+ # work for additional information regarding copyright ownership. The ASF
4
+ # licenses this file to you under the Apache License, Version 2.0 (the
5
+ # "License"); you may not use this file except in compliance with the License.
6
+ # You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
+ # License for the specific language governing permissions and limitations under
14
+ # the License.
15
+
16
+ module Buildr
17
+ # Provides the <code>javancss:html</code> and <code>javancss:xml</code> tasks.
18
+ # Require explicitly using <code>require "buildr/javancss"</code>.
19
+ module JavaNCSS
20
+
21
+ class << self
22
+
23
+ # The specs for requirements
24
+ def dependencies
25
+ [
26
+ 'org.codehaus.javancss:javancss:jar:32.53',
27
+ 'javancss:ccl:jar:29.50',
28
+ 'javancss:jhbasic:jar:29.50'
29
+ ]
30
+ end
31
+
32
+ def javancss(output_file, source_paths, options = {})
33
+ dependencies = (options[:dependencies] || []) + self.dependencies
34
+ cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
35
+
36
+ args = []
37
+ args << "-all"
38
+ args << "-xml"
39
+ args << "-out"
40
+ args << output_file
41
+ args << "-recursive"
42
+ source_paths.each do |source_path|
43
+ args << source_path
44
+ end
45
+
46
+ begin
47
+ Java::Commands.java 'javancss.Main', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
48
+ rescue => e
49
+ raise e if options[:fail_on_error]
50
+ end
51
+ end
52
+ end
53
+
54
+ class Config
55
+ def enabled?
56
+ !!@enabled
57
+ end
58
+
59
+ attr_writer :enabled
60
+
61
+ def html_enabled?
62
+ File.exist?(self.style_file)
63
+ end
64
+
65
+ attr_writer :config_directory
66
+
67
+ def config_directory
68
+ @config_directory || project._(:source, :main, :etc, :javancss)
69
+ end
70
+
71
+ attr_writer :report_dir
72
+
73
+ def report_dir
74
+ @report_dir || project._(:reports, :javancss)
75
+ end
76
+
77
+ attr_writer :fail_on_error
78
+
79
+ def fail_on_error?
80
+ @fail_on_error.nil? ? false : @fail_on_error
81
+ end
82
+
83
+ attr_writer :xml_output_file
84
+
85
+ def xml_output_file
86
+ @xml_output_file || "#{self.report_dir}/javancss.xml"
87
+ end
88
+
89
+ attr_writer :html_output_file
90
+
91
+ def html_output_file
92
+ @html_output_file || "#{self.report_dir}/javancss.html"
93
+ end
94
+
95
+ attr_writer :style_file
96
+
97
+ def style_file
98
+ @style_file || "#{self.config_directory}/javancss2html.xsl"
99
+ end
100
+
101
+ def source_paths
102
+ @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
103
+ end
104
+
105
+ protected
106
+
107
+ def initialize(project)
108
+ @project = project
109
+ end
110
+
111
+ attr_reader :project
112
+
113
+ end
114
+
115
+ module ProjectExtension
116
+ include Extension
117
+
118
+ def javancss
119
+ @javancss ||= Buildr::JavaNCSS::Config.new(project)
120
+ end
121
+
122
+ after_define do |project|
123
+ if project.javancss.enabled?
124
+ desc "Generate JavaNCSS xml report."
125
+ project.task("javancss:xml") do
126
+ puts "JavaNCSS: Analyzing source code..."
127
+ mkdir_p File.dirname(project.javancss.xml_output_file)
128
+ Buildr::JavaNCSS.javancss(project.javancss.xml_output_file,
129
+ project.javancss.source_paths.flatten.compact,
130
+ :fail_on_error => project.javancss.fail_on_error?)
131
+ end
132
+
133
+ if project.javancss.html_enabled?
134
+ xml_task = project.task("javancss:xml")
135
+ desc "Generate JavaNCSS html report."
136
+ project.task("javancss:html" => xml_task) do
137
+ puts "JavaNCSS: Generating report"
138
+ mkdir_p File.dirname(project.javancss.html_output_file)
139
+ Buildr.ant "javancss" do |ant|
140
+ ant.xslt :in => project.javancss.xml_output_file,
141
+ :out => project.javancss.html_output_file,
142
+ :style => project.javancss.style_file
143
+ end
144
+ end
145
+
146
+ end
147
+ end
148
+ end
149
+ end
150
+ end
151
+ end
152
+
153
+ class Buildr::Project
154
+ include Buildr::JavaNCSS::ProjectExtension
155
+ end
@@ -1,74 +1,74 @@
1
- # Licensed to the Apache Software Foundation (ASF) under one or more
2
- # contributor license agreements. See the NOTICE file distributed with this
3
- # work for additional information regarding copyright ownership. The ASF
4
- # licenses this file to you under the Apache License, Version 2.0 (the
5
- # "License"); you may not use this file except in compliance with the License.
6
- # You may obtain a copy of the License at
7
- #
8
- # http://www.apache.org/licenses/LICENSE-2.0
9
- #
10
- # Unless required by applicable law or agreed to in writing, software
11
- # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
- # License for the specific language governing permissions and limitations under
14
- # the License.
15
-
16
- module Buildr
17
- module JaxbXjc
18
- class << self
19
-
20
- def jaxb_version
21
- "2.2.1"
22
- end
23
-
24
- # The specs for requirements
25
- def dependencies
26
- [
27
- "javax.xml.bind:jaxb-api:jar:#{jaxb_version}",
28
- "com.sun.xml.bind:jaxb-impl:jar:#{jaxb_version}",
29
- "com.sun.xml.bind:jaxb-xjc:jar:#{jaxb_version}"
30
- ]
31
- end
32
-
33
- # Repositories containing the requirements
34
- def remote_repository
35
- "http://download.java.net/maven/2"
36
- end
37
-
38
- def xjc(*args)
39
- cp = Buildr.artifacts(self.dependencies).each(&:invoke).map(&:to_s)
40
- Java::Commands.java 'com.sun.tools.xjc.XJCFacade', *(args + [{ :classpath => cp }])
41
- end
42
- end
43
-
44
- def compile_jaxb(files, *args)
45
- options = Hash === args.last ? args.pop.dup : {}
46
- rake_check_options options, :directory, :keep_content, :package, :id
47
- args = args.dup
48
- files = Array === files ? files.flatten : [files]
49
-
50
- target_dir = File.expand_path(options[:directory] || _(:target, :generated, :jaxb, 'main/java'))
51
- timestamp_file = File.expand_path("#{target_dir}/jaxb-#{options[:id] || 1}.cache")
52
-
53
- project.iml.main_source_directories << target_dir if project.iml?
54
-
55
- file(target_dir => timestamp_file)
56
-
57
- file(timestamp_file => files.flatten) do |task|
58
- rm_rf target_dir unless options[:keep_content]
59
- mkdir_p target_dir
60
- args << "-d" << target_dir
61
- args << "-p" << options[:package] if options[:package]
62
- args += files.collect{|f| f.to_s}
63
- JaxbXjc.xjc args
64
- touch timestamp_file
65
- end
66
-
67
- target_dir
68
- end
69
- end
70
- end
71
-
72
- class Buildr::Project
73
- include Buildr::JaxbXjc
74
- end
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with this
3
+ # work for additional information regarding copyright ownership. The ASF
4
+ # licenses this file to you under the Apache License, Version 2.0 (the
5
+ # "License"); you may not use this file except in compliance with the License.
6
+ # You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
+ # License for the specific language governing permissions and limitations under
14
+ # the License.
15
+
16
+ module Buildr
17
+ module JaxbXjc
18
+ class << self
19
+
20
+ def jaxb_version
21
+ "2.2.1"
22
+ end
23
+
24
+ # The specs for requirements
25
+ def dependencies
26
+ [
27
+ "javax.xml.bind:jaxb-api:jar:#{jaxb_version}",
28
+ "com.sun.xml.bind:jaxb-impl:jar:#{jaxb_version}",
29
+ "com.sun.xml.bind:jaxb-xjc:jar:#{jaxb_version}"
30
+ ]
31
+ end
32
+
33
+ # Repositories containing the requirements
34
+ def remote_repository
35
+ "http://download.java.net/maven/2"
36
+ end
37
+
38
+ def xjc(*args)
39
+ cp = Buildr.artifacts(self.dependencies).each(&:invoke).map(&:to_s)
40
+ Java::Commands.java 'com.sun.tools.xjc.XJCFacade', *(args + [{ :classpath => cp }])
41
+ end
42
+ end
43
+
44
+ def compile_jaxb(files, *args)
45
+ options = Hash === args.last ? args.pop.dup : {}
46
+ rake_check_options options, :directory, :keep_content, :package, :id
47
+ args = args.dup
48
+ files = Array === files ? files.flatten : [files]
49
+
50
+ target_dir = File.expand_path(options[:directory] || _(:target, :generated, :jaxb, 'main/java'))
51
+ timestamp_file = File.expand_path("#{target_dir}/jaxb-#{options[:id] || 1}.cache")
52
+
53
+ project.iml.main_source_directories << target_dir if project.iml?
54
+
55
+ file(target_dir => timestamp_file)
56
+
57
+ file(timestamp_file => files.flatten) do |task|
58
+ rm_rf target_dir unless options[:keep_content]
59
+ mkdir_p target_dir
60
+ args << "-d" << target_dir
61
+ args << "-p" << options[:package] if options[:package]
62
+ args += files.collect{|f| f.to_s}
63
+ JaxbXjc.xjc args
64
+ touch timestamp_file
65
+ end
66
+
67
+ target_dir
68
+ end
69
+ end
70
+ end
71
+
72
+ class Buildr::Project
73
+ include Buildr::JaxbXjc
74
+ end