esr-rim 1.4.4 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a6cf9a777ebf7199d6642919737640ed4194dc18b191973cc51612d196f4b5
-  data.tar.gz: 1254ea13f802865c004cac16759b71c509b42026c735da1838e98ecce0f75816
+  metadata.gz: 4b293dbe27fac4aa9a8a8a9ddd5e4646137bc2ef1e1199c15fb88b5949c45177
+  data.tar.gz: 8ac963407d05985800068f93c0bfd3eed86afce4326d2d60cf1d71d4cd226d29
 SHA512:
-  metadata.gz: 0aa2478abeecc42a19eeccbfa30b7769811a62c17593c9d2384b00d73e4fb9a640b68ab65019f97ee967ffaba0a9d56222ec0c54af4289d920960aa4fff2f4b6
-  data.tar.gz: 55dec8e4158dfe395db31d92174dbd42eff729f6a36292903e0df90abbc6a3311ea98545126470af72a309d2dc540583aba7e7b4d37a89a2ebb20586856f798e
+  metadata.gz: 6c4c1e5a227cc9984a524cd2edc0141f1422b9101db9d865469cbe1573668b97ef9f38829d6104155b59208a07df35e615f4e56f100d6cc1c06132743d08e8a1
+  data.tar.gz: 71d75b7b8d54415c5dc366d161286bb4944886bdc89fc575d2ab3b3023f0e9cfe9944d4a5e9cd7936a1332321f67afc12bb1a9f951e0997e790a090ad0fa4739

data/CHANGELOG

@@ -142,4 +142,16 @@
 
 # 1.4.4
 
-* Fixed exception which results in ugly log output for Ruby >= 2.5 (Thread.report_on_exception)
+* Fixed exception which results in ugly log output for Ruby >= 2.5
+
+# 1.4.5
+
+* Wrong build: deprecated
+
+# 1.4.6
+
+* Fixed issue #28: rim sync is not working in root of destination repository
+
+# 1.4.7
+
+* Added a notification in `rim info` in case the current SHA1 is not an existing commit

data/Rakefile

@@ -14,13 +14,13 @@ RTextGemSpec = Gem::Specification.new do |s|
   s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = "RIM - multi git tool"
   s.description = "RIM lets you work with multiple git repositories from within one single git repository."
-  s.authors = "ESR Labs AG"
+  s.authors = "ESR Labs GmbH"
   s.homepage = "http://github.com/esrlabs/esr-rim"
   s.add_dependency('subcommand', '>= 1.0.6')
   gemfiles = Rake::FileList.new
   gemfiles.include("{lib,test}/**/*")
   gemfiles.include(DocFiles)
-  gemfiles.include("Rakefile") 
+  gemfiles.include("Rakefile")
   s.files = gemfiles
   s.rdoc_options = ["--main", "README.md", "-x", "test"]
   s.extra_rdoc_files = DocFiles
@@ -37,14 +37,14 @@ end
 
 RTextPackageTask = Gem::PackageTask.new(RTextGemSpec) do |p|
   p.need_zip = false
-end	
+end
 
 task :prepare_package_rdoc => :rdoc do
   RTextPackageTask.package_files.include("doc/**/*")
 end
 
 desc 'run unit tests'
-task :run_tests do
+task :unit_tests do
   sh "ruby test/unit_tests.rb"
 end
 

data/lib/rim/command_helper.rb

@@ -27,7 +27,7 @@ class CommandHelper < Processor
   def check_ready
     raise RimException.new("The workspace git contains uncommitted changes.") if !local_changes?(@ws_root)
   end
-  
+
   def check_arguments
     raise RimException.new("Unexpected command line arguments.") if !ARGV.empty?
   end
@@ -49,7 +49,7 @@ class CommandHelper < Processor
     end
     true
   end
-  
+
   def modules_from_paths(paths, opts = {})
     if paths.empty?
       module_from_path(nil, opts)
@@ -61,7 +61,7 @@ class CommandHelper < Processor
       raise RimException.new("Multiple modules cannot be used with URL option.")
     end
   end
-  
+
   def module_from_path(path, opts = {})
     module_path = find_file_dir_in_workspace(path || ".", RimInfo::InfoFileName)
     if module_path
@@ -79,10 +79,10 @@ class CommandHelper < Processor
         raise RimException.new("Invalid .riminfo file found in directory '#{module_path}'.")
       end
     else
-      raise RimException.new(path ? "No module info found in '#{path}'." : "No module info found.") 
+      raise RimException.new(path ? "No module info found in '#{path}'." : "No module info found.")
     end
   end
-  
+
   def module_paths(paths, exclude_paths = nil)
     module_paths = []
     (paths.empty? ? ['.'] : paths).each do |p|
@@ -98,11 +98,11 @@ class CommandHelper < Processor
     end
     module_paths.sort
   end
-  
+
   def all_module_paths_from_path(path)
     Dir.glob(File.join(path, "**/.riminfo")).map { |f| Pathname.new(File.expand_path(File.dirname(f))).relative_path_from(Pathname.pwd).to_s }
   end
-  
+
   def add_unique_module_info(module_info)
     if !@paths.include?(module_info.local_path)
       @paths.push(module_info.local_path)
@@ -119,19 +119,20 @@ class CommandHelper < Processor
 
   def find_file_dir_in_workspace(start_dir, file)
     path = File.expand_path(start_dir)
-    while path != @ws_root
+    loop do
       if File.exist?(File.join(path, file))
         return path
-      else
+      elsif path != @ws_root
         parent = File.dirname(path)
         if parent != path
           path = parent
         else
-          break
+          return nil
         end
-      end 
+      else
+        return nil
+      end
     end
-    nil
   end
 
 protected

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)

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/sync_module_helper.rb

@@ -32,7 +32,7 @@ module RIM
             raise RimException.new("Unknown target revision '#{@module_info.target_revision}' for module '#{@module_info.local_path}'.")
           end
           local_path = File.join(@dest_root, @module_info.local_path)
-          prepare_empty_folder(local_path, @module_info.ignores)
+          prepare_empty_folder(local_path, [*@module_info.ignores, ".git/**/*"])
           temp_commit(d, "clear directory") if d.uncommited_changes?
           strip = ""
           if @module_info.subdir

data/lib/rim/version.rb

@@ -2,9 +2,8 @@ module RIM
 
 module Version
 
-Version = "1.4.4"
+Version = "1.4.7"
 
 end
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.7
 platform: ruby
 authors:
-- ESR Labs AG
+- ESR Labs GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
@@ -106,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: RIM - multi git tool