git-multirepo 1.0.0.beta40 → 1.0.0.beta42

data/lib/multirepo/files/config-file.rb

@@ -1,46 +1,46 @@
-require "fileutils"
-require "pathname"
-
-require_relative "config-entry"
-
-module MultiRepo
-  class ConfigFile
-    FILENAME = ".multirepo"
-    
-    def initialize(path)
-      @path = path
-    end
-    
-    def file
-      File.join(@path, FILENAME)
-    end
-    
-    def filename
-      FILENAME
-    end
-    
-    def exists?
-      File.exists?(file)
-    end
-    
-    def load_entries
-      Psych.load(File.read(file))
-    end
-    
-    def save_entries(entries)
-      File.write(file, Psych.dump(entries))
-    end
-    
-    def entry_exists?(entry)
-      load_entries.any? { |e| e == entry }
-    end
-    
-    def add_entry(entry)
-      save_entries(load_entries.push(entry))
-    end
-    
-    def remove_entry(entry)
-      save_entries(load_entries.delete_if { |e| e == entry })
-    end
-  end
+require "fileutils"
+require "pathname"
+
+require_relative "config-entry"
+
+module MultiRepo
+  class ConfigFile
+    FILENAME = ".multirepo"
+    
+    def initialize(path)
+      @path = path
+    end
+    
+    def file
+      File.join(@path, FILENAME)
+    end
+    
+    def filename
+      FILENAME
+    end
+    
+    def exists?
+      File.exists?(file)
+    end
+    
+    def load_entries
+      Psych.load(File.read(file))
+    end
+    
+    def save_entries(entries)
+      File.write(file, Psych.dump(entries))
+    end
+    
+    def entry_exists?(entry)
+      load_entries.any? { |e| e == entry }
+    end
+    
+    def add_entry(entry)
+      save_entries(load_entries.push(entry))
+    end
+    
+    def remove_entry(entry)
+      save_entries(load_entries.delete_if { |e| e == entry })
+    end
+  end
 end

data/lib/multirepo/files/lock-entry.rb

@@ -1,25 +1,29 @@
-require "multirepo/utility/console"
-require "multirepo/git/repo"
-
-module MultiRepo
-  class LockEntry
-    attr_accessor :name
-    attr_accessor :id
-    attr_accessor :head
-    attr_accessor :branch
-    
-    def encode_with(coder)
-      coder["name"] = @name
-      coder["id"] = @id
-      coder["head"] = @head
-      coder["branch"] = @branch
-    end
-    
-    def initialize(config_entry)
-      @name = config_entry.name
-      @id = config_entry.id
-      @head = config_entry.repo.head_hash
-      @branch = config_entry.repo.current_branch
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/git/repo"
+
+module MultiRepo
+  class LockEntry
+    attr_accessor :name
+    attr_accessor :id
+    attr_accessor :head
+    attr_accessor :branch
+    
+    def encode_with(coder)
+      coder["name"] = @name
+      coder["id"] = @id
+      coder["head"] = @head
+      coder["branch"] = @branch
+    end
+    
+    def initialize(config_entry)
+      @name = config_entry.name
+      @id = config_entry.id
+      
+      head = config_entry.repo.head
+      @head = head.commit_id
+      
+      current_branch = config_entry.repo.current_branch
+      @branch = current_branch ? current_branch.name : nil
+    end
+  end
 end

data/lib/multirepo/files/lock-file.rb

