git-multirepo 1.0.0.beta9 → 1.0.0.beta10

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/git.rb

@@ -1,39 +1,39 @@
-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, show_output)
-      full_command = "git #{git_command}"
-      run(full_command, show_output)
-    end
-    
-    def self.run_in_working_dir(path, git_command, show_output)
-      full_command = "git -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
-      full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" if Config.instance.running_git_hook
-      
-      run(full_command, show_output)
-    end
-    
-    def self.run(full_command, show_output)
-      Console.log_info(full_command) if Config.instance.verbose
-      result = Runner.run(full_command, show_output)
-      @last_command_succeeded = Runner.last_command_succeeded
-      return result
-    end
-    
-    def self.is_inside_git_repo(path)
-      return false unless Dir.exist?("#{path}/.git")
-      return Git.run_in_working_dir(path, "rev-parse --is-inside-work-tree", false).strip == "true"
-    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, show_output)
+      full_command = "git #{git_command}"
+      run(full_command, show_output)
+    end
+    
+    def self.run_in_working_dir(path, git_command, show_output)
+      full_command = "git -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
+      full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" if Config.instance.running_git_hook
+      
+      run(full_command, show_output)
+    end
+    
+    def self.run(full_command, show_output)
+      Console.log_info(full_command) if Config.instance.verbose
+      result = Runner.run(full_command, show_output)
+      @last_command_succeeded = Runner.last_command_succeeded
+      return result
+    end
+    
+    def self.is_inside_git_repo(path)
+      return false unless Dir.exist?("#{path}/.git")
+      return Git.run_in_working_dir(path, "rev-parse --is-inside-work-tree", false).strip == "true"
+    end
+  end
 end

data/lib/multirepo/git/remote.rb

@@ -1,16 +1,16 @@
-require_relative "git"
-
-module MultiRepo
-  class Remote
-    attr_accessor :name
-    
-    def initialize(repo, name)
-      @repo = repo
-      @name = name
-    end
-    
-    def url
-      Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", false).strip
-    end
-  end
+require_relative "git"
+
+module MultiRepo
+  class Remote
+    attr_accessor :name
+    
+    def initialize(repo, name)
+      @repo = repo
+      @name = name
+    end
+    
+    def url
+      Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", false).strip
+    end
+  end
 end

data/lib/multirepo/git/repo.rb

@@ -1,67 +1,67 @@
-require_relative "branch"
-require_relative "remote"
-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?
-      Git.is_inside_git_repo(@path)
-    end
-    
-    def current_branch
-      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", false).strip
-      branch != "HEAD" ? branch : nil
-    end
-    
-    def head_hash
-      Git.run_in_working_dir(@path, "rev-parse HEAD", false).strip
-    end
-    
-    def changes
-      output = Git.run_in_working_dir(@path, "status --porcelain", false)
-      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", true)
-      Runner.last_command_succeeded
-    end
-    
-    def clone(url)
-      Git.run_in_current_dir("clone #{url} #{@path} --progress", true)
-      Runner.last_command_succeeded
-    end
-    
-    def checkout(ref)
-      Git.run_in_working_dir(@path, "checkout #{ref}", false)
-      Runner.last_command_succeeded
-    end
-    
-    # Remotes and branches
-    
-    def branch(name)
-      Branch.new(self, name)
-    end
-    
-    def remote(name)
-      Remote.new(self, name)
-    end
-  end
+require_relative "branch"
+require_relative "remote"
+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?
+      Git.is_inside_git_repo(@path)
+    end
+    
+    def current_branch
+      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", false).strip
+      branch != "HEAD" ? branch : nil
+    end
+    
+    def head_hash
+      Git.run_in_working_dir(@path, "rev-parse HEAD", false).strip
+    end
+    
+    def changes
+      output = Git.run_in_working_dir(@path, "status --porcelain", false)
+      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", true)
+      Runner.last_command_succeeded
+    end
+    
+    def clone(url)
+      Git.run_in_current_dir("clone #{url} #{@path} --progress", true)
+      Runner.last_command_succeeded
+    end
+    
+    def checkout(ref)
+      Git.run_in_working_dir(@path, "checkout #{ref}", false)
+      Runner.last_command_succeeded
+    end
+    
+    # Remotes and branches
+    
+    def branch(name)
+      Branch.new(self, name)
+    end
+    
+    def remote(name)
+      Remote.new(self, name)
+    end
+  end
 end

data/lib/multirepo/hooks/pre-commit-hook.rb

