esr-rim 1.3.8 → 1.4.4

data/lib/rim/processor.rb

@@ -1,155 +1,152 @@
-require 'fileutils'
-require 'pathname'
-require 'rim/file_helper'
-require 'rim/git'
-require 'rim/rim_exception'
-require 'rake'
-require 'pathname'
-require 'uri'
-require 'digest/sha1'
-
-module RIM
-
-class Processor
-
-MaxThreads = 10
-GerritServer = "ssh://gerrit/"
-
-def initialize(workspace_root, logger)
-  @ws_root = workspace_root
-  rim_dir = nil
-  rim_dir = File.expand_path(ENV['RIM_HOME']) if ENV.has_key?('RIM_HOME')
-  rim_dir = File.join(File.expand_path(ENV['HOME']), ".rim") if rim_dir.nil? && ENV.has_key?('HOME')
-  if rim_dir
-    @rim_path = File.join(rim_dir, Processor.shorten_path(@ws_root))
-  else
-    @rim_path = File.join(@ws_root, ".rim")
-  end
-  @logger = logger
-end
-
-def module_git_path(remote_path)
-  # remote url without protocol specifier
-  # this way the local path should be unique
-  File.join(@rim_path, Processor.shorten_path(remote_path))
-end
-
-def module_tmp_git_path(remote_path)
-  # remote url without protocol specifier
-  # this way the local path should be unique
-  File.join(@rim_path, ".tmp", Processor.shorten_path(remote_path))
-end
-
-def remote_path(remote_url)
-  remote_url.
-    # protocol specifier, e.g. ssh://
-    sub(/^\w+:\/\//,'').
-    # windows drive letter 
-    sub(/^\w+:/,'\1').
-    # make sure we don't .. up in a filesystem
-    gsub(/\.\.[\\\/]/,'')
-end
-
-def get_relative_path(path)
-  FileHelper.get_relative_path(path, @ws_root)
-end
-
-def get_absolute_remote_url(remote_url)
-  if remote_url.start_with?("file:")
-    remote_url = remote_url.gsub(/^file:(\/\/)?/, "")
-    match = remote_url.match(/^\/(\w)\|/)
-    if match
-      remote_url = "#{match[1]}:#{remote_url[match[0].size..-1]}"
-    elsif !remote_url.start_with?(File::SEPARATOR)
-      File.expand_path(remote_url, @ws_root)
-    else
-      remote_url
-    end
-  else
-    URI.parse(GerritServer).merge(URI.parse(remote_url)).to_s
-  end
-end
-
-def local_changes?(ws_dir, dir=ws_dir)
-  stat = nil
-  RIM::git_session(ws_dir) do |s|
-    stat = s.status(dir)
-  end
-  stat.lines.all?{|l| l.ignored?}
-end
-
-def clone_or_fetch_repository(remote_url, local_path, clone_log = nil)
-  FileUtils.mkdir_p local_path
-  RIM::git_session(local_path) do |s|
-    if !File.exist?(File.join(local_path, ".git"))
-      @logger.info(clone_log) if clone_log
-      FileHelper.make_empty_dir(local_path)
-      s.execute("git clone #{remote_url} .")
-      s.execute("git config core.ignorecase false")
-    else
-      s.execute("git remote set-url origin #{remote_url}") if !s.has_valid_remote_repository?()
-      s.execute("git fetch")
-    end
-  end
-  local_path
-end
-
-def commit(session, message)
-  msg_file = Tempfile.new('message')
-  begin
-    msg_file << message
-    msg_file.close
-    session.execute("git add --all")
-    session.execute("git commit -F #{msg_file.path}")
-  ensure
-    msg_file.close(true)
-  end
-end
-
-def each_module_parallel(task_desc, modules)
-  if !modules.empty?
-    @logger.debug "starting \"#{task_desc}\" for #{modules.size} modules\r"
-    threads = []
-    messages = []
-    i = 0
-    done = 0
-    while i == 0 || !threads.empty?
-      while threads.size < MaxThreads && i < modules.size
-        threads << Thread.new(i) do |i|
-          begin
-            yield(modules[i], i)
-          rescue RimException => e
-            messages += e.messages
-          end
-        end
-        i += 1
-      end
-      sleep(0.1)
-      threads = threads.select{|t|
-        if t.alive?
-          true
-        else
-          t.join
-          done += 1
-          @logger.debug "#{task_desc} #{done}/#{modules.size}\r"
-          false
-        end
-      }
-    end
-    if !messages.empty?
-      raise RimException.new(messages)
-    end
-  end
-end
-
-def self.shorten_path(path)
-  if path.length <= 10
-    path.gsub(':', '#')
-  else
-    Digest::SHA1.hexdigest(path || '')[0...10]
-  end
-end  
-
-end
-
-end
+require 'fileutils'
+require 'pathname'
+require 'rim/file_helper'
+require 'rim/git'
+require 'rim/rim_exception'
+require 'rake'
+require 'pathname'
+require 'uri'
+require 'digest/sha1'
+
+module RIM
+
+class Processor
+
+MaxThreads = 10
+GerritServer = "ssh://gerrit/"
+
+def initialize(workspace_root, logger)
+  @ws_root = workspace_root
+  rim_dir = nil
+  rim_dir = File.expand_path(ENV['RIM_HOME']) if ENV.has_key?('RIM_HOME')
+  rim_dir = File.join(File.expand_path(ENV['HOME']), ".rim") if rim_dir.nil? && ENV.has_key?('HOME')
+  if rim_dir
+    @rim_path = File.join(rim_dir, Processor.shorten_path(@ws_root))
+  else  
+    @rim_path = File.join(@ws_root, ".rim")
+  end
+  @logger = logger
+end
+
+def module_git_path(remote_path)
+  # remote url without protocol specifier
+  # this way the local path should be unique
+  File.join(@rim_path, Processor.shorten_path(remote_path))
+end
+
+def module_tmp_git_path(remote_path)
+  # remote url without protocol specifier
+  # this way the local path should be unique
+  File.join(@rim_path, ".tmp", Processor.shorten_path(remote_path))
+end
+
+def remote_path(remote_url)
+  remote_url.
+    # protocol specifier, e.g. ssh://
+    sub(/^\w+:\/\//,'').
+    # windows drive letter 
+    sub(/^\w+:/,'\1').
+    # make sure we don't .. up in a filesystem
+    gsub(/\.\.[\\\/]/,'')
+end
+
+def get_relative_path(path)
+  FileHelper.get_relative_path(path, @ws_root)
+end
+
+def get_absolute_remote_url(remote_url)
+  if remote_url.start_with?("file:")
+    remote_url = remote_url.gsub(/^file:(\/\/)?/, "")
+    match = remote_url.match(/^\/(\w)\|/)
+    if match
+      remote_url = "#{match[1]}:#{remote_url[match[0].size..-1]}"
+    elsif !remote_url.start_with?(File::SEPARATOR)
+      File.expand_path(remote_url, @ws_root)
+    else
+      remote_url
+    end
+  else
+    URI.parse(GerritServer).merge(URI.parse(remote_url)).to_s
+  end
+end
+
+def local_changes?(ws_dir, dir=ws_dir)
+  stat = nil
+  RIM::git_session(ws_dir) do |s|
+    stat = s.status(dir)
+  end
+  stat.lines.all?{|l| l.ignored?}
+end
+
+def clone_or_fetch_repository(remote_url, local_path, clone_log = nil)
+  FileUtils.mkdir_p local_path
+  RIM::git_session(local_path) do |s|
+    if !File.exist?(File.join(local_path, ".git"))
+      @logger.info(clone_log) if clone_log
+      FileHelper.make_empty_dir(local_path)
+      s.execute("git clone #{remote_url} .")
+      s.execute("git config core.ignorecase false")
+    else
+      s.execute("git remote set-url origin #{remote_url}") if !s.has_valid_remote_repository?()
+      s.execute("git fetch")
+    end
+  end
+  local_path
+end
+
+def commit(session, message)
+  msg_file = Tempfile.new('message')
+  begin
+    msg_file << message
+    msg_file.close
+    session.execute("git add --all")
+    session.execute("git commit -F #{msg_file.path}")
+  ensure
+    msg_file.close(true)
+  end
+end
+
+def each_module_parallel(task_desc, modules)
+  if !modules.empty?
+    @logger.debug "starting \"#{task_desc}\" for #{modules.size} modules\r"
+    index_queue = Queue.new
+    (0...modules.size).each do |i|
+      index_queue << i
+    end
+    result_queue = Queue.new
+    (1..MaxThreads).each do
+      Thread.new do
+        loop do
+          i = index_queue.empty? ? nil : index_queue.pop(true) 
+          break if i.nil?
+          result = []
+          begin
+            yield(modules[i], i)
+          rescue RimException => e
+            result = e.messages
+          rescue Exception => e
+            result = [e.to_s]
+          end
+          result_queue << result
+        end
+      end
+    end
+    messages = []
+    (0...modules.size).each do |i|
+      messages.concat(result_queue.pop)
+    end
+    raise RimException.new(messages) if !messages.empty?
+  end
+end
+
+def self.shorten_path(path)
+  if path.length <= 10
+    path.gsub(':', '#')
+  else
+    Digest::SHA1.hexdigest(path || '')[0...10]
+  end
+end  
+
+end
+
+end

data/lib/rim/rim.rb

@@ -1,94 +1,94 @@
-$:.unshift(File.dirname(__FILE__)+"/lib")
-require 'subcommand'
-require 'rim/file_logger'
-require 'rim/command/sync'
-require 'rim/command/upload'
-require 'rim/command/status'
-require 'rim/command/info'
-require 'rim/git'
-require 'rim/rim_exception'
-require 'rim/version'
-require 'tmpdir'
-
-include Subcommands
-
-# -C option was added in 1.8.5
-# --ignore-removal was added in 1.8.3
-MinimumGitVersion = "1.8.5"
-
-logger = RIM::FileLogger.new($stdout, File.join(Dir.tmpdir, "rim", Time.now().strftime("rim_%Y%m%d-%H%M%S-%L.log")))
-logger.level = Logger::INFO
-logger.formatter = proc do |severity, time, progname, msg|
-  if severity == "INFO"
-    "#{msg}\n"
-  else
-    "#{severity}: #{msg}\n"
-  end
-end
-
-RIM::GitSession.logger = logger
-
-RIM::git_session(".") do |s|
-  begin
-    version = s.git_version
-    if version
-      cmp_str = lambda {|v| v.split(".").collect{|p| p.rjust(10)}.join}
-      if cmp_str.call(version) < cmp_str.call(MinimumGitVersion)
-        logger.info "Rim needs git version #{MinimumGitVersion} or higher"
-        logger.info "Please update git from http://git-scm.com/"
-        exit(1)
-      end
-    else
-      # version unknown, don't complain
-    end
-  rescue RIM::GitException
-    logger.info "It seems git is not installed or it's not in your path"
-    logger.info "Please update your path or find git at http://git-scm.com/"
-    exit(1)
-  end
-end
-
-prog_info = "rim, version #{RIM::Version::Version}, Copyright (c) 2015, esrlabs.com"
-
-global_options do |opts|
-  opts.banner = prog_info
-  opts.separator ""
-  opts.separator "Usage: [<options>] rim <command> [<args>]"
-  opts.on("-v","--version", "Print version info") do
-    logger.info prog_info
-    exit
-  end
-  opts.on("-l LOGLEVEL", [:debug, :info, :warn, :error, :fatal], "log level",
-    "one of [debug, info, warn, error, fatal]") do |v|
-    logger.level = Logger.const_get(v.upcase)
-  end
-end
-
-commands = {}
-add_help_option
-ObjectSpace.each_object(Class).select{|clazz| clazz < RIM::Command::Command }.each do |cmdclazz|
-  name = cmdclazz.name.to_s.downcase.split("::").last
-  command name do |opts|
-    cmd = cmdclazz.new(opts) 
-    commands[name] = cmd;
-  end
-end
-ARGV.unshift("help") if ARGV.empty?
-begin
-  cmdname = opt_parse()
-  if cmdname
-    cmd = commands[cmdname]
-    cmd.logger = logger
-    begin
-      cmd.invoke()
-    rescue RIM::RimException => e
-      e.messages.each do |m|
-        logger.error(m)
-      end
-      exit(1)
-    end
-  end
-rescue OptionParser::InvalidOption => e
-  logger.error(e.message)  
-  exit(1)
-end
+$:.unshift(File.dirname(__FILE__)+"/lib")
+require 'subcommand'
+require 'rim/file_logger'
+require 'rim/command/sync'
+require 'rim/command/upload'
+require 'rim/command/status'
+require 'rim/command/info'
+require 'rim/git'
+require 'rim/rim_exception'
+require 'rim/version'
+require 'tmpdir'
+
+include Subcommands
+
+# -C option was added in 1.8.5
+# --ignore-removal was added in 1.8.3
+MinimumGitVersion = "1.8.5"
+
+logger = RIM::FileLogger.new($stdout, File.join(Dir.tmpdir, "rim", Time.now().strftime("rim_%Y%m%d-%H%M%S-%L.log")))
+logger.level = Logger::INFO
+logger.formatter = proc do |severity, time, progname, msg|
+  if severity == "INFO"
+    "#{msg}\n"
+  else
+    "#{severity}: #{msg}\n"
+  end
+end
+
+RIM::GitSession.logger = logger
+
+RIM::git_session(".") do |s|
+  begin
+    version = s.git_version
+    if version
+      cmp_str = lambda {|v| v.split(".").collect{|p| p.rjust(10)}.join}
+      if cmp_str.call(version) < cmp_str.call(MinimumGitVersion)
+        logger.info "Rim needs git version #{MinimumGitVersion} or higher"
+        logger.info "Please update git from http://git-scm.com/"
+        exit(1)
+      end
+    else
+      # version unknown, don't complain
+    end
+  rescue RIM::GitException
+    logger.info "It seems git is not installed or it's not in your path"
+    logger.info "Please update your path or find git at http://git-scm.com/"
+    exit(1)
+  end
+end
+
+prog_info = "rim, version #{RIM::Version::Version}, Copyright (c) 2015, esrlabs.com"
+
+global_options do |opts|
+  opts.banner = prog_info
+  opts.separator ""
+  opts.separator "Usage: [<options>] rim <command> [<args>]"
+  opts.on("-v","--version", "Print version info") do
+    logger.info prog_info
+    exit
+  end
+  opts.on("-l LOGLEVEL", [:debug, :info, :warn, :error, :fatal], "log level",
+    "one of [debug, info, warn, error, fatal]") do |v|
+    logger.level = Logger.const_get(v.upcase)
+  end
+end
+
+commands = {}
+add_help_option
+ObjectSpace.each_object(Class).select{|clazz| clazz < RIM::Command::Command }.each do |cmdclazz|
+  name = cmdclazz.name.to_s.downcase.split("::").last
+  command name do |opts|
+    cmd = cmdclazz.new(opts) 
+    commands[name] = cmd;
+  end
+end
+ARGV.unshift("help") if ARGV.empty?
+begin
+  cmdname = opt_parse()
+  if cmdname
+    cmd = commands[cmdname]
+    cmd.logger = logger
+    begin
+      cmd.invoke()
+    rescue RIM::RimException => e
+      e.messages.each do |m|
+        logger.error(m)
+      end
+      exit(1)
+    end
+  end
+rescue OptionParser::InvalidOption => e
+  logger.error(e.message)  
+  exit(1)
+end