esr-rim 1.3.5 → 1.3.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWUzYjVhOGMyZDNmZWUwOGYwYmIxZjdhNjAzOWFmZWYxNGVmNTNiMA==
+  data.tar.gz: !binary |-
+    NTk4MjAwMTExNWQ5ZDgzODVjOWIzYjFmZTk2YTVlNTc5MjZiZWUyOQ==
+SHA512:
+  metadata.gz: !binary |-
+    NDY2Y2NmNjEzZGNkMWQ1ZTViMTBlYjRiOWRmN2Q3NDc5YmI3ZjYzNTc1ZjZl
+    MDcwOWVlNTJhNzI5MzVhYmI5ZWJjODhhZjFlYzIxNWIzMWZhZmE2M2I5ZDQ2
+    OGE1NzY5MmI2N2JkZGVmOTVkNTQ3NmMwYmQxNzBhODQyMzNjYWM=
+  data.tar.gz: !binary |-
+    OWNlNmUzYTk4Y2MyMGU2ZjYyODRmZTM3YTEzNGFjNjc4YjFkOTg4ZmZjMTVl
+    MDFjOTAyODQwMzExMzA5NDcwZWQzNWUzZjQyOWMwYzk3NmYzOGJkZjRkMzAw
+    ZGIyYWJlOGM4MmQwYjRjYzcxYTA3MjJkZTkyYmRmNmQ1ODhmYWM=

data/CHANGELOG

@@ -102,4 +102,10 @@
 
 * Shorten paths of helper git directories.
 * Use RIM_HOME for helper git directories if defined.
- 
+
+# 1.3.6
+
+* Use fully qualified reference for branches to avoid ambiguities.
+* Normalize path set in RIM_HOME before using (fixes problems with backslash used in Windows).
+* Use SHA1 for shortened paths only if shorter than original path.
+* Set RIM_HOME to non-persistent path for unit tests.

data/lib/rim/processor.rb

@@ -18,7 +18,7 @@ GerritServer = "ssh://gerrit/"
 def initialize(workspace_root, logger)
   @ws_root = workspace_root
   rim_dir = nil
-  rim_dir = ENV['RIM_HOME'] if ENV.has_key?('RIM_HOME')
+  rim_dir = File.expand_path(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))
@@ -143,7 +143,11 @@ def each_module_parallel(task_desc, modules)
 end
 
 def self.shorten_path(path)
-  Digest::SHA1.hexdigest(path || '')[0...10]
+  if path.length <= 10
+    path.gsub(':', '#')
+  else
+    Digest::SHA1.hexdigest(path || '')[0...10]
+  end
 end  
 
 end

data/lib/rim/sync_helper.rb

@@ -31,6 +31,7 @@ class SyncHelper < CommandHelper
       elsif branch.start_with?("rim/")
         raise RimException.new("The current git branch '#{branch}' is a rim integration branch. Please switch to a non rim branch to proceed.")
       else
+        branch = "refs/heads/#{branch}"
         branch_sha1 = s.rev_sha1(rim_branch)
         remote_rev = get_latest_remote_revision(s, branch)
         rev = get_latest_clean_path_revision(s, branch, remote_rev)

data/lib/rim/upload_helper.rb

@@ -24,7 +24,7 @@ class UploadHelper < CommandHelper
           @logger.info("Uploading modules...")
           upload_modules(get_upload_revisions(s, sha1))
         ensure
-          s.execute("git checkout #{branch}")
+          s.execute("git checkout -B #{branch}")
         end
       else
         raise RimException.new("The current git branch '#{branch}' is a rim integration branch. Please switch to a non rim branch to proceed.")

data/lib/rim/version.rb

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

data/test/rim_info_test.rb

@@ -106,7 +106,11 @@ def test_subdir_default
   ri = RIM::RimInfo.from_dir(d)
   #puts File.read(d+"/.riminfo")
   attrs_expected.each_pair do |k,v|
-    assert_equal v, ri.send(k)
+    if v.nil?
+      assert_nil ri.send(k)
+    else
+      assert_equal v, ri.send(k)
+    end
   end
 end
 

data/test/test_helper.rb

@@ -16,6 +16,7 @@ def empty_test_dir(dir)
   dir = File.dirname(__FILE__)+"/"+dir
   rm_rf(dir)
   mkdir_p(dir)
+  ENV["RIM_HOME"] = File.join(dir, ".rim") if @test_dirs.nil?
   @test_dirs ||= []
   @test_dirs << dir
   dir

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.3.5
-  prerelease: 
+  version: 1.3.6
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -37,6 +34,10 @@ 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
@@ -83,12 +84,9 @@ files:
 - test/unit_tests.rb
 - test/upload_helper_test.rb
 - test/upload_module_helper_test.rb
-- README.md
-- CHANGELOG
-- Rakefile
-- bin/rim
 homepage: http://github.com/esrlabs/esr-rim
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -98,21 +96,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RIM - multi git tool
 test_files: []