esr-rim 1.2.2 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b33d85be666d5c844f3cea2badd20b014e513ba4
+  data.tar.gz: 5f33ff002ac05cf4c3d387bda151e0e8f21658fb
+SHA512:
+  metadata.gz: 74d2e60c72834483f12dbc892ab25e87997d75913ad88caa979af85467bb89c42b98c06b7900ff88520da55082b563eeb721f6ea98bdbe0bb7f747ca3bb36478
+  data.tar.gz: a941d0d2b90bd32a6d5ea5221dacd399769bb6de2e9e81d81ff796faf9d92e143754ed1f312c70ab72a437132ebbdaca1ba7dfce8ac1a97c370fb87c271ea38e

data/CHANGELOG

@@ -76,3 +76,7 @@
 
 * fixed Issue #11: rim/xxx branch is not forwarded when remote head is past xxx branch.
 
+# 1.3.0
+
+* added support for rimming subdirectories from module gits
+* added rim info command

data/lib/rim/command/info.rb

@@ -0,0 +1,28 @@
+require 'rim/command/command'
+require 'rim/info_helper'
+
+module RIM
+module Command
+
+class Info < Command
+
+  def initialize(opts)
+    opts.banner = "Usage: rim info [<options>] [<local_module_path>]"
+    opts.description = "Prints information about RIM modules in <local_module_path> or all modules if omitted"
+    opts.separator ""
+    opts.on("-d", "--detailed", "print detailed information") do
+      @detailed = true
+    end
+  end
+
+  def invoke
+    helper = InfoHelper.new(project_git_dir, @logger)
+    helper.modules_from_paths(helper.module_paths(ARGV))
+    helper.upstream_info
+  end
+
+end
+
+end
+end
+

data/lib/rim/command/sync.rb

@@ -44,6 +44,9 @@ class Sync < Command
     opts.on("-m", "--message MESSAGE", String, "Message header to provide to each commit.") do |message|
       @message = message
     end
+    opts.on("-d", "--subdir SUBDIR", String, "Sync just a subdir from the remote module.") do |subdir|
+      @module_options[:subdir] = subdir
+    end
     opts.on("-s", "--split", "Create a separate commit for each module.") do
       @split = true
     end
@@ -63,8 +66,13 @@ class Sync < Command
       elsif !@module_options[:remote_url] || !@module_options[:target_revision]
         raise RimException.new("Please specify remote URL and target revision for the new module.")
       else
-        helper.add_module_info(helper.create_module_info(@module_options[:remote_url], local_path, @module_options[:target_revision], \
-            @module_options[:ignores]))
+        helper.add_module_info(helper.create_module_info(
+            @module_options[:remote_url],
+            local_path,
+            @module_options[:target_revision],
+            @module_options[:ignores],
+            @module_options[:subdir],
+        ))
       end 
     else
       helper.modules_from_paths(@all ? helper.module_paths(ARGV, @excludedirs) : ARGV, @module_options)

data/lib/rim/command_helper.rb

@@ -32,8 +32,14 @@ class CommandHelper < Processor
     raise RimException.new("Unexpected command line arguments.") if !ARGV.empty?
   end
 
-  def create_module_info(remote_url, local_path, target_revision, ignores)
-    ModuleInfo.new(remote_url, get_relative_path(local_path), target_revision, ignores, remote_url ? get_remote_branch_format(remote_url) : nil)
+  def create_module_info(remote_url, local_path, target_revision, ignores, subdir)
+    ModuleInfo.new(
+        remote_url,
+        get_relative_path(local_path),
+        target_revision,
+        ignores,
+        remote_url ? get_remote_branch_format(remote_url) : nil,
+        subdir)
   end
 
   def modules_from_manifest(path)
@@ -60,9 +66,12 @@ class CommandHelper < Processor
     module_path = find_file_dir_in_workspace(path || ".", RimInfo::InfoFileName)
     if module_path
       rim_info = RimInfo.from_dir(module_path)
-      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_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,
+        opts.has_key?(:subdir) ? opts[:subdir] : rim_info.subdir)
       if module_info.valid?
         add_unique_module_info(module_info)
         module_path

data/lib/rim/info_helper.rb

