git-multirepo 1.0.0.beta34 → 1.0.0.beta37

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

@@ -1,34 +1,42 @@
-require "pathname"
-require "psych"
-
-require "info"
-require "multirepo/git/git"
-require_relative "tracking-file"
-require_relative "lock-entry"
-require_relative "config-file"
-
-module MultiRepo
-  class MetaFile < TrackingFile
-    FILE = Pathname.new(".multirepo.meta")
-    FILENAME = FILE.to_s
-    
-    attr_accessor :version
-    
-    def initialize
-      @version = MultiRepo::VERSION
-    end
-    
-    def encode_with(coder)
-      coder["version"] = @version
-    end
-        
-    def self.load
-      Psych.load(FILE.read)
-    end
-    
-    def self.update
-      content = Psych.dump(MetaFile.new)
-      return update_internal(FILENAME, content)
-    end
-  end
+require "pathname"
+require "psych"
+
+require "info"
+require "multirepo/git/git"
+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 self.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,44 +1,42 @@
-require "multirepo/git/git"
-require_relative "meta-file"
-require_relative "lock-file"
-
-module MultiRepo
-  class TrackingFiles
-    FILE_CLASSES = [MetaFile, LockFile]
-    
-    def self.update
-      updated = false
-      FILE_CLASSES.each do |file_class|
-        updated |= file_class.update
-      end
-      return updated
-    end
-    
-    def self.stage
-      Git.run_in_current_dir("add --force -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def self.commit(message)
-      stage
-      
-      output = Git.run_in_current_dir("ls-files --modified --others -- #{files_pathspec}", Runner::Verbosity::NEVER_OUTPUT)
-      files_are_untracked_or_modified = output.strip != ""
-      
-      output = Git.run_in_current_dir("diff --name-only --cached -- #{files_pathspec}", Runner::Verbosity::NEVER_OUTPUT)
-      files_are_staged = output.strip != ""
-      
-      must_commit = files_are_untracked_or_modified || files_are_staged
-      Git.run_in_current_dir("commit -m \"#{message}\" --only -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR) if must_commit
-            
-      return must_commit
-    end
-    
-    def self.delete
-      FILE_CLASSES.each { |c| FileUtils.rm_f(c::FILENAME) }
-    end
-    
-    def self.files_pathspec
-      FILE_CLASSES.map{ |c| c::FILENAME }.join(" ")
-    end
-  end
+require "multirepo/git/git"
+require_relative "meta-file"
+require_relative "lock-file"
+
+module MultiRepo
+  class TrackingFiles
+    FILES = [MetaFile.new("."), LockFile.new(".")]
+    
+    def self.update
+      updated = false
+      FILES.each { |f| updated |= f.update }
+      return updated
+    end
+    
+    def self.stage
+      Git.run_in_current_dir("add --force -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def self.commit(message)
+      stage
+      
+      output = Git.run_in_current_dir("ls-files --modified --others -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
+      files_are_untracked_or_modified = output.strip != ""
+      
+      output = Git.run_in_current_dir("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
+      Git.run_in_current_dir("commit -m \"#{message}\" --only -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR) if must_commit
+            
+      return must_commit
+    end
+    
+    def self.delete
+      FILES.each { |f| FileUtils.rm_f(f.file) }
+    end
+    
+    def self.files_pathspec
+      FILES.map{ |f| f.file }.join(" ")
+    end
+  end
 end

data/lib/multirepo/git/branch.rb

@@ -1,28 +1,28 @@
-require_relative "git"
-
-module MultiRepo
-  class Branch
-    attr_accessor :name
-    
-    def initialize(repo, name)
-      @repo = repo
-      @name = name
-    end
-
-    def exists?
-      lines = Git.run_in_working_dir(@repo.path, "branch", Runner::Verbosity::NEVER_OUTPUT).split("\n")
-      branch_names = lines.map { |line| line.tr("* ", "")}
-      branch_names.include?(@name)
-    end
-
-    def create(remote_tracking = false)
-      Git.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", Runner::Verbosity::OUTPUT_ON_ERROR) if remote_tracking
-    end
-    
-    def checkout
-      Git.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      Git.last_command_succeeded
-    end
-  end
+require_relative "git"
+
+module MultiRepo
+  class Branch
+    attr_accessor :name
+    
+    def initialize(repo, name)
+      @repo = repo
+      @name = name
+    end
+
+    def exists?
+      lines = Git.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(remote_tracking = false)
+      Git.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", Runner::Verbosity::OUTPUT_ON_ERROR) if remote_tracking
+    end
+    
+    def checkout
+      Git.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      Git.last_command_succeeded
+    end
+  end
 end

data/lib/multirepo/git/change.rb

@@ -1,11 +1,11 @@
-module MultiRepo
-  class Change
-    attr_accessor :status
-    attr_accessor :path
-    
-    def initialize(line)
-      @status = line[0...2].strip
-      @path = line[3..-1]
-    end
-  end
+module MultiRepo
+  class Change
+    attr_accessor :status
+    attr_accessor :path
+    
+    def initialize(line)
+      @status = line[0...2].strip
+      @path = line[3..-1]
+    end
+  end
 end

data/lib/multirepo/git/commit.rb

@@ -1,18 +1,18 @@
-require_relative "git"
-
-module MultiRepo
-  class Commit
-    attr_accessor :ref
-    
-    def initialize(repo, ref)
-      @repo = repo
-      @ref = ref
-    end
-
-    def is_merge?
-      lines = Git.run_in_working_dir(@repo.path, "cat-file -p #{@ref}", Runner::Verbosity::NEVER_OUTPUT).split("\n")
-      parents = lines.grep(/^parent /)
-      return parents.count > 1
-    end
-  end
+require_relative "git"
+
+module MultiRepo
+  class Commit
+    attr_accessor :ref
+    
+    def initialize(repo, ref)
+      @repo = repo
+      @ref = ref
+    end
+
+    def is_merge?
+      lines = Git.run_in_working_dir(@repo.path, "cat-file -p #{@ref}", Runner::Verbosity::OUTPUT_NEVER).split("\n")
+      parents = lines.grep(/^parent /)
+      return parents.count > 1
+    end
+  end
 end

data/lib/multirepo/git/git.rb

@@ -1,40 +1,40 @@
-require "multirepo/utility/runner"
-require "multirepo/git/git"
-require "multirepo/config"
-
-module MultiRepo
-  class Git
-    class << self
-      attr_accessor :last_command_succeeded
-    end
-    
-    def self.run_in_current_dir(git_command, verbosity)
-      full_command = "#{git_executable} #{git_command}"
-      run(full_command, verbosity)
-    end
-    
-    def self.run_in_working_dir(path, git_command, verbosity)
-      full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
-      
-      # True fix for the -C flag issue in pre-commit hook where the status command would
-      # fail to provide correct results if a pathspec was provided when performing a commit.
-      # http://thread.gmane.org/gmane.comp.version-control.git/263319/focus=263323
-      
-      if Config.instance.running_git_hook
-        full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" 
-      end
-      
-      run(full_command, verbosity)
-    end
-    
-    def self.run(full_command, verbosity)
-      result = Runner.run(full_command, verbosity)
-      @last_command_succeeded = Runner.last_command_succeeded
-      return result
-    end
-
-    def self.git_executable
-      Config.instance.git_executable || "git"
-    end
-  end
+require "multirepo/utility/runner"
+require "multirepo/git/git"
+require "multirepo/config"
+
+module MultiRepo
+  class Git
+    class << self
+      attr_accessor :last_command_succeeded
+    end
+    
+    def self.run_in_current_dir(git_command, verbosity)
+      full_command = "#{git_executable} #{git_command}"
+      run(full_command, verbosity)
+    end
+    
+    def self.run_in_working_dir(path, git_command, verbosity)
+      full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
+      
+      # True fix for the -C flag issue in pre-commit hook where the status command would
+      # fail to provide correct results if a pathspec was provided when performing a commit.
+      # http://thread.gmane.org/gmane.comp.version-control.git/263319/focus=263323
+      
+      if Config.instance.running_git_hook
+        full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" 
+      end
+      
+      run(full_command, verbosity)
+    end
+    
+    def self.run(full_command, verbosity)
+      result = Runner.run(full_command, verbosity)
+      @last_command_succeeded = Runner.last_command_succeeded
+      return result
+    end
+
+    def self.git_executable
+      Config.instance.git_executable || "git"
+    end
+  end
 end

data/lib/multirepo/git/remote.rb

@@ -1,17 +1,17 @@
-require_relative "git"
-
-module MultiRepo
-  class Remote
-    attr_accessor :name
-    
-    def initialize(repo, name)
-      @repo = repo
-      @name = name
-    end
-    
-    def url
-      output = Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::NEVER_OUTPUT).strip
-      return output == "" ? nil : output
-    end
-  end
+require_relative "git"
+
+module MultiRepo
+  class Remote
+    attr_accessor :name
+    
+    def initialize(repo, name)
+      @repo = repo
+      @name = name
+    end
+    
+    def url
+      output = Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::OUTPUT_NEVER).strip
+      return output == "" ? nil : output
+    end
+  end
 end

data/lib/multirepo/git/repo.rb

@@ -1,78 +1,78 @@
-require_relative "branch"
-require_relative "remote"
-require_relative "commit"
-require_relative "change"
-
-module MultiRepo
-  class Repo
-    attr_accessor :path
-    attr_accessor :basename
-    
-    def initialize(path)
-      @path = path
-      @basename = Pathname.new(path).basename.to_s
-    end
-    
-    # Inspection
-    
-    def exists?
-      return false unless Dir.exist?("#{@path}/.git")
-      return Git.run_in_working_dir(@path, "rev-parse --is-inside-work-tree", Runner::Verbosity::NEVER_OUTPUT).strip == "true"
-    end
-    
-    def head_born?
-      result = Git.run_in_working_dir(@path, "rev-parse HEAD --", Runner::Verbosity::NEVER_OUTPUT).strip
-      return !result.start_with?("fatal: bad revision")
-    end
-    
-    def current_branch
-      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", Runner::Verbosity::NEVER_OUTPUT).strip
-      branch != "HEAD" ? branch : nil
-    end
-    
-    def head_hash
-      Git.run_in_working_dir(@path, "rev-parse HEAD", Runner::Verbosity::NEVER_OUTPUT).strip
-    end
-    
-    def changes
-      output = Git.run_in_working_dir(@path, "status --porcelain", Runner::Verbosity::NEVER_OUTPUT)
-      lines = output.split("\n").each{ |f| f.strip }.delete_if{ |f| f == "" }
-      lines.map { |l| Change.new(l) }
-    end
-    
-    def is_clean?
-      return changes.count == 0
-    end
-    
-    # Operations
-    
-    def fetch
-      Git.run_in_working_dir(@path, "fetch --progress", Runner::Verbosity::ALWAYS_OUTPUT)
-      Runner.last_command_succeeded
-    end
-    
-    def clone(url)
-      Git.run_in_current_dir("clone #{url} #{@path} --progress", Runner::Verbosity::ALWAYS_OUTPUT)
-      Runner.last_command_succeeded
-    end
-    
-    def checkout(ref)
-      Git.run_in_working_dir(@path, "checkout #{ref}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      Runner.last_command_succeeded
-    end
-    
-    # Remotes and branches
-    
-    def branch(name)
-      Branch.new(self, name)
-    end
-    
-    def remote(name)
-      Remote.new(self, name)
-    end
-    
-    def commit(ref)
-      Commit.new(self, ref)
-    end
-  end
+require_relative "branch"
+require_relative "remote"
+require_relative "commit"
+require_relative "change"
+
+module MultiRepo
+  class Repo
+    attr_accessor :path
+    attr_accessor :basename
+    
+    def initialize(path)
+      @path = path
+      @basename = Pathname.new(path).basename.to_s
+    end
+    
+    # Inspection
+    
+    def exists?
+      return false unless Dir.exist?("#{@path}/.git")
+      return Git.run_in_working_dir(@path, "rev-parse --is-inside-work-tree", Runner::Verbosity::OUTPUT_NEVER).strip == "true"
+    end
+    
+    def head_born?
+      result = Git.run_in_working_dir(@path, "rev-parse HEAD --", Runner::Verbosity::OUTPUT_NEVER).strip
+      return !result.start_with?("fatal: bad revision")
+    end
+    
+    def current_branch
+      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
+      branch != "HEAD" ? branch : nil
+    end
+    
+    def head_hash
+      Git.run_in_working_dir(@path, "rev-parse HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
+    end
+    
+    def changes
+      output = Git.run_in_working_dir(@path, "status --porcelain", Runner::Verbosity::OUTPUT_NEVER)
+      lines = output.split("\n").each{ |f| f.strip }.delete_if{ |f| f == "" }
+      lines.map { |l| Change.new(l) }
+    end
+    
+    def clean?
+      return changes.count == 0
+    end
+    
+    # Operations
+    
+    def fetch
+      Git.run_in_working_dir(@path, "fetch --progress", Runner::Verbosity::OUTPUT_ALWAYS)
+      Runner.last_command_succeeded
+    end
+    
+    def clone(url)
+      Git.run_in_current_dir("clone #{url} #{@path} --progress", Runner::Verbosity::OUTPUT_ALWAYS)
+      Runner.last_command_succeeded
+    end
+    
+    def checkout(ref)
+      Git.run_in_working_dir(@path, "checkout #{ref}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      Runner.last_command_succeeded
+    end
+    
+    # Remotes and branches
+    
+    def branch(name)
+      Branch.new(self, name)
+    end
+    
+    def remote(name)
+      Remote.new(self, name)
+    end
+    
+    def commit(ref)
+      Commit.new(self, ref)
+    end
+  end
 end