git-multirepo 1.0.0.beta60 → 1.0.0.beta61

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

@@ -1,121 +1,121 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-require "multirepo/files/tracking-files"
-require "multirepo/commands/command"
-
-module MultiRepo
-  class InitCommand < Command
-    self.command = "init"
-    self.summary = "Initialize the current repository as a multirepo project."
-    
-    def self.options
-      [['[--extras]', 'Keep the current .multirepo config file as-is and initialize everything else.']].concat(super)
-    end
-    
-    def initialize(argv)
-      @only_extras = argv.flag?("extras")
-      super
-    end
-    
-    def run
-      ensure_in_work_tree
-      
-      if @only_extras
-        ensure_multirepo_enabled
-        Console.log_step("Initializing extras...")
-        initialize_extras_step
-      else
-        Console.log_step("Initializing multirepo...")
-        full_initialize_step
-      end
-      
-      Console.log_step("Done!")
-    end
-    
-    def full_initialize_step
-      if ConfigFile.new(".").exists?
-        reinitialize = Console.ask(".multirepo file already exists. Reinitialize?")
-        fail MultiRepoException, "Initialization aborted" unless reinitialize
-      end
-      
-      unless add_sibling_repos_step
-        fail MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
-      end
-
-      initialize_extras_step
-    end
-    
-    def add_sibling_repos_step
-      sibling_repos = Utils.sibling_repos
-      return false unless sibling_repos.any?
-
-      Console.log_substep("Creating new multirepo config...")
-      
-      valid_repos = find_valid_repos(sibling_repos)
-      entries = create_entries(valid_repos)
-      
-      fail MultiRepoException, "No sibling repositories were added as dependencies; init aborted" unless entries.any?
-      
-      ConfigFile.new(".").save_entries(entries)
-      return true
-    end
-    
-    def initialize_extras_step
-      install_hooks_step
-      update_gitattributes_step
-      update_gitconfig_step
-    end
-    
-    def install_hooks_step
-      install_hooks(".")
-      Console.log_substep("Installed git hooks")
-    end
-    
-    def update_gitattributes_step
-      TrackingFiles.new(".").files.each do |f|
-        filename = f.filename
-        regex_escaped_filename = Regexp.quote(filename)
-        Utils.append_if_missing("./.gitattributes", /^#{regex_escaped_filename} .*/, "#{filename} merge=ours")
-      end
-      Console.log_substep("Updated .gitattributes file")
-    end
-    
-    def update_gitconfig_step
-      update_gitconfig(".")
-      Console.log_substep("Updated .git/config file")
-    end
-    
-    def find_valid_repos(repos)
-      repos.select do |repo|
-        next true if repo.head_born?
-        Console.log_warning("Ignoring repo '#{repo.path}' because its HEAD is unborn. You must perform at least one commit.")
-      end
-    end
-    
-    def create_entries(repos)
-      entries = []
-      repos.each do |repo|
-        origin_url = repo.remote('origin').url
-        current_branch_name = repo.current_branch.name
-        
-        next unless Console.ask("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || 'NONE'}, branch: #{current_branch_name}]")
-        
-        unless origin_url
-          Console.log_warning("Repo 'origin' remote url is not set; skipping")
-          next
-        end
-        
-        entries.push(ConfigEntry.new(repo))
-        Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
-      end
-      return entries
-    end
-    
-    def check_repo_exists
-      fail MultiRepoException, "There is no folder at path '#{@repo.path}'" unless Dir.exist?(@repo.path)
-      fail MultiRepoException, "'#{@repo.path}' is not a repository" unless @repo.exists?
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+require "multirepo/files/tracking-files"
+require "multirepo/commands/command"
+
+module MultiRepo
+  class InitCommand < Command
+    self.command = "init"
+    self.summary = "Initialize the current repository as a multirepo project."
+    
+    def self.options
+      [['[--extras]', 'Keep the current .multirepo config file as-is and initialize everything else.']].concat(super)
+    end
+    
+    def initialize(argv)
+      @only_extras = argv.flag?("extras")
+      super
+    end
+    
+    def run
+      ensure_in_work_tree
+      
+      if @only_extras
+        ensure_multirepo_enabled
+        Console.log_step("Initializing extras...")
+        initialize_extras_step
+      else
+        Console.log_step("Initializing multirepo...")
+        full_initialize_step
+      end
+      
+      Console.log_step("Done!")
+    end
+    
+    def full_initialize_step
+      if ConfigFile.new(".").exists?
+        reinitialize = Console.ask(".multirepo file already exists. Reinitialize?")
+        fail MultiRepoException, "Initialization aborted" unless reinitialize
+      end
+      
+      unless add_sibling_repos_step
+        fail MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
+      end
+
+      initialize_extras_step
+    end
+    
+    def add_sibling_repos_step
+      sibling_repos = Utils.sibling_repos
+      return false unless sibling_repos.any?
+
+      Console.log_substep("Creating new multirepo config...")
+      
+      valid_repos = find_valid_repos(sibling_repos)
+      entries = create_entries(valid_repos)
+      
+      fail MultiRepoException, "No sibling repositories were added as dependencies; init aborted" unless entries.any?
+      
+      ConfigFile.new(".").save_entries(entries)
+      return true
+    end
+    
+    def initialize_extras_step
+      install_hooks_step
+      update_gitattributes_step
+      update_gitconfig_step
+    end
+    
+    def install_hooks_step
+      install_hooks(".")
+      Console.log_substep("Installed git hooks")
+    end
+    
+    def update_gitattributes_step
+      TrackingFiles.new(".").files.each do |f|
+        filename = f.filename
+        regex_escaped_filename = Regexp.quote(filename)
+        Utils.append_if_missing("./.gitattributes", /^#{regex_escaped_filename} .*/, "#{filename} merge=ours")
+      end
+      Console.log_substep("Updated .gitattributes file")
+    end
+    
+    def update_gitconfig_step
+      update_gitconfig(".")
+      Console.log_substep("Updated .git/config file")
+    end
+    
+    def find_valid_repos(repos)
+      repos.select do |repo|
+        next true if repo.head_born?
+        Console.log_warning("Ignoring repo '#{repo.path}' because its HEAD is unborn. You must perform at least one commit.")
+      end
+    end
+    
+    def create_entries(repos)
+      entries = []
+      repos.each do |repo|
+        origin_url = repo.remote('origin').url
+        current_branch_name = repo.current_branch.name
+        
+        next unless Console.ask("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || 'NONE'}, branch: #{current_branch_name}]")
+        
+        unless origin_url
+          Console.log_warning("Repo 'origin' remote url is not set; skipping")
+          next
+        end
+        
+        entries.push(ConfigEntry.new(repo))
+        Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
+      end
+      return entries
+    end
+    
+    def check_repo_exists
+      fail MultiRepoException, "There is no folder at path '#{@repo.path}'" unless Dir.exist?(@repo.path)
+      fail MultiRepoException, "'#{@repo.path}' is not a repository" unless @repo.exists?
+    end
+  end
+end

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

@@ -1,48 +1,48 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-
-module MultiRepo
-  class InspectCommandStats
-    VERSION = "version"
-    TRACKED = "tracked"
-  end
-
-  class InspectCommand < Command
-    self.command = "inspect"
-    self.summary = "Outputs various information about multirepo-enabled repos. For use in scripting and CI scenarios."
-    
-    def self.options
-      [['<stat name>', 'The name of the statistic to output.']].concat(super)
-    end
-    
-    def initialize(argv)
-      stat = argv.shift_argument
-      @stat = stat ? stat.downcase : nil
-      super
-    end
-
-    def validate!
-      super
-      help! "You must provide a valid stat name. Available stats: \n    #{stats.join(', ')}" unless valid_stat?(@stat)
-    end
-
-    def stats
-      InspectCommandStats.constants.map { |s| InspectCommandStats.const_get(s) }
-    end
-
-    def valid_stat?(stat)
-      stats.include?(stat)
-    end
-    
-    def run
-      ensure_in_work_tree
-      
-      case @stat
-      when InspectCommandStats::VERSION
-        puts MetaFile.new(".").load.version
-      when InspectCommandStats::TRACKED
-        puts Utils.multirepo_tracked?(".").to_s
-      end
-    end
-  end
-end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+
+module MultiRepo
+  class InspectCommandStats
+    VERSION = "version"
+    TRACKED = "tracked"
+  end
+
+  class InspectCommand < Command
+    self.command = "inspect"
+    self.summary = "Outputs various information about multirepo-enabled repos. For use in scripting and CI scenarios."
+    
+    def self.options
+      [['<stat name>', 'The name of the statistic to output.']].concat(super)
+    end
+    
+    def initialize(argv)
+      stat = argv.shift_argument
+      @stat = stat ? stat.downcase : nil
+      super
+    end
+
+    def validate!
+      super
+      help! "You must provide a valid stat name. Available stats: \n    #{stats.join(', ')}" unless valid_stat?(@stat)
+    end
+
+    def stats
+      InspectCommandStats.constants.map { |s| InspectCommandStats.const_get(s) }
+    end
+
+    def valid_stat?(stat)
+      stats.include?(stat)
+    end
+    
+    def run
+      ensure_in_work_tree
+      
+      case @stat
+      when InspectCommandStats::VERSION
+        puts MetaFile.new(".").load.version
+      when InspectCommandStats::TRACKED
+        puts Utils.multirepo_tracked?(".").to_s
+      end
+    end
+  end
+end