buildr 1.4.8-x86-mswin32 → 1.4.9-x86-mswin32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/CHANGELOG +6 -0
  2. data/doc/download.textile +20 -20
  3. data/lib/buildr/core/application.rb +9 -40
  4. data/lib/buildr/core/util.rb +0 -35
  5. data/lib/buildr/version.rb +1 -1
  6. data/rakelib/doc.rake +3 -1
  7. data/rakelib/release.rake +29 -18
  8. data/rakelib/stage.rake +27 -3
  9. metadata +3 -3
data/CHANGELOG CHANGED
@@ -1,3 +1,9 @@
1
+ 1.4.9 (2012-11-08)
2
+ * Fixed: Fixed the interaction with the FileUtils classes. The last release
3
+ introduced a non-deterministic bug that sometimes caused logging
4
+ preferences to be ignored and the install method to be
5
+ inadvertently overwritten.
6
+
1
7
  1.4.8 (2012-11-01)
2
8
  * Change: Revert to importing non-verbose FileUtils utility methods to match buildr 1.4.6 release and earlier.
3
9
  * Added: Experimental support for jacoco code coverage tool.
data/doc/download.textile CHANGED
@@ -35,37 +35,37 @@ p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.8/KEYS)
35
35
  h3. buildr 1.4.7 (2012-05-29)
36
36
 
37
37
  |_. Package |_. MD5 Checksum |_. PGP |
38
- | "buildr-1.4.7-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.7/buildr-1.4.7-x86-mswin32.gem | "062031b8890b489673be814ca08598cb":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7-x86-mswin32.gem.asc |
39
- | "buildr-1.4.7-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.7/buildr-1.4.7-java.gem | "a7cfac76a53fb6deaac0b12acc02a82c":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7-java.gem.asc |
40
- | "buildr-1.4.7.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.7/buildr-1.4.7.gem | "85a8ddb9ae752e04c0416e2f1d30d064":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7.gem.asc |
41
- | "buildr-1.4.7.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.7/buildr-1.4.7.tgz | "576789cb7d10216cc3b7383441fd2596":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7.tgz.asc |
42
- | "buildr-1.4.7.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.7/buildr-1.4.7.zip | "e414f72706885a695a380693e9c530c7":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.7/buildr-1.4.7.zip.asc |
38
+ | "buildr-1.4.7-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7-x86-mswin32.gem | "062031b8890b489673be814ca08598cb":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7-x86-mswin32.gem.asc |
39
+ | "buildr-1.4.7-java.gem":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7-java.gem | "a7cfac76a53fb6deaac0b12acc02a82c":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7-java.gem.asc |
40
+ | "buildr-1.4.7.gem":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.gem | "85a8ddb9ae752e04c0416e2f1d30d064":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.gem.asc |
41
+ | "buildr-1.4.7.tgz":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.tgz | "576789cb7d10216cc3b7383441fd2596":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.tgz.asc |
42
+ | "buildr-1.4.7.zip":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.zip | "e414f72706885a695a380693e9c530c7":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.7/buildr-1.4.7.zip.asc |
43
43
 
44
- p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.7/KEYS)
44
+ p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.7/KEYS)
45
45
 
46
46
 
47
47
  h3. buildr 1.4.6 (2011-06-22)
48
48
 
49
49
  |_. Package |_. MD5 Checksum |_. PGP |
50
- | "buildr-1.4.6-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.6/buildr-1.4.6-java.gem | "4b5952d99abd59bd1d296bf21b4854e2":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6-java.gem.asc |
51
- | "buildr-1.4.6-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.6/buildr-1.4.6-x86-mswin32.gem | "2c89b87a44f7f957169434969d2cdaed":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6-x86-mswin32.gem.asc |
52
- | "buildr-1.4.6.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.6/buildr-1.4.6.gem | "4d6848a6370925e54135c36f5085be94":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6.gem.asc |
53
- | "buildr-1.4.6.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.6/buildr-1.4.6.tgz | "3b76c4037d3ad95c79c3dd8d07805fb0":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6.tgz.asc |
54
- | "buildr-1.4.6.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.6/buildr-1.4.6.zip | "e9b7a313d7ac726c0a74c62afa7bfdc5":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.6/buildr-1.4.6.zip.asc |
50
+ | "buildr-1.4.6-java.gem":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6-java.gem | "4b5952d99abd59bd1d296bf21b4854e2":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6-java.gem.asc |
51
+ | "buildr-1.4.6-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6-x86-mswin32.gem | "2c89b87a44f7f957169434969d2cdaed":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6-x86-mswin32.gem.asc |
52
+ | "buildr-1.4.6.gem":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.gem | "4d6848a6370925e54135c36f5085be94":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.gem.asc |
53
+ | "buildr-1.4.6.tgz":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.tgz | "3b76c4037d3ad95c79c3dd8d07805fb0":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.tgz.asc |
54
+ | "buildr-1.4.6.zip":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.zip | "e9b7a313d7ac726c0a74c62afa7bfdc5":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.6/buildr-1.4.6.zip.asc |
55
55
 
