esr-rim 1.3.4 → 1.3.5

data/CHANGELOG

@@ -97,3 +97,9 @@
 
 * fixed Issue #12: Exception when rebase is in progress
 * fixed Issue #3: Set homepage in gem info properly
+
+# 1.3.5
+
+* Shorten paths of helper git directories.
+* Use RIM_HOME for helper git directories if defined.
+ 

data/README.md

@@ -6,7 +6,8 @@ RIM lets you work with multiple git repositories from within one single git repo
 
 > From RIM version 1.1.4 it is no more necessary to set the global git autocrlf option to false on Windows platforms. If you don't have other reasons you might want to set it back to the recommended value (which is true).
 
-> From RIM version 1.3.3 the temporary directory used for git repositories is no more placed into the workspace. If the HOME environment variable is set it will be placed into a unique directory under $HOME/.rim
+> From RIM version 1.3.3 the location of the helper directory for copies of git repositories can be configured with environment variables: If a RIM_HOME environment variable is set
+then it will be placed into the specified location, otherwise if the HOME environment variable is set it will be placed into a unique directory under $HOME/.rim
 
 ## Concept
 

data/lib/rim/processor.rb

@@ -17,8 +17,11 @@ GerritServer = "ssh://gerrit/"
 
 def initialize(workspace_root, logger)
   @ws_root = workspace_root
-  if ENV.has_key?('HOME')
-    @rim_path = File.join(ENV['HOME'], ".rim", Digest::SHA1.hexdigest(@ws_root)[0...10])
+  rim_dir = nil
+  rim_dir = ENV['RIM_HOME'] if ENV.has_key?('RIM_HOME')
+  rim_dir = File.join(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
@@ -28,13 +31,13 @@ end
 def module_git_path(remote_path)
   # remote url without protocol specifier
   # this way the local path should be unique
-  File.join(@rim_path, remote_path)
+  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", remote_path)
+  File.join(@rim_path, ".tmp", Processor.shorten_path(remote_path))
 end
 
 def remote_path(remote_url)
@@ -139,6 +142,10 @@ def each_module_parallel(task_desc, modules)
   end
 end
 
+def self.shorten_path(path)
+  Digest::SHA1.hexdigest(path || '')[0...10]
+end  
+
 end
 
 end

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.3.4"
+Version = "1.3.5"
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand