diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be7945..45c5a89fc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,4 @@ +# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ + module ApplicationHelper end diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb index a7b8cec89..6833fa8a0 100644 --- a/app/helpers/posts_helper.rb +++ b/app/helpers/posts_helper.rb @@ -1,2 +1,4 @@ +# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ + module PostsHelper end diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb index f68ce0dba..2b6253a86 100644 --- a/app/models/channel/email_parser.rb +++ b/app/models/channel/email_parser.rb @@ -531,9 +531,9 @@ module Mail # Search for occurences of quoted strings or plain strings text.scan(/( # Group around entire regex to include it in matches - \=\?[^?]+\?([QB])\?[^?]+?\?\= # Quoted String with subgroup for encoding method - | # or - .+?(?=\=\?|$) # Plain String + \=\?[^?]+\?([QB])\?[^?]+?\?\= # Quoted String with subgroup for encoding method + | # or + .+?(?=\=\?|$) # Plain String )/xmi).map do |matches| string, method = *matches if method == 'b' || method == 'B' diff --git a/script/code_beauty_ruby.rb b/script/code_beauty_ruby.rb index 5c335d2a5..32dbc9101 100755 --- a/script/code_beauty_ruby.rb +++ b/script/code_beauty_ruby.rb @@ -27,7 +27,7 @@ module RBeautify # user-customizable values RBeautify::TabStr = " " - RBeautify::TabSize = 3 + RBeautify::TabSize = 2 # indent regexp tests @@ -35,6 +35,7 @@ module RBeautify /^module\b/, /^class\b/, /^if\b/, + /[A-z]\($/, /(=\s*|^)until\b/, /(=\s*|^)for\b/, /^unless\b/, @@ -59,6 +60,9 @@ module RBeautify /^rescue\b/, /^ensure\b/, /^elsif\b/, + /^\)$/, + /^\);$/, + /^\)\./, /^end\b/, /^else\b/, /\bwhen\b/, diff --git a/script/scheduler.rb b/script/scheduler.rb index fa7538b17..aa95c9267 100755 --- a/script/scheduler.rb +++ b/script/scheduler.rb @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ + $LOAD_PATH << './lib' require 'rubygems' @@ -22,15 +24,15 @@ worker_count = 2 else ARGV.clear end - + Dir.chdir dir RAILS_ENV = ARGV.first || ENV['RAILS_ENV'] || 'development' - + $stdout.reopen( dir + "/log/" + name + "_out.log", "w") $stderr.reopen( dir + "/log/" + name + "_err.log", "w") require File.join(dir, "config", "environment") require 'scheduler' - + Scheduler.run(count, worker_count) end -} \ No newline at end of file +} diff --git a/script/source_code_filter.rb b/script/source_code_filter.rb index 162905907..fc4413095 100755 --- a/script/source_code_filter.rb +++ b/script/source_code_filter.rb @@ -4,59 +4,57 @@ require 'tempfile' require 'code_beauty_ruby.rb' def checkForHeader(fileName) - foundHeader = false; - foundSheBang = false; - header = "# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/\n\n" + foundHeader = false; + foundSheBang = false; + header = "# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/\n\n" - file = File.open(fileName) - t_file = Tempfile.new('Temp') - allLines = IO.readlines(fileName) + file = File.open(fileName) + t_file = Tempfile.new('Temp') + allLines = IO.readlines(fileName) - if allLines[0] =~ /(^# Copyright)/ || allLines[1] =~ /(^# Copyright)/ - foundHeader = true - elsif allLines[1] =~/^=begin/ #assume external script - foundHeader = true - end - if allLines[0] =~ /(^#!\/)/ - foundSheBang = true - end + if allLines[0] =~ /(^# Copyright)/ || allLines[1] =~ /(^# Copyright)/ + foundHeader = true + elsif allLines[1] =~/^=begin/ #assume external script + foundHeader = true + end + if allLines[0] =~ /(^#!\/)/ + foundSheBang = true + end - file.each do |line| - if file.lineno == 1 && foundSheBang && foundHeader - t_file.puts line - elsif file.lineno == 1 && !foundSheBang && !foundHeader - t_file.puts header - t_file.puts line - elsif file.lineno == 1 && foundSheBang && !foundHeader - t_file.puts line - t_file.puts header - else - t_file.puts line.rstrip - end - end + file.each do |line| + if file.lineno == 1 && foundSheBang && foundHeader + t_file.puts line + elsif file.lineno == 1 && !foundSheBang && !foundHeader + t_file.puts header + t_file.puts line + elsif file.lineno == 1 && foundSheBang && !foundHeader + t_file.puts line + t_file.puts header + else + t_file.puts line.rstrip + end + end - t_file.rewind - t_file.close - FileUtils.cp(t_file.path, fileName) - t_file.unlink + t_file.rewind + t_file.close + FileUtils.cp(t_file.path, fileName) + t_file.unlink - t_file = RBeautify.beautify_file(fileName) + t_file = RBeautify.beautify_file(fileName) end #folder array -#folder = ['app/controllers/','app/models/', 'app/helpers/', 'app/mailers/'] -#folder = ['app/controllers/', 'script'] -folder = ['script/'] +folder = ['app/controllers/', 'app/models/', 'app/helpers/', 'app/mailers/' ] folder.each do |folder| - puts 'Working on folder' + folder.to_s - rbfiles = File.join("../#{folder}**", "*.rb") - d = Dir.glob(rbfiles) + puts 'Working on folder' + folder.to_s + rbfiles = File.join("../#{folder}**", "*.rb") + d = Dir.glob(rbfiles) - d.each {|fileName| - puts "Working on #{fileName}" + d.each {|fileName| + puts "Working on #{fileName}" - #check if file header is present - checkForHeader(fileName) - } + #check if file header is present + checkForHeader(fileName) + } end diff --git a/script/websocket-server.rb b/script/websocket-server.rb index 55ba8a546..55a3a8862 100755 --- a/script/websocket-server.rb +++ b/script/websocket-server.rb @@ -1,4 +1,6 @@ #!/usr/bin/env ruby +# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ + $LOAD_PATH << './lib' require 'rubygems' @@ -160,12 +162,12 @@ EventMachine.run { @clients[client_id][:session] = data['session'] Session.create( client_id, data['session'], { :type => 'websocket' } ) - # remember ping, send pong back + # remember ping, send pong back elsif data['action'] == 'ping' @clients[client_id][:last_ping] = Time.now @clients[client_id][:websocket].send( '[{"action":"pong"}]' ) - # broadcast + # broadcast elsif data['action'] == 'broadcast' # list all current clients @@ -197,7 +199,7 @@ EventMachine.run { end end - # broadcast every client + # broadcast every client else log 'notice', "send broadcast from (#{client_id.to_s})", local_client_id if local_client[:meta][:type] == 'websocket' && @clients[ local_client_id ] @@ -256,7 +258,7 @@ EventMachine.run { begin queue = Session.queue( client_id ) if queue && queue[0] -# log "send " + queue.inspect, client_id + # log "send " + queue.inspect, client_id log 'notice', "send data to client", client_id client[:websocket].send( queue.to_json ) end @@ -313,7 +315,7 @@ EventMachine.run { return if level == 'debug' end puts "#{Time.now}:client(#{ client_id }) #{ data }" -# puts "#{Time.now}:#{ level }:client(#{ client_id }) #{ data }" + # puts "#{Time.now}:#{ level }:client(#{ client_id }) #{ data }" end }