git-multirepo 1.0.0.beta60 → 1.0.0.beta61

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

@@ -1,58 +1,62 @@
-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.exist?(file)
-    end
-    
-    def load_entries
-      fail MultiRepoException, "Can't read lock file (no permission)" if !File.stat(file).readable? 
-      Psych.load(File.read(file))
-    end
-    
-    def update
-      fail MultiRepoException, "Can't write lock file (no permission)" if !File.stat(file).writable?
-      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(@path, "check-ref-format --branch #{entry.branch}", Verbosity::OUTPUT_NEVER)
-      valid &= (entry.branch == "" || GitRunner.last_command_succeeded)
-      
-      return valid
-    end
-  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.exist?(file)
+    end
+    
+    def load_entries
+      ensure_access(file, "Can't read lock file (permissions)") { |stat| stat.readable? }
+      Psych.load(File.read(file))
+    end
+    
+    def update
+      ensure_access(file, "Can't write lock file (permissions)") { |stat| stat.writable? }
+      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(@path, "check-ref-format --branch #{entry.branch}", Verbosity::OUTPUT_NEVER)
+      valid &= (entry.branch == "" || GitRunner.last_command_succeeded)
+      
+      return valid
+    end
+
+    def ensure_access(file, error_message, &check)
+      fail MultiRepoException, error_message if File.exists?(file) && !check.call(File.stat(file))
+    end
+  end
+end

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