@@ -1,39 +1,56 @@
-require "pathname"
-require "psych"
-
-require_relative "tracking-file"
-require_relative "lock-entry"
-require_relative "config-file"
-
-module MultiRepo
-  class LockFile < TrackingFile
-    FILENAME = ".multirepo.lock"
-    
-    def initialize(path)
-      @path = path
-    end
-    
-    def file
-      File.join(@path, FILENAME)
-    end
-    
-    def filename
-      FILENAME
-    end
-    
-    def exists?
-      File.exists?(file)
-    end
-    
-    def load_entries
-      Psych.load(File.read(file))
-    end
-    
-    def update
-      config_entries = ConfigFile.new(@path).load_entries
-      lock_entries = config_entries.map { |c| LockEntry.new(c) }
-      content = Psych.dump(lock_entries)
-      return update_internal(file, content)
-    end
-  end
+require "pathname"
+require "psych"
+
+require_relative "tracking-file"
+require_relative "lock-entry"
+require_relative "config-file"
+
+module MultiRepo
+  class LockFile < TrackingFile
+    FILENAME = ".multirepo.lock"
+    
+    def initialize(path)
+      @path = path
+    end
+    
+    def file
+      File.join(@path, FILENAME)
+    end
+    
+    def filename
+      FILENAME
+    end
+    
+    def exists?
+      File.exists?(file)
+    end
+    
+    def load_entries
+      Psych.load(File.read(file))
+    end
+    
+    def update
+      config_entries = ConfigFile.new(@path).load_entries
+      lock_entries = config_entries.map { |c| LockEntry.new(c) }
+      content = Psych.dump(lock_entries)
+      return update_internal(file, content)
+    end
+    
+    def validate!
+      load_entries.all? { |e| validate_entry! e }
+    end
+    
+    def validate_entry!(entry)
+      valid = true
+      
+      # head
+      valid &= /\b([a-f0-9]{40})\b/ =~ entry.head.to_s
+      
+      # branch
+      GitRunner.run_in_working_dir(@path, "check-ref-format --branch #{entry.branch}", Runner::Verbosity::OUTPUT_NEVER)
+      valid &= (entry.branch == "" || GitRunner.last_command_succeeded)
+      
+      return valid
+    end
+  end
 end

data/lib/multirepo/files/meta-file.rb

@@ -1,41 +1,41 @@
-require "pathname"
-require "psych"
-
-require "info"
-require_relative "tracking-file"
-require_relative "lock-entry"
-require_relative "config-file"
-
-module MultiRepo
-  class MetaFile < TrackingFile
-    FILENAME = ".multirepo.meta"
-    
-    attr_accessor :version
-    
-    def initialize(path)
-      @path = path
-      @version = MultiRepo::VERSION
-    end
-    
-    def file
-      File.join(@path, FILENAME)
-    end
-    
-    def filename
-      FILENAME
-    end
-    
-    def encode_with(coder)
-      coder["version"] = @version
-    end
-        
-    def load
-      Psych.load(file)
-    end
-    
-    def update
-      content = Psych.dump(self)
-      return update_internal(file, content)
-    end
-  end
+require "pathname"
+require "psych"
+
+require "info"
+require_relative "tracking-file"
+require_relative "lock-entry"
+require_relative "config-file"
+
+module MultiRepo
+  class MetaFile < TrackingFile
+    FILENAME = ".multirepo.meta"
+    
+    attr_accessor :version
+    
+    def initialize(path)
+      @path = path
+      @version = MultiRepo::VERSION
+    end
+    
+    def file
+      File.join(@path, FILENAME)
+    end
+    
+    def filename
+      FILENAME
+    end
+    
+    def encode_with(coder)
+      coder["version"] = @version
+    end
+        
+    def load
+      Psych.load(file)
+    end
+    
+    def update
+      content = Psych.dump(self)
+      return update_internal(file, content)
+    end
+  end
 end

data/lib/multirepo/files/tracking-file.rb

@@ -1,9 +1,9 @@
-module MultiRepo
-  class TrackingFile
-    def update_internal(file, new_content)
-      old_content = File.exists?(file) ? File.read(file) : nil
-      File.write(file, new_content)
-      return new_content != old_content
-    end
-  end
+module MultiRepo
+  class TrackingFile
+    def update_internal(file, new_content)
+      old_content = File.exists?(file) ? File.read(file) : nil
+      File.write(file, new_content)
+      return new_content != old_content
+    end
+  end
 end

data/lib/multirepo/files/tracking-files.rb

