From: jiil.hyoun Date: Sun, 26 Aug 2012 07:32:02 +0000 (+0900) Subject: [Title] apply roodi use for statment to iteration X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b10cef9e44e3156b092c3ad8847e3fb9ae4cec67;p=sdk%2Ftools%2Fsdk-build.git [Title] apply roodi use for statment to iteration [Type] Enhancement [Module] Toolchain / [Priority] Minor [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: I17081e29821c00854c2775436f5e18a0a0c3ebe9 --- diff --git a/build-cli b/build-cli index 73665c8..040e1a1 100755 --- a/build-cli +++ b/build-cli @@ -101,7 +101,7 @@ def query_system_info(ip, port) client.send "QUERY|OS" result0 = client.receive_data() if not result0.nil? then - for item in result0 + result0.each do |item| puts "#{item.strip}" end end @@ -123,7 +123,7 @@ def query_project_list(ip, port) client.terminate exit 1 end - for item in result1 + result1.each do |item| tok = item.split(",").map { |x| x.strip } type = (tok[0]=="G" ? "NORMAL":"REMOTE") printf("%-25s %s\n",tok[1],type) @@ -145,7 +145,7 @@ def query_job_list(ip, port) client.terminate exit 1 end - for item in result1 + result1.each do |item| tok = item.split(",").map { |x| x.strip } if tok[3].nil? then puts "#{tok[1]} #{tok[0]} #{tok[2]}" diff --git a/src/build_server/BuildComm.rb b/src/build_server/BuildComm.rb index be741ce..f4025fd 100644 --- a/src/build_server/BuildComm.rb +++ b/src/build_server/BuildComm.rb @@ -155,7 +155,7 @@ class BuildCommServer # upload to ftp server ftp_filepath = nil - for attempt in ATTEMPTS + ATTEMPTS.each do |attempt| ftp_filepath = FileTransfer.putfile(ip, port, username, passwd, src_file, @log) if !ftp_filepath.nil? then break; else @log.info "Server is the #{attempt} upload attempt fails" end @@ -223,7 +223,7 @@ class BuildCommServer # download from ftp server dst_filepath = nil - for attempt in ATTEMPTS + for attempt in ATTEMPTS dst_filepath = FileTransfer.getfile(ip, port, username, passwd, filepath, dst_file, @log) if not dst_filepath.nil? then break else "Server is the #{attempt} download attempt fails" end @@ -448,7 +448,7 @@ class BuildCommClient if line.strip == "READY" then @log.info "Server is ready to receive file" ftp_filepath = nil - for attempt in ATTEMPTS + for attempt in ATTEMPTS ftp_filepath = FileTransfer.putfile(ip, port, username, passwd, src_file, @log) if !ftp_filepath.nil? then break; else @log.info "Client is the #{attempt} upload attempt fails" end @@ -516,7 +516,7 @@ class BuildCommClient ftp_filepath = tok[1].strip @log.info "Server uploaded file sucessfully" dst_filepath = nil - for attempt in ATTEMPTS + ATTEMPTS.each do |attempt| dst_filepath = FileTransfer.getfile(ip, port, username, passwd, ftp_filepath, dst_file, @log) if not dst_filepath.nil? then break else "Client is the #{attempt} download attempt fails" end diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb index 8d37a47..b8dea94 100644 --- a/src/build_server/BuildJob.rb +++ b/src/build_server/BuildJob.rb @@ -209,7 +209,7 @@ class BuildJob #cancel def cancel() # cancel all its reverse job - for job in @server.jobmgr.reverse_build_jobs + @server.jobmgr.reverse_build_jobs.each do |job| if job.get_parent_job() == self and job.cancel_state == "NONE" then job.cancel_state = "INIT" end @@ -275,7 +275,7 @@ class BuildJob def can_be_built_on?(host_os) if @pkginfo.nil? then return false end - for pkg in @pkginfo.packages + @pkginfo.packages.each do |pkg| if pkg.os_list.include? @os and pkg.build_host_os.include? host_os then return true end @@ -347,8 +347,8 @@ class BuildJob end # check package name - for pkg in get_packages() - for wpkg in wjob.get_packages() + get_packages().each do |pkg| + wjob.get_packages().each do |wpkg| if pkg.package_name == wpkg.package_name then #puts "Removed from candiated... A == B" return true @@ -363,8 +363,8 @@ class BuildJob def does_depend_on?( wjob ) # compare build dependency - for dep in get_build_dependencies(@os) - for wpkg in wjob.get_packages() + get_build_dependencies(@os).each do |dep| + wjob.get_packages().each do |wpkg| # dep packages of my job must have same name and target os # with packages in working job if dep.package_name == wpkg.package_name and @@ -381,8 +381,8 @@ class BuildJob def does_depended_by?( wjob ) - for pkg in get_packages() - for dep in wjob.get_build_dependencies(wjob.os) + get_packages().each do |pkg| + wjob.get_build_dependencies(wjob.os).each do |dep| # dep package of working job must have same name and target os # with packages in my job if dep.package_name == pkg.package_name and @@ -420,7 +420,7 @@ class BuildJob # check [project,os] is in reverse fail project list def is_rev_fail_project( prj, os ) # check the project already exist - for p in @rev_fail_projects + @rev_fail_projects.each do |p| if p[0] == prj and p[1] == os then return true end @@ -433,7 +433,7 @@ class BuildJob # add [project,os] to reverse fail project list def add_rev_fail_project( prj, os ) # check the project already exist - for p in @rev_fail_projects + @rev_fail_projects.each do |p| if p[0] == prj and p[1] == os then return end @@ -448,14 +448,14 @@ class BuildJob remove_list = [] # check project and os name - for p in @rev_fail_projects + @rev_fail_projects.each do |p| if p[0] == prj and p[1] == os then remove_list.push p end end # remove - for r in remove_list + remove_list.each do |r| @rev_fail_projects.delete r end end @@ -487,7 +487,7 @@ class BuildJob # check if the project is my dependent project def is_build_dependent_project( prj, os ) dep_list = get_build_dependent_projects() - for dep in dep_list + dep_list.each do |dep| if dep[0] == prj and dep[1] == os then return true end @@ -592,7 +592,7 @@ class BuildJob end # compare with package version in package server - for pkg in @pkginfo.packages + @pkginfo.packages.each do |pkg| # check all supported os ver_svr = @pkgsvr_client.get_attr_from_pkg( pkg.package_name, @os, "version") # ignore if package does not exist @@ -616,7 +616,7 @@ class BuildJob @log.info( "Checking build dependency ...", Log::LV_USER) @pkgsvr_client.update unmet_bdeps = [] - for dep in @pkginfo.get_build_dependencies( @os ) + @pkginfo.get_build_dependencies( @os ).each do |dep| # if parent exist, search parent source path first # if not found, check package server ver_svr = nil @@ -637,7 +637,7 @@ class BuildJob @log.info( "Checking install dependency ...", Log::LV_USER) unmet_ideps = [] - for dep in @pkginfo.get_install_dependencies( @os ) + @pkginfo.get_install_dependencies( @os ).each do |dep| # if parent exist, search pkginfos for all sub jobs # if not found, check package server found = false @@ -792,7 +792,7 @@ class BuildJob # get local packages to install src_path = @parent.source_path deps = @pkginfo.get_build_dependencies(@os) - for dep in deps + deps.each do |dep| pkgs = get_local_required_packages( dep, src_path ) local_pkgs += pkgs end @@ -974,13 +974,13 @@ class BuildJob local_pkgs += @external_pkgs src_path = @pending_ancestor.source_path ver = @pending_ancestor.pkginfo.get_version() - for pkg in @pending_ancestor.pkginfo.get_target_packages(@os) + @pending_ancestor.pkginfo.get_target_packages(@os).each do |pkg| local_pkgs.push "#{src_path}/#{pkg.package_name}_#{ver}_#{@os}.zip" end @pending_ancestor.rev_success_jobs.each do |job| src_path = job.source_path ver = job.pkginfo.get_version() - for pkg in job.pkginfo.get_target_packages(@os) + job.pkginfo.get_target_packages(@os).each do |pkg| local_pkgs.push "#{src_path}/#{pkg.package_name}_#{ver}_#{@os}.zip" end end @@ -1063,7 +1063,7 @@ class BuildJob # get package path list binpkg_path_list = Dir.glob("#{@source_path}/*_*_#{@os}.zip") - for file in binpkg_path_list + binpkg_path_list.each do |file| @log.info( " * #{file}", Log::LV_USER) FileUtils.cp(file,"#{dst_path}/") end diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb index 8f6714b..e635878 100644 --- a/src/build_server/BuildServer.rb +++ b/src/build_server/BuildServer.rb @@ -159,7 +159,7 @@ class BuildServer while( not @finish ) # update friend server status - for server in @friend_servers + @friend_servers.each do |server| # update state server.update_state end @@ -213,7 +213,7 @@ class BuildServer def add_remote_server( ip, port ) # if already exit, return false - for svr in @friend_servers + @friend_servers.each do |svr| if svr.ip.eql? ip and svr.port == port then return false end @@ -231,7 +231,7 @@ class BuildServer def add_remote_package_server( url, proxy ) # if already exit, return false - for entry in @remote_pkg_servers + @remote_pkg_servers.each do |entry| u = entry[0] if u == url then @@ -250,7 +250,7 @@ class BuildServer def add_target_os( os_name ) # if already exit, return false - for os in @supported_os_list + @supported_os_list.each do |os| if os.eql? os_name then return false end @@ -278,7 +278,7 @@ class BuildServer # get availables server # but, job must not be "REGISTER" and "MULTIBUILD" job if job.type != "REGISTER" and job.type != "MULTIBUILD" then - for server in @friend_servers + @friend_servers.each do |server| if ( server.status == "RUNNING" and server.can_build?( job ) and not server.has_waiting_jobs and server.get_number_of_empty_room > 0 ) @@ -293,7 +293,7 @@ class BuildServer # get best # it is better if working jobs count is less max_empty_room = best_server.get_number_of_empty_room - for server in candidates + candidates.each do |server| # check whether idle, use it if not server.has_working_jobs then return server end @@ -319,7 +319,7 @@ class BuildServer if can_build? job then return true end #if not found, check friends - for server in @friend_servers + @friend_servers.each do |server| if server.status == "RUNNING" and job.can_be_built_on? server.host_os then return true diff --git a/src/build_server/BuildServerController.rb b/src/build_server/BuildServerController.rb index 5f9ec62..eef50cb 100644 --- a/src/build_server/BuildServerController.rb +++ b/src/build_server/BuildServerController.rb @@ -253,11 +253,11 @@ class BuildServerController end # check OS name - for os in os_list + os_list.each do |os| if not server.supported_os_list.include? os then puts "Unsupported OS name \"#{os}\" is used!" puts "Check the following supported OS list:" - for s_os in server.supported_os_list + server.supported_os_list.each do |s_os| puts " * #{s_os}" end diff --git a/src/build_server/FullBuildJob.rb b/src/build_server/FullBuildJob.rb index 1aebaed..31778c0 100644 --- a/src/build_server/FullBuildJob.rb +++ b/src/build_server/FullBuildJob.rb @@ -192,20 +192,20 @@ class FullBuildJob # create sub jobs build_jobs = [] - for prj in @server.prjmgr.projects + @server.prjmgr.projects.each do |prj| if prj.type != "GIT" then next end build_jobs += @server.prjmgr.create_new_jobs_for_all_os( prj.name ) end # set full build job flag - for job in build_jobs + build_jobs.each do |job| job.is_fullbuild_job = true job.set_parent_job( self ) end # add all jobs to jobmanager job_status_map = {} # for tracking job status changes - for job in build_jobs + build_jobs.each do |job| @server.jobmgr.add_internal_job( job ) @log.info( "Added new job \"#{job.id}\"(#{job.get_project().name}) for #{job.os}!", @@ -224,7 +224,7 @@ class FullBuildJob error_exist = false while not all_jobs_finished all_jobs_finished = true - for job in build_jobs + build_jobs.each do |job| # check status chanaged, if then print if job_status_map[ job.id ] != job.status then diff --git a/src/build_server/GitBuildJob.rb b/src/build_server/GitBuildJob.rb index 9e4d957..dca1705 100644 --- a/src/build_server/GitBuildJob.rb +++ b/src/build_server/GitBuildJob.rb @@ -82,7 +82,7 @@ class GitBuildJob < BuildJob contents.push " " contents.push "%-30s| %10s | %10s" % ["package name", "version", "os"] contents.push "---------------------------------------------------------------" - for pkg in @pkginfo.packages + @pkginfo.packages.each do |pkg| if not pkg.os.eql? @os then next end mail_list = mail_list | Mail.parse_email( pkg.maintainer ) contents.push("%-30s| %10s | %10s" % [ pkg.package_name, pkg.version, pkg.os] ) diff --git a/src/build_server/GitBuildProject.rb b/src/build_server/GitBuildProject.rb index 4afdef6..d06af21 100644 --- a/src/build_server/GitBuildProject.rb +++ b/src/build_server/GitBuildProject.rb @@ -171,7 +171,7 @@ class GitBuildProject < CommonProject # check name and version pkginfo=@package_infos[version] pkg_list = os.nil? ? pkginfo.packages : pkginfo.get_target_packages(os) - for pkg in pkg_list + pkg_list.each do |pkg| if pkg.package_name.eql? name then return true end end diff --git a/src/build_server/JobClean.rb b/src/build_server/JobClean.rb index d58de7d..846e84d 100644 --- a/src/build_server/JobClean.rb +++ b/src/build_server/JobClean.rb @@ -84,7 +84,7 @@ class JobCleanAction < Action # write the line except my job_id File.open(@list_file,"w") do |f| - for l in lines + lines.each do |l| if l.split(",")[0].eql? @job_id then next end f.puts l end @@ -142,7 +142,7 @@ class JobCleaner # scan all jobs - for id in Dir.new(jobs_path).entries + Dir.new(jobs_path).entries.each do |id| # skip . or .. if id.eql? "." or id.eql? ".." then next end diff --git a/src/build_server/JobManager.rb b/src/build_server/JobManager.rb index 2372d3b..c1d916d 100644 --- a/src/build_server/JobManager.rb +++ b/src/build_server/JobManager.rb @@ -200,7 +200,7 @@ class JobManager # for reverse build jobs job_list = @reverse_build_jobs - for job in job_list + job_list.each do |job| # if "ERROR", "FINISHED", "CANCELED" remove it from list if job.status == "ERROR" @parent.log.info "Job \"#{job.id}\" is stopped by ERROR" @@ -221,7 +221,7 @@ class JobManager # for internal jobs job_list = @internal_jobs - for job in job_list + job_list.each do |job| # if "ERROR", "FINISHED", "CANCELED" remove it from list if job.status == "ERROR" @parent.log.info "Job \"#{job.id}\" is stopped by ERROR" @@ -242,7 +242,7 @@ class JobManager # for normal job job_list = @jobs - for job in job_list + job_list.each do |job| # if "ERROR", "FINISHED", "CANCELED" remove it from list if job.status == "ERROR" @parent.log.info "Job \"#{job.id}\" is stopped by ERROR" @@ -294,7 +294,7 @@ class JobManager def get_available_job # check reverse build job first selected_job = nil - for job in @reverse_build_jobs + @reverse_build_jobs.each do |job| if job.status == "WAITING" then selected_job = job break @@ -324,7 +324,7 @@ class JobManager def get_number_of_empty_room working_cnt = 0 parent_list = [] - for job in @jobs + @internal_jobs + @reverse_build_jobs + (@jobs + @internal_jobs + @reverse_build_jobs).each do |job| if job.status == "WORKING" then working_cnt = working_cnt + 1 end @@ -343,7 +343,7 @@ class JobManager # check there are working jobs def has_working_jobs - for job in @jobs + @internal_jobs + @reverse_build_jobs + (@jobs + @internal_jobs + @reverse_build_jobs).each do |job| if job.status == "WORKING" then return true end @@ -355,7 +355,7 @@ class JobManager # check there are waiting jobs def has_waiting_jobs - for job in @jobs + @internal_jobs + @reverse_build_jobs + (@jobs + @internal_jobs + @reverse_build_jobs).each do |job| if job.status == "WAITING" then return true end @@ -367,7 +367,7 @@ class JobManager def get_working_jobs result = [] - for job in @jobs + @internal_jobs + @reverse_build_jobs + (@jobs + @internal_jobs + @reverse_build_jobs).each do |job| if job.status == "WORKING" then result.push job end @@ -379,7 +379,7 @@ class JobManager def get_waiting_jobs result = [] - for job in @jobs + @internal_jobs + @reverse_build_jobs + (@jobs + @internal_jobs + @reverse_build_jobs).each do |job| if job.status == "WAITING" then result.push job end @@ -391,7 +391,7 @@ class JobManager def get_remote_jobs result = [] - for job in @jobs + @internal_jobs + @reverse_build_jobs + (@jobs + @internal_jobs + @reverse_build_jobs).each do |job| if job.status == "REMOTE_WORKING" then result.push job end @@ -403,7 +403,7 @@ class JobManager def get_pending_jobs result = [] - for job in @jobs + @jobs.each do |job| if job.status == "PENDING" then result.push job end @@ -420,7 +420,7 @@ class JobManager # gather all working jobs and full-build jobs check_dep_jobs = [] - for job in jobs + jobs.each do |job| if job.cancel_state != "NONE" then next end if job.status == "WORKING" or job.status == "REMOTE_WORKING" or job.status == "PENDING" then @@ -431,13 +431,13 @@ class JobManager end # for waiting jobs - for job in jobs + jobs.each do |job| if job.cancel_state != "NONE" then next end if job.status != "WAITING" then next end # check build dependency against working job pre_jobs = [] - for cjob in check_dep_jobs + check_dep_jobs.each do |cjob| if job == cjob then next end # In case that "WORKING/REMOTE_WORKING" job has build dependency on me if (cjob.status == "WORKING" or cjob.status == "REMOTE_WORKING" ) and @@ -459,7 +459,7 @@ class JobManager if pre_jobs.count != job.pre_jobs.count then is_changed=true else - for pjob in pre_jobs + pre_jobs.each do |pjob| if not job.pre_jobs.include? pjob then is_changed = true break @@ -468,7 +468,7 @@ class JobManager end if pre_jobs.count > 0 and is_changed then job.log.info( "Waiting for finishing following jobs:", Log::LV_USER) - for bjob in pre_jobs + pre_jobs.each do |bjob| if bjob.type == "BUILD" then job.log.info( " * #{bjob.id} #{bjob.pkginfo.packages[0].source}", Log::LV_USER) elsif bjob.type == "MULTIBUILD" then diff --git a/src/build_server/MultiBuildJob.rb b/src/build_server/MultiBuildJob.rb index de8b437..a37c2ba 100644 --- a/src/build_server/MultiBuildJob.rb +++ b/src/build_server/MultiBuildJob.rb @@ -128,7 +128,7 @@ class MultiBuildJob end # initialize all sub jobs and add them to "internal_jobs" - for job in @sub_jobs + @sub_jobs.each do |job| # initialize job if not job.init or job.status == "ERROR" then job.status = "ERROR" @@ -161,7 +161,7 @@ class MultiBuildJob # report error if @status == "ERROR" then # register delayed clean action for sub jobs - for job in @sub_jobs + @sub_jobs.each do |job| @server.cleaner.clean_afterwards(job.id) end @@ -171,7 +171,7 @@ class MultiBuildJob elsif @status == "CANCELED" then # register delayed clean action for sub jobs - for job in @sub_jobs + @sub_jobs.each do |job| @server.cleaner.clean_afterwards(job.id) end @@ -181,7 +181,7 @@ class MultiBuildJob else # terminate all sub jobs - for job in @sub_jobs + @sub_jobs.each do |job| if not job.log.nil? then job.terminate() end end @@ -212,7 +212,7 @@ class MultiBuildJob def get_packages() packages = [] - for job in @sub_jobs + @sub_jobs.each do |job| packages = packages + job.get_packages() end packages.uniq! @@ -223,7 +223,7 @@ class MultiBuildJob def get_build_dependencies(target_os) deps = [] - for job in @sub_jobs + @sub_jobs.each do |job| deps = deps + job.get_build_dependencies(target_os) end deps.uniq! @@ -234,7 +234,7 @@ class MultiBuildJob def get_source_dependencies(target_os, host_os) deps = [] - for job in @sub_jobs + @sub_jobs.each do |job| deps = deps + job.get_source_dependencies(target_os,host_os) end deps.uniq! @@ -268,8 +268,8 @@ class MultiBuildJob end # check package name - for pkg in get_packages - for wpkg in wjob.get_packages() + get_packages.each do |pkg| + wjob.get_packages().each do |wpkg| if pkg.package_name == wpkg.package_name then #puts "Removed from candiated... A == B" return true @@ -284,8 +284,8 @@ class MultiBuildJob def does_depend_on?( wjob ) # compare build dependency - for dep in get_build_dependencies(@os) - for wpkg in wjob.get_packages() + get_build_dependencies(@os).each do |dep| + wjob.get_packages().each do |wpkg| # dep packages of my job must have same name and target os # with packages in working job if dep.package_name == wpkg.package_name and @@ -302,8 +302,8 @@ class MultiBuildJob def does_depended_by?( wjob ) - for pkg in get_packages() - for dep in wjob.get_build_dependencies(wjob.os) + get_packages().each do |pkg| + wjob.get_build_dependencies(wjob.os).each do |dep| # dep package of working job must have same name and target os # with packages in my job if dep.package_name == pkg.package_name and @@ -368,13 +368,13 @@ class MultiBuildJob # initialize status map job_status_map = {} - for job in @sub_jobs + @sub_jobs.each do |job| job_status_map[job.id] = job.status end # add to internal job @server.jobmgr.internal_job_schedule.synchronize { - for job in @sub_jobs + @sub_jobs.each do |job| # init finished, add internal_jobs @server.jobmgr.add_internal_job(job) @log.info( "Added new job \"#{job.get_project().name}\" for #{job.os}! (#{job.id})", @@ -390,7 +390,7 @@ class MultiBuildJob stop_status = "FINISHED" while not all_jobs_finished all_jobs_finished = true - for job in @sub_jobs + @sub_jobs.each do |job| # check status chanaged, if then print if job_status_map[ job.id ] != job.status then @log.info(" * Sub-Job \"#{job.get_project().name}(#{job.os})\" has entered \"#{job.status}\" state. (#{job.id})", Log::LV_USER) diff --git a/src/build_server/ProjectManager.rb b/src/build_server/ProjectManager.rb index ef2619f..9d61df1 100644 --- a/src/build_server/ProjectManager.rb +++ b/src/build_server/ProjectManager.rb @@ -53,7 +53,7 @@ class ProjectManager end # scan all projects - for name in Dir.new(@project_root).entries + Dir.new(@project_root).entries.each do |name| # skip . or .. if name.eql? "." or name.eql? ".." then next end @@ -70,7 +70,7 @@ class ProjectManager # get_project of the name def get_project ( name ) - for prj in @projects + @projects.each do |prj| if prj.name.eql? name then return prj end end @@ -140,7 +140,7 @@ class ProjectManager def create_new_multi_build_job( sub_job_list ) result = MultiBuildJob.new( @server ) - for job in sub_job_list + sub_job_list.each do |job| result.add_sub_job( job ) end @@ -154,10 +154,10 @@ class ProjectManager result = MultiBuildJob.new( @server ) # create sub jobs - for prj in @projects + @projects.each do |prj| if prj.type != "GIT" then next end - for os in prj.os_list + prj.os_list.each do |os| if not @server.supported_os_list.include? os then next end new_job = create_new_job( prj.name, os ) @@ -180,8 +180,8 @@ class ProjectManager # will return [project,os,ver] list def get_projects_from_pkgs(pkgs) result = [] - for prj in @projects - for pkg in pkgs + @projects.each do |prj| + pkgs.each do |pkg| name = pkg.package_name ver = pkg.version os = pkg.os @@ -199,7 +199,7 @@ class ProjectManager def get_project_from_package_name(pkg_name) - for prj in @projects + @projects.each do |prj| # check project provide target package if prj.include_package?(pkg_name) then return prj @@ -296,7 +296,7 @@ class ProjectManager # read pkginfo pkginfo_dir = "#{@project_root}/#{name}/pkginfos" if not File.exist? pkginfo_dir then FileUtils.mkdir_p pkginfo_dir end - for file in Dir.new(pkginfo_dir).entries + Dir.new(pkginfo_dir).entries.each do |file| if file.eql? "." or file.eql? ".." then next end vlen = file.length - ".manifest".length diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb index 6d00fe5..7962c65 100644 --- a/src/build_server/RegisterPackageJob.rb +++ b/src/build_server/RegisterPackageJob.rb @@ -300,7 +300,7 @@ class RegisterPackageJob def does_depended_by?( wjob ) if @pkg_type == "BINARY" then - for dep in wjob.get_build_dependencies(wjob.os) + wjob.get_build_dependencies(wjob.os).each do |dep| # dep package of working job must have same name and target os # with packages in my job if dep.package_name == @pkg_name and @@ -310,7 +310,7 @@ class RegisterPackageJob end end else - for dep in wjob.get_source_dependencies(wjob.os,@host_os) + wjob.get_source_dependencies(wjob.os,@host_os).each do |dep| if dep.package_name == @pkg_name then return true end @@ -381,7 +381,7 @@ class RegisterPackageJob @pkginfo.packages[0].os_list.count > 1 then pkg = @pkginfo.packages[0] - for os in pkg.os_list + pkg.os_list.each do |os| if @os == os then next end # skip when the os does not exist in project's supported os list @@ -435,7 +435,7 @@ class RegisterPackageJob # create reverse build job rev_build_jobs = [] - for p in rev_projects + rev_projects.each do |p| prj = p[0] os = p[1] version = p[2] @@ -454,7 +454,7 @@ class RegisterPackageJob rev_prjs_txt = rev_build_jobs.map {|j| "#{j.get_project().name}(#{j.os})"}.join(", ") @log.info( " * Will check reverse-build for next projects: #{rev_prjs_txt}", Log::LV_USER) end - for new_job in rev_build_jobs + rev_build_jobs.each do |new_job| @log.info( " * Checking reverse-build ... #{new_job.get_project().name}(#{new_job.id})", Log::LV_USER) # job init result = new_job.init() @@ -516,7 +516,7 @@ class RegisterPackageJob # package update @pkgsvr_client.update - for pkg in @pkginfo.packages + @pkginfo.packages.each do |pkg| ver_local = pkg.version #ver_svr = @pkgsvr_client.get_package_version( pkg.package_name, @os ) ver_svr = @pkgsvr_client.get_attr_from_pkg( pkg.package_name, @os, "version") diff --git a/src/build_server/RemoteBuilder.rb b/src/build_server/RemoteBuilder.rb index f6e1b89..647da7e 100644 --- a/src/build_server/RemoteBuilder.rb +++ b/src/build_server/RemoteBuilder.rb @@ -53,7 +53,7 @@ class RemoteBuilder def build( git_repos, source_path, os, is_rev_build, srcinfo, local_pkgs ) @log.info( "Start to build on remote server...", Log::LV_USER ) # send local packages - for pkg_path in local_pkgs + local_pkgs.each do |pkg_path| @log.info( "Sending file... : #{pkg_path}", Log::LV_USER ) result = send_file_to_remote( pkg_path ) if not result then @@ -78,7 +78,7 @@ class RemoteBuilder end # receive binary package - for file_name in result_files + result_files.each do |file_name| @log.info( "Receiving file from remote server : #{file_name}", Log::LV_USER ) result = receive_file_from_remote( "#{source_path}/#{file_name}" ) if not result then diff --git a/src/build_server/ReverseBuildChecker.rb b/src/build_server/ReverseBuildChecker.rb index f7aa897..7ae943e 100644 --- a/src/build_server/ReverseBuildChecker.rb +++ b/src/build_server/ReverseBuildChecker.rb @@ -53,7 +53,7 @@ class ReverseBuildChecker src_pkg_name_list = [] case job.type when "BUILD" - for pkg in job.pkginfo.get_target_packages(job_os) + job.pkginfo.get_target_packages(job_os).each do |pkg| bin_pkg_name_list.push pkg.package_name end when "REGISTER" @@ -66,10 +66,10 @@ class ReverseBuildChecker # get reverse projects from build dependency rev_pkgs = [] - for pkg_name in bin_pkg_name_list + bin_pkg_name_list.each do |pkg_name| rev_pkgs += job.pkgsvr_client.get_reverse_build_dependent_packages(pkg_name, job_os) end - for pkg_name in src_pkg_name_list + src_pkg_name_list.each do |pkg_name| rev_pkgs += job.pkgsvr_client.get_reverse_source_dependent_packages(pkg_name) end rev_pkgs.uniq! @@ -77,7 +77,7 @@ class ReverseBuildChecker # create reverse build job rev_build_jobs = [] - for p in rev_projects + rev_projects.each do |p| rev_prj = p[0] rev_os = p[1] rev_ver = p[2] @@ -103,7 +103,7 @@ class ReverseBuildChecker # if this is sub job, all other sibling job must be excluded if job.is_sub_job? then - for sub_job in job.get_parent_job().get_sub_jobs + job.get_parent_job().get_sub_jobs.each do |sub_job| sub_prj = sub_job.get_project() sub_os = sub_job.os if rev_prj == sub_prj and rev_os == sub_os then @@ -128,7 +128,7 @@ class ReverseBuildChecker end # for all reverse job - for rev_job in rev_build_jobs + rev_build_jobs.each do |rev_job| # add to job manager job.server.jobmgr.add_reverse_build_job(rev_job) log.info( " * Added new job for reverse-build ... \ @@ -142,7 +142,7 @@ class ReverseBuildChecker cancel_other_jobs = false while not rev_build_finished rev_build_finished = true - for rev_job in rev_build_jobs + rev_build_jobs.each do |rev_job| rev_prj = rev_job.get_project() rev_os = rev_job.os @@ -158,7 +158,7 @@ class ReverseBuildChecker # if "exist on error" cancel all other jobs if exit_on_error then cancel_other_jobs = true - for j in rev_build_jobs + rev_build_jobs.each do |j| if j.status != "ERROR" and j.status != "FINISHED" and j.status != "CANCELED" and j.cancel_state == "NONE" then @@ -182,7 +182,7 @@ class ReverseBuildChecker end # clean up all reverse build jobs - for rev_job in rev_build_jobs + rev_build_jobs.each do |rev_job| if rev_job.status == "ERROR" or rev_job.status == "CANCELED" then rev_job.server.cleaner.clean_afterwards(rev_job.id) else @@ -196,7 +196,7 @@ class ReverseBuildChecker private def self.is_project_included?( prj_list, prj, os ) - for p in prj_list + prj_list.each do |p| if p[0] == prj and p[1] == os then return true end end diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb index b8898bf..259ccfc 100644 --- a/src/build_server/SocketJobRequestListener.rb +++ b/src/build_server/SocketJobRequestListener.rb @@ -358,7 +358,7 @@ class SocketJobRequestListener # send the status BuildCommServer.send_begin(req) - for job in job_list + job_list.each do |job| status = job.status if status == "REMOTE_WORKING" then status = "REMOTE" end if job.cancel_state != "NONE" then status = "CANCEL" end @@ -401,17 +401,17 @@ class SocketJobRequestListener BuildCommServer.send_begin(req) # print GIT projects sorted_list = @parent_server.prjmgr.projects.sort { |x,y| x.name <=> y.name } - for prj in sorted_list + sorted_list.each do |prj| if prj.type != "GIT" then next end BuildCommServer.send(req,"G,#{prj.name},#{prj.repository},#{prj.branch}") end # print BINARY projects - for prj in sorted_list + sorted_list.each do |prj| if prj.type != "BINARY" then next end BuildCommServer.send(req,"B,#{prj.name},#{prj.pkg_name}") end # print REMOTE project - for prj in sorted_list + sorted_list.each do |prj| if prj.type != "REMOTE" then next end BuildCommServer.send(req,"R,#{prj.name}") end @@ -421,7 +421,7 @@ class SocketJobRequestListener when "OS" BuildCommServer.send_begin(req) # print GIT projects - for os_name in @parent_server.supported_os_list + @parent_server.supported_os_list.each do |os_name| BuildCommServer.send(req,"#{os_name}") end BuildCommServer.send_end(req) @@ -711,7 +711,7 @@ class SocketJobRequestListener end result = [] - for os in os_list + os_list.each do |os| if os == "all" or os == "*" then result = result + @parent_server.supported_os_list @@ -722,7 +722,7 @@ class SocketJobRequestListener elsif os.include? "*" then reg_os = os.gsub("*","[a-zA-Z0-9.]*") - for svr_os in @parent_server.supported_os_list + @parent_server.supported_os_list.each do |svr_os| matches = svr_os.match("#{reg_os}") if not matches.nil? and matches.size == 1 and matches[0] == svr_os then @@ -734,7 +734,7 @@ class SocketJobRequestListener BuildCommServer.send_begin(req) req.puts "Error: Unsupported OS name \"#{os}\" is used!" req.puts "Error: Check the following supported OS list. " - for os_name in @parent_server.supported_os_list + @parent_server.supported_os_list.each do |os_name| req.puts " * #{os_name}" end BuildCommServer.send_end(req) diff --git a/src/builder/Builder.rb b/src/builder/Builder.rb index a8f020b..fc42014 100644 --- a/src/builder/Builder.rb +++ b/src/builder/Builder.rb @@ -218,7 +218,7 @@ class Builder return false end else - for l in local_dep_pkgs + local_dep_pkgs.each do |l| @log.info( "Installing local pacakge...#{l}", Log::LV_USER) cl.install_local_pkg(l,true,false,File.dirname(l)) end @@ -231,7 +231,7 @@ class Builder src_archive_list.push dep.package_name end src_archive_list.uniq! - for archive_name in src_archive_list + src_archive_list.each do |archive_name| @log.info( " * #{archive_name}", Log::LV_USER) if cl.download_dep_source(archive_name).nil? then @log.error( "Downloading \"#{archive_name}\" failed!", Log::LV_USER) @@ -384,7 +384,7 @@ class Builder # generate shell script File.open( "#{src_path}/.build.sh", "w" ) do |f| f.puts "#!/bin/sh -xe" - for l in contents + contents.each do |l| f.puts l end @@ -427,7 +427,7 @@ class Builder # get category os_category = Utils.get_os_category( os ) - for pkg in pkginfo.packages + pkginfo.packages.each do |pkg| # skip if not support the target os if not pkg.os_list.include? os next @@ -579,7 +579,7 @@ class Builder # get category os_category = Utils.get_os_category( os ) - for pkg in pkginfo.packages + pkginfo.packages.each do |pkg| # skip if not support the target os if not pkg.os_list.include? os next @@ -632,7 +632,7 @@ class Builder # get category # make clean - for pkg in pkginfo.packages + pkginfo.packages.each do |pkg| os = pkg.os os_category = Utils.get_os_category( os ) @@ -651,7 +651,7 @@ class Builder @log.error( e.message, Log::LV_USER) return false end - for pkg in pkginfo.packages + pkginfo.packages.each do |pkg| os = pkg.os os_category = Utils.get_os_category( os ) diff --git a/src/common/PackageManifest.rb b/src/common/PackageManifest.rb index 60eba38..044b7b6 100644 --- a/src/common/PackageManifest.rb +++ b/src/common/PackageManifest.rb @@ -41,14 +41,14 @@ class PackageManifest def get_build_dependencies( target_os ) # for all list = [] - for pkg in @packages + @packages.each do |pkg| # package that has the target os if not pkg.os_list.include?(target_os) next end # package that has the target os - for dep in pkg.build_dep_list + pkg.build_dep_list.each do |dep| list.push dep end end @@ -62,7 +62,7 @@ class PackageManifest def get_source_dependencies( target_os, host_os ) # for all list = [] - for pkg in @packages + @packages.each do |pkg| # only package that used in target os if not pkg.os_list.include?(target_os) next @@ -74,7 +74,7 @@ class PackageManifest end # package that has the target os - for dep in pkg.source_dep_list + pkg.source_dep_list.each do |dep| # if dep.target_os_list.include? target_os list.push dep # end @@ -90,7 +90,7 @@ class PackageManifest def get_install_dependencies( target_os, pkg_name=nil ) # for all list = [] - for pkg in @packages + @packages.each do |pkg| if not pkg_name.nil? and pkg.package_name != pkg_name then next end # only package that used in target os if not pkg.os_list.include?(target_os) @@ -98,7 +98,7 @@ class PackageManifest end # package that has the target os - for dep in pkg.install_dep_list + pkg.install_dep_list.each do |dep| list.push dep end end @@ -109,7 +109,7 @@ class PackageManifest def package_exist?(target_os, host_os) - for pkg in @packages + @packages.each do |pkg| # only package that used in target os if pkg.os_list.include?(target_os) and pkg.build_host_os.include?(host_os) @@ -128,7 +128,7 @@ class PackageManifest def get_target_packages(target_os) pkgs = [] - for pkg in @packages + @packages.each do |pkg| if pkg.os_list.include?(target_os) then pkgs.push pkg end @@ -139,7 +139,7 @@ class PackageManifest def pkg_exist?(name,ver,os) - for pkg in @packages + @packages.each do |pkg| if pkg.package_name != name then next end if not ver.nil? and pkg.version != ver then next end if not os.nil? and not pkg.os_list.include?(os) then next end diff --git a/src/common/ScheduledActionHandler.rb b/src/common/ScheduledActionHandler.rb index 2c226d3..a62c5f0 100644 --- a/src/common/ScheduledActionHandler.rb +++ b/src/common/ScheduledActionHandler.rb @@ -70,7 +70,7 @@ class ScheduledActionHandler # get list action_list = Array.new(@actions) - for action in action_list + action_list.each do |action| # if its time is reached, execute action if not action.time.nil? and current_time > action.time then action.execute diff --git a/src/common/fileTransfer.rb b/src/common/fileTransfer.rb index 2fa3249..cda6a4b 100644 --- a/src/common/fileTransfer.rb +++ b/src/common/fileTransfer.rb @@ -97,7 +97,7 @@ class FileTransfer ftp.chdir(dirname) list = ftp.ls # TODO: if list is directory? - for l in list + list.each do |l| file = l.split(" ")[-1].strip ftp.delete(file) end diff --git a/src/pkg_server/client.rb b/src/pkg_server/client.rb index 7e62827..34d7b49 100644 --- a/src/pkg_server/client.rb +++ b/src/pkg_server/client.rb @@ -877,7 +877,7 @@ class Client def get_reverse_source_dependent_packages(pkg_name) result = [] - for os in @support_os_list + @support_os_list.each do |os| pkg_hash = @pkg_hash_os[os] pkg_list = pkg_hash.values pkg_list.each do |pkg| @@ -1513,7 +1513,7 @@ class Client end def read_remote_pkg_list(list_path) - for os in @support_os_list + @support_os_list.each do |os| filename = PKG_LIST_FILE_PREFIX + os local_file_path = File.join(list_path, filename) if File.exist? local_file_path then @@ -1590,7 +1590,7 @@ class Client def download_pkg_list(from_server, dist = nil) if dist.nil? then dist = get_pkglist_path end - for os in @support_os_list + @support_os_list.each do |os| filename = PKG_LIST_FILE_PREFIX + os file_url = File.join(@server_addr, @snapshot_path, filename) if from_server then diff --git a/src/pkg_server/distribution.rb b/src/pkg_server/distribution.rb index 9368a17..c7c7aaa 100644 --- a/src/pkg_server/distribution.rb +++ b/src/pkg_server/distribution.rb @@ -144,7 +144,7 @@ class Distribution end # copy package list - for os in @support_os_list + @support_os_list.each do |os| FileUtils.copy_file( "#{snapshot_path}/#{PKG_LIST_FILE_PREFIX}#{os}", "#{@location}/snapshots/#{name}/#{PKG_LIST_FILE_PREFIX}#{os}" ) end @@ -332,7 +332,7 @@ class Distribution used_archive_list = [] # collect remaining file's name from current package server version - for os in @support_os_list + @support_os_list.each do |os| @pkg_hash_os[os].each_value{ |pkg| file_list.push(pkg.path.sub("/binary/","")) @@ -366,7 +366,7 @@ class Distribution os_list = @support_os_list end - for os in os_list + os_list.each do |os| begin info_file = "#{@location}/snapshots/#{snapshot}/#{PKG_LIST_FILE_PREFIX}#{os}" if not File.exist? info_file then @@ -422,7 +422,7 @@ class Distribution end def write_all_pkg_list - for os in @support_os_list + @support_os_list.each do |os| write_pkg_list(os) end end @@ -490,10 +490,10 @@ class Distribution else os_list = [ os ] end - for package_name in pkg_name_list + pkg_name_list.each do |package_name| removed_flag = false - for os in os_list + os_list.each do |os| if not @support_os_list.include? os then @log.error( "package server does not support input os : #{os}") next @@ -525,7 +525,7 @@ class Distribution # update pkg_list file - for os in os_list + os_list.each do |os| write_pkg_list(os) end write_archive_pkg_list @@ -562,8 +562,8 @@ class Distribution def check_integrity @log.info "check server pkg's install dependency integrity" - for os in @support_os_list - for pkg in @pkg_hash_os[os].each_value + @support_os_list.each do |os| + @pkg_hash_os[os].each_value.each do |pkg| check_package_integrity(pkg) end end @@ -573,7 +573,7 @@ class Distribution error_msg = "[[#{pkg.package_name}] in #{pkg.os}]'s install dependency not matched in " os = pkg.os - for dep in pkg.install_dep_list + pkg.install_dep_list.each do |dep| if @pkg_hash_os[os].has_key? dep.package_name then target_pkg = @pkg_hash_os[os][dep.package_name] else @@ -588,7 +588,7 @@ class Distribution end error_msg = "[[#{pkg.package_name}] in #{pkg.os}]'s build dependency not matched in " - for dep in pkg.build_dep_list + pkg.build_dep_list.each do |dep| if dep.target_os_list.length == 0 then build_dep_os = os else @@ -608,7 +608,7 @@ class Distribution end error_msg = "[[#{pkg.package_name}] in #{pkg.os}]'s source dependency not matched in " - for dep in pkg.source_dep_list + pkg.source_dep_list.each do |dep| if not @archive_pkg_list.include? dep.package_name then raise RuntimeError,(error_msg + dep.to_s) end @@ -656,7 +656,7 @@ class Distribution end # read package_list file - for os in @support_os_list + @support_os_list.each do |os| @pkg_hash_os[os] = {} pkg_list_file = "#{@location}/#{PKG_LIST_FILE_PREFIX}#{os}" @@ -799,7 +799,7 @@ class Distribution def get_all_reverse_depends_pkgs(pkg, checked_list) depends_list = [] - for os in @support_os_list + @support_os_list.each do |os| @pkg_hash_os[os].each_value{ |dpkg| if dpkg.install_dep_list.include? pkg or \ dpkg.build_dep_list.include? pkg then @@ -830,7 +830,7 @@ class Distribution end # read binary package_list file - for os in @support_os_list + @support_os_list.each do |os| @pkg_hash_os[os] = {} pkg_list_file = "#{@location}/#{PKG_LIST_FILE_PREFIX}#{os}"