56
- p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.6/KEYS)
56
+ p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.6/KEYS)
57
57
 
58
58
 
59
59
  h3. buildr 1.4.5 (2011-02-21)
60
60
 
61
61
  |_. Package |_. MD5 Checksum |_. PGP |
62
- | "buildr-1.4.5.gem":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem | "57cccec175e0b1b682a36f75e54d15cf":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.asc |
63
- | "buildr-1.4.5-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem | "d24b11446eaa01e24b9ec1be4b6d93d1":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.asc |
64
- | "buildr-1.4.5-java.gem":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem | "c167e67e33e7c3b4bf2316d7405eb11e":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.asc |
65
- | "buildr-1.4.5.tgz":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz | "9b335479ce006caf109c4786d83aa00c":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.asc |
66
- | "buildr-1.4.5.zip":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip | "0d3b3b474a3c90c717bdc953aab8e626":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.asc |
62
+ | "buildr-1.4.5.gem":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem | "57cccec175e0b1b682a36f75e54d15cf":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.asc |
63
+ | "buildr-1.4.5-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem | "d24b11446eaa01e24b9ec1be4b6d93d1":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.asc |
64
+ | "buildr-1.4.5-java.gem":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem | "c167e67e33e7c3b4bf2316d7405eb11e":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.asc |
65
+ | "buildr-1.4.5.tgz":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz | "9b335479ce006caf109c4786d83aa00c":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.asc |
66
+ | "buildr-1.4.5.zip":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip | "0d3b3b474a3c90c717bdc953aab8e626":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.asc |
67
67
 
68
- p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.5/KEYS)
68
+ p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.5/KEYS)
69
69
 
70
70
 
71
71
  h3. buildr 1.4.4 (2010-11-16)
@@ -135,7 +135,7 @@ h3. buildr 1.3.4 (2009-04-21)
135
135
  | "buildr-1.3.4.tgz":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.tgz | "7d918b88a3bb8139f28f6ff0b39d003c":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.tgz.asc |
136
136
  | "buildr-1.3.4.zip":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.zip | "8f4cf84dc6e293aac5fba7e2a9cc0776":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.zip.asc |
137
137
 