@@ -0,0 +1,45 @@
+require 'rim/command_helper'
+require 'rim/info_module_helper'
+
+module RIM
+
+class InfoHelper < CommandHelper
+
+  def initialize(workspace_root, logger)
+    @module_helpers = []
+    super(workspace_root, logger)
+  end
+
+  def add_module_info(module_info)
+    @module_helpers.push(InfoModuleHelper.new(@ws_root, module_info, @logger))
+  end
+
+  def upstream_info
+    each_module_parallel("gather info", @module_helpers) do |m|
+      print "."
+      m.gather_info
+    end
+    puts
+    @module_helpers.each do |h|
+      path = h.module_info.local_path.split(/[\\\/]/).last.ljust(40)
+      info = "#{path}: ->#{h.target_rev.ljust(10)} @#{h.current_sha1[0..6]}"
+      if h.upstream_revs
+        if h.upstream_revs.size > 0
+          info += " [#{h.upstream_revs.size} commits behind]"
+        else
+          info += " [UP TO DATE]"
+        end
+        @logger.info(info)
+        h.upstream_revs.each do |r|
+          @logger.info("  #{r.strip}")
+        end
+      else
+        @logger.info(info)
+      end
+    end
+  end
+
+end
+
+end
+

data/lib/rim/info_module_helper.rb

@@ -0,0 +1,35 @@
+require 'rim/module_helper'
+
+module RIM
+
+class InfoModuleHelper < ModuleHelper
+
+  attr_accessor :target_rev
+  attr_accessor :current_sha1
+  attr_accessor :upstream_revs
+  attr_accessor :upstream_non_fast_forward
+
+  def initialize(workspace_root, module_info, logger)
+    super(workspace_root, module_info, logger)
+  end
+
+  def gather_info
+    fetch_module
+    rim_info = RimInfo.from_dir(File.join(@ws_root, @module_info.local_path))
+    @target_rev = rim_info.target_revision
+    @current_sha1 = rim_info.revision_sha1
+    RIM::git_session(git_path) do |s|
+      if s.has_remote_branch?(target_rev)
+        # repository is mirrored so branches are "local"
+        if s.is_ancestor?(current_sha1, target_rev)
+          @upstream_revs = s.execute("git rev-list --oneline #{target_rev} \"^#{current_sha1}\"").split("\n")
+        else
+          @upstream_non_fast_forward = true
+        end
+      end
+    end
+  end
+
+end
+
+end

data/lib/rim/module_helper.rb

@@ -23,7 +23,6 @@ protected
   # fetch module +mod+ into the .rim folder
   # works both for initial fetch and updates
   def fetch_module
-    git_path = module_git_path(@remote_path)
     FileUtils.mkdir_p git_path
     RIM::git_session(git_path) do |s|
       if !File.exist?(git_path + "/config")
@@ -49,6 +48,10 @@ protected
     FileUtils.mkdir_p(local_path)
   end
 
+  def git_path
+    module_git_path(@remote_path)
+  end
+
 end
 
 end

data/lib/rim/module_info.rb

@@ -11,12 +11,20 @@ class ModuleInfo
   attr_reader :target_revision
   # ignores
   attr_reader :ignores
+
+  attr_reader :subdir
   
-  def initialize(remote_url, local_path, target_revision, ignores = nil, remote_branch_format = nil)
+  def initialize(remote_url,
+                 local_path,
+                 target_revision,
+                 ignores = nil,
+                 remote_branch_format = nil,
+                 subdir = nil)
     @remote_url = remote_url
     @remote_branch_format = remote_branch_format
     @local_path = local_path
     @target_revision = target_revision
+    @subdir = subdir
     if ignores.is_a?(String)
       @ignores = ignores.split(",").each do |s| 
         s.strip! 

data/lib/rim/rim.rb

@@ -4,6 +4,7 @@ require 'rim/file_logger'
 require 'rim/command/sync'
 require 'rim/command/upload'
 require 'rim/command/status'
+require 'rim/command/info'
 require 'rim/git'
 require 'rim/rim_exception'
 require 'rim/version'

data/lib/rim/rim_info.rb

@@ -9,12 +9,11 @@ module RIM
 # Example:
 #
 #  4759302048574720930432049375757593827561
-#  remote_url: ssh://some/url/to/git/repo
-#  revision:   8347982374198379842984562095637243593092
-#  rev_name:   mymod-1.2.3
-#  upstream:   trunk
-#  ignores:    CMakeLists.txt,*.arxml
-#  checksum:   9584872389474857324485873627894494726222
+#  remote_url:      ssh://some/url/to/git/repo
+#  revision_sha1:   8347982374198379842984562095637243593092
+#  target_revision: trunk
+#  ignores:         CMakeLists.txt,*.arxml
+#  checksum:        9584872389474857324485873627894494726222
 #
 # rev_name is a symbolic name for revision
 #
@@ -29,7 +28,8 @@ class RimInfo
     :revision_sha1,
     :target_revision,
     :ignores,
-    :checksum
+    :checksum,
+    :subdir
   ]
 
   AttrsDef.each do |d|
@@ -74,6 +74,9 @@ class RimInfo
           end
         end
       end
+      if attrs[:subdir] == ""
+        attrs[:subdir] = nil
+      end
     end
     AttrsDef.each do |a|
       send("#{a}=".to_sym, attrs[a])

data/lib/rim/sync_module_helper.rb

@@ -3,6 +3,7 @@ require 'rim/rim_info'
 require 'rim/file_helper'
 require 'rim/dirty_check'
 require 'tempfile'
+require 'pathname'
 
 module RIM
   class SyncModuleHelper < ModuleHelper
@@ -33,13 +34,19 @@ module RIM
           local_path = File.join(@dest_root, @module_info.local_path)
           prepare_empty_folder(local_path, @module_info.ignores)
           temp_commit(d, "clear directory") if d.uncommited_changes?
-          s.execute("git archive --format tar #{@module_info.target_revision} | tar -x -C #{local_path}")
+          strip = ""
+          if @module_info.subdir
+              depth = Pathname(@module_info.subdir).each_filename.count()
+              strip = "--strip-components=#{depth}"
+          end
+          s.execute("git archive --format tar #{@module_info.target_revision} #{@module_info.subdir} | tar #{strip} -x -C #{local_path}")
           sha1 = s.execute("git rev-parse #{@module_info.target_revision}").strip
           @rim_info = RimInfo.new
           @rim_info.remote_url = @module_info.remote_url
           @rim_info.target_revision = @module_info.target_revision
           @rim_info.revision_sha1 = sha1
           @rim_info.ignores = @module_info.ignores.join(",")
+          @rim_info.subdir = @module_info.subdir
           @rim_info.to_dir(local_path)
           DirtyCheck.mark_clean(local_path)
         end

data/lib/rim/upload_module_helper.rb

@@ -30,6 +30,11 @@ private
       local_branch = nil
       remote_branch = nil
       infos = nil
+      if @module_info.subdir
+        dest_path = File.join([tmp_git_path] + @module_info.subdir.split("/"))
+      else
+        dest_path = tmp_git_path
+      end
       RIM::git_session(@ws_root) do |src|
         infos = get_branches_and_revision_infos(src, dest, parent_sha1, sha1s)
         if infos.branches.size == 1
@@ -37,7 +42,12 @@ private
           if dest.has_remote_branch?(remote_branch)
             infos.rev_infos.each do |rev_info|
               local_branch = create_update_branch(dest, infos.parent_sha1, rev_info.src_sha1) if !local_branch
-              copy_revision_files(src, rev_info.src_sha1, tmp_git_path, rev_info.rim_info.ignores)
+              copy_revision_files(
+                src,
+                rev_info.src_sha1,
+                dest_path,
+                rev_info.rim_info.ignores
+              )
               commit_changes(dest, local_branch, rev_info.src_sha1, rev_info.message)
             end
           else

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.2.2"
+Version = "1.3.0"
 
 end
 

data/test/rim_info_test.rb

@@ -75,7 +75,8 @@ def test_attributes
     :remote_url => "ssh://somehost/dir1/dir2",
     :revision_sha1 => "8347982374198379842984562095637243593092",
     :target_revision => "trunk",
-    :ignores => "CMakeLists.txt,*.arxml"
+    :ignores => "CMakeLists.txt,*.arxml",
+    :subdir => "foo/bar"
   }
   d = empty_test_dir("rim_info")
   create_rim_info(d, attrs)
@@ -86,6 +87,30 @@ def test_attributes
   end
 end
 
+def test_subdir_default
+  attrs_write = {
+    :remote_url => "ssh://somehost/dir1/dir2",
+    :revision_sha1 => "8347982374198379842984562095637243593092",
+    :target_revision => "trunk",
+    :ignores => "CMakeLists.txt,*.arxml",
+  }
+  attrs_expected = {
+    :remote_url => "ssh://somehost/dir1/dir2",
+    :revision_sha1 => "8347982374198379842984562095637243593092",
+    :target_revision => "trunk",
+    :ignores => "CMakeLists.txt,*.arxml",
+    :subdir => nil
+  }
+  d = empty_test_dir("rim_info")
+  create_rim_info(d, attrs_write)
+  ri = RIM::RimInfo.from_dir(d)
+  #puts File.read(d+"/.riminfo")
+  attrs_expected.each_pair do |k,v|
+    assert_equal v, ri.send(k)
+  end
+end
+
+
 def teardown
   # clean up test dirs created during last test
   remove_test_dirs

