esr-rim 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b33d85be666d5c844f3cea2badd20b014e513ba4
-  data.tar.gz: 5f33ff002ac05cf4c3d387bda151e0e8f21658fb
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2NkZDZjMGM5MmViZTZjYzdmY2Y1NDU2NTk0NWU5MGZjZGY4N2E0Yw==
+  data.tar.gz: !binary |-
+    N2I0ZTgwMThkMjk0MDFiNGI1NzBkOGJhNDEzYTc4NjFkOWExM2NlMw==
 SHA512:
-  metadata.gz: 74d2e60c72834483f12dbc892ab25e87997d75913ad88caa979af85467bb89c42b98c06b7900ff88520da55082b563eeb721f6ea98bdbe0bb7f747ca3bb36478
-  data.tar.gz: a941d0d2b90bd32a6d5ea5221dacd399769bb6de2e9e81d81ff796faf9d92e143754ed1f312c70ab72a437132ebbdaca1ba7dfce8ac1a97c370fb87c271ea38e
+  metadata.gz: !binary |-
+    MDgxMTYzMTU2ZjdiMTZiMjU5YjljNTM1NGFjZTRjNDE2YTI0N2ExYzZhMGZl
+    NGZkODZjM2Q3MTdiOGI5NmE2OTkzOTk3NzQzNDFiMTQ3ZmEwMDIwMDk4MDYz
+    ZWYxNjkwNzNhYTlmYmE1OGQzZDlmNDFmOWQ2NWVmYjhkYzdhNjg=
+  data.tar.gz: !binary |-
+    ZDFiY2Q0YmNlMTE1NDFmN2IyNWQ0YjkzNzk2MDA5MjMxOTQ5OGU2ZTM3Yjdj
+    ZjdlOTczOGM5ZWU1ODVlZGNhY2JjYmEyNzE0NTU1ZWYzZWY0ODE3YWYwZjI2
+    ZmRhZmJiMmQyYTI3ZGVjOTk4NmM5MzM2NmY4NjhiMDViNTAxYmE=

data/CHANGELOG

@@ -80,3 +80,8 @@
 
 * added support for rimming subdirectories from module gits
 * added rim info command
+
+# 1.3.1
+
+* fixed sync with manifests and extended to support of subdirectories
+

data/lib/rim/command_helper.rb

@@ -45,7 +45,7 @@ class CommandHelper < Processor
   def modules_from_manifest(path)
     manifest = read_manifest(path)
     manifest.modules.each do |mod|
-      add_unique_module_info(create_module_info(mod.remote_path, mod.local_path, mod.target_revision, mod.ignores))
+      add_unique_module_info(create_module_info(mod.remote_path, mod.local_path, mod.target_revision, mod.ignores, mod.subdir))
     end
     true
   end

data/lib/rim/manifest/json_reader.rb

@@ -28,7 +28,8 @@ module Manifest
             :remote_path => mod["remote_path"],
             :local_path => mod["local_path"],
             :target_revision => mod["target_revision"],
-            :ignores => mod["ignores"]
+            :ignores => mod["ignores"],
+            :subdir => mod["subdir"]
           ))
       end
     end

data/lib/rim/manifest/model.rb

@@ -18,12 +18,14 @@ class Module
   attr_reader :local_path
   attr_reader :target_revision
   attr_reader :ignores
+  attr_reader :subdir
 
   def initialize(args = {})
     @remote_path = args[:remote_path]
     @local_path = args[:local_path]
     @target_revision = args[:target_revision]
     @ignores = args[:ignores]
+    @subdir = args[:subdir]
   end
 end
 

data/lib/rim/version.rb

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

data/test/command_helper_test.rb

@@ -0,0 +1,83 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+$:.unshift File.join(File.dirname(__FILE__))
+
+require 'minitest/autorun'
+require 'rim/command_helper'
+require 'test_helper'
+require 'fileutils'
+require 'json'
+
+class CommandHelperTest < Minitest::Test
+  include FileUtils
+  include TestHelper
+
+  class TestCommand < RIM::CommandHelper
+    
+    attr_reader :module_infos
+    
+    def initialize(*args)
+      super
+      @module_infos = []
+    end
+    
+    def add_module_info(module_info)
+      @module_infos << module_info
+    end
+    
+  end
+
+  def setup
+    @test_dir = empty_test_dir("command_helper_test")
+    @ws_dir = File.join(@test_dir, "ws")
+    @logger = Logger.new($stdout)
+    @logger.level = Logger::ERROR unless ARGV.include? "debug"
+    RIM::GitSession.logger = @logger
+  end
+  
+  def teardown
+    remove_test_dirs
+  end
+
+  def test_create_module_info
+    cut = RIM::CommandHelper.new(@ws_dir, @logger)
+    mi = cut.create_module_info('ssh://gerrit/bsw/test', File.join(@ws_dir, 'sub/test'), 'master', ['CMakeLists.txt', 'OtherPattern*'], 'subdir')
+    assert(mi.remote_url == 'ssh://gerrit/bsw/test')
+    assert(mi.remote_branch_format == 'refs/for/%s')
+    assert(mi.local_path == 'sub/test')
+    assert(mi.target_revision == 'master')
+    assert(mi.ignores == ['CMakeLists.txt', 'OtherPattern*'])
+    assert(mi.subdir == 'subdir')
+  end
+
+  def test_modules_from_manifest
+    manifest = {
+      'modules' => [
+        { 'remote_path' => 'ssh://gerrit/bsw/test', 'local_path' => File.join(@ws_dir, 'sub/test'), 'target_revision' => 'master', 'ignores' => ['CMakeLists.txt', 'OtherPattern*'], 'subdir' => 'test/subdir'},
+        { 'remote_path' => '../file/test', 'local_path' => File.join(@ws_dir, 'sub/file_test'), 'target_revision' => 'branch' }
+      ]
+    }
+    
+    manifest_file = File.join(@test_dir, 'manifest.json')
+    File.open(manifest_file, 'w') do |file|
+      file << manifest.to_json
+    end
+    cut = TestCommand.new(@ws_dir, @logger)
+    cut.modules_from_manifest(manifest_file)
+    assert(cut.module_infos.size == 2)
+    mi = cut.module_infos[0]
+    assert(mi.remote_url == 'ssh://gerrit/bsw/test')
+    assert(mi.remote_branch_format == 'refs/for/%s')
+    assert(mi.local_path == 'sub/test')
+    assert(mi.target_revision == 'master')
+    assert(mi.ignores == ['CMakeLists.txt', 'OtherPattern*'])
+    assert(mi.subdir == 'test/subdir')
+    mi = cut.module_infos[1]
+    assert(mi.remote_url == '../file/test')
+    assert(mi.remote_branch_format == 'refs/for/%s')
+    assert(mi.local_path == 'sub/file_test')
+    assert(mi.target_revision == 'branch')
+    assert(mi.ignores == [])
+    assert(mi.subdir.nil?)
+  end
+  
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-28 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,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
@@ -64,6 +68,7 @@ files:
 - lib/rim/upload_helper.rb
 - lib/rim/upload_module_helper.rb
 - lib/rim/version.rb
+- test/command_helper_test.rb
 - test/dirty_check_test.rb
 - test/file_helper_test.rb
 - test/git_test.rb
@@ -79,10 +84,6 @@ 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: {}
@@ -96,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.0.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RIM - multi git tool