esr-rim 1.4.0 → 1.4.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTAxYjg0NjcxMmVhMThhNTA4MWI0ZDU0YzQxZGEzNmQ3NzJkYWM0Yg==
-  data.tar.gz: !binary |-
-    MWFjMjVhMTY4YzYyNGQxMTRmNDVlNzU1ZjNiOTdiZmMyOGYzODZmNQ==
+SHA256:
+  metadata.gz: bdd17c24fa16f44fb9d746f559792de236d441f42a9a49174a87edfcea479395
+  data.tar.gz: e789260532bade62c2bc64dbc88eae3ed532f32c7989858bfa50a7931ebeef5f
 SHA512:
-  metadata.gz: !binary |-
-    MGJlMTY3YTQ1N2Y1MjllOTVmZjZjNzM5NGM0M2FjYjMxYWI4MzNiM2VlZWU3
-    Y2VmNDNkMGJjODNmYzU1M2E0ZmMxMWM3ODgxOTAxNWI2M2VjZDRlNmJkMGFk
-    MGQ1NTE3YTI4MmFhYjk4NDBmNzYzODk3NmE3ZTkzYTJiZjU3N2Y=
-  data.tar.gz: !binary |-
-    NTg0MzcxODM3YjQyYjVjM2JjY2I1N2ZiMDZmNDZlZTI0YjM3NWM2YjA1NmY2
-    YmQzYjdhNzE1MWFjNTI4NmI3ZjIyYzc1ZTRlZGM0YjYyYzgxMWYzY2FkZDc3
-    YmExNjgxZDI0ZjEyOTE0MjkyMDY1YzFmNjJlODczNGY3NTkxMmE=
+  metadata.gz: f9e463d07bea078b84c3c36a5c18248996fe7e9bcd74a9482790c1173ce0b2b9abd65eb6c14abdb31b4a218dcef54b149c9827de21da15bac9703ac84fb37365
+  data.tar.gz: b073b89e8afd986decc656f00ad3b8d8431317548d6c9bdfc9df16f6bf9cceaa7bbed093497ed5fe5c2d3a8fd9b084c29ec8a551a5a5a6b64d76c9a1ec60578e

data/CHANGELOG

@@ -126,3 +126,12 @@
 # 1.4.0
 
 * fixed Issue #20: Add revision timestamp to .riminfo
+
+# 1.4.1
+
+* Allow changing sub directory path to empty string
+* Fix tar usage for Windows
+
+# 1.4.2
+
+* Fixed temporary-folder-generation on Windows, which could e.g. break the dirty check

data/Rakefile

@@ -1,56 +1,56 @@
-$:.unshift(File.dirname(__FILE__)+"/lib")
-
-require 'rubygems/package_task'
-require 'rdoc/task'
-require 'rim/version'
-
-DocFiles = [
-  "README.md", "CHANGELOG"
-  ]
-
-RTextGemSpec = Gem::Specification.new do |s|
-  s.name = "esr-rim"
-  s.version = RIM::Version::Version
-  s.date = Time.now.strftime("%Y-%m-%d")
-  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://github.com/esrlabs/esr-rim"
-  s.add_dependency('subcommand', '>= 1.0.6')
-  gemfiles = Rake::FileList.new
-  gemfiles.include("{lib,test}/**/*")
-  gemfiles.include(DocFiles)
-  gemfiles.include("Rakefile") 
-  s.files = gemfiles
-  s.rdoc_options = ["--main", "README.md", "-x", "test"]
-  s.extra_rdoc_files = DocFiles
-  s.bindir = "bin"
-  s.executables = ["rim"]
-end
-
-RDoc::Task.new do |rd|
-  rd.main = "README.md"
-  rd.rdoc_files.include(DocFiles)
-  rd.rdoc_files.include("lib/**/*.rb")
-  rd.rdoc_dir = "doc"
-end
-
-RTextPackageTask = Gem::PackageTask.new(RTextGemSpec) do |p|
-  p.need_zip = false
-end	
-
-task :prepare_package_rdoc => :rdoc do
-  RTextPackageTask.package_files.include("doc/**/*")
-end
-
-desc 'run unit tests'
-task :run_tests do
-  sh "ruby test/unit_tests.rb"
-end
-
-task :release => [:prepare_package_rdoc, :package]
-
-task :clobber => [:clobber_rdoc, :clobber_package]
-
-task :default => :run_tests
-
+$:.unshift(File.dirname(__FILE__)+"/lib")
+
+require 'rubygems/package_task'
+require 'rdoc/task'
+require 'rim/version'
+
+DocFiles = [
+  "README.md", "CHANGELOG"
+  ]
+
+RTextGemSpec = Gem::Specification.new do |s|
+  s.name = "esr-rim"
+  s.version = RIM::Version::Version
+  s.date = Time.now.strftime("%Y-%m-%d")
+  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://github.com/esrlabs/esr-rim"
+  s.add_dependency('subcommand', '>= 1.0.6')
+  gemfiles = Rake::FileList.new
+  gemfiles.include("{lib,test}/**/*")
+  gemfiles.include(DocFiles)
+  gemfiles.include("Rakefile") 
+  s.files = gemfiles
+  s.rdoc_options = ["--main", "README.md", "-x", "test"]
+  s.extra_rdoc_files = DocFiles
+  s.bindir = "bin"
+  s.executables = ["rim"]
+end
+
+RDoc::Task.new do |rd|
+  rd.main = "README.md"
+  rd.rdoc_files.include(DocFiles)
+  rd.rdoc_files.include("lib/**/*.rb")
+  rd.rdoc_dir = "doc"
+end
+
+RTextPackageTask = Gem::PackageTask.new(RTextGemSpec) do |p|
+  p.need_zip = false
+end	
+
+task :prepare_package_rdoc => :rdoc do
+  RTextPackageTask.package_files.include("doc/**/*")
+end
+
+desc 'run unit tests'
+task :run_tests do
+  sh "ruby test/unit_tests.rb"
+end
+
+task :release => [:prepare_package_rdoc, :package]
+
+task :clobber => [:clobber_rdoc, :clobber_package]
+
+task :default => :run_tests
+

data/lib/rim/command/sync.rb

@@ -1,89 +1,89 @@
-require 'rim/command/command'
-require 'rim/manifest/helper'
-require 'rim/rim_exception'
-require 'rim/rim_info'
-require 'rim/sync_helper'
-require 'uri'
-
-module RIM
-module Command
-
-class Sync < Command
-
-  include RIM::Manifest
-
-  def initialize(opts)
-    opts.banner = "Usage: rim sync [<options>] [<local_module_path>]"
-    opts.description = "Synchronize specified rim modules with remote repository revisions."
-    opts.separator ""
-    opts.on("-m", "--manifest [MANIFEST]", String, "Read information from manifest.", \
-                                                   "If no manifest file is specified a 'manifest.rim' file will be used.") do |manifest|
-      @manifest = manifest ? manifest : Helpers::default_manifest
-    end
-    opts.on("-c", "--create", "Synchronize module initially to <local_module_path>.", \
-                              "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|
-      @module_options[:remote_url] = url 
-    end 
-    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|
-      @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("-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
-    opts.on("-b", "--rebase", "Rebase after successful sync.") do
-      @rebase = true
-    end
-  end
-
-  def invoke()
-    helper = SyncHelper.new(project_git_dir, @logger)
-    if @manifest
-      helper.modules_from_manifest(@manifest)
-    elsif @create
-      local_path = ARGV.shift || "."
-      if helper.find_file_dir_in_workspace(local_path, RimInfo::InfoFileName)
-        raise RimException.new("There's already a module file. Don't use the create option to sync the module.")
-      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],
-            @module_options[:subdir],
-        ))
-      end 
-    else
-      helper.modules_from_paths(@all ? helper.module_paths(ARGV, @excludedirs) : ARGV, @module_options)
-    end
-    helper.check_arguments
-    helper.sync(@message, @rebase, @split)
-  end
-
-end
-
-end
-end
-
-
+require 'rim/command/command'
+require 'rim/manifest/helper'
+require 'rim/rim_exception'
+require 'rim/rim_info'
+require 'rim/sync_helper'
+require 'uri'
+
+module RIM
+module Command
+
+class Sync < Command
+
+  include RIM::Manifest
+
+  def initialize(opts)
+    opts.banner = "Usage: rim sync [<options>] [<local_module_path>]"
+    opts.description = "Synchronize specified rim modules with remote repository revisions."
+    opts.separator ""
+    opts.on("-m", "--manifest [MANIFEST]", String, "Read information from manifest.", \
+                                                   "If no manifest file is specified a 'manifest.rim' file will be used.") do |manifest|
+      @manifest = manifest ? manifest : Helpers::default_manifest
+    end
+    opts.on("-c", "--create", "Synchronize module initially to <local_module_path>.", \
+                              "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|
+      @module_options[:remote_url] = url 
+    end 
+    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|
+      @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("-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
+    opts.on("-b", "--rebase", "Rebase after successful sync.") do
+      @rebase = true
+    end
+  end
+
+  def invoke()
+    helper = SyncHelper.new(project_git_dir, @logger)
+    if @manifest
+      helper.modules_from_manifest(@manifest)
+    elsif @create
+      local_path = ARGV.shift || "."
+      if helper.find_file_dir_in_workspace(local_path, RimInfo::InfoFileName)
+        raise RimException.new("There's already a module file. Don't use the create option to sync the module.")
+      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],
+            @module_options[:subdir],
+        ))
+      end 
+    else
+      helper.modules_from_paths(@all ? helper.module_paths(ARGV, @excludedirs) : ARGV, @module_options)
+    end
+    helper.check_arguments
+    helper.sync(@message, @rebase, @split)
+  end
+
+end
+
+end
+end
+
+

