esr-rim 1.3.3 → 1.3.4

data/CHANGELOG

@@ -92,4 +92,8 @@
 # 1.3.3
 
 * No more placing .rim into the workspace if HOME is being set: using a unique folder under HOME/.rim for each workspace
- 
+
+# 1.3.4
+
+* fixed Issue #12: Exception when rebase is in progress
+* fixed Issue #3: Set homepage in gem info properly

data/README.md

@@ -5,6 +5,7 @@ RIM lets you work with multiple git repositories from within one single git repo
 # RIM User Guide
 
 > 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
 
 ## Concept

data/Rakefile

@@ -15,7 +15,7 @@ RTextGemSpec = Gem::Specification.new do |s|
   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.homepage = "http://esrlabs.com"
+  s.homepage = "http://github.com/esrlabs/esr-rim"
   s.add_dependency('subcommand', '>= 1.0.6')
   gemfiles = Rake::FileList.new
   gemfiles.include("{lib,test}/**/*")

data/lib/rim/git.rb

@@ -92,7 +92,7 @@ class GitSession
   def current_branch
     out = execute "git branch"
     out.split("\n").each do |l| 
-      if l =~ /^\*\s+(\S+)/
+      if !l.include?('(') && (l =~ /^\*\s+(\S+)/)
         return $1
       end
     end

data/lib/rim/sync_helper.rb

@@ -22,7 +22,7 @@ class SyncHelper < CommandHelper
   def sync(message = nil, rebase = nil, split = true)
     # get the name of the current workspace branch
     RIM::git_session(@ws_root) do |s|
-      branch = s.current_branch
+      branch = s.current_branch || ''
       rim_branch = "rim/" + branch
       branch_sha1 = nil
       changed_modules = nil

data/lib/rim/upload_helper.rb

@@ -16,7 +16,9 @@ class UploadHelper < CommandHelper
     # get the name of the current workspace branch
     RIM::git_session(@ws_root) do |s|
       branch = s.current_branch
-      if !branch.start_with?("rim/")
+      if branch.nil?
+        raise RimException.new("Not on a git branch.")
+      elsif !branch.start_with?("rim/")
         begin
           sha1 = s.rev_sha1(branch)
           @logger.info("Uploading modules...")

data/lib/rim/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
@@ -87,7 +87,7 @@ files:
 - CHANGELOG
 - Rakefile
 - bin/rim
-homepage: http://esrlabs.com
+homepage: http://github.com/esrlabs/esr-rim
 licenses: []
 post_install_message: 
 rdoc_options: