esr-rim 1.1.5

checksums.yaml

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

data/CHANGELOG

@@ -0,0 +1,40 @@
+# 0.1.0
+
+* initial version
+
+# 0.1.1
+
+* take latest clean commit to create rim branch on
+* Avoid additional parameters in message.
+
+# 0.1.2
+
+* fixed rim status verify clean when remotes are dirty [BS-236]
+
+# 0.1.3
+
+* made rim status faster
+* fixed rim exception when project git is renamed
+
+# 1.0.0
+
+* changed checksum calculation, not backward compatible!
+* fixed commits becoming dirty when line ending format changes
+* allow specification of multiple modules on sync and upload
+* fixed sync with create option
+* made printing of working copy status optional
+* major performance improvements
+
+# 1.0.1
+
+* fixed dirty check to ignore empty directories
+
+# 1.0.2
+
+* write all logs to temporary file
+
+# 1.1.0
+
+* added --gerrit option, needed for pushing new branchs to gerrit [BS-202]
+* fixed exception on rim sync after moving working copy [BS-248]
+

data/README.md

@@ -0,0 +1,3 @@
+# RIM - Multi git tool
+
+RIM lets you work with multiple git repositories from within one single git repository.

data/Rakefile

@@ -0,0 +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://esrlabs.com"
+  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/bin/rim

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'rim/rim'
+

data/lib/rim/command/command.rb

@@ -0,0 +1,37 @@
+module RIM
+module Command
+
+class Command
+  attr_writer :logger
+
+  def initialize(processor)
+    @processor = processor
+  end
+
+  def project_git_dir
+    git_dir = find_git_dir(".")
+    raise RimException.new("The current path is not part of a git repository.") if !git_dir
+    git_dir
+  end
+
+  private
+
+  def find_git_dir(start_dir)
+    last_dir = nil
+    dir = File.expand_path(start_dir)
+    while dir != last_dir
+      if File.exist?("#{dir}/.git") || dir =~ /\.git$/
+        return dir
+      end
+      last_dir = dir
+      # returns itself on file system root
+      dir = File.dirname(dir)
+    end
+    nil
+  end
+
+end
+end
+end
+
+

data/lib/rim/command/status.rb

