esr-rim 1.3.2 → 1.3.3

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG CHANGED
@@ -89,3 +89,7 @@
89
89
 
90
90
  * fixed character case related problem on windows [#13]
91
91
 
92
+ # 1.3.3
93
+
94
+ * No more placing .rim into the workspace if HOME is being set: using a unique folder under HOME/.rim for each workspace
95
+
data/README.md CHANGED
@@ -5,6 +5,7 @@ RIM lets you work with multiple git repositories from within one single git repo
5
5
  # RIM User Guide
6
6
 
7
7
  > 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).
8
+ > 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
8
9
 
9
10
  ## Concept
10
11
 
@@ -37,7 +38,10 @@ Install and update RIM via the gem package mechanism:
37
38
  ## Getting started in your project
38
39
 
39
40
  There's not a lot you have to do to introduce rim into your project. The most important step is:
40
- Before using rim add the pattern
41
+
42
+ If you don't want RIM to place .rim folders into your workspaces make sure to define the HOME variable. If defined the working folders will be placed into a .rim folder within the HOME directory.
43
+
44
+ Otherwise add the pattern
41
45
 
42
46
  .rim/
43
47
 
@@ -6,6 +6,7 @@ require 'rim/rim_exception'
6
6
  require 'rake'
7
7
  require 'pathname'
8
8
  require 'uri'
9
+ require 'digest/sha1'
9
10
 
10
11
  module RIM
11
12
 
@@ -16,19 +17,24 @@ GerritServer = "ssh://gerrit/"
16
17
 
17
18
  def initialize(workspace_root, logger)
18
19
  @ws_root = workspace_root
20
+ if ENV.has_key?('HOME')
21
+ @rim_path = File.join(ENV['HOME'], ".rim", Digest::SHA1.hexdigest(@ws_root)[0...10])
22
+ else
23
+ @rim_path = File.join(@ws_root, ".rim")
24
+ end
19
25
  @logger = logger
20
26
  end
21
27
 
22
28
  def module_git_path(remote_path)
23
29
  # remote url without protocol specifier
24
30
  # this way the local path should be unique
25
- File.join(@ws_root, ".rim", remote_path)
31
+ File.join(@rim_path, remote_path)
26
32
  end
27
33
 
28
34
  def module_tmp_git_path(remote_path)
29
35
  # remote url without protocol specifier
30
36
  # this way the local path should be unique
31
- File.join(@ws_root, ".rim", ".tmp", remote_path)
37
+ File.join(@rim_path, ".tmp", remote_path)
32
38
  end
33
39
 
34
40
  def remote_path(remote_url)
@@ -39,6 +39,7 @@ class SyncHelper < CommandHelper
39
39
  branch_sha1 = s.rev_sha1(rim_branch)
40
40
  end
41
41
  remote_url = "file://" + @ws_root
42
+ @logger.debug("Folder for temporary git repositories: #{@rim_path}")
42
43
  tmpdir = clone_or_fetch_repository(remote_url, module_tmp_git_path(".ws"), "Cloning workspace git...")
43
44
  RIM::git_session(tmpdir) do |tmp_session|
44
45
  tmp_session.execute("git reset --hard")
@@ -2,7 +2,7 @@ module RIM
2
2
 
3
3
  module Version
4
4
 
5
- Version = "1.3.2"
5
+ Version = "1.3.3"
6
6
 
7
7
  end
8
8
 
metadata CHANGED
@@ -1,27 +1,30 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: esr-rim
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.2
4
+ version: 1.3.3
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - ESR Labs AG
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2016-09-23 00:00:00.000000000 Z
12
+ date: 2016-11-22 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: subcommand
15
16
  requirement: !ruby/object:Gem::Requirement
17
+ none: false
16
18
  requirements:
17
- - - '>='
19
+ - - ! '>='
18
20
  - !ruby/object:Gem::Version
19
21
  version: 1.0.6
20
22
  type: :runtime
21
23
  prerelease: false
22
24
  version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
23
26
  requirements:
24
- - - '>='
27
+ - - ! '>='
25
28
  - !ruby/object:Gem::Version
26
29
  version: 1.0.6
27
30
  description: RIM lets you work with multiple git repositories from within one single
@@ -86,7 +89,6 @@ files:
86
89
  - bin/rim
87
90
  homepage: http://esrlabs.com
88
91
  licenses: []
89
- metadata: {}
90
92
  post_install_message:
91
93
  rdoc_options:
92
94
  - --main
@@ -96,19 +98,21 @@ rdoc_options:
96
98
  require_paths:
97
99
  - lib
98
100
  required_ruby_version: !ruby/object:Gem::Requirement
101
+ none: false
99
102
  requirements:
100
- - - '>='
103
+ - - ! '>='
101
104
  - !ruby/object:Gem::Version
102
105
  version: '0'
103
106
  required_rubygems_version: !ruby/object:Gem::Requirement
107
+ none: false
104
108
  requirements:
105
- - - '>='
109
+ - - ! '>='
106
110
  - !ruby/object:Gem::Version
107
111
  version: '0'
108
112
  requirements: []
109
113
  rubyforge_project:
110
- rubygems_version: 2.0.3
114
+ rubygems_version: 1.8.23
111
115
  signing_key:
112
- specification_version: 4
116
+ specification_version: 3
113
117
  summary: RIM - multi git tool
114
118
  test_files: []
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 00bcab56723db9e64aeec8bcf239ee0bac0625a1
4
- data.tar.gz: 03b7d077b4c2a6b9c3b53893460af1d785fa520a
5
- SHA512:
6
- metadata.gz: 0cf6eefa5594007e15d8af10e47d9d3513a6643caaf9669729cdfd57926da08e9f5f6b1449f1b3c40e0fc3d3157aab9e00c08b7bfd3f8485b75094e44f0f14ba
7
- data.tar.gz: 081d40058f79b2da0cda5ec5aac1229bc0b70b1b45eab92bf189ff755e10869ca22468091fc96921711b81beb9f464a40e3a12b2978cd1b2da9cee4a4b8c43d1