esr-rim 1.4.0 → 1.4.2

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.4.0"
+Version = "1.4.2"
 
 end
 

data/test/command_helper_test.rb

@@ -1,83 +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
+$:.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

data/test/file_helper_test.rb

@@ -1,132 +1,132 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-$:.unshift File.join(File.dirname(__FILE__))
-
-require 'minitest/autorun'
-require 'rim/file_helper'
-require 'fileutils'
-require 'test_helper'
-
-class FileHelperTest < Minitest::Test
-  include FileUtils
-  include TestHelper
-
-  def setup
-    @test_dir = empty_test_dir("file_helper_test")
-  end
-  
-  def teardown
-    remove_test_dirs
-  end
-
-  def test_find_matching_relative_files
-    create_test_file(".", "aaa")
-    create_test_file(".", "abc")
-    create_test_file(".", "bbb")
-    create_test_file("f1", "aaa")
-    create_test_file("f1", "ccc")
-    create_test_file("f2", "ccc")
-    create_test_file("f2", "ddd")
-    files = RIM::FileHelper.find_matching_files(@test_dir, false)
-    assert files[0] == "aaa"
-    assert files[1] == "abc"
-    assert files[2] == "bbb"
-    assert files[3] == "f1"
-    assert files[4] == "f1/aaa"
-    assert files[5] == "f1/ccc"
-    assert files[6] == "f2"
-    assert files[7] == "f2/ccc"
-    assert files[8] == "f2/ddd"
-  end
-
-  def test_find_matching_absolute_files
-    create_test_file(".", "aaa")
-    create_test_file(".", "abc")
-    create_test_file(".", "bbb")
-    create_test_file("f1", "aaa")
-    create_test_file("f1", "ccc")
-    create_test_file("f2", "ccc")
-    create_test_file("f2", "ddd")
-    files = RIM::FileHelper.find_matching_files(@test_dir, true)
-    assert files[0] == File.join(@test_dir, "aaa")
-    assert files[1] == File.join(@test_dir, "abc")
-    assert files[2] == File.join(@test_dir, "bbb")
-    assert files[3] == File.join(@test_dir, "f1")
-    assert files[4] == File.join(@test_dir, "f1/aaa")
-    assert files[5] == File.join(@test_dir, "f1/ccc")
-    assert files[6] == File.join(@test_dir, "f2")
-    assert files[7] == File.join(@test_dir, "f2/ccc")
-    assert files[8] == File.join(@test_dir, "f2/ddd")
-  end
-
-  def test_find_matching_relative_files_with_patterns
-    create_test_file(".", "aaa")
-    create_test_file(".", "abc")
-    create_test_file(".", "bbb")
-    create_test_file("f1", "aaa")
-    create_test_file("f1", "ccc")
-    create_test_file("f2", "ccc")
-    create_test_file("f2", "ddd")
-    files = RIM::FileHelper.find_matching_files(@test_dir, false, ["**/a*", "f2/ccc"])
-    assert files[0] == "aaa"
-    assert files[1] == "abc"
-    assert files[2] == "f1/aaa"
-    assert files[3] == "f2/ccc"
-  end
-
-  def test_find_matching_absolute_files_with_patterns
-    create_test_file(".", "aaa")
-    create_test_file(".", "abc")
-    create_test_file(".", "bbb")
-    create_test_file("f1", "aaa")
-    create_test_file("f1", "ccc")
-    create_test_file("f2", "ccc")
-    create_test_file("f2", "ddd")
-    files = RIM::FileHelper.find_matching_files(@test_dir, true, ["**/a*", "f2/ccc"])
-    assert files[0] == File.join(@test_dir, "aaa")
-    assert files[1] == File.join(@test_dir, "abc")
-    assert files[2] == File.join(@test_dir, "f1/aaa")
-    assert files[3] == File.join(@test_dir, "f2/ccc")
-  end
-  
-  def test_remove_empty_dirs
-    create_test_file(".", "a")
-    create_test_file("f1", "ab")
-    create_test_file("f1/f1")
-    create_test_file("f1/f1/f1")
-    create_test_file("f1/f1/f2")
-    RIM::FileHelper.remove_empty_dirs(@test_dir)
-    files = RIM::FileHelper.find_matching_files(@test_dir, false)
-    assert files[0] = "a"
-    assert files[1] = "f1"
-    assert files[2] = "f1/ab"
-    assert !files[3]
-  end
-
-  def test_remove_empty_dirs_with_avoid
-    create_test_file(".", "a")
-    create_test_file("f1", "ab")
-    create_test_file("f1/f1")
-    create_test_file("f1/f1/f1")
-    create_test_file("f1/f1/f2")
-    RIM::FileHelper.remove_empty_dirs(@test_dir, File.join(@test_dir, "f1/f1"))
-    files = RIM::FileHelper.find_matching_files(@test_dir, false)
-    assert files[0] = "a"
-    assert files[1] = "f1"
-    assert files[2] = "f1/ab"
-    assert files[2] = "f1/f1"
-    assert !files[4]
-  end
-    
-private
-  
-  def create_test_file(dir, name = nil)
-    abs_dir = File.join(@test_dir, dir)
-    FileUtils.mkdir_p(abs_dir)
-    if name
-      File.open(File.join(abs_dir, name), "w") do |f| 
-        f.write("Content of #{name}\n") 
-      end
-    end
-  end
-  
-end
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+$:.unshift File.join(File.dirname(__FILE__))
+
+require 'minitest/autorun'
+require 'rim/file_helper'
+require 'fileutils'
+require 'test_helper'
+
+class FileHelperTest < Minitest::Test
+  include FileUtils
+  include TestHelper
+
+  def setup
+    @test_dir = empty_test_dir("file_helper_test")
+  end
+  
+  def teardown
+    remove_test_dirs
+  end
+
+  def test_find_matching_relative_files
+    create_test_file(".", "aaa")
+    create_test_file(".", "abc")
+    create_test_file(".", "bbb")
+    create_test_file("f1", "aaa")
+    create_test_file("f1", "ccc")
+    create_test_file("f2", "ccc")
+    create_test_file("f2", "ddd")
+    files = RIM::FileHelper.find_matching_files(@test_dir, false)
+    assert files[0] == "aaa"
+    assert files[1] == "abc"
+    assert files[2] == "bbb"
+    assert files[3] == "f1"
+    assert files[4] == "f1/aaa"
+    assert files[5] == "f1/ccc"
+    assert files[6] == "f2"
+    assert files[7] == "f2/ccc"
+    assert files[8] == "f2/ddd"
+  end
+
+  def test_find_matching_absolute_files
+    create_test_file(".", "aaa")
+    create_test_file(".", "abc")
+    create_test_file(".", "bbb")
+    create_test_file("f1", "aaa")
+    create_test_file("f1", "ccc")
+    create_test_file("f2", "ccc")
+    create_test_file("f2", "ddd")
+    files = RIM::FileHelper.find_matching_files(@test_dir, true)
+    assert files[0] == File.join(@test_dir, "aaa")
+    assert files[1] == File.join(@test_dir, "abc")
+    assert files[2] == File.join(@test_dir, "bbb")
+    assert files[3] == File.join(@test_dir, "f1")
+    assert files[4] == File.join(@test_dir, "f1/aaa")
+    assert files[5] == File.join(@test_dir, "f1/ccc")
+    assert files[6] == File.join(@test_dir, "f2")
+    assert files[7] == File.join(@test_dir, "f2/ccc")
+    assert files[8] == File.join(@test_dir, "f2/ddd")
+  end
+
+  def test_find_matching_relative_files_with_patterns
+    create_test_file(".", "aaa")
+    create_test_file(".", "abc")
+    create_test_file(".", "bbb")
+    create_test_file("f1", "aaa")
+    create_test_file("f1", "ccc")
+    create_test_file("f2", "ccc")
+    create_test_file("f2", "ddd")
+    files = RIM::FileHelper.find_matching_files(@test_dir, false, ["**/a*", "f2/ccc"])
+    assert files[0] == "aaa"
+    assert files[1] == "abc"
+    assert files[2] == "f1/aaa"
+    assert files[3] == "f2/ccc"
+  end
+
+  def test_find_matching_absolute_files_with_patterns
+    create_test_file(".", "aaa")
+    create_test_file(".", "abc")
+    create_test_file(".", "bbb")
+    create_test_file("f1", "aaa")
+    create_test_file("f1", "ccc")
+    create_test_file("f2", "ccc")
+    create_test_file("f2", "ddd")
+    files = RIM::FileHelper.find_matching_files(@test_dir, true, ["**/a*", "f2/ccc"])
+    assert files[0] == File.join(@test_dir, "aaa")
+    assert files[1] == File.join(@test_dir, "abc")
+    assert files[2] == File.join(@test_dir, "f1/aaa")
+    assert files[3] == File.join(@test_dir, "f2/ccc")
+  end
+  
+  def test_remove_empty_dirs
+    create_test_file(".", "a")
+    create_test_file("f1", "ab")
+    create_test_file("f1/f1")
+    create_test_file("f1/f1/f1")
+    create_test_file("f1/f1/f2")
+    RIM::FileHelper.remove_empty_dirs(@test_dir)
+    files = RIM::FileHelper.find_matching_files(@test_dir, false)
+    assert files[0] = "a"
+    assert files[1] = "f1"
+    assert files[2] = "f1/ab"
+    assert !files[3]
+  end
+
+  def test_remove_empty_dirs_with_avoid
+    create_test_file(".", "a")
+    create_test_file("f1", "ab")
+    create_test_file("f1/f1")
+    create_test_file("f1/f1/f1")
+    create_test_file("f1/f1/f2")
+    RIM::FileHelper.remove_empty_dirs(@test_dir, File.join(@test_dir, "f1/f1"))
+    files = RIM::FileHelper.find_matching_files(@test_dir, false)
+    assert files[0] = "a"
+    assert files[1] = "f1"
+    assert files[2] = "f1/ab"
+    assert files[2] = "f1/f1"
+    assert !files[4]
+  end
+    
+private
+  
+  def create_test_file(dir, name = nil)
+    abs_dir = File.join(@test_dir, dir)
+    FileUtils.mkdir_p(abs_dir)
+    if name
+      File.open(File.join(abs_dir, name), "w") do |f| 
+        f.write("Content of #{name}\n") 
+      end
+    end
+  end
+  
+end