data/test/sync_helper_test.rb

@@ -44,9 +44,48 @@ class SyncHelperTest < Minitest::Test
       assert log[1].include?("mod2")
       assert File.exist?(File.join(@ws_dir, "mod1"))
       assert File.exist?(File.join(@ws_dir, "mod2"))
+      assert File.exist?(File.join(@ws_dir, "mod1", "readme.txt"))
+      assert File.exist?(File.join(@ws_dir, "mod2", "readme.txt"))
     end
   end
 
+  def test_files_are_synchronized_subtree
+    mod_git_dir = create_all_module_git("mod_all")
+    mod_a_info =  RIM::ModuleInfo.new("file://" + mod_git_dir, "modules/a", "master", nil, nil, "mod_a")
+    create_ws_git("testbr")
+    cut = RIM::SyncHelper.new(@ws_dir, @logger, [mod_a_info])
+    cut.sync
+    RIM::git_session(@ws_dir) do |s|
+      assert !File.exist?(File.join(@ws_dir, "modules", "a"))
+      s.execute("git checkout rim/testbr")
+      check_not_dirty(s)
+      log = s.execute("git log | grep \" module \"").split("\n").sort
+      assert log.size == 1
+      assert log[0].include?("modules/a")
+      assert !File.exist?(File.join(@ws_dir, "modules", "b"))
+      assert File.exist?(File.join(@ws_dir, "modules", "a"))
+      assert File.exist?(File.join(@ws_dir, "modules", "a", "file_a.c"))
+    end
+  end
+
+  def test_files_are_synchronized_subtree_deep
+    mod_git_dir = create_all_module_git("mod_all")
+    mod_a_info =  RIM::ModuleInfo.new("file://" + mod_git_dir, "modules/b_src", "master", nil, nil, "mod_b/src")
+    create_ws_git("testbr")
+    cut = RIM::SyncHelper.new(@ws_dir, @logger, [mod_a_info])
+    cut.sync
+    RIM::git_session(@ws_dir) do |s|
+      assert !File.exist?(File.join(@ws_dir, "modules", "b_src"))
+      s.execute("git checkout rim/testbr")
+      check_not_dirty(s)
+      log = s.execute("git log | grep \" module \"").split("\n").sort
+      assert log.size == 1
+      assert log[0].include?("modules/b_src")
+      assert File.exist?(File.join(@ws_dir, "modules", "b_src", "file_b.c"))
+    end
+  end
+
+
   def test_files_are_synchronized_on_existing_branch
     mod1_info = create_module_git("mod1")
     mod2_info = create_module_git("mod2")
@@ -217,6 +256,28 @@ private
     return RIM::ModuleInfo.new("file://" + git_dir, name, branch)
   end
 