@@ -0,0 +1,110 @@
+require 'rim/status_builder'
+
+module RIM
+module Command
+
+class Status < Command
+
+  def initialize(opts)
+    opts.banner = "Usage: rim status [<options>] [<to-rev>|<from-rev>..<to-rev>]"
+    opts.description = "Prints commits and their RIM status"
+    opts.separator ""
+    opts.separator "Without revision arguments checks the current branch and all local ancestors."
+    opts.separator "With a single <to-rev> checks that revision and all local ancestors."
+    opts.separator "Otherwise checks <to-rev> and ancestors without <from-rev> and ancestors."
+    opts.separator "With the --gerrit option, assumes all yet unknown commits to be 'local'."
+    opts.separator ""
+    opts.on("-d", "--detailed", "print detailed status") do
+      @detailed = true
+    end
+    opts.on("-w", "--working-copy", "print working copy status") do
+      @wc_status = true
+    end
+    opts.on("-f", "--fast", "fast status assuming remote is clean") do
+      @fast = true
+    end
+    opts.on("--verify-clean", "exit with error code 1 if commits are dirty") do
+      @verify_clean = true
+    end
+    opts.on("--gerrit", "special gerrit mode which stops on all known commits") do
+      @gerrit_mode = true
+    end
+  end
+
+  def invoke()
+    root = project_git_dir
+    rev_arg = ARGV.shift
+    stat = nil
+    RIM.git_session(root) do |gs|
+      sb = RIM::StatusBuilder.new
+      if @wc_status
+        stat = sb.fs_status(root)
+        print_status(gs, stat)
+      end
+      if rev_arg
+        if rev_arg =~ /\.\./
+          from_rev, to_rev = rev_arg.split("..")
+        else
+          from_rev, to_rev = nil, rev_arg
+        end
+        stat = sb.rev_history_status(gs, to_rev, :stop_rev => from_rev, :fast => @fast, :gerrit => @gerrit_mode)
+        print_status(gs, stat)
+      else
+        branch = gs.current_branch_name
+        stat = sb.rev_history_status(gs, branch, :fast => @fast)
+        print_status(gs, stat)
+      end
+    end
+    if @verify_clean && any_dirty?(stat)
+      exit(1)
+    end
+  end
+
+  private 
+
+  def any_dirty?(stat)
+    # don't check the last (remote) status nodes (leaves of the status tree)
+    # these are normally remote commits which could be dirty
+    # the initial commit would also be a leave
+    # TODO: see print_status
+    stat.dirty? || stat.parents.any?{|p| !p.parents.empty? && any_dirty?(p)}
+  end
+
+  def print_status(gs, stat)
+    # don't print the last (remote) status nodes
+    # note: this also excludes the initial commit
+    # TODO: make sure to print the first commit
+    #       otherwise the first could be dirty but won't be shown to the user
+    return if stat.git_rev && stat.parents.empty?
+    dirty_mods = stat.modules.select{|m| m.dirty?}
+    stat_info = dirty_mods.empty? ? "[   OK]" : "[DIRTY]"
+    headline = ""
+    if stat.git_rev
+      out = gs.execute "git rev-list --format=oneline -n 1 #{stat.git_rev}" 
+      if out =~ /^(\w+) (.*)/
+        sha1, comment = $1, $2
+        comment = comment[0..56]+"..." if comment.size > 60
+        headline += "#{stat_info} #{sha1[0..6]} #{comment}"
+      end
+    else
+      headline += "#{stat_info} ------- uncommitted changes"
+    end
+    if @detailed
+      @logger.info headline
+      dirty_mods.each do |m|
+        @logger.info "        - #{m.dir}"
+      end
+    elsif dirty_mods.size > 0
+      @logger.info "#{headline} (#{dirty_mods.size} modules dirty)"
+    else
+      @logger.info headline
+    end
+    stat.parents.each do |p|
+      print_status(gs, p)
+    end
+  end
+
+end
+
+end
+end

data/lib/rim/command/sync.rb

@@ -0,0 +1,69 @@
+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
+    @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
+  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]))
+      end 
+    else
+      helper.modules_from_paths(ARGV, @module_options)
+    end
+    helper.check_arguments
+    helper.sync(@message)
+  end
+
+end
+
+end
+end
+
+

data/lib/rim/command/upload.rb

@@ -0,0 +1,33 @@
+require 'rim/command/command'
+require 'rim/processor'
+require 'rim/upload_helper'
+
+module RIM
+module Command
+
+class Upload < Command
+
+  include RIM::Manifest
+
+  def initialize(opts)
+    @review = true
+    opts.banner = "Usage: rim upload <local_module_path>"
+    opts.description = "Upload changes from rim module synchronized to <local_module_path> to remote repository."
+    opts.on("-n", "--no-review", "Uploads without review. The changes will be pushed directly to the module's target branch.") do
+      @review = false
+    end
+  end
+
+  def invoke()
+    helper = UploadHelper.new(project_git_dir, @review, @logger)
+    helper.modules_from_paths(ARGV)
+    helper.check_arguments
+    helper.upload
+  end
+
+end
+
+end
+end
+
+

data/lib/rim/command_helper.rb

@@ -0,0 +1,119 @@
+require 'rim/file_helper'
+require 'rim/processor'
+require 'rim/module_info'
+require 'rim/rim_info'
+require 'rim/manifest/json_reader'
+require 'rim/status_builder'
+
+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)
+    ModuleInfo.new(remote_url, get_relative_path(local_path), target_revision, ignores, get_remote_branch_format(remote_url))
+  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))
+    end
+    true
+  end
+  
+  def modules_from_paths(paths, opts = {})
+    if paths.empty?
+      module_from_path(nil, opts)
+    elsif paths.length == 1 || opts.empty?
+      while !paths.empty?
+        module_from_path(paths.shift, opts)
+      end
+    else
+      raise RimException.new("Multiple modules cannot be used with additional options.")
+    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)
+      add_unique_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
+    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))
+      end
+      true
+    end
+  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