138
- p>. ("Release signing keys":http://www.apache.org/dist/buildr/KEYS)
138
+ p>. ("Release signing keys":http://archive.apache.org/dist/buildr/KEYS)
139
139
 
140
140
 
141
141
  h3. buildr 1.3.3-incubating (2008-10-08)
@@ -183,5 +183,5 @@ h3. buildr 1.3.0-incubating (2008-05-01)
183
183
  p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.3.0-incubating/KEYS)
184
184
 
185
185
 
186
- p(note). When downloading from files please check the "md5sum":http://www.apache.org/dev/release-signing#md5 and verify the "OpenPGP":http://www.apache.org/dev/release-signing#openpgp compatible signature from the main Apache site. This "KEYS":http://www.apache.org/dist/buildr/KEYS file contains the public keys used for signing releases. It is recommended that (when possible) a web of trust is used to confirm the identity of these keys. For more information, please see the "Apache Release FAQ":http://www.apache.org/dev/release.html.
186
+ p(note). When downloading from files please check the "md5sum":http://www.apache.org/dev/release-signing#md5 and verify the "OpenPGP":http://www.apache.org/dev/release-signing#openpgp compatible signature from the main Apache site. This KEYS file contains the public keys used for signing releases. It is recommended that (when possible) a web of trust is used to confirm the identity of these keys. For more information, please see the "Apache Release FAQ":http://www.apache.org/dev/release.html.
187
187
 
data/lib/buildr/core/application.rb CHANGED
@@ -679,46 +679,15 @@ module Rake #:nodoc
679
679
  end
680
680
  end
681
681
 
682
-
683
- module RakeFileUtils #:nodoc:
684
- FileUtils::OPT_TABLE.each do |name, opts|
685
- default_options = []
686
- if opts.include?(:verbose) || opts.include?("verbose")
687
- default_options << ':verbose => RakeFileUtils.verbose_flag == true'
688
- end
689
- next if default_options.empty?
690
- module_eval(<<-EOS, __FILE__, __LINE__ + 1)
691
- def #{name}( *args, &block )
692
- super(
693
- *rake_merge_option(args,
694
- #{default_options.join(', ')}
695
- ), &block)
696
- end
697
- EOS
698
- end
699
- end
700
-
701
-
702
- # It is unclear why this needs to be included on windows but it does seem to be needed.
703
- # But it can not be included under linux as it rewrites the install command
704
- if Buildr::Util.win_os?
705
-
706
- module Rake::DSL #:nodoc:
707
- FileUtils::OPT_TABLE.each do |name, opts|
708
- default_options = []
709
- if opts.include?(:verbose) || opts.include?("verbose")
710
- default_options << ':verbose => RakeFileUtils.verbose_flag == true'
711
- end
712
- next if default_options.empty?
713
- module_eval(<<-EOS, __FILE__, __LINE__ + 1)
714
- def #{name}( *args, &block )
715
- super(
716
- *rake_merge_option(args,
717
- #{default_options.join(', ')}
718
- ), &block)
682
+ module FileUtils
683
+ def fu_output_message(msg) #:nodoc:
684
+ if Rake::FileUtilsExt::DEFAULT == RakeFileUtils.verbose_flag
685
+ # Swallow the default output
686
+ elsif RakeFileUtils.verbose_flag
687
+ @fileutils_output ||= $stderr
688
+ @fileutils_label ||= ''
689
+ @fileutils_output.puts @fileutils_label + msg
719
690
  end
720
- EOS
721
691
  end
722
- end
723
-
692
+ private_module_function :fu_output_message
724
693
  end
data/lib/buildr/core/util.rb CHANGED
@@ -285,41 +285,6 @@ if Buildr::Util.java_platform?
285
285
  remove_method :error if method_defined?(:error)
286
286
  end
287
287
 
288
- # Fix for BUILDR-292.
289
- # JRuby fails to rename a file on different devices
290
- # this monkey-patch wont be needed when JRUBY-3381 gets resolved.
291
- module FileUtils #:nodoc:
292
- alias_method :__mv_native, :mv
293
-
294
- def mv(from, to, options = nil)
295
- dir_to = File.directory?(to) ? to : File.dirname(to)
296
- Array(from).each do |from|
297
- dir_from = File.dirname(from)
298
- if File.stat(dir_from).dev != File.stat(dir_to).dev
299
- cp from, to, options
300
- rm from, options
301
- else
302
- __mv_native from, to, options
303
- end
304
- end
305
- end
306
- private :mv
307
- end
308
-
309
- module RakeFileUtils #:nodoc:
310
- def rake_merge_option(args, defaults)
311
- defaults[:verbose] = false if defaults[:verbose] == Rake::FileUtilsExt::DEFAULT
312
-
313
- if Hash === args.last
314
- defaults.update(args.last)
315
- args.pop
316
- end
317
- args.push defaults
318
- args
319
- end
320
- private :rake_merge_option
321
- end
322
-
323
288
  module Buildr
324
289
  class ProcessStatus
325
290
  attr_reader :pid, :termsig, :stopsig, :exitstatus
data/lib/buildr/version.rb CHANGED
@@ -14,5 +14,5 @@
14
14
  # the License.
15
15
 
16
16
  module Buildr
17
- VERSION = '1.4.8'.freeze
17
+ VERSION = '1.4.9'.freeze
18
18
  end
data/rakelib/doc.rake CHANGED
@@ -90,6 +90,7 @@ ForceType 'text/plain; charset=UTF-8'
90
90
  end
91
91
 
92
92
  # Publish prerequisites to Web site.
93
+ desc "Publish complete web site"
93
94
  task 'publish' => 'site' do
94
95
  target = "people.apache.org:/www/#{spec.name}.apache.org/"
95
96
  puts "Uploading new site to #{target} ..."
@@ -98,7 +99,8 @@ task 'publish' => 'site' do
98
99
  puts 'Done'
99
100
  end
100
101
 
101
- # Update HTML + PDF documentation (but not entire site; no specs, coverage, etc.)
102
+ # Update HTML + PDF documentation (but not rdoc, changelog etc.)
103
+ desc "Publish non-release specific documentation to web site"
102
104
  task 'publish-doc' => %w(buildr.pdf _site) do
103
105
  cp 'buildr.pdf', '_site'
104
106
  target = "people.apache.org:/www/#{spec.name}.apache.org/"
data/rakelib/release.rake CHANGED
@@ -13,7 +13,7 @@
13
13
  # License for the specific language governing permissions and limitations under
14
14
  # the License.
15
15
 
16
-
16
+ desc "Release the next version of buildr from existing staged repository"
17
17
  task 'release' do
18
18
  # First, we need to get all the staged files from Apache to _release.
19
19
  mkpath '_release'
@@ -24,7 +24,6 @@ task 'release' do
24
24
  puts '[X] Staged files are now in _release'
25
25
  end.call
26
26
 
27
-
28
27
  # Upload binary and source packages and new Web site
29
28
  lambda do
30
29
  target = "people.apache.org:/www/www.apache.org/dist/#{spec.name}/#{spec.version}"
@@ -32,7 +31,8 @@ task 'release' do
32
31
  host, remote_dir = target.split(':')
33
32
  sh 'ssh', host, 'rm', '-rf', remote_dir rescue nil
34
33
  sh 'ssh', host, 'mkdir', remote_dir
35
- sh 'rsync', '--progress', '--recursive', "_release/#{spec.version}/dist/", target
34
+ sh 'rsync', '--progress', '--recursive', '--delete', "_release/#{spec.version}/dist/", target
35
+ sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "#{remote_dir}/*"
36
36
  puts '[X] Uploaded packages to www.apache.org/dist'
37
37
 
38
38
  target = "people.apache.org:/www/#{spec.name}.apache.org/"
@@ -42,7 +42,6 @@ task 'release' do
42
42
  puts "[X] Uploaded new site to #{spec.name}.apache.org"
43
43
  end.call
44
44
 
45
-
46
45
  # Upload binary and source packages to RubyForge.
47
46
  lambda do
48
47
  # update rubyforge projects, processors, etc. in local config
@@ -54,7 +53,7 @@ task 'release' do
54
53
  rubyforge.userconfig.merge!('release_changes'=>"_release/#{spec.version}/CHANGES", 'preformatted' => true)
55
54
  rubyforge.add_release spec.rubyforge_project.downcase, spec.name.downcase, spec.version.to_s, *files
56
55
 
57
- puts 'Posting news to RubyForge ...'
56
+ puts "Posting news to RubyForge ... "
58
57
  changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
59
58
  rubyforge.post_news spec.rubyforge_project.downcase, "Buildr #{spec.version} released",
60
59
  "#{spec.description}\n\nNew in Buildr #{spec.version}:\n#{changes.gsub(/^/, ' ')}\n"
@@ -101,32 +100,45 @@ task 'release' do
101
100
  puts '[X] Updated CHANGELOG and added entry for next release'
102
101
  end.call
103
102
 
104
-
105
103
  # Update source files to next release number.
106
104
  lambda do
107
105
  next_version = spec.version.to_s.split('.').map { |v| v.to_i }.
108
106
  zip([0, 0, 1]).map { |a| a.inject(0) { |t,i| t + i } }.join('.')
109
107
 
110
- ver_file = "lib/#{spec.name}.rb"
108
+ ver_file = "lib/#{spec.name}/version.rb"
111
109
  if File.exist?(ver_file)
112
- modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
110
+ modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}.dev#{$2}" }
113
111
  File.open ver_file, 'w' do |file|
114
112
  file.write modified
115
113
  end
116
114
  puts "[X] Updated #{ver_file} to next release"
117
115
  end
116
+ end.call
118
117
 
119
- spec_file = "#{spec.name}.gemspec"
120
- if File.exist?(spec_file)
121
- modified = File.read(spec_file).sub(/(s(?:pec)?\.version\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
122
- File.open spec_file, 'w' do |file|
123
- file.write modified
124
- end
125
- puts "[X] Updated #{spec_file} to next release"
118
+ # Update doap file for current release.
119
+ lambda do
120
+ doap_file = "doap.rdf"
121
+ release_date = File.read("_release/#{spec.version}/CHANGES").scan(/#{spec.version} \((.*)\)/).flatten[0]
122
+ changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
123
+ doap_entry = <<DOAP
124
+ <release>
125
+ <Version>
126
+ <name>#{spec.version}</name>
127
+ <created>#{release_date}</created>
128
+ <revision>#{spec.version}</revision>
129
+ <dc:description>
130
+ #{changes}
131
+ </dc:description>
132
+ </Version>
133
+ </release>
134
+ DOAP
135
+ modified = File.read(doap_file).sub(/^ \<category.* \/\>$/) { |category_line| "#{category_line}\n#{textile}" }
136
+ File.open doap_file, 'w' do |file|
137
+ file.write modified
126
138
  end
139
+ puts "[X] Updated #{doap_file} for current release"
127
140
  end.call
128
141
 
129
-
130
142
  # Prepare release announcement email.
131
143
  lambda do
132
144
  changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
@@ -152,8 +164,7 @@ The Apache Buildr Team
152
164
  end
153
165
  puts '[X] Created release announce email template in ''announce-email.txt'''
154
166
  puts email
155
- end
156
-
167
+ end.call
157
168
  end
158
169
 
159
170
  task('clobber') { rm_rf '_release' }
data/rakelib/stage.rake CHANGED
@@ -22,7 +22,21 @@ gpg_cmd = 'gpg2'
22
22
  task 'prepare' do |task, args|
23
23
  gpg_arg = args.gpg || ENV['gpg']
24
24
 
25
- if false
25
+ # Update source files to next release number.
26
+ lambda do
27
+ current_version = spec.version.to_s.split('.').map { |v| v.to_i }.
28
+ zip([0, 0, 0]).map { |a| a.inject(0) { |t,i| i.nil? ? nil : t + i } }.compact.join('.')
29
+
30
+ ver_file = "lib/#{spec.name}/version.rb"
31
+ if File.exist?(ver_file)
32
+ modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{current_version}#{$2}" }
33
+ File.open ver_file, 'w' do |file|
34
+ file.write modified
35
+ end
36
+ puts "[X] Removed dev suffix from version in #{ver_file}"
37
+ end
38
+ end.call
39
+
26
40
  # Make sure we're doing a release from checked code.
27
41
  lambda do
28
42
  puts 'Checking there are no local changes ... '
@@ -41,7 +55,6 @@ task 'prepare' do |task, args|
41
55
  fail "Expecting CHANGELOG to start with #{expecting}, but found #{header} instead" unless expecting == header
42
56
  puts '[x] CHANGELOG indicates most recent version and today''s date'
43
57
  end.call
44
- end
45
58
 
46
59
  # Need GPG to sign the packages.
47
60
  lambda do
@@ -63,6 +76,14 @@ task 'prepare' do |task, args|
63
76
  puts '[X] We have prince available'
64
77
  end.call
65
78
 
79
+ # Need RubyForge to upload new release files.
80
+ lambda do
81
+ puts "[!] Make sure you have admin privileges to make a release on RubyForge"
82
+ rubyforge = RubyForge.new.configure
83
+ rubyforge.login
84
+ rubyforge.scrape_project(spec.name)
85
+ end.call
86
+
66
87
  raise "Can not run stage process under jruby" if RUBY_PLATFORM[/java/]
67
88
  raise "Can not run staging process under older rubies" unless RUBY_VERSION >= '1.9'
68
89
  end
@@ -123,7 +144,10 @@ p>. ("Release signing keys":#{official}/KEYS)
123
144
  TEXTILE
124
145
  file_name = 'doc/download.textile'
125
146
  print "Adding download links to #{file_name} ... "
126
- modified = File.read(file_name).sub(/^h2\(#dist\).*$/) { |header| "#{header}\n\n#{textile}" }
147
+ modified = File.read(file_name).
148
+ gsub('http://www.apache.org/dist','http://archive.apache.org/dist').
149
+ gsub('http://www.apache.org/dyn/closer.cgi','http://archive.apache.org/dist').
150
+ sub(/^h2\(#dist\).*$/) { |header| "#{header}\n\n#{textile}" }
127
151
  File.open file_name, 'w' do |file|
128
152
  file.write modified
129
153
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: buildr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.8
4
+ version: 1.4.9
5
5
  prerelease:
6
6
  platform: x86-mswin32
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-01 00:00:00.000000000 Z
12
+ date: 2012-11-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
@@ -737,7 +737,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
737
737
  version: '0'
738
738
  segments:
739
739
  - 0
740
- hash: -3367967067219773219
740
+ hash: 3221001784676050362
741
741
  required_rubygems_version: !ruby/object:Gem::Requirement
742
742
  none: false
743
743
  requirements: