git-multirepo 1.0.0.beta16 → 1.0.0.beta17

data/lib/multirepo/commands/clone-command.rb

@@ -1,54 +1,54 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/git/repo"
-require_relative "install-command"
-
-module MultiRepo
-  class CloneCommand < Command
-    self.command = "clone"
-    self.summary = "Clones the specified repository in a subfolder, then installs it."
-    
-    def self.options
-      [
-        ['[url]', 'The repository to clone.'],
-        ['[name]', 'The name of the containing folder that will be created.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @url = argv.shift_argument
-      @name = argv.shift_argument
-      super
-    end
-
-    def validate!
-      super
-      help! "You must specify a repository to clone" unless @url
-      help! "You must specify a containing folder name" unless @name
-    end
-
-    def run
-      Console.log_step("Cloning #{@url} ...")
-
-      raise MultiRepoException, "A directory named #{@name} already exists" if Dir.exists?(@name)
-
-      main_repo_path = "#{@name}/#{@name}"
-
-      FileUtils.mkpath(main_repo_path)
-
-      main_repo = Repo.new(main_repo_path)
-      main_repo.clone(@url)
-      
-      original_path = Dir.pwd
-      Dir.chdir(main_repo_path)
-      
-      InstallCommand.new(CLAide::ARGV.new([])).install_internal
-      
-      Dir.chdir(original_path)
-            
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/git/repo"
+require_relative "install-command"
+
+module MultiRepo
+  class CloneCommand < Command
+    self.command = "clone"
+    self.summary = "Clones the specified repository in a subfolder, then installs it."
+    
+    def self.options
+      [
+        ['[url]', 'The repository to clone.'],
+        ['[name]', 'The name of the containing folder that will be created.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @url = argv.shift_argument
+      @name = argv.shift_argument
+      super
+    end
+
+    def validate!
+      super
+      help! "You must specify a repository to clone" unless @url
+      help! "You must specify a containing folder name" unless @name
+    end
+
+    def run
+      Console.log_step("Cloning #{@url} ...")
+
+      raise MultiRepoException, "A directory named #{@name} already exists" if Dir.exists?(@name)
+
+      main_repo_path = "#{@name}/#{@name}"
+
+      FileUtils.mkpath(main_repo_path)
+
+      main_repo = Repo.new(main_repo_path)
+      main_repo.clone(@url)
+      
+      original_path = Dir.pwd
+      Dir.chdir(main_repo_path)
+      
+      InstallCommand.new(CLAide::ARGV.new([])).install_internal
+      
+      Dir.chdir(original_path)
+            
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

data/lib/multirepo/commands/command.rb

@@ -1,37 +1,33 @@
-require "claide"
-
-require "info"
-require "multirepo/multirepo-exception"
-require "multirepo/config"
-
-module MultiRepo
-  class Command < CLAide::Command
-    self.abstract_command = true
-    self.command = "multi"
-    self.version = VERSION
-    self.description = DESCRIPTION
-    
-    def initialize(argv)
-      Config.instance.verbose = argv.flag?("verbose") ? true : false
-      super
-    end
-    
-    def validate_in_work_tree
-      raise MultiRepoException, "Not a git repository" unless Git.is_inside_git_repo(".")
-    end
-        
-    def install_pre_commit_hook
-      Utils.install_pre_commit_hook
-      Console.log_substep("Installed pre-commit hook")
-    end
-    
-    def update_lock_file
-      LockFile.update
-      Console.log_substep("Updated and staged lock file with current HEAD revisions for all dependencies")
-    end
-
-    def ensure_multirepo_initialized
-      raise MultiRepoException, "multirepo is not initialized in this repository." unless ConfigFile.exists?
-    end
-  end
+require "claide"
+
+require "info"
+require "multirepo/multirepo-exception"
+require "multirepo/config"
+
+module MultiRepo
+  class Command < CLAide::Command
+    self.abstract_command = true
+    self.command = "multi"
+    self.version = VERSION
+    self.description = DESCRIPTION
+    
+    def initialize(argv)
+      Config.instance.verbose = argv.flag?("verbose") ? true : false
+      super
+    end
+    
+    def validate_in_work_tree
+      raise MultiRepoException, "Not a git repository" unless Git.is_inside_git_repo(".")
+    end
+    
+    def install_hooks
+      Utils.install_hook("pre-commit")
+      Utils.install_hook("post-merge")
+      Console.log_substep("Installed git hooks")
+    end
+    
+    def ensure_multirepo_initialized
+      raise MultiRepoException, "multirepo is not initialized in this repository." unless ConfigFile.exists?
+    end
+  end
 end

data/lib/multirepo/commands/edit-command.rb

@@ -1,22 +1,22 @@
-require "os"
-
-module MultiRepo
-  class EditCommand < Command
-    self.command = "edit"
-    self.summary = "Opens the .multirepo file in the default text editor."
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_initialized
-      
-      if OS.posix?
-        editor = `echo ${FCEDIT:-${VISUAL:-${EDITOR:-vi}}}`.strip
-        system(editor, ".multirepo")
-      elsif OS.windows?
-        raise MultiRepoException, "The edit command is not implemented on Window yet."
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "os"
+
+module MultiRepo
+  class EditCommand < Command
+    self.command = "edit"
+    self.summary = "Opens the .multirepo file in the default text editor."
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_initialized
+      
+      if OS.posix?
+        editor = `echo ${FCEDIT:-${VISUAL:-${EDITOR:-vi}}}`.strip
+        system(editor, ".multirepo")
+      elsif OS.windows?
+        raise MultiRepoException, "The edit command is not implemented on Window yet."
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

data/lib/multirepo/commands/fetch-command.rb

@@ -1,24 +1,24 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class FetchCommand < Command
-    self.command = "fetch"
-    self.summary = "Performs a git fetch on all dependencies."
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_initialized
-      
-      Console.log_step("Fetching dependencies...")
-      
-      ConfigFile.load.each do |entry|
-        Console.log_substep("Fetching from #{entry.repo.remote('origin').url}...")
-        entry.repo.fetch
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+
+module MultiRepo
+  class FetchCommand < Command
+    self.command = "fetch"
+    self.summary = "Performs a git fetch on all dependencies."
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_initialized
+      
+      Console.log_step("Fetching dependencies...")
+      
+      ConfigFile.load.each do |entry|
+        Console.log_substep("Fetching from #{entry.repo.remote('origin').url}...")
+        entry.repo.fetch
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

data/lib/multirepo/commands/init-command.rb

@@ -1,54 +1,54 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/commands/command"
-
-module MultiRepo
-  class InitCommand < Command
-    self.command = "init"
-    self.summary = "Initialize the current repository as a multirepo project."
-    
-    def run
-      validate_in_work_tree
-      Console.log_step("Initializing new multirepo config...")
-      
-      if ConfigFile.exists?
-        return unless Console.ask_yes_no(".multirepo file already exists. Reinitialize?")
-      end
-      
-      sibling_repos = Utils.sibling_repos
-      
-      if sibling_repos.any?
-        entries = []
-        sibling_repos.each do |repo|
-          if Console.ask_yes_no("Do you want to add '#{repo.path}' (#{repo.remote('origin').url} #{repo.current_branch}) as a dependency?")
-            entries.push(ConfigEntry.new(repo))
-            Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
-          end
-        end
-        
-        ConfigFile.save(entries)
-        ConfigFile.stage
-      
-        dependencies_clean = Utils.ensure_dependencies_clean(entries)
-        raise MultiRepoException, "Can't finish initialization!" unless dependencies_clean
-        
-        self.update_lock_file
-      else
-        Console.log_info("There are no sibling repositories to add")
-      end
-      
-      self.install_pre_commit_hook
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-    
-    def check_repo_exists
-      if !Dir.exists?(@repo.path) then raise MultiRepoException, "There is no folder at path '#{@repo.path}'" end
-      if !@repo.exists? then raise MultiRepoException, "'#{@repo.path}' is not a repository" end
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+require "multirepo/commands/command"
+
+module MultiRepo
+  class InitCommand < Command
+    self.command = "init"
+    self.summary = "Initialize the current repository as a multirepo project."
+    
+    def run
+      validate_in_work_tree
+      Console.log_step("Initializing new multirepo config...")
+      
+      if ConfigFile.exists?
+        return unless Console.ask_yes_no(".multirepo file already exists. Reinitialize?")
+      end
+      
+      sibling_repos = Utils.sibling_repos
+      
+      if sibling_repos.any?
+        entries = []
+        sibling_repos.each do |repo|
+          if Console.ask_yes_no("Do you want to add '#{repo.path}' (#{repo.remote('origin').url} #{repo.current_branch}) as a dependency?")
+            entries.push(ConfigEntry.new(repo))
+            Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
+          end
+        end
+        
+        ConfigFile.save(entries)
+        ConfigFile.stage
+      
+        dependencies_clean = Utils.ensure_dependencies_clean(entries)
+        raise MultiRepoException, "Can't finish initialization!" unless dependencies_clean
+        
+        LockFile.update
+      else
+        Console.log_info("There are no sibling repositories to add")
+      end
+      
+      install_hooks
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def check_repo_exists
+      if !Dir.exists?(@repo.path) then raise MultiRepoException, "There is no folder at path '#{@repo.path}'" end
+      if !@repo.exists? then raise MultiRepoException, "'#{@repo.path}' is not a repository" end
+    end
+  end
 end

data/lib/multirepo/commands/install-command.rb

@@ -1,69 +1,69 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/git/repo"
-
-module MultiRepo
-  class InstallCommand < Command
-    self.command = "install"
-    self.summary = "Clones and checks out dependencies as defined in the .multirepo file, and installs git-multirepo's local pre-commit hook."
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_initialized
-      
-      Console.log_step("Cloning dependencies and installing hook...")
-      
-      install_internal
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-    
-    def install_internal
-      config_entries = ConfigFile.load
-
-      Console.log_substep("Installing #{config_entries.count} dependencies...");
-      
-      config_entries.each { |e| install(e) }
-      
-      self.install_pre_commit_hook
-    end
-    
-    def install(entry)
-      if entry.repo.exists?
-        check_repo_validity(entry)
-        fetch_repo(entry)
-      else
-        clone_repo(entry)
-      end
-      checkout_branch(entry)
-    end
-    
-    # Repo operations
-    
-    def fetch_repo(entry)
-      Console.log_substep("Working copy '#{entry.repo.path}' already exists, fetching instead...")
-      raise MultiRepoException, "Could not fetch from remote #{entry.repo.remote('origin').url}" unless entry.repo.fetch
-    end
-    
-    def clone_repo(entry)
-      Console.log_substep("Cloning '#{entry.url} to #{entry.repo.path}'")
-      raise MultiRepoException, "Could not clone remote #{entry.url}" unless entry.repo.clone(entry.url)
-    end
-    
-    def checkout_branch(entry)
-      branch = entry.repo.branch(entry.branch);
-      raise MultiRepoException, "Could not checkout branch #{branch.name}" unless branch.checkout
-      Console.log_substep("Checked out branch #{branch.name} -> origin/#{branch.name}")
-    end
-    
-    # Validation
-    
-    def check_repo_validity(entry)
-      unless entry.repo.remote("origin").url == entry.url
-        raise MultiRepoException, "'#{entry.path}' origin URL (#{entry.repo.remote('origin').url}) does not match entry (#{entry.url})!"
-      end
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/git/repo"
+
+module MultiRepo
+  class InstallCommand < Command
+    self.command = "install"
+    self.summary = "Clones and checks out dependencies as defined in the .multirepo file, and installs git-multirepo's local hooks."
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_initialized
+      
+      Console.log_step("Cloning dependencies and installing hook...")
+      
+      install_internal
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def install_internal
+      config_entries = ConfigFile.load
+
+      Console.log_substep("Installing #{config_entries.count} dependencies...");
+      
+      config_entries.each { |e| install(e) }
+      
+      install_hooks
+    end
+    
+    def install(entry)
+      if entry.repo.exists?
+        check_repo_validity(entry)
+        fetch_repo(entry)
+      else
+        clone_repo(entry)
+      end
+      checkout_branch(entry)
+    end
+    
+    # Repo operations
+    
+    def fetch_repo(entry)
+      Console.log_substep("Working copy '#{entry.repo.path}' already exists, fetching instead...")
+      raise MultiRepoException, "Could not fetch from remote #{entry.repo.remote('origin').url}" unless entry.repo.fetch
+    end
+    
+    def clone_repo(entry)
+      Console.log_substep("Cloning '#{entry.url} to #{entry.repo.path}'")
+      raise MultiRepoException, "Could not clone remote #{entry.url}" unless entry.repo.clone(entry.url)
+    end
+    
+    def checkout_branch(entry)
+      branch = entry.repo.branch(entry.branch);
+      raise MultiRepoException, "Could not checkout branch #{branch.name}" unless branch.checkout
+      Console.log_substep("Checked out branch #{branch.name} -> origin/#{branch.name}")
+    end
+    
+    # Validation
+    
+    def check_repo_validity(entry)
+      unless entry.repo.remote("origin").url == entry.url
+        raise MultiRepoException, "'#{entry.path}' origin URL (#{entry.repo.remote('origin').url}) does not match entry (#{entry.url})!"
+      end
+    end
+  end
 end