esr-rim 1.1.5 → 1.2.0

data/CHANGELOG

@@ -38,3 +38,32 @@
 * added --gerrit option, needed for pushing new branchs to gerrit [BS-202]
 * fixed exception on rim sync after moving working copy [BS-248]
 
+# 1.1.1
+
+* fixed rim sync fails if CRLF warning is present [BS-281]
+* fixed rim upload fails to upload claiming branch does not exist [BS-264]
+
+# 1.1.2
+
+* fixed Exception in rim  sync when autocrlf is turned on [BS-233]
+
+# 1.1.3
+
+* added -n (no review) option to rim upload.
+* fixed rim sync doesn't handle filename case changes correctly [BS-254]
+* made preparation of mirrored workspace more robust
+
+# 1.1.4
+
+* allow sync and upload on touched git working repository.
+
+# 1.1.5
+
+* fixed workaround for windows file lock problem [BS-308]
+
+# 1.2.0
+
+* changed commit strategy for sync to automatic squashing to a single commit. Added -s option to force separate commits.
+* added -a option to allow simple specification of multiple syncs.
+* added -r option that allows sync and rebase in one step [BS-319]
+* fixed exception in rim sync when -u option is not provided [BS-232]

data/README.md

@@ -1,3 +1,184 @@
 # RIM - Multi git tool
 
 RIM lets you work with multiple git repositories from within one single git repository.
+
+# 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).
+
+## Concept
+
+RIM is used to synchronize software modules (let's call them library modules) which are git repositories into a project specific git repository. As long as you don't need to upgrade or modify one of the synchronized library modules, you don't need RIM. In other words: if somebody else in the project takes care of the library module synchronization, you can work with one single GIT repository without worrying about RIM or library module synchronization.
+When RIM has synchronized a specific version of a library module into your project GIT, it records the source of the library module in the local module directory within a .riminfo file.
+
+## Use Cases
+
+* Check the status of your local commits (dirty or clean), which lists dirty modules just in case  (rim status -d)
+* Add a new library module to your project git (rim sync -c)
+* Upgrade an existing library module (rim sync)
+* Upload modifications of a library module (rim upload)
+
+## Terms
+
+* __Project__: a set of modules plus project specific code
+* __Project Git__: a single git repository which contains all code belonging to the project (including the code from modules)
+* __Module__: a unit of code which can be added to a project individually
+* __Module Git__: git repository holding a module
+* __Module Dir__: directory in the project workspace where the module is located
+* __.riminfo File__: file contained in a Module Dir holding rim specific information
+* __.rim Dir__: directory in a project root dir holding rim specific information
+
+## Installation
+
+Install and update RIM via the gem package mechanism:
+
+    > gem install esr-rim
+
+## Getting started in your project
+
+There's not a lot you have to do to introduce rim into your project. The most important step is:
+Before using rim add the pattern
+
+    .rim/
+
+to your project's `.gitignore` and commit this change.
+
+## Synchronize your project git with a module git
+
+Whenever you decide to use rim to synchronize the content of a library module with your project Git you have to do an initial synchronization step:
+
+    > rim sync -c -u <gerrit path> -r <branch or tag> -m <message header> -i <ignore patterns> <local directory>
+
+which actually means the following:
+
+1. The option -c indicates that we want to create a new rim module folder at the local specified with <local directory>. If <local directory> is already part of a module folder synchronized this will result in an error.
+2. The mandatory option -u specifies the remote repository holding the module's content (the Module Git)
+3. The mandatory option -r specifies the revision to synchronize with, typically a branch (such as master) or a specific tag.
+4. The option -m helps you to define a header message text for the commits of rim. This option is important if your project requires a certain Git message header pattern.
+5. The option -i can be used to specify patterns of files/folders which are specific only to this project and are not expected or allowed to be part of the Module Git. Files or folders matching to one of the patterns aren't removed when synchronizing content and wont't be forwarded to the Module Git when uploading.
+
+### Example:
+
+    > rim sync -c -u libraries/modules/projectA -r master -m "PROJ-123/ThHe: integrated projectA module" -i CMakeLists.txt projectA
+
+lets rim synchronize the state of branch master from the remote repository `ssh://gerrit/libraries/modules/projectA` into the relative folder projectA and won't touch files named CMakeLists.txt that are already within this folder. The corresponding commit message header will be "PROJ-123/ThHe: integrated projectA module"
+
+## The magic rim integration branch
+
+A call to rim sync actually does not change anything on the current branch in your Project Git. In fact all changes are committed to a special branch - the rim integration branch. It s managed automatically and named by adding the prefix 'rim/' to your current branch's name. So if your working branch is called 'master' all changes of rim sync will be commited to the branch 'rim/master'.
+The rim integration branch will be automatically created if it is not existing or the latest remote revision is not (transitive) parent of the branch. In this case the branch will be created on the latest clean revision that only has clean parent revisions.
+To get the changes commited to the rim integration branch into your working branch you simply rebase using git, e.g.:
+
+    > git rebase rim/master
+
+*Never change (e.g. squash or amend) a commit created by rim after rebasing! This could cause conflicts on the .riminfo file on subsequent rebasing.*
+
+## Synchronize again
+
+The rim tool stores all the settings given by the initial rim sync call within a .riminfo file in the root of the module folder.
+
+*This file shall not be changed manually and it will cause rim to ignore the content if it has been touched.*
+
+Unless you intentionally want to change the synchronization settings for a specific module you never have to specify those settings in a subsequent call to rim sync again. So once you've integrated a module with rim you're able to resynchronize the contents of module folders using just:
+
+    > rim sync -m <message header> <local directory>
+
+This will cause rim to read out the settings from the module's .riminfo file and do exactly the same as described for the initial synchronization step above. Note that it makes sense to think about the correct message header (although it's optional). If there were changes to the module's revision stored in the .riminfo file (e.g. the specified branch has moved in the module Git) then you will find the appropriate commit in the corresponding rim integration branch. Otherwise rim will indicate that there were no changes and you're done.
+If you want to change the configuration of a module integrated with rim (e.g. you want to integrate a certain revision) you can simply call rim sync by specifying all options you want to change:
+
+    > rim sync -u <gerrit path> -r <branch or tag> -m <message header> -i <ignore patterns> <local directory>
+
+This means:
+
+1. If you want to change the remote repository specify the -u option as described above
+2. Use the -r option if you need another branch or tag to synchronize with
+3. If you want to change the list of files or folders to ignore then specify the new list using -i.
+The -i option allows you only to replace the ignore list completely. So to append a new pattern to this list don't forget to also specify the previous entries.
+
+### Example:
+
+    > rim sync -r release_1.1.2 projectA
+
+lets rim commit the content of the tag or branch release_1.1.2 (same repository, same ignore patterns, automatically created commit message) to the integration branch.
+
+## Modify and commit files in a Module Directory
+
+If you're owner of a library module and thus are authorized to do changes in the module's sources rim supports you in doing that from within your Project Git: whenever you have the need of modifying files in a module directory you can do that in your project directory. Make your changes as needed and commit them to your local project repository.
+
+*You cannot simply push the changes to the remote repository. The remote server will reject your direct push because module folders are touched and thus got "dirty". This behaviour ensures that no unintended modifications of library modules can creep into your project code.*
+
+So if you're not allowed to commit changes to a library module: reset your branch to a clean rim status, otherwise you will never be able to push anything again.
+
+### But how can a module owner get the local changes to the library module Git?
+
+Supposed you are authorized and you now want to publish your module changes (i.e. push them to the remote project repository) the way is as follows:
+
+1. Use rim to upload your changes to the review branch in Gerrit. 
+2. As soon as the review is successful and the modifications are applied to your module Git you use rim sync to resynchronize the changes into your local repository again – after the rebase and if you did no further changes your module is "clean" again.
+3. Now that the module has reached a clean rim status you can commit your change to the remote project repository.
+
+In the next sections we will have a more detailled look on integrating changes to library modules.
+
+### Prepare your repository for work
+
+Before using rim to upload changes from the Project Git to a Module Git you should prepare your local project repository:
+
+* Use curl or scp to inject the Gerrit commit-msg hook (which adds automatically Gerrit-ChangeIds to your message) using one of the following lines:
+
+~~~
+> curl -Lo <local path to project git>/.git/hooks/commit-msg http://gerrit/tools/hooks/commit-msg
+~~~
+
+or
+
+    > scp -p gerrit:hooks/commit-msg <local path to project git>/.git/hooks/
+
+* Make sure that the downloaded hook file is executable:
+
+~~~
+> chmod u+x <local path to project git>/.git/hooks/commit-msg
+~~~
+
+### Upload to the review branch
+
+To track the quality of module changes all modifications to a library module have to be reviewed (using Gerrit). So similar to the workflow with repo all changes are first committed to the corresponding review branch. rim helps you in forwarding your module changes to Gerrit:
+
+    > rim upload <local directory>
+
+With this command rim collects your changes to the specific module directory and commits a copy of the content to the corresponding branch that you specified for the module. So if you have specified master as the target revision of your module then your changes will be pushed to the refs/for/master branch (just like repo does).
+
+*Only files are uploaded which do not match one the patterns specified in the rim ignore list (-i option of rim sync). So to avoid upload of project-only files specify them in the ignore list.*
+
+*You can upload changes only if you specified a branch (-r option of rim sync) for your module, rim refuses uploads for tag or SHA1 revisions.*
+
+### Resynchronize your reviewed changes from the Module Git
+
+If you have a merciful reviewer or he just likes what you did then your changes will be submitted to the remote branch of the Module Git. If your intention was just to submit this change to your Module Git then your work is done. But normally you also want to get ahead in your project. Therefore you still want to push the commited and reviewed changes also to your remote project repository. This can now easily be done by using rim sync:
+
+* Synchronize with curren revision.
+
+~~~
+> rim sync -m <message header> <local directory>
+~~~
+
+* Rebase on rim integration branch
+
+~~~
+> git rebase rim/<current branch>
+~~~
+
+as described earlier. Proposed you haven't changed anything in your module since your last rim upload this rebase should have simply replaced the module's .riminfo file and thus made this folder clean again.
+
+### Correct rejected changes
+
+In case your modifications are rejected by the reviewer you can simply adjust your code and upload your changes again by doing the following steps:
+
+* Correct your code corresponding to the results of the review. But now commit the changes by amending your previous commit:
+
+~~~
+> git commit --amend
+~~~
+
+This will keep the correct ChangeId for the corresponding Gerrit in your commit and it will avoid a second "dirty" commit in your project repository.
+
+* Upload the changes again with rim upload as described above and wait for the next Gerrit review result.

data/lib/rim/command/sync.rb

@@ -24,6 +24,12 @@ class Sync < Command
                               "Specify the remote URL and the target revision with the options.") do
       @create = true
     end
+    opts.on("-a", "--all", "Collects all modules from the specified paths.") do
+      @all = true
+    end
+    opts.on("-e", "--exclude=[PATTERN_LIST]", String, "Exclude all modules of a comma separated list of directories when using sync with -a option.") do |dirlist|
+      @excludedirs = dirlist.split(",")
+    end
     @module_options = {}
     opts.on("-u", "--remote-url URL", String, "Set the remote URL of the module.", \
                                               "A relative path will be applied to ssh://gerrit/") do |url|
@@ -32,12 +38,18 @@ class Sync < Command
     opts.on("-r", "--target-revision REVISION", String, "Set the target revision of the module.") do |target_revision|
       @module_options[:target_revision] = target_revision
     end
-    opts.on("-i", "--ignore [PATTERN_LIST]", String, "Set the ignore patterns by specifying a comma separated list.") do |ignores|
+    opts.on("-i", "--ignore=[PATTERN_LIST]", String, "Set the ignore patterns by specifying a comma separated list.") do |ignores|
       @module_options[:ignores] = ignores || ""
     end
     opts.on("-m", "--message MESSAGE", String, "Message header to provide to each commit.") do |message|
       @message = message
     end
+    opts.on("-s", "--split", "Create a separate commit for each module.") do
+      @split = true
+    end
+    opts.on("-b", "--rebase", "Rebase after successful sync.") do
+      @rebase = true
+    end
   end
 
   def invoke()
@@ -55,10 +67,10 @@ class Sync < Command
             @module_options[:ignores]))
       end 
     else
-      helper.modules_from_paths(ARGV, @module_options)
+      helper.modules_from_paths(@all ? helper.module_paths(ARGV, @excludedirs) : ARGV, @module_options)
     end
     helper.check_arguments
-    helper.sync(@message)
+    helper.sync(@message, @rebase, @split)
   end
 
 end

data/lib/rim/command_helper.rb

@@ -4,6 +4,7 @@ require 'rim/module_info'
 require 'rim/rim_info'
 require 'rim/manifest/json_reader'
 require 'rim/status_builder'
+require 'pathname'
 
 module RIM
 
@@ -32,7 +33,7 @@ class CommandHelper < Processor
   end
 
   def create_module_info(remote_url, local_path, target_revision, ignores)
-    ModuleInfo.new(remote_url, get_relative_path(local_path), target_revision, ignores, get_remote_branch_format(remote_url))
+    ModuleInfo.new(remote_url, get_relative_path(local_path), target_revision, ignores, remote_url ? get_remote_branch_format(remote_url) : nil)
   end
 
   def modules_from_manifest(path)
@@ -46,12 +47,12 @@ class CommandHelper < Processor
   def modules_from_paths(paths, opts = {})
     if paths.empty?
       module_from_path(nil, opts)
-    elsif paths.length == 1 || opts.empty?
+    elsif paths.length == 1 || !opts.has_key?(:remote_url)
       while !paths.empty?
         module_from_path(paths.shift, opts)
       end
     else
-      raise RimException.new("Multiple modules cannot be used with additional options.")
+      raise RimException.new("Multiple modules cannot be used with URL option.")
     end
   end
   
@@ -59,26 +60,40 @@ class CommandHelper < Processor
     module_path = find_file_dir_in_workspace(path || ".", RimInfo::InfoFileName)
     if module_path
       rim_info = RimInfo.from_dir(module_path)
-      add_unique_module_info(create_module_info(opts.has_key?(:remote_url) ? opts[:remote_url] : rim_info.remote_url, \
+      module_info = create_module_info(opts.has_key?(:remote_url) ? opts[:remote_url] : rim_info.remote_url, \
           module_path, opts.has_key?(:target_revision) ? opts[:target_revision] : rim_info.target_revision, \
-          opts.has_key?(:ignores) ? opts[:ignores] : rim_info.ignores))
-      module_path
+          opts.has_key?(:ignores) ? opts[:ignores] : rim_info.ignores)
+      if module_info.valid?
+        add_unique_module_info(module_info)
+        module_path
+      else
+        raise RimException.new("Invalid .riminfo file found in directory '#{module_path}'.")
+      end
     else
       raise RimException.new(path ? "No module info found in '#{path}'." : "No module info found.") 
     end
   end
   
-  def modules_from_workspace()
-    if File.directory?(File.join(@ws_root, ".rim"))
-      status = StatusBuilder.new.fs_status(@ws_root)
-      status.modules.each do |mod|
-        rim_info = mod.rim_info
-        add_unique_module_info(ModuleInfo.new(rim_info.remote_url, mod.dir, rim_info.upstream, rim_info.ignores))
+  def module_paths(paths, exclude_paths = nil)
+    module_paths = []
+    (paths.empty? ? ['.'] : paths).each do |p|
+      module_paths.concat(all_module_paths_from_path(p))
+    end
+    paths.clear
+    if exclude_paths
+      exclude_paths.each do |e|
+        all_module_paths_from_path(e).each do |p|
+          module_paths.delete(p)
+        end
       end
-      true
     end
+    module_paths.sort
   end
-
+  
+  def all_module_paths_from_path(path)
+    Dir.glob(File.join(path, "**/.riminfo")).map { |f| Pathname.new(File.expand_path(File.dirname(f))).relative_path_from(Pathname.pwd).to_s }
+  end
+  
   def add_unique_module_info(module_info)
     if !@paths.include?(module_info.local_path)
       @paths.push(module_info.local_path)

data/lib/rim/dirty_check.rb

@@ -47,7 +47,7 @@ class DirtyCheck
   def self.dirty?(dir)
     mi = RimInfo.from_dir(dir)
     # always fails if there is no checksum
-    !mi.checksum || mi.checksum != self.new.calc_checksum(mi, dir)
+    mi.dirty? || !mi.checksum || mi.checksum != self.new.calc_checksum(mi, dir)
   end
 
   # returns nil if checksum can't be calculated due to missing info

data/lib/rim/module_helper.rb

@@ -8,11 +8,13 @@ module RIM
 
 class ModuleHelper < Processor
 
+  attr_reader :module_info
+
   def initialize(workspace_root, module_info, logger)
     super(workspace_root, logger)
     @module_info = module_info
-    @remote_url = get_absolute_remote_url(@module_info.remote_url)
-    @remote_path = remote_path(@module_info.remote_url)
+    @remote_url = get_absolute_remote_url(@module_info.remote_url) if @module_info.remote_url
+    @remote_path = remote_path(@module_info.remote_url) if @module_info.remote_url
     @logger = logger
   end
   

data/lib/rim/module_info.rb

@@ -25,6 +25,11 @@ class ModuleInfo
       @ignores = ignores || []
     end
   end
+  
+  def valid?
+    return @remote_url && @local_path && @target_revision
+  end
+  
 end
 
 end

data/lib/rim/processor.rb

@@ -85,6 +85,18 @@ def clone_or_fetch_repository(remote_url, local_path, clone_log = nil)
   local_path
 end
 
+def commit(session, message)
+  msg_file = Tempfile.new('message')
+  begin
+    msg_file << message
+    msg_file.close
+    session.execute("git add --all")
+    session.execute("git commit -F #{msg_file.path}")
+  ensure
+    msg_file.close(true)
+  end
+end
+
 def each_module_parallel(task_desc, modules)
   if !modules.empty?
     @logger.debug "starting \"#{task_desc}\" for #{modules.size} modules\r"

data/lib/rim/rim_info.rb

@@ -51,7 +51,11 @@ class RimInfo
     mi.from_s(content)
     mi
   end
-  
+
+  def dirty?
+    @dirty
+  end
+
   def from_s(content)
     attrs = {}
     # normalize line endings
@@ -60,7 +64,7 @@ class RimInfo
     checksum = content[0..39]
     # exclude \n after checksum
     content = content[41..-1]
-    if content && checksum == calc_sha1(content)
+    if content
       content.split("\n").each do |l|
         col = l.index(":")
         if col
@@ -70,13 +74,11 @@ class RimInfo
           end
         end
       end
-    else
-      # checksum error, ignore content
-      # TODO: output user warning
     end
     AttrsDef.each do |a|
       send("#{a}=".to_sym, attrs[a])
     end
+    @dirty = checksum != calc_sha1(content)
   end
 
   def from_dir(dir)

data/lib/rim/sync_helper.rb

@@ -19,12 +19,13 @@ class SyncHelper < CommandHelper
   end
 
   # sync all module changes into rim branch
-  def sync(message = nil)
+  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
       rim_branch = "rim/" + branch
       branch_sha1 = nil
+      changed_modules = nil
       if branch.empty?
         raise RimException.new("Not on a git branch.")
       elsif branch.start_with?("rim/")
@@ -35,6 +36,7 @@ class SyncHelper < CommandHelper
         rev = get_latest_clean_path_revision(s, branch, remote_rev)
         if !s.has_branch?(rim_branch) || has_ancestor?(s, branch, s.rev_sha1(rim_branch)) || !has_ancestor?(s, rim_branch, remote_rev)
           s.execute("git branch -f #{rim_branch} #{rev}")
+          branch_sha1 = s.rev_sha1(rim_branch)
         end
         remote_url = "file://" + @ws_root
         tmpdir = clone_or_fetch_repository(remote_url, module_tmp_git_path(".ws"), "Cloning workspace git...")
@@ -47,13 +49,21 @@ class SyncHelper < CommandHelper
             tmp_session.execute("git clean -xdf")
             tmp_session.execute("git checkout #{rim_branch}")
           end
-          @logger.info("Synchronizing modules...")
-          sync_modules(tmp_session, message)
+          changed_modules = sync_modules(tmp_session, message)
+          if !split
+            tmp_session.execute("git reset --soft #{branch_sha1}")
+            commit(tmp_session, message ? message : get_commit_message(changed_modules)) if tmp_session.uncommited_changes?
+          end
           tmp_session.execute("git push #{remote_url} #{rim_branch}:#{rim_branch}")
         end
       end
-      if s.rev_sha1(rim_branch) != branch_sha1
-        @logger.info("Changes have been commited to branch #{rim_branch}. Rebase to apply changes to workspace.")
+      if !changed_modules.empty?
+        if rebase
+          s.execute("git rebase #{rim_branch}")
+          @logger.info("Changes have been commited to branch #{rim_branch} and workspace has been rebased successfully.")
+        else
+          @logger.info("Changes have been commited to branch #{rim_branch}. Rebase to apply changes to workspace.")
+        end
       else
         @logger.info("No changes.")
       end
@@ -67,9 +77,14 @@ private
     @module_infos.each do |module_info|
       module_helpers.push(SyncModuleHelper.new(session.execute_dir, @ws_root, module_info, @logger))
     end
+    changed_modules = []
     module_helpers.each do |m|
-      m.sync(message)
+      @logger.info("Synchronizing #{m.module_info.local_path}...")
+      if m.sync(message)
+        changed_modules << m.module_info
+      end
     end
+    changed_modules
   end
 
   # get latest revision from which all parent revisions are clean 
@@ -116,6 +131,18 @@ private
     !parents.empty? ? parents.first : nil 
   end  
 
+  #create default commit message from array of changed modules
+  def get_commit_message(changed_modules)
+    StringIO.open do |s|
+      s.puts "rim sync."
+      s.puts
+      changed_modules.each do |m|
+        s.puts m.local_path
+      end
+      s.string
+    end
+  end
+
 end
 
 end

data/lib/rim/sync_module_helper.rb

@@ -22,6 +22,7 @@ module RIM
     # export +revision+ of +mod+ into working copy
     # BEWARE: any changes to the working copy target dir will be lost!
     def export_module(message)
+      changes = false
       RIM::git_session(@dest_root) do |d|
         start_sha1 = d.rev_sha1("HEAD")
         git_path = module_git_path(@remote_path)
@@ -44,26 +45,10 @@ module RIM
         end
         temp_commit(d, "commit changes") if needs_commit?(d)
         d.execute("git reset --soft #{start_sha1}")
-        commit(message) if d.uncommited_changes?
-      end
-    end
-
-    def commit(message)
-      RIM::git_session(@dest_root) do |s|
-        msg_file = Tempfile.new('message')
-        begin
-          if message
-            msg_file << message
-          else
-            msg_file << "rim sync: module #{@module_info.local_path}"
-          end
-          msg_file.close
-          s.execute("git add --all")
-          s.execute("git commit -F #{msg_file.path}")
-        ensure
-          msg_file.close(true)
-        end
+        changes = d.uncommited_changes?
+        commit(d, message || "rim sync: module #{@module_info.local_path}") if changes
       end
+      changes
     end
 
     def needs_commit?(session)

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.1.5"
+Version = "1.2.0"
 
 end
 

data/test/rim_info_test.rb

@@ -32,6 +32,7 @@ def test_read
   d = empty_test_dir("rim_info")
   create_rim_info(d, :remote_url => "ssh://gerrit")
   ri = RIM::RimInfo.from_dir(d)
+  assert !ri.dirty?
   assert_equal "ssh://gerrit", ri.remote_url
 end
 
@@ -47,7 +48,7 @@ def test_tamper
   end
   # after
   ri = RIM::RimInfo.from_dir(d)
-  assert_nil ri.remote_url
+  assert ri.dirty?
 end
 
 def test_line_ending_change
@@ -65,6 +66,7 @@ def test_line_ending_change
   end
   # still valid
   ri = RIM::RimInfo.from_dir(d)
+  assert !ri.dirty?
   assert_equal "ssh://gerrit", ri.remote_url
 end
 

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
 description: RIM lets you work with multiple git repositories from within one single
@@ -82,7 +85,6 @@ files:
 - bin/rim
 homepage: http://esrlabs.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -92,19 +94,21 @@ 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: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: RIM - multi git tool
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e39178ba7e2f000cec05a0ca417d4064b1c06cb6
-  data.tar.gz: e51d10cecfd216dcb0890a5b3a47ab13086c46c4
-SHA512:
-  metadata.gz: a09bfcc5ef6fd0138f5c3be1be93c9c19da499cfd6701cf5efc46eafb3c213b047a8aa0e6eb0b6342f42884a65f1913a5776631104f50970bcc30c64167ed9cb
-  data.tar.gz: 7941fdf8455ba6ccc8594a89fe17634ad82f3458aee8a56e6871c65834ddbdd17808c18ff58b1d1b2adc60f81d3c71fbd9ad5e8b05510f91039290fe202626eb