esr-rim 1.3.1 → 1.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2NkZDZjMGM5MmViZTZjYzdmY2Y1NDU2NTk0NWU5MGZjZGY4N2E0Yw==
-  data.tar.gz: !binary |-
-    N2I0ZTgwMThkMjk0MDFiNGI1NzBkOGJhNDEzYTc4NjFkOWExM2NlMw==
+SHA1:
+  metadata.gz: 00bcab56723db9e64aeec8bcf239ee0bac0625a1
+  data.tar.gz: 03b7d077b4c2a6b9c3b53893460af1d785fa520a
 SHA512:
-  metadata.gz: !binary |-
-    MDgxMTYzMTU2ZjdiMTZiMjU5YjljNTM1NGFjZTRjNDE2YTI0N2ExYzZhMGZl
-    NGZkODZjM2Q3MTdiOGI5NmE2OTkzOTk3NzQzNDFiMTQ3ZmEwMDIwMDk4MDYz
-    ZWYxNjkwNzNhYTlmYmE1OGQzZDlmNDFmOWQ2NWVmYjhkYzdhNjg=
-  data.tar.gz: !binary |-
-    ZDFiY2Q0YmNlMTE1NDFmN2IyNWQ0YjkzNzk2MDA5MjMxOTQ5OGU2ZTM3Yjdj
-    ZjdlOTczOGM5ZWU1ODVlZGNhY2JjYmEyNzE0NTU1ZWYzZWY0ODE3YWYwZjI2
-    ZmRhZmJiMmQyYTI3ZGVjOTk4NmM5MzM2NmY4NjhiMDViNTAxYmE=
+  metadata.gz: 0cf6eefa5594007e15d8af10e47d9d3513a6643caaf9669729cdfd57926da08e9f5f6b1449f1b3c40e0fc3d3157aab9e00c08b7bfd3f8485b75094e44f0f14ba
+  data.tar.gz: 081d40058f79b2da0cda5ec5aac1229bc0b70b1b45eab92bf189ff755e10869ca22468091fc96921711b81beb9f464a40e3a12b2978cd1b2da9cee4a4b8c43d1

data/CHANGELOG

@@ -85,3 +85,7 @@
 
 * fixed sync with manifests and extended to support of subdirectories
 
+# 1.3.2
+
+* fixed character case related problem on windows [#13]
+

data/lib/rim/sync_helper.rb

@@ -43,7 +43,12 @@ class SyncHelper < CommandHelper
         RIM::git_session(tmpdir) do |tmp_session|
           tmp_session.execute("git reset --hard")
           tmp_session.execute("git clean -xdf")
-          tmp_session.execute("git checkout -B #{rim_branch} remotes/origin/#{rim_branch}")
+          # use -f here to prevent git checkout from checking for untracked files which might be overwritten. 
+          # this is safe since we removed any untracked files before.
+          # this is a workaround for a name case problem on windows:
+          # if a file's name changes case between the current head and the checkout target,
+          # git checkout will report the file with the new name as untracked and will fail
+          tmp_session.execute("git checkout -B #{rim_branch} -f remotes/origin/#{rim_branch}")
           changed_modules = sync_modules(tmp_session, message)
           if !split
             tmp_session.execute("git reset --soft #{branch_sha1}")

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.3.1"
+Version = "1.3.2"
 
 end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
 description: RIM lets you work with multiple git repositories from within one single
@@ -34,10 +34,6 @@ extra_rdoc_files:
 - README.md
 - CHANGELOG
 files:
-- CHANGELOG
-- README.md
-- Rakefile
-- bin/rim
 - lib/rim/command/command.rb
 - lib/rim/command/info.rb
 - lib/rim/command/status.rb
@@ -84,6 +80,10 @@ files:
 - test/unit_tests.rb
 - test/upload_helper_test.rb
 - test/upload_module_helper_test.rb
+- README.md
+- CHANGELOG
+- Rakefile
+- bin/rim
 homepage: http://esrlabs.com
 licenses: []
 metadata: {}
@@ -97,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: RIM - multi git tool