esr-rim 1.3.9 → 1.4.7

data/lib/rim/dirty_check.rb

@@ -61,8 +61,15 @@ class DirtyCheck
       files.delete("..")
       # ignore the info file itself
       files.delete(RimInfo::InfoFileName)
-      # ignores defined by user
-      files -= FileHelper.find_matching_files(dir, false, mi.ignores)
+      # ignore all other files
+      # (note: in esr-rim <= 1.42 this was realized by Dir::glob, but this breaks if "dir" is
+      # changed during the check, e.g. by parallel unittest builds
+      # fnIgn is calculated like find_matching_files did it before to avoid problems
+      dirpath = Pathname.new(dir)
+      fnIgn = FileHelper.normalize_patterns(mi.ignores).map do |m|
+        Pathname.new(File.join(dir, m)).relative_path_from(dirpath).to_s
+      end
+      files.delete_if { |f| fnIgn.any?{|m| File.fnmatch(m, f, File::FNM_PATHNAME)} }
       # order of files makes a difference
       # sort to eliminate platform specific glob behavior
       files.sort!

data/lib/rim/file_helper.rb

@@ -40,8 +40,6 @@ class FileHelper
     FileUtils.mkdir_p(dir)
   end
   
-private
-  
   def self.normalize_patterns(patterns = [])
     if patterns.is_a?(String)
       return patterns.split(",").each do |p|

data/lib/rim/git.rb

@@ -98,6 +98,13 @@ class GitSession
     end
     nil
   end
+
+  # check whether a commit exists
+  def commit_exists?(sha)
+    execute("git rev-parse --quiet --verify #{sha}^{commit}") do |b, e|
+      return !e
+    end
+  end
   
   # check whether branch exists
   def has_branch?(branch)
@@ -144,6 +151,17 @@ class GitSession
     end
     sha1
   end
+
+  # returns some informations about a revision
+  def rev_infos(rev, desired)
+    info = {}
+    desired.each_pair do |key, value|
+      execute "git log -1 --format=#{value} #{rev} --" do |out, e|
+        info[key] = out.strip if !e
+      end
+    end
+    info
+  end
   
   # returns the SHA-1 representations of the heads of all remote branches
   def remote_branch_revs
@@ -179,7 +197,7 @@ class GitSession
         path_args << " "
         path_args << paths.shift
       end
-      execute "git archive --format tar #{rev} #{path_args} | tar -x -C #{dir}"
+      execute "git archive --format tar #{rev} #{path_args} | tar -C #{dir} -xf -"
       break if paths.empty?
     end
   end
@@ -189,6 +207,7 @@ class GitSession
   # returns the value returned by the block
   def within_exported_rev(rev, paths=[])
     Dir.mktmpdir("rim") do |d|
+      d = Dir.glob(d)[0]
       c = File.join(d, "content")
       FileUtils.mkdir(c)
       export_rev(rev, c, paths)

data/lib/rim/info_helper.rb

@@ -23,7 +23,11 @@ class InfoHelper < CommandHelper
     @module_helpers.each do |h|
       path = h.module_info.local_path.split(/[\\\/]/).last.ljust(40)
       info = "#{path}: ->#{h.target_rev.ljust(10)} @#{h.current_sha1[0..6]}"
-      if h.upstream_revs
+
+      if (!h.current_commit_exists)
+        info += " [COMMIT NOT FOUND]"
+        @logger.info(info)
+      elsif h.upstream_revs
         if h.upstream_revs.size > 0
           info += " [#{h.upstream_revs.size} commits behind]"
         else

data/lib/rim/info_module_helper.rb

@@ -5,6 +5,7 @@ module RIM
 class InfoModuleHelper < ModuleHelper
 
   attr_accessor :target_rev
+  attr_accessor :current_commit_exists
   attr_accessor :current_sha1
   attr_accessor :upstream_revs
   attr_accessor :upstream_non_fast_forward
@@ -19,6 +20,10 @@ class InfoModuleHelper < ModuleHelper
     @target_rev = rim_info.target_revision
     @current_sha1 = rim_info.revision_sha1
     RIM::git_session(git_path) do |s|
+      if s.commit_exists?(current_sha1)
+        @current_commit_exists = true
+      end
+
       if s.has_remote_branch?(target_rev)
         # repository is mirrored so branches are "local"
         if s.is_ancestor?(current_sha1, target_rev)

data/lib/rim/manifest/helper.rb

@@ -1,82 +1,82 @@
-require 'monitor'
-require 'pathname'
-
-module RIM
-module Manifest
-
-class RimError < StandardError
-  def self.status_code(code)
-    define_method(:status_code) { code }
-  end
-end
-
-class ManifestFileNotFound       < RimError; status_code(10) ; end
-
-module Helpers
-  CHDIR_MONITOR = Monitor.new
-  CONFIG_FILE_NAME = "manifest.rim"
-
-  def default_manifest
-    manifest = find_manifest
-    raise ManifestFileNotFound, "Could not locate #{CONFIG_FILE_NAME}" unless manifest
-    Pathname.new(manifest)
-  end
-
-  def default_lockfile
-    manifest = default_manifest
-    Pathname.new(manifest.sub(/.rim$/, '.locked'))
-  end
-
-  def in_rim_project?
-    find_manifest
-  end
-
-  def chdir_monitor
-    CHDIR_MONITOR
-  end
-
-  def chdir(dir, &blk)
-    chdir_monitor.synchronize do
-      Dir.chdir dir, &blk
-    end
-  end
-
-private
-
-  def find_manifest
-    given = ENV['RIM_MANIFEST']
-    return given if given && !given.empty?
-
-    find_file(CONFIG_FILE_NAME)
-  end
-
-  def find_file(*names)
-    search_up(*names) {|filename|
-      return filename if File.file?(filename)
-    }
-  end
-
-  def find_directory(*names)
-    search_up(*names) do |dirname|
-      return dirname if File.directory?(dirname)
-    end
-  end
-
-  def search_up(*names)
-    previous = nil
-    current  = File.expand_path(Dir.pwd)
-
-    until !File.directory?(current) || current == previous
-      names.each do |name|
-        filename = File.join(current, name)
-        yield filename
-      end
-      current, previous = File.expand_path("..", current), current
-    end
-  end
-  extend self
-end
-
-end # Manifest
-end # RIM
-
+require 'monitor'
+require 'pathname'
+
+module RIM
+module Manifest
+
+class RimError < StandardError
+  def self.status_code(code)
+    define_method(:status_code) { code }
+  end
+end
+
+class ManifestFileNotFound       < RimError; status_code(10) ; end
+
+module Helpers
+  CHDIR_MONITOR = Monitor.new
+  CONFIG_FILE_NAME = "manifest.rim"
+
+  def default_manifest
+    manifest = find_manifest
+    raise ManifestFileNotFound, "Could not locate #{CONFIG_FILE_NAME}" unless manifest
+    Pathname.new(manifest)
+  end
+
+  def default_lockfile
+    manifest = default_manifest
+    Pathname.new(manifest.sub(/.rim$/, '.locked'))
+  end
+
+  def in_rim_project?
+    find_manifest
+  end
+
+  def chdir_monitor
+    CHDIR_MONITOR
+  end
+
+  def chdir(dir, &blk)
+    chdir_monitor.synchronize do
+      Dir.chdir dir, &blk
+    end
+  end
+
+private
+
+  def find_manifest
+    given = ENV['RIM_MANIFEST']
+    return given if given && !given.empty?
+
+    find_file(CONFIG_FILE_NAME)
+  end
+
+  def find_file(*names)
+    search_up(*names) {|filename|
+      return filename if File.file?(filename)
+    }
+  end
+
+  def find_directory(*names)
+    search_up(*names) do |dirname|
+      return dirname if File.directory?(dirname)
+    end
+  end
+
+  def search_up(*names)
+    previous = nil
+    current  = File.expand_path(Dir.pwd)
+
+    until !File.directory?(current) || current == previous
+      names.each do |name|
+        filename = File.join(current, name)
+        yield filename
+      end
+      current, previous = File.expand_path("..", current), current
+    end
+  end
+  extend self
+end
+
+end # Manifest
+end # RIM
+

data/lib/rim/manifest/json_reader.rb

@@ -1,41 +1,41 @@
-require 'json'
-require 'csv'
-require 'rim/manifest/model'
-
-class RimError < StandardError
-  def self.status_code(code)
-    define_method(:status_code) { code }
-  end
-end
-
-class ManifestFileNotFound       < RimError; status_code(10) ; end
-
-module RIM
-module Manifest
-
-  def read_manifest(f)
-    raise "no manifest found" unless f
-    parse_manifest(File.read(f))
-  end
-    
-  def parse_manifest(json)
-    data_hash = JSON.parse(json)
-    modules = []
-    if data_hash.has_key?("modules")
-      data_hash["modules"].each do |mod|
-        modules.push(
-          Module.new(
-            :remote_path => mod["remote_path"],
-            :local_path => mod["local_path"],
-            :target_revision => mod["target_revision"],
-            :ignores => mod["ignores"],
-            :subdir => mod["subdir"]
-          ))
-      end
-    end
-    Manifest.new(data_hash["remote_url"], modules)
-  end
-
-end
-
-end
+require 'json'
+require 'csv'
+require 'rim/manifest/model'
+
+class RimError < StandardError
+  def self.status_code(code)
+    define_method(:status_code) { code }
+  end
+end
+
+class ManifestFileNotFound       < RimError; status_code(10) ; end
+
+module RIM
+module Manifest
+
+  def read_manifest(f)
+    raise "no manifest found" unless f
+    parse_manifest(File.read(f))
+  end
+    
+  def parse_manifest(json)
+    data_hash = JSON.parse(json)
+    modules = []
+    if data_hash.has_key?("modules")
+      data_hash["modules"].each do |mod|
+        modules.push(
+          Module.new(
+            :remote_path => mod["remote_path"],
+            :local_path => mod["local_path"],
+            :target_revision => mod["target_revision"],
+            :ignores => mod["ignores"],
+            :subdir => mod["subdir"]
+          ))
+      end
+    end
+    Manifest.new(data_hash["remote_url"], modules)
+  end
+
+end
+
+end