@@ -1,25 +1,24 @@
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PreCommitHook
-    def self.run
-      Config.instance.running_git_hook = true
-
-      entries =  ConfigFile.load
-      uncommitted = Utils.warn_of_uncommitted_changes(entries)
-      
-      if uncommitted
-        Console.log_error("You must commit changes to your dependencies before you can commit the main repo")
-        exit 1
-      end
-      
-      LockFile.update
-      Console.log_info("Updated and staged lock file with current HEAD revisions for all dependencies")
-      
-      exit 0 # Success!
-    end
-  end
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PreCommitHook
+    def self.run
+      Config.instance.running_git_hook = true
+      
+      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
+      
+      if !dependencies_clean
+        Console.log_error("You must commit changes to your dependencies before you can commit the main repo")
+        exit 1
+      end
+      
+      LockFile.update
+      Console.log_info("Updated and staged lock file with current HEAD revisions for all dependencies")
+      
+      exit 0 # Success!
+    end
+  end
 end

data/lib/multirepo/multirepo-exception.rb

@@ -1,6 +1,6 @@
-require "claide/informative_error"
-
-module MultiRepo
-  class MultiRepoException < StandardError
-  end
+require "claide/informative_error"
+
+module MultiRepo
+  class MultiRepoException < StandardError
+  end
 end

data/lib/multirepo/utility/console.rb

@@ -1,52 +1,52 @@
-require "colored"
-
-module MultiRepo
-  class Console
-    def self.log_step(message)
-      print_arrow
-      puts $stdout.isatty ? message.bold.green : message
-    end
-    
-    def self.log_substep(message)
-      print_arrow
-      puts $stdout.isatty ? message.blue : message
-    end
-    
-    def self.log_info(message)
-      print_arrow
-      puts $stdout.isatty ? message.white : message
-    end
-    
-    def self.log_warning(message)
-      print_arrow
-      puts $stdout.isatty ? message.yellow : message
-    end
-    
-    def self.log_error(message)
-      print_arrow
-      puts $stdout.isatty ? message.red : message
-    end
-    
-    def self.ask_yes_no(message)
-      answered = false
-      while !answered
-        print_arrow
-        print message
-        print " (y/n) "
-        
-        case $stdin.gets.strip.downcase
-        when "y", "yes"
-          answered = true
-          return true
-        when "n", "no"
-          answered = true
-          return false
-        end
-      end
-    end
-    
-    def self.print_arrow
-      print $stdout.isatty ? "> ".white : ""
-    end
-  end
+require "colored"
+
+module MultiRepo
+  class Console
+    def self.log_step(message)
+      print_arrow
+      puts $stdout.isatty ? message.bold.green : message
+    end
+    
+    def self.log_substep(message)
+      print_arrow
+      puts $stdout.isatty ? message.blue : message
+    end
+    
+    def self.log_info(message)
+      print_arrow
+      puts $stdout.isatty ? message.white : message
+    end
+    
+    def self.log_warning(message)
+      print_arrow
+      puts $stdout.isatty ? message.yellow : message
+    end
+    
+    def self.log_error(message)
+      print_arrow
+      puts $stdout.isatty ? message.red : message
+    end
+    
+    def self.ask_yes_no(message)
+      answered = false
+      while !answered
+        print_arrow
+        print message
+        print " (y/n) "
+        
+        case $stdin.gets.strip.downcase
+        when "y", "yes"
+          answered = true
+          return true
+        when "n", "no"
+          answered = true
+          return false
+        end
+      end
+    end
+    
+    def self.print_arrow
+      print $stdout.isatty ? "> ".white : ""
+    end
+  end
 end

data/lib/multirepo/utility/runner.rb

@@ -1,21 +1,21 @@
-require "open3"
-
-module MultiRepo
-  class Runner
-    class << self
-      attr_accessor :last_command_succeeded
-    end
-    
-    def self.run(cmd, show_output)
-      output = []
-      Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
-        stdout_and_stderr.each do |line|
-          puts line if show_output
-          output << line
-        end
-        @last_command_succeeded = thread.value.success?
-      end
-      output.join("")
-    end
-  end
+require "open3"
+
+module MultiRepo
+  class Runner
+    class << self
+      attr_accessor :last_command_succeeded
+    end
+    
+    def self.run(cmd, show_output)
+      output = []
+      Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
+        stdout_and_stderr.each do |line|
+          puts line if show_output
+          output << line
+        end
+        @last_command_succeeded = thread.value.success?
+      end
+      output.join("")
+    end
+  end
 end