data/test/manifest_helper_test.rb

@@ -1,29 +1,29 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-
-require "minitest/autorun"
-require "rim/manifest/helper"
-require "fileutils"
-
-class ManifestHelperTest < Minitest::Test
-  include FileUtils
-  include RIM::Manifest::Helpers
-
-  def setup
-  end
-
-  def test_find_local_config
-
-    cd File.dirname(__FILE__)+"/manifest_test_dir" do
-      m = default_manifest
-      assert m != nil
-    end
-  end
-
-  def test_find_config_from_subdir
-
-    cd File.dirname(__FILE__)+"/manifest_test_dir/subdir" do
-      m = default_manifest
-      assert m != nil
-    end
-  end
-end
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require "minitest/autorun"
+require "rim/manifest/helper"
+require "fileutils"
+
+class ManifestHelperTest < Minitest::Test
+  include FileUtils
+  include RIM::Manifest::Helpers
+
+  def setup
+  end
+
+  def test_find_local_config
+
+    cd File.dirname(__FILE__)+"/manifest_test_dir" do
+      m = default_manifest
+      assert m != nil
+    end
+  end
+
+  def test_find_config_from_subdir
+
+    cd File.dirname(__FILE__)+"/manifest_test_dir/subdir" do
+      m = default_manifest
+      assert m != nil
+    end
+  end
+end