[#197] Better regex and no trailing whitespace.
This commit is contained in:
parent
ec3717e644
commit
40ce66d05d
|
@ -1,11 +1,24 @@
|
||||||
|
#-- copyright
|
||||||
|
# ChiliProject is a project management system.
|
||||||
|
#
|
||||||
|
# Copyright (C) 2010-2011 the ChiliProject Team
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; either version 2
|
||||||
|
# of the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# See doc/COPYRIGHT.rdoc for more details.
|
||||||
|
#++
|
||||||
|
|
||||||
namespace :copyright do
|
namespace :copyright do
|
||||||
desc "Update the copyright on the source files"
|
desc "Update the copyright on the source files"
|
||||||
task :update do
|
task :update do
|
||||||
short_copyright = File.readlines("doc/COPYRIGHT_short.rdoc").collect do |line|
|
short_copyright = File.readlines("doc/COPYRIGHT_short.rdoc").collect do |line|
|
||||||
"# #{line}"
|
"# #{line}".rstrip
|
||||||
end.join("")
|
end.join("\n")
|
||||||
|
|
||||||
short_copyright_as_rdoc = "#-- copyright\n" + short_copyright + "#++"
|
short_copyright_as_rdoc = "#-- copyright\n" + short_copyright + "\n#++"
|
||||||
|
|
||||||
Dir['**/**{.rb,.rake}'].each do |file_name|
|
Dir['**/**{.rb,.rake}'].each do |file_name|
|
||||||
# Skip 3rd party code
|
# Skip 3rd party code
|
||||||
|
@ -14,11 +27,9 @@ namespace :copyright do
|
||||||
file_name.include?("lib/faster_csv") ||
|
file_name.include?("lib/faster_csv") ||
|
||||||
file_name.include?("lib/redcloth") ||
|
file_name.include?("lib/redcloth") ||
|
||||||
file_name.include?("lib/diff")
|
file_name.include?("lib/diff")
|
||||||
next if file_name.include?("lib/tasks/copyright") # skip self
|
|
||||||
next if file_name.include?("unified_diff_test") # confict
|
|
||||||
|
|
||||||
file_content = File.read(file_name)
|
file_content = File.read(file_name)
|
||||||
@copyright_regex = /#-- copyright.*\+\+/m
|
@copyright_regex = /^#--\s*copyright.*?\+\+/m
|
||||||
if file_content.match(@copyright_regex)
|
if file_content.match(@copyright_regex)
|
||||||
file_content.gsub!(@copyright_regex, short_copyright_as_rdoc)
|
file_content.gsub!(@copyright_regex, short_copyright_as_rdoc)
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue