[Title] Fixed indentation error
authordonghee yang <donghee.yang@samsung.com>
Wed, 17 Oct 2012 02:39:27 +0000 (11:39 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Wed, 17 Oct 2012 02:39:27 +0000 (11:39 +0900)
src/build_server/CommonJob.rb
src/build_server/DistributionManager.rb
src/build_server/JobManager.rb
src/build_server/ProjectManager.rb
src/build_server/SocketJobRequestListener.rb
src/common/utils.rb
src/pkg_server/SocketRegisterListener.rb
src/pkg_server/client.rb
src/pkg_server/distribution.rb

index 70cac51d1deae0f2935d1d8231e273ff538200e0..d9b8828160eda72087af1f1f621478f618628d67 100644 (file)
@@ -104,7 +104,7 @@ class CommonJob
        def execute(sync=false)
 
                # create a thread for job
-               @thread = Thread.new {
+               @thread = Thread.new do
                        begin
                                job_main()
 
@@ -114,7 +114,7 @@ class CommonJob
                        @log.error e.message
                        @log.error e.backtrace.inspect
                end
-               }
+               end
 
                if sync then
                        @thread.join
index 54ab618035e2471b4e754a118e02a8a2092756a7..298db1b04a232a40e98d674690767adb3d78860f 100644 (file)
@@ -135,10 +135,10 @@ class DistributionManager
 
                        # distributions
                        db.do "DELETE FROM distributions"
-                       @distributions.each { |dist|
+                       @distributions.each do |dist|
                                dist_addr = dist.pkgsvr_ip + ":" + dist.pkgsvr_port.to_s
                                db.do "INSERT INTO distributions VALUES('#{dist.name}','#{dist.pkgsvr_url}','#{dist_addr}')"
-                       }
+                       end     
                                rescue DBI::DatabaseError => e
                                        puts "DB update failed!"
                                        puts e.errstr
@@ -162,11 +162,11 @@ class DistributionManager
 
                                        # distributions
                                        rs = db.execute "SELECT * FROM distributions"
-                                       rs.fetch_hash { |row|
+                                       rs.fetch_hash do |row|
                                                pkgsvr_ip = row['pkgsvr_addr'].split(":")[0]
                                                pkgsvr_port = row['pkgsvr_addr'].split(":")[1].to_i
                                                add_distribution_internal(row['name'], row['pkgsvr_url'], pkgsvr_ip, pkgsvr_port)
-                                       }
+                                       end
                                        rs.finish
                                rescue DBI::DatabaseError => e
                                        puts "DB loading failed!"
index e7d1ec6bd047a82005969fb4ac2c1efbc07e44ad..1fdef6619251e7dc91c983e6714828169e27d6ae 100644 (file)
@@ -59,12 +59,12 @@ class JobManager
                file_path = "#{BuildServer::CONFIG_ROOT}/#{@parent.id}/latest_job"
                if File.exist? file_path then
                        latest_idx = -1
-                       File.open( file_path, "r" ) { |f|
-                               f.each_line { |l|
+                       File.open( file_path, "r" ) do |f|
+                               f.each_line do |l|
                                        latest_idx = l.strip.to_i
                                        break
-                               }
-                       }
+                               end
+                       end
                        if latest_idx < 0 then latest_idx = -1 end
                        @new_job_index = latest_idx + 1
                else
@@ -76,16 +76,16 @@ class JobManager
        # get new id
        def get_new_job_id
                new_idx = 0
-               @latest_job_touch.synchronize {
+               @latest_job_touch.synchronize do
                        new_idx = @new_job_index
 
                        file_path = "#{BuildServer::CONFIG_ROOT}/#{@parent.id}/latest_job"
-                       File.open( file_path, "w" ) { |f|
+                       File.open( file_path, "w" ) do |f|
                                f.puts "#{@new_job_index}"
-                       }
+                       end
 
                        @new_job_index += 1
-               }
+               end
 
                return new_idx
        end
@@ -128,7 +128,7 @@ class JobManager
        # intialize normal job
        def initialize_job ( job )
                job.status = "INITIALIZING"
-               Thread.new {
+               Thread.new do
                        begin
                                # init
                                if not job.init or job.status == "ERROR" then
@@ -145,7 +145,7 @@ class JobManager
                        @parent.log.error e.message
                        @parent.log.error e.backtrace.inspect
                end
-               }
+               end
                @parent.log.info "Job \"#{job.id}\" entered INITIALIZING status" 
        end
 
@@ -177,7 +177,7 @@ class JobManager
        def cancel_job( job)
                job.cancel_state = "WORKING"
                @parent.log.info "Creating thread for canceling the job \"#{job.id}\"" 
-               Thread.new {
+               Thread.new do
                        begin
                                #terminate job thread
                                if not job.thread.nil? then
@@ -197,7 +197,7 @@ class JobManager
                        @parent.log.error e.message
                        @parent.log.error e.backtrace.inspect
                end
-               }
+               end
        end
 
        # handle
@@ -316,7 +316,7 @@ class JobManager
                if not selected_job.nil? then return selected_job end
 
                # if no reverse build job exist!
-               @internal_job_schedule.synchronize {
+               @internal_job_schedule.synchronize do
                        # internal job first
                        ret = nil
                        if @internal_jobs.count > 0 then
@@ -329,7 +329,7 @@ class JobManager
                        end
 
                        return ret
-               }
+               end
        end
 
 
index 1908d567644d60caf82737ecc2cd7525336cdbfc..86bd9245e7348b2f0765c664acde2524d21adb92 100644 (file)
@@ -224,13 +224,13 @@ class ProjectManager
 
        # get project from git repository
        def get_git_project( repos, dist_name )
-               @projects.each { |prj|
+               @projects.each do |prj|
                        # check project's distribution
                        if prj.dist_name != dist_name then next end
                        if prj.type == "GIT" and prj.repository == repos then 
                                return prj 
                        end
-               }
+               end
 
                return nil
        end
@@ -261,18 +261,18 @@ class ProjectManager
                        db.do "DELETE FROM project_os"
 
                        # insert  project info
-                       @projects.each { |prj|
+                       @projects.each do |prj|
                                # COMMON
                                db.do "INSERT INTO projects (name,type,password,dist_name) VALUES('#{prj.name}', '#{prj.type}', '#{prj.passwd}', '#{prj.dist_name}')"
 
                                # OS
                                prj_id = db.select_one("select last_insert_rowid()")[0]
-                               prj.os_list.each { |os|
+                               prj.os_list.each do |os|
                                        db.do "INSERT INTO project_os VALUES('#{prj_id}','#{os}')"
-                               }
+                               end
 
                                if not prj.save_db() then raise RuntimeError ,"Save project DB is failed!" end
-                       }
+                       end
                                        rescue DBI::DatabaseError => e
                                                puts "DB update failed!"
                                                puts e.errstr
@@ -296,7 +296,7 @@ class ProjectManager
 
                                                # distributions
                                                rs = db.execute "SELECT * FROM projects"
-                                               rs.fetch_hash { |row|
+                                               rs.fetch_hash do |row|
                                                        prj_id = row['id']
                                                        prj_name = row['name']
                                                        prj_type = row['type']
@@ -307,9 +307,9 @@ class ProjectManager
                                                        # os
                                                        prj_os_list = []
                                                        rs2 = db.execute "SELECT os_name FROM project_os WHERE prj_id = #{prj_id}"
-                                                       rs2.fetch { |row2|
+                                                       rs2.fetch do |row2|
                                                                prj_os_list.push row2[0]
-                                                       }
+                                                       end
                                                        rs2.finish
                                                        if prj_type == "GIT" then
                                                                new_project = GitBuildProject.new(prj_name, @server, prj_os_list, prj_dist)
@@ -323,7 +323,7 @@ class ProjectManager
 
                                                        if not new_project.load_db() then raise RuntimeError, "Project DB load failed!" end
                                                        @projects.push new_project
-                                               }
+                                               end
                                                rs.finish
                                        rescue DBI::DatabaseError => e
                                                puts "DB loading failed!"
index 6cf2a428725c9420bd81955ff3eab2b4ed499253..cf072d4fd78ba543187692627f1b47cf24170273 100644 (file)
@@ -44,7 +44,7 @@ class SocketJobRequestListener
 
        # start listening
        def start()
-               @thread = Thread.new {
+               @thread = Thread.new do
                        # make loop recover when unhandled exception occurred
                        while not @finish_loop
                                begin
@@ -54,7 +54,7 @@ class SocketJobRequestListener
                                        @log.error e.backtrace.inspect
                                end
                end
-               }
+               end
        end
 
 
@@ -145,7 +145,7 @@ class SocketJobRequestListener
                        handle_cmd_register( req_line, req )
                        @log.info "Handled REQ: #{req_line}"
                when "DOWNLOAD"
-                       Thread.new {
+                       Thread.new do
                                begin
                                        handle_cmd_download( req_line, req )
                        rescue => e
@@ -153,9 +153,9 @@ class SocketJobRequestListener
                                @log.error e.message
                                @log.error e.backtrace.inspect
                        end
-                       }             
+                       end            
                when "UPLOAD"
-                       Thread.new {
+                       Thread.new do
                                begin
                                        handle_cmd_upload( req_line, req )
                        rescue => e
@@ -163,7 +163,7 @@ class SocketJobRequestListener
                                @log.error e.message
                                @log.error e.backtrace.inspect
                        end
-                       }                
+                       end                
                else
                        @log.info "Received Unknown REQ: #{req_line}" 
                        raise "Unknown request: #{req_line}"
@@ -221,11 +221,11 @@ class SocketJobRequestListener
                if project_name_list.count > 1 or os_list.count > 1 then
                        new_job_list = []
                        i = 0
-                       project_name_list.each { |pname|
+                       project_name_list.each do |pname|
                                if not passwd_list[i].nil? then passwd = passwd_list[i]
                                else passwd = passwd_list[0] end
                                check_build_project(pname,passwd,dist_name,req)
-                               os_list.each { |os|
+                               os_list.each do |os|
                                        new_job = create_new_job( pname, os, dist_name )
                                        if new_job.nil? then
                                                @log.warn "\"#{pname}\" does not support #{os}"
@@ -233,9 +233,9 @@ class SocketJobRequestListener
                                        end
                                        new_job_list.push new_job
                                        @log.info "Received a request for building this project : #{pname}, #{os}"
-                               }
+                               end
                                i = i + 1
-                       }
+                       end
 
                        if new_job_list.count > 1 then
                                new_job = @parent_server.prjmgr.create_new_multi_build_job( new_job_list )
@@ -913,9 +913,9 @@ class SocketJobRequestListener
                new_job.set_internal_job( dock_num ) 
                new_job.git_commit = git_commit
                incoming_dir = "#{@parent_server.transport_path}/#{dock_num}"
-               pkg_files.each { |file|
+               pkg_files.each do |file|
                        new_job.add_external_package( file )
-               }
+               end
 
                return new_job
        end
index e2707f19bcd33da014a06aaecee9f79a6c5edb39..eae944615c064230625392327dfdbb5281698546 100644 (file)
@@ -608,7 +608,7 @@ class Utils
                        result += win_pids
 
                        # gather MinGW/MSYS process id 
-                       Hash[*`ps -e`.scan(/^[\t\s]*(\d+)[\t\s]+(\d+)/).flatten.map{|x| x.to_i}].each {|pid,ppid|
+                       Hash[*`ps -e`.scan(/^[\s]*(\d+)[\s]+(\d+)/).flatten.map{|x| x.to_i}].each {|pid,ppid|
                                descendants[ppid] << descendants[pid]
                        }
 
index 738ec6c751fae46a4ceb0a9dd385e17530b28312..8a04796e7dad8dd32348ad9a465ec59a5ab7ca61 100644 (file)
@@ -194,14 +194,14 @@ class SocketRegisterListener
                                @parent_server.reload_dist_package()
                                snapshot_name = @parent_server.register( file_path_list, dist_name, true, false, true) 
                                BuildCommServer.send(req,"SUCC|#{snapshot_name}") 
-               rescue => e
-                       @log.error "register failed"
-                       @log.error e.message
-                       @log.error e.backtrace.inspect
-                       BuildCommServer.send(req, "ERROR|#{e.message}")
-                       @parent_server.release_lock_file
-                       return
-               end
+                       rescue => e
+                               @log.error "register failed"
+                               @log.error e.message
+                               @log.error e.backtrace.inspect
+                               BuildCommServer.send(req, "ERROR|#{e.message}")
+                               @parent_server.release_lock_file
+                               return
+                       end
                }
 
                if not dock_name.empty? then
index a603d8863b7fec55b3e4145bf40ad2f2e70c4553..8022b180bb15c850bd16861a84db1fe9d2f8cb5a 100644 (file)
@@ -275,10 +275,10 @@ class Client
                $filemove_mutex.synchronize {
                        if not File.exist? distfile then
                                Utils.execute_shell("mv #{filepath} #{distfile}")
-               else 
-                       Utils.execute_shell("rm -f #{filepath}")                                
-                       return distfile 
-               end
+                       else 
+                               Utils.execute_shell("rm -f #{filepath}")                                
+                               return distfile 
+                       end
                }
 
                if File.exist? distfile then return distfile
index e5d4b30d904d6f95c3a01416ed37825ae2bf72a0..de62a32a4dba3a856ee722b78202f4f09af4a1a6 100644 (file)
@@ -73,7 +73,7 @@ class Distribution
 
                # version check and if existing version is higher then upload version?
                if (not exist_pkg.nil?) and (not internal_flag) then
-                       if not ( Utils.compare_version( exist_pkg.version, pkg.version ) == 1 ) then
+                       if Utils.compare_version( exist_pkg.version, pkg.version ) != 1 then
                                raise RuntimeError, "existing package's version is higher then register package : [#{pkg.package_name}] in [#{pkg.os}]"
                        end
                end
@@ -517,15 +517,15 @@ class Distribution
                pkg_name_list.each do |package_name|
                        removed_flag = false 
 
-                       os_list.each do |os|
-                               if not @support_os_list.include? os then
-                                       @log.error( "package server does not support input os : #{os}")
+                       os_list.each do |o|
+                               if not @support_os_list.include? o then
+                                       @log.error( "package server does not support input os : #{o}")
                                        next
                                end
 
-                               if @pkg_hash_os[os].key?(package_name) then 
-                                       @log.info( "remove package [#{package_name}] in #{os}", Log::LV_USER)
-                                       @pkg_hash_os[os].delete(package_name)  
+                               if @pkg_hash_os[o].key?(package_name) then 
+                                       @log.info( "remove package [#{package_name}] in #{o}", Log::LV_USER)
+                                       @pkg_hash_os[o].delete(package_name)  
                                        removed_flag = true
                                end
                        end  
@@ -549,8 +549,8 @@ class Distribution
 
 
                # update pkg_list file
-               os_list.each do |os|
-                       write_pkg_list(os
+               os_list.each do |o|
+                       write_pkg_list(o) 
                end
                write_archive_pkg_list
        end