@@ -1,47 +1,51 @@
-require "pathname"
-require "psych"
-
-require "multirepo/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 exists?
-      File.exist?(file)
-    end
-    
-    def encode_with(coder)
-      coder["version"] = @version
-    end
-        
-    def load
-      fail MultiRepoException, "Can't read meta file (no permission)" if !File.stat(file).readable?
-      Psych.load(File.read(file))
-    end
-    
-    def update
-      fail MultiRepoException, "Can't write meta file (no permission)" if !File.stat(file).writable?
-      content = Psych.dump(self)
-      return update_internal(file, content)
-    end
-  end
-end
+require "pathname"
+require "psych"
+
+require "multirepo/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 exists?
+      File.exist?(file)
+    end
+    
+    def encode_with(coder)
+      coder["version"] = @version
+    end
+        
+    def load
+      ensure_access(file, "Can't read meta file (permissions)") { |stat| stat.readable? }
+      Psych.load(File.read(file))
+    end
+    
+    def update
+      ensure_access(file, "Can't write meta file (permissions)") { |stat| stat.writable? }
+      content = Psych.dump(self)
+      return update_internal(file, content)
+    end
+
+    def ensure_access(file, error_message, &check)
+      fail MultiRepoException, error_message if File.exists?(file) && !check.call(File.stat(file))
+    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.exist?(file) ? File.read(file) : nil
-      File.write(file, new_content)
-      return new_content != old_content
-    end
-  end
-end
+module MultiRepo
+  class TrackingFile
+    def update_internal(file, new_content)
+      old_content = File.exist?(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,65 +1,65 @@
-require "multirepo/git/git-runner"
-require_relative "meta-file"
-require_relative "lock-file"
-require "multirepo/info"
-require "multirepo/logic/version-comparer"
-
-module MultiRepo
-  class TrackingFiles
-    attr_accessor :files
-    
-    def initialize(path)
-      @path = path
-      @meta_file = MetaFile.new(path)
-      @lock_file = LockFile.new(path)
-      @files = [@meta_file, @lock_file]
-    end
-    
-    def update
-      ensure_tool_not_outdated
-      updated = false
-      files.each { |f| updated |= f.update }
-      return updated
-    end
-
-    def ensure_tool_not_outdated
-      base_message = "Can't update tracking files with an outdated version of git-multirepo"
-
-      fail MultiRepoException, base_message if !@meta_file.exists?
-
-      current_version = MultiRepo::VERSION
-      meta_version = @meta_file.load.version
-      outdated_tool = !VersionComparer.is_latest(current: current_version, last: meta_version)
-      message = base_message + "\n  Current version is #{current_version} and repo is tracked by #{meta_version}"
-      
-      fail MultiRepoException, message if outdated_tool
-    end
-    
-    def stage
-      GitRunner.run(@path, "add --force -- #{files_pathspec}", Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def commit(message)
-      stage
-      
-      output = GitRunner.run(@path, "ls-files --modified --others -- #{files_pathspec}", Verbosity::OUTPUT_NEVER)
-      files_are_untracked_or_modified = output.strip != ""
-      
-      output = GitRunner.run(@path, "diff --name-only --cached -- #{files_pathspec}", Verbosity::OUTPUT_NEVER)
-      files_are_staged = output.strip != ""
-      
-      must_commit = files_are_untracked_or_modified || files_are_staged
-      GitRunner.run(@path, "commit --no-verify -m \"#{message}\" --only -- #{files_pathspec}", 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
+require "multirepo/git/git-runner"
+require_relative "meta-file"
+require_relative "lock-file"
+require "multirepo/info"
+require "multirepo/logic/version-comparer"
+
+module MultiRepo
+  class TrackingFiles
+    attr_accessor :files
+    
+    def initialize(path)
+      @path = path
+      @meta_file = MetaFile.new(path)
+      @lock_file = LockFile.new(path)
+      @files = [@meta_file, @lock_file]
+    end
+    
+    def update
+      ensure_tool_not_outdated
+      updated = false
+      files.each { |f| updated |= f.update }
+      return updated
+    end
+
+    def ensure_tool_not_outdated
+      base_message = "Can't update tracking files with an outdated version of git-multirepo"
+
+      fail MultiRepoException, base_message if !@meta_file.exists?
+
+      current_version = MultiRepo::VERSION
+      meta_version = @meta_file.load.version
+      outdated_tool = !VersionComparer.is_latest(current: current_version, last: meta_version)
+      message = base_message + "\n  Current version is #{current_version} and repo is tracked by #{meta_version}"
+      
+      fail MultiRepoException, message if outdated_tool
+    end
+    
+    def stage
+      GitRunner.run(@path, "add --force -- #{files_pathspec}", Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def commit(message)
+      stage
+      
+      output = GitRunner.run(@path, "ls-files --modified --others -- #{files_pathspec}", Verbosity::OUTPUT_NEVER)
+      files_are_untracked_or_modified = output.strip != ""
+      
+      output = GitRunner.run(@path, "diff --name-only --cached -- #{files_pathspec}", Verbosity::OUTPUT_NEVER)
+      files_are_staged = output.strip != ""
+      
+      must_commit = files_are_untracked_or_modified || files_are_staged
+      GitRunner.run(@path, "commit --no-verify -m \"#{message}\" --only -- #{files_pathspec}", 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,32 +1,32 @@
-require_relative "ref"
-require_relative "git-runner"
-
-module MultiRepo
-  class Branch < Ref
-    def exists?
-      lines = GitRunner.run(@repo.path, "branch", Verbosity::OUTPUT_NEVER).split("\n")
-      branch_names = lines.map { |line| line.tr("* ", "") }
-      branch_names.include?(@name)
-    end
-    
-    def upstream_branch
-      output = GitRunner.run(@repo.path, "config --get branch.#{@name}.merge", Verbosity::OUTPUT_NEVER)
-      output.sub!("refs/heads/", "")
-      return nil if output == ""
-      Branch.new(@repo, "origin/#{output}")
-    end
-    
-    def create
-      GitRunner.run(@repo.path, "branch #{@name}", Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def push
-      GitRunner.run(@repo.path, "push -u origin #{@name}", Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def checkout
-      GitRunner.run(@repo.path, "checkout #{@name}", Verbosity::OUTPUT_ON_ERROR)
-      GitRunner.last_command_succeeded
-    end
-  end
-end
+require_relative "ref"
+require_relative "git-runner"
+
+module MultiRepo
+  class Branch < Ref
+    def exists?
+      lines = GitRunner.run(@repo.path, "branch", Verbosity::OUTPUT_NEVER).split("\n")
+      branch_names = lines.map { |line| line.tr("* ", "") }
+      branch_names.include?(@name)
+    end
+    
+    def upstream_branch
+      output = GitRunner.run(@repo.path, "config --get branch.#{@name}.merge", Verbosity::OUTPUT_NEVER)
+      output.sub!("refs/heads/", "")
+      return nil if output == ""
+      Branch.new(@repo, "origin/#{output}")
+    end
+    
+    def create
+      GitRunner.run(@repo.path, "branch #{@name}", Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def push
+      GitRunner.run(@repo.path, "push -u origin #{@name}", Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def checkout
+      GitRunner.run(@repo.path, "checkout #{@name}", Verbosity::OUTPUT_ON_ERROR)
+      GitRunner.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
-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,7 +1,7 @@
-require_relative "ref"
-require_relative "git-runner"
-
-module MultiRepo
-  class Commit < Ref
-  end
-end
+require_relative "ref"
+require_relative "git-runner"
+
+module MultiRepo
+  class Commit < Ref
+  end
+end

data/lib/multirepo/git/git-runner.rb

@@ -1,56 +1,56 @@
-require "multirepo/utility/verbosity"
-require "multirepo/utility/popen-runner"
-require "multirepo/utility/system-runner"
-require "multirepo/config"
-
-module MultiRepo
-  class GitRunner
-    class << self
-      attr_accessor :last_command_succeeded
-    end
-    
-    def self.run(path, git_command, verbosity)
-      command = build_command(path, git_command)
-      runner_popen(command, verbosity)
-    end
-    
-    def self.run_as_system(path, git_command)
-      command = build_command(path, git_command)
-      runner_system(command)
-    end
-    
-    def self.build_command(path, git_command)
-      if path == "."
-        # It is always better to skip -C when running git commands in the
-        # current directory (especially in hooks). Doing this prevents
-        # any future issues because we automatically fallback to non-"-C" for ".".
-        # Fixes bug: https://www.pivotaltracker.com/story/show/94505654
-        return "#{git_executable} #{git_command}"
-      end
-      
-      full_command = "#{git_executable} -C \"#{path}\" #{git_command}"
-      if Config.instance.running_git_hook
-        # 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
-        full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" 
-      end
-      
-      return full_command
-    end
-    
-    def self.runner_popen(full_command, verbosity)
-      result, @last_command_succeeded = PopenRunner.run(full_command, verbosity)
-      return result
-    end
-    
-    def self.runner_system(full_command)
-      result, @last_command_succeeded = SystemRunner.run(full_command)
-      return result
-    end
-
-    def self.git_executable
-      Config.instance.git_executable || "git"
-    end
-  end
-end
+require "multirepo/utility/verbosity"
+require "multirepo/utility/popen-runner"
+require "multirepo/utility/system-runner"
+require "multirepo/config"
+
+module MultiRepo
+  class GitRunner
+    class << self
+      attr_accessor :last_command_succeeded
+    end
+    
+    def self.run(path, git_command, verbosity)
+      command = build_command(path, git_command)
+      runner_popen(command, verbosity)
+    end
+    
+    def self.run_as_system(path, git_command)
+      command = build_command(path, git_command)
+      runner_system(command)
+    end
+    
+    def self.build_command(path, git_command)
+      if path == "."
+        # It is always better to skip -C when running git commands in the
+        # current directory (especially in hooks). Doing this prevents
+        # any future issues because we automatically fallback to non-"-C" for ".".
+        # Fixes bug: https://www.pivotaltracker.com/story/show/94505654
+        return "#{git_executable} #{git_command}"
+      end
+      
+      full_command = "#{git_executable} -C \"#{path}\" #{git_command}"
+      if Config.instance.running_git_hook
+        # 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
+        full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" 
+      end
+      
+      return full_command
+    end
+    
+    def self.runner_popen(full_command, verbosity)
+      result, @last_command_succeeded = PopenRunner.run(full_command, verbosity)
+      return result
+    end
+    
+    def self.runner_system(full_command)
+      result, @last_command_succeeded = SystemRunner.run(full_command)
+      return result
+    end
+
+    def self.git_executable
+      Config.instance.git_executable || "git"
+    end
+  end
+end

data/lib/multirepo/git/git.rb

@@ -1,10 +1,10 @@
-require "multirepo/git/git-runner"
-
-module MultiRepo
-  class Git
-    def self.valid_branch_name?(name)
-      GitRunner.run(".", "check-ref-format --branch \"#{name}\"", Verbosity::OUTPUT_NEVER)
-      GitRunner.last_command_succeeded
-    end
-  end
-end
+require "multirepo/git/git-runner"
+
+module MultiRepo
+  class Git
+    def self.valid_branch_name?(name)
+      GitRunner.run(".", "check-ref-format --branch \"#{name}\"", Verbosity::OUTPUT_NEVER)
+      GitRunner.last_command_succeeded
+    end
+  end
+end