data/lib/rim/command_helper.rb

@@ -1,143 +1,143 @@
-require 'rim/file_helper'
-require 'rim/processor'
-require 'rim/module_info'
-require 'rim/rim_info'
-require 'rim/manifest/json_reader'
-require 'rim/status_builder'
-require 'pathname'
-
-module RIM
-
-class CommandHelper < Processor
-
-  include Manifest
-
-  def initialize(workspace_root, logger, module_infos = nil)
-    super(workspace_root, logger)
-    @paths = []
-    @logger = logger
-    if module_infos
-      module_infos.each do |m|
-        add_module_info(m)
-      end
-    end
-  end
-
-  # check whether workspace is not touched
-  def check_ready
-    raise RimException.new("The workspace git contains uncommitted changes.") if !local_changes?(@ws_root)
-  end
-  
-  def check_arguments
-    raise RimException.new("Unexpected command line arguments.") if !ARGV.empty?
-  end
-
-  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)
-    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, mod.subdir))
-    end
-    true
-  end
-  
-  def modules_from_paths(paths, opts = {})
-    if paths.empty?
-      module_from_path(nil, opts)
-    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 URL option.")
-    end
-  end
-  
-  def module_from_path(path, opts = {})
-    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,
-        opts.has_key?(:subdir) ? opts[:subdir] : rim_info.subdir)
-      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 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
-    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)
-      add_module_info(module_info)
-    else
-      raise RimException.new("Module '#{module_info.local_path}' specified more than once.")
-    end
-  end
-
-  def get_remote_branch_format(remote_url)
-    get_absolute_remote_url(remote_url).start_with?(GerritServer) ? "refs/for/%s" : nil
-    #"refs/for/%s"
-  end
-
-  def find_file_dir_in_workspace(start_dir, file)
-    path = File.expand_path(start_dir)
-    while path != @ws_root
-      if File.exist?(File.join(path, file))
-        return path
-      else
-        parent = File.dirname(path)
-        if parent != path
-          path = parent
-        else
-          break
-        end
-      end 
-    end
-    nil
-  end
-
-protected
-  def add_module_info(module_info)
-  end
-
-end
-
-end
+require 'rim/file_helper'
+require 'rim/processor'
+require 'rim/module_info'
+require 'rim/rim_info'
+require 'rim/manifest/json_reader'
+require 'rim/status_builder'
+require 'pathname'
+
+module RIM
+
+class CommandHelper < Processor
+
+  include Manifest
+
+  def initialize(workspace_root, logger, module_infos = nil)
+    super(workspace_root, logger)
+    @paths = []
+    @logger = logger
+    if module_infos
+      module_infos.each do |m|
+        add_module_info(m)
+      end
+    end
+  end
+
+  # check whether workspace is not touched
+  def check_ready
+    raise RimException.new("The workspace git contains uncommitted changes.") if !local_changes?(@ws_root)
+  end
+  
+  def check_arguments
+    raise RimException.new("Unexpected command line arguments.") if !ARGV.empty?
+  end
+
+  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)
+    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, mod.subdir))
+    end
+    true
+  end
+  
+  def modules_from_paths(paths, opts = {})
+    if paths.empty?
+      module_from_path(nil, opts)
+    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 URL option.")
+    end
+  end
+  
+  def module_from_path(path, opts = {})
+    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,
+        opts.has_key?(:subdir) ? opts[:subdir] : rim_info.subdir)
+      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 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
+    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)
+      add_module_info(module_info)
+    else
+      raise RimException.new("Module '#{module_info.local_path}' specified more than once.")
+    end
+  end
+
+  def get_remote_branch_format(remote_url)
+    get_absolute_remote_url(remote_url).start_with?(GerritServer) ? "refs/for/%s" : nil
+    #"refs/for/%s"
+  end
+
+  def find_file_dir_in_workspace(start_dir, file)
+    path = File.expand_path(start_dir)
+    while path != @ws_root
+      if File.exist?(File.join(path, file))
+        return path
+      else
+        parent = File.dirname(path)
+        if parent != path
+          path = parent
+        else
+          break
+        end
+      end 
+    end
+    nil
+  end
+
+protected
+  def add_module_info(module_info)
+  end
+
+end
+
+end