git-multirepo 1.0.0.beta9 → 1.0.0.beta10

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
-      super
-      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
+      super
+      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
-      super
-      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
+      super
+      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
-      super
-      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
-      
-        uncommitted = Utils.warn_of_uncommitted_changes(entries)
-        raise MultiRepoException, "Can't finish initialization!" if uncommitted
-        
-        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
+      super
+      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
 end

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

@@ -1,65 +1,65 @@
-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
-      super
-      ensure_multirepo_initialized
-      
-      Console.log_step("Cloning dependencies and installing hook...")
-      
-      config_entries = ConfigFile.load
-
-      Console.log_info("There are #{config_entries.count} dependencies to install");
-      
-      config_entries.each { |e| install(e) }
-      
-      self.install_pre_commit_hook
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    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 pre-commit hook."
+    
+    def run
+      super
+      ensure_multirepo_initialized
+      
+      Console.log_step("Cloning dependencies and installing hook...")
+      
+      config_entries = ConfigFile.load
+
+      Console.log_info("There are #{config_entries.count} dependencies to install");
+      
+      config_entries.each { |e| install(e) }
+      
+      self.install_pre_commit_hook
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    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

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

@@ -1,26 +1,26 @@
-require "os"
-
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-
-module MultiRepo
-  class OpenCommand < Command
-    self.command = "open"
-    self.summary = "Opens all dependencies in the current OS's file explorer."
-    
-    def run
-      super
-      ensure_multirepo_initialized
-      
-      ConfigFile.load.each do |entry|
-        if OS.osx?
-          `open "#{entry.repo.path}"`
-        elsif OS.windows?
-          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
-        end
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "os"
+
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+
+module MultiRepo
+  class OpenCommand < Command
+    self.command = "open"
+    self.summary = "Opens all dependencies in the current OS's file explorer."
+    
+    def run
+      super
+      ensure_multirepo_initialized
+      
+      ConfigFile.load.each do |entry|
+        if OS.osx?
+          `open "#{entry.repo.path}"`
+        elsif OS.windows?
+          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
+        end
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,42 +1,42 @@
-require "multirepo/utility/console"
-require "multirepo/files/config-file"
-
-module MultiRepo
-  class RemoveCommand < Command
-    self.command = "remove"
-    self.summary = "Removes the specified dependency from multirepo."
-    
-    def initialize(argv)
-      @path = argv.shift_argument
-      @delete = argv.flag?("delete")
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a dependency repository to remove" unless @path
-    end
-    
-    def run
-      super
-      ensure_multirepo_initialized
-      
-      repo = Repo.new(@path)
-      entry = ConfigEntry.new(repo)
-      
-      if ConfigFile.entry_exists?(entry)
-        ConfigFile.remove_entry(entry)
-        Console.log_step("Removed '#{@path}' from the .multirepo file")
-        
-        if @delete
-          FileUtils.rm_rf(@path)
-          Console.log_step("Deleted '#{@path}' from disk")
-        end
-      else
-        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class RemoveCommand < Command
+    self.command = "remove"
+    self.summary = "Removes the specified dependency from multirepo."
+    
+    def initialize(argv)
+      @path = argv.shift_argument
+      @delete = argv.flag?("delete")
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a dependency repository to remove" unless @path
+    end
+    
+    def run
+      super
+      ensure_multirepo_initialized
+      
+      repo = Repo.new(@path)
+      entry = ConfigEntry.new(repo)
+      
+      if ConfigFile.entry_exists?(entry)
+        ConfigFile.remove_entry(entry)
+        Console.log_step("Removed '#{@path}' from the .multirepo file")
+        
+        if @delete
+          FileUtils.rm_rf(@path)
+          Console.log_step("Deleted '#{@path}' from disk")
+        end
+      else
+        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end