@@ -1,47 +1,47 @@
-require "multirepo/git/git-runner"
-require_relative "meta-file"
-require_relative "lock-file"
-
-module MultiRepo
-  class TrackingFiles
-    attr_accessor :files
-    
-    def initialize(path)
-      @path = path
-      @files = [MetaFile.new(path), LockFile.new(path)]
-    end
-    
-    def update
-      updated = false
-      files.each { |f| updated |= f.update }
-      return updated
-    end
-    
-    def stage
-      GitRunner.run_in_working_dir(@path, "add --force -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def commit(message)
-      stage
-      
-      output = GitRunner.run_in_working_dir(@path, "ls-files --modified --others -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
-      files_are_untracked_or_modified = output.strip != ""
-      
-      output = GitRunner.run_in_working_dir(@path, "diff --name-only --cached -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
-      files_are_staged = output.strip != ""
-      
-      must_commit = files_are_untracked_or_modified || files_are_staged
-      GitRunner.run_in_working_dir(@path, "commit --no-verify -m \"#{message}\" --only -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR) if must_commit
-      
-      return must_commit
-    end
-    
-    def delete
-      files.each { |f| FileUtils.rm_f(f.file) }
-    end
-    
-    def files_pathspec
-      files.map{ |f| File.basename(f.file) }.join(" ")
-    end
-  end
+require "multirepo/git/git-runner"
+require_relative "meta-file"
+require_relative "lock-file"
+
+module MultiRepo
+  class TrackingFiles
+    attr_accessor :files
+    
+    def initialize(path)
+      @path = path
+      @files = [MetaFile.new(path), LockFile.new(path)]
+    end
+    
+    def update
+      updated = false
+      files.each { |f| updated |= f.update }
+      return updated
+    end
+    
+    def stage
+      GitRunner.run_in_working_dir(@path, "add --force -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def commit(message)
+      stage
+      
+      output = GitRunner.run_in_working_dir(@path, "ls-files --modified --others -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
+      files_are_untracked_or_modified = output.strip != ""
+      
+      output = GitRunner.run_in_working_dir(@path, "diff --name-only --cached -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
+      files_are_staged = output.strip != ""
+      
+      must_commit = files_are_untracked_or_modified || files_are_staged
+      GitRunner.run_in_working_dir(@path, "commit --no-verify -m \"#{message}\" --only -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR) if must_commit
+      
+      return must_commit
+    end
+    
+    def delete
+      files.each { |f| FileUtils.rm_f(f.file) }
+    end
+    
+    def files_pathspec
+      files.map{ |f| File.basename(f.file) }.join(" ")
+    end
+  end
 end

data/lib/multirepo/git/branch.rb

@@ -1,31 +1,32 @@
-require_relative "git-runner"
-
-module MultiRepo
-  class Branch
-    attr_accessor :name
-    
-    def initialize(repo, name)
-      @repo = repo
-      @name = name
-    end
-
-    def exists?
-      lines = GitRunner.run_in_working_dir(@repo.path, "branch", Runner::Verbosity::OUTPUT_NEVER).split("\n")
-      branch_names = lines.map { |line| line.tr("* ", "")}
-      branch_names.include?(@name)
-    end
-
-    def create
-      GitRunner.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def push
-      GitRunner.run_in_working_dir(@repo.path, "push -u origin #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def checkout
-      GitRunner.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      GitRunner.last_command_succeeded
-    end
-  end
+require_relative "ref"
+require_relative "git-runner"
+
+module MultiRepo
+  class Branch < Ref
+    def exists?
+      lines = GitRunner.run_in_working_dir(@repo.path, "branch", Runner::Verbosity::OUTPUT_NEVER).split("\n")
+      branch_names = lines.map { |line| line.tr("* ", "")}
+      branch_names.include?(@name)
+    end
+    
+    def upstream_branch
+      output = GitRunner.run_in_working_dir(@repo.path, "config --get branch.#{@name}.merge", Runner::Verbosity::OUTPUT_NEVER)
+      output.sub!("refs/heads/", "")
+      return nil if output == ""
+      Branch.new(@repo, "origin/#{output}")
+    end
+    
+    def create
+      GitRunner.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def push
+      GitRunner.run_in_working_dir(@repo.path, "push -u origin #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def checkout
+      GitRunner.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      GitRunner.last_command_succeeded
+    end
+  end
 end