data/lib/rim/manifest/manifest.json

@@ -1,7 +1,7 @@
-{
-    "remote_url" : "ssh://gerrit",
-    "modules" : [
-        {"local_path": "./bsw/nvStorage", "remote_path": "bsw/modules/nvStorage", "target_revision": "1.1"},
-        {"local_path": "./bsw/eepromManager", "remote_path":"bsw/modules/eepromManager", "target_revision": "1.0"}
-    ]
-}
+{
+    "remote_url" : "ssh://gerrit",
+    "modules" : [
+        {"local_path": "./bsw/nvStorage", "remote_path": "bsw/modules/nvStorage", "target_revision": "1.1"},
+        {"local_path": "./bsw/eepromManager", "remote_path":"bsw/modules/eepromManager", "target_revision": "1.0"}
+    ]
+}

data/lib/rim/module_helper.rb

@@ -1,57 +1,57 @@
-require 'rim/processor'
-require 'rim/rim_exception'
-require 'rim/rim_info'
-require 'rim/file_helper'
-require 'rim/dirty_check'
-
-module RIM
-
-class ModuleHelper < Processor
-
-  attr_reader :module_info
-
-  def initialize(workspace_root, module_info, logger)
-    super(workspace_root, logger)
-    @module_info = module_info
-    @remote_url = get_absolute_remote_url(@module_info.remote_url) if @module_info.remote_url
-    @remote_path = remote_path(@module_info.remote_url) if @module_info.remote_url
-    @logger = logger
-  end
-  
-protected
-  
-  # fetch module +mod+ into the .rim folder
-  # works both for initial fetch and updates
-  def fetch_module
-    FileUtils.mkdir_p git_path
-    RIM::git_session(git_path) do |s|
-      if !File.exist?(git_path + "/config")
-        s.execute("git clone --mirror #{@remote_url} #{git_path}") do |out, e|
-          raise RimException.new("Remote repository '#{@remote_url}' of module '#{@module_info.local_path}' not found.") if e
-        end
-      else
-        s.execute("git remote update")
-      end
-    end
-    git_path
-  end
-
-  # prepare empty folder: remove all files not on the ignore list and empty folders
-  def prepare_empty_folder(local_path, ignores)
-    ignores = FileHelper.find_matching_files(local_path, true, ignores)
-    FileHelper.find_matching_files(local_path, true, "/**/*", File::FNM_DOTMATCH).each do |f|
-      if File.file?(f) && !ignores.include?(f)
-        FileUtils.rm(f)
-      end
-    end
-    FileHelper.remove_empty_dirs(local_path)
-    FileUtils.mkdir_p(local_path)
-  end
-
-  def git_path
-    module_git_path(@remote_path)
-  end
-
-end
-
-end
+require 'rim/processor'
+require 'rim/rim_exception'
+require 'rim/rim_info'
+require 'rim/file_helper'
+require 'rim/dirty_check'
+
+module RIM
+
+class ModuleHelper < Processor
+
+  attr_reader :module_info
+
+  def initialize(workspace_root, module_info, logger)
+    super(workspace_root, logger)
+    @module_info = module_info
+    @remote_url = get_absolute_remote_url(@module_info.remote_url) if @module_info.remote_url
+    @remote_path = remote_path(@module_info.remote_url) if @module_info.remote_url
+    @logger = logger
+  end
+  
+protected
+  
+  # fetch module +mod+ into the .rim folder
+  # works both for initial fetch and updates
+  def fetch_module
+    FileUtils.mkdir_p git_path
+    RIM::git_session(git_path) do |s|
+      if !File.exist?(git_path + "/config")
+        s.execute("git clone --mirror #{@remote_url} #{git_path}") do |out, e|
+          raise RimException.new("Remote repository '#{@remote_url}' of module '#{@module_info.local_path}' not found.") if e
+        end
+      else
+        s.execute("git remote update")
+      end
+    end
+    git_path
+  end
+
+  # prepare empty folder: remove all files not on the ignore list and empty folders
+  def prepare_empty_folder(local_path, ignores)
+    ignores = FileHelper.find_matching_files(local_path, true, ignores)
+    FileHelper.find_matching_files(local_path, true, "/**/*", File::FNM_DOTMATCH).each do |f|
+      if File.file?(f) && !ignores.include?(f)
+        FileUtils.rm(f)
+      end
+    end
+    FileHelper.remove_empty_dirs(local_path)
+    FileUtils.mkdir_p(local_path)
+  end
+
+  def git_path
+    module_git_path(@remote_path)
+  end
+
+end
+
+end