+  def create_all_module_git(name, branch = "master")
+    git_dir = File.join(@remote_git_dir, name)
+    FileUtils.mkdir_p(File.join(git_dir,"mod_a"))
+    FileUtils.mkdir_p(File.join(git_dir,"mod_b","src"))
+    RIM::git_session(git_dir) do |s|
+      s.execute("git init")
+      s.execute("git checkout -B #{branch}")
+      File.open(File.join(git_dir, "readme.txt"), "w") do |f|
+        f.write("Content.")
+      end
+      File.open(File.join(git_dir, "mod_a", "file_a.c"), "w") do |f|
+        f.write("Content.")
+      end
+      File.open(File.join(git_dir, "mod_b", "src", "file_b.c"), "w") do |f|
+        f.write("Content.")
+      end
+      s.execute("git add .")
+      s.execute("git commit -m \"Initial commit\"")
+    end
+    return git_dir
+  end
+
   def path_from_module_info(module_info)
     module_info.remote_url.gsub(/^file:\/\//, "")
   end

data/test/upload_helper_test.rb

@@ -79,6 +79,47 @@ class UploadHelperTest < Minitest::Test
     end
   end
 
+  def test_files_of_new_commits_are_uploaded_subdir
+    mod_git_dir = create_all_module_git("mod_all")
+    mod_a_info =  RIM::ModuleInfo.new("file://" + mod_git_dir, "modules/a", "master", nil, nil, "mod_a")
+    create_ws_git("testbr")
+    sync_helper = RIM::SyncHelper.new(@ws_dir, @logger, [mod_a_info])
+    sync_helper.sync
+    RIM::git_session(@ws_dir) do |s|
+      s.execute("git rebase rim/testbr")
+    end
+    shas = []
+    # make two changes to module
+    RIM::git_session(@ws_dir) do |s|
+      `echo ' appended' >> #{File.join(@ws_dir, "modules/a/file_a.c")}`
+      s.execute("git commit . -m \"First change\"")
+      shas.push(s.rev_sha1("HEAD"))
+      `echo 'Test' > #{File.join(@ws_dir, "modules/a/new_file.txt")}`
+      s.execute("git add .")
+      s.execute("git commit . -m \"Second change\"")
+      shas.push(s.rev_sha1("HEAD"))
+    end
+    cut = RIM::UploadHelper.new(@ws_dir, true, @logger, [mod_a_info])
+
+    module_session(mod_a_info) do |s|
+      s.execute("git checkout --detach master")
+      assert File.exist?(File.join(mod_git_dir, "mod_a", "file_a.c"))
+      assert !File.exist?(File.join(mod_git_dir, "mod_a", "new_file.txt"))
+      assert File.exist?(File.join(mod_git_dir, "mod_b", "src", "file_b.c"))
+    end
+
+    cut.upload
+
+    module_session(mod_a_info) do |s|
+      s.execute("git checkout --detach master")
+      assert File.exist?(File.join(mod_git_dir, "mod_a", "file_a.c"))
+      assert File.exist?(File.join(mod_git_dir, "mod_a", "new_file.txt"))
+      assert File.exist?(File.join(mod_git_dir, "mod_b", "src", "file_b.c"))
+      assert s.execute("git show -s --format=%B HEAD").start_with?("Second change")
+      assert s.execute("git show -s --format=%B HEAD~1").start_with?("First change")
+    end
+  end
+
   def test_files_of_new_commits_are_uploaded_to_push_branch
     mod1_info = create_module_git("mod1", "master", "for/%s")
     create_ws_git("testbr")
@@ -318,6 +359,30 @@ private
     return RIM::ModuleInfo.new("file://" + git_dir, name, branch, nil, remote_branch_format)
   end
 
+  def create_all_module_git(name, branch = "master")
+    git_dir = File.join(@remote_git_dir, name)
+    FileUtils.mkdir_p(File.join(git_dir,"mod_a"))
+    FileUtils.mkdir_p(File.join(git_dir,"mod_b","src"))
+    RIM::git_session(git_dir) do |s|
+      s.execute("git init")
+      s.execute("git checkout -B #{branch}")
+      File.open(File.join(git_dir, "readme.txt"), "w") do |f|
+        f.write("Content.")
+      end
+      File.open(File.join(git_dir, "mod_a", "file_a.c"), "w") do |f|
+        f.write("Content.")
+      end
+      File.open(File.join(git_dir, "mod_b", "src", "file_b.c"), "w") do |f|
+        f.write("Content.")
+      end
+      s.execute("git add .")
+      s.execute("git commit -m \"Initial commit\"")
+      s.execute("git checkout --detach #{branch}")
+    end
+    return git_dir
+  end
+
+
   def module_session(module_info)
     RIM::git_session(module_info.remote_url.gsub(/^file:\/\//, "")) do |s|
       yield s

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.2.2
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-06-13 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
@@ -38,6 +35,7 @@ extra_rdoc_files:
 - CHANGELOG
 files:
 - lib/rim/command/command.rb
+- lib/rim/command/info.rb
 - lib/rim/command/status.rb
 - lib/rim/command/sync.rb
 - lib/rim/command/upload.rb
@@ -46,6 +44,8 @@ files:
 - lib/rim/file_helper.rb
 - lib/rim/file_logger.rb
 - lib/rim/git.rb
+- lib/rim/info_helper.rb
+- lib/rim/info_module_helper.rb
 - lib/rim/manifest/helper.rb
 - lib/rim/manifest/json_reader.rb
 - lib/rim/manifest/manifest.json
@@ -85,6 +85,7 @@ files:
 - bin/rim
 homepage: http://esrlabs.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -94,21 +95,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.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RIM - multi git tool
 test_files: []