Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
bf476d74ed
1 changed files with 10 additions and 5 deletions
|
@ -6,7 +6,12 @@ require 'code_beauty_ruby.rb'
|
||||||
def checkForHeader(fileName)
|
def checkForHeader(fileName)
|
||||||
foundHeader = false;
|
foundHeader = false;
|
||||||
foundSheBang = false;
|
foundSheBang = false;
|
||||||
|
isCoffee = false;
|
||||||
|
|
||||||
header = "# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/\n\n"
|
header = "# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/\n\n"
|
||||||
|
if File.extname(fileName) == '.coffee'
|
||||||
|
isCoffee = true
|
||||||
|
end
|
||||||
|
|
||||||
file = File.open(fileName)
|
file = File.open(fileName)
|
||||||
t_file = Tempfile.new('Temp')
|
t_file = Tempfile.new('Temp')
|
||||||
|
@ -39,16 +44,16 @@ def checkForHeader(fileName)
|
||||||
t_file.close
|
t_file.close
|
||||||
FileUtils.cp(t_file.path, fileName)
|
FileUtils.cp(t_file.path, fileName)
|
||||||
t_file.unlink
|
t_file.unlink
|
||||||
|
if !isCoffee
|
||||||
t_file = RBeautify.beautify_file(fileName)
|
t_file = RBeautify.beautify_file(fileName)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
#folder array
|
#folder array
|
||||||
folder = ['app/controllers/', 'app/models/', 'app/helpers/', 'app/mailers/' ]
|
folder = ['app/assets/javascripts/app','app/controllers/', 'app/models/', 'app/helpers/', 'app/mailers/' ]
|
||||||
|
|
||||||
folder.each do |folder|
|
folder.each do |folder|
|
||||||
puts 'Working on folder' + folder.to_s
|
puts 'Working on folder' + folder.to_s
|
||||||
rbfiles = File.join("../#{folder}**", "*.rb")
|
rbfiles = File.join("../#{folder}**", "*.{rb,coffee}")
|
||||||
d = Dir.glob(rbfiles)
|
d = Dir.glob(rbfiles)
|
||||||
|
|
||||||
d.each {|fileName|
|
d.each {|fileName|
|
||||||
|
|
Loading…
Reference in a new issue