Add methods to find branches

lib/baes/actions/bisect.rb

@@ -10,11 +10,9 @@ class << self
     def call(command_args)
       output.puts("searching for branch that fails command: `#{command_args}`")
       branches = Baes::Actions::BuildTree.call
-      root_branch = find_root_branch(branches)
 
       current_branch_name = git.current_branch_name
-      current_branch =
-        branches.find { |branch| branch.name == current_branch_name }
+      current_branch = branches.find_by_name(current_branch_name)
 
       _, _, status = Open3.capture3(command_args)
 
@@ -23,22 +21,14 @@ def call(command_args)
       end
 
       fail_branch =
-        find_failing_branch(root_branch, current_branch, command_args)
+        find_failing_branch(branches.root, current_branch, command_args)
 
       git.checkout(fail_branch.name)
       output.puts("first failing branch: #{fail_branch.name}")
     end
 
     private
 
-    def find_root_branch(branches)
-      if root_name
-        branches.find { |branch| branch.name == root_name }
-      else
-        branches.find { |branch| ["main", "master"].include?(branch.name) }
-      end
-    end
-
     def find_failing_branch(success_branch, fail_branch, command_args)
       next_branch = find_middle_branch(success_branch, fail_branch)
 

lib/baes/actions/build_tree.rb

@@ -10,31 +10,22 @@ class << self
     # generate a tree of Branch records linked to their children
     def call
       branches = generate_branches
-      root_branch = find_root_branch(branches)
       indexed_branches = index_branches(branches)
 
       branches.each do |branch|
         link_branch_to_parent(
           branch,
           indexed_branches,
-          root_branch: root_branch
+          root_branch: branches.root
         )
       end
 
-      prune(root_branch)
+      prune(branches.root)
       branches
     end
 
     private
 
-    def find_root_branch(branches)
-      if root_name
-        branches.find { |branch| branch.name == root_name }
-      else
-        branches.find { |branch| ["main", "master"].include?(branch.name) }
-      end
-    end
-
     def generate_branches
       branches = Baes::BranchCollection.new
       git.branch_names.each do |branch_name|

lib/baes/actions/rebase.rb

@@ -8,7 +8,7 @@ class << self
     # rebase branches
     def call
       branches = Baes::Actions::BuildTree.call
-      root_branch = find_root_branch(branches)
+      root_branch = branches.root
 
       if dry_run?
         output.puts(root_branch.inspect)
@@ -21,14 +21,6 @@ def call
 
     private
 
-    def find_root_branch(branches)
-      if root_name
-        branches.find { |branch| branch.name == root_name }
-      else
-        branches.find { |branch| ["main", "master"].include?(branch.name) }
-      end
-    end
-
     def rebase_children(branch)
       branch.children.each do |child_branch|
         child_branch.rebase(branch)

lib/baes/branch_collection.rb

@@ -2,22 +2,33 @@
 
 # class to encapsulate a collection of branches
 class Baes::BranchCollection
+  include Baes::Configuration::Helpers
+
   attr_accessor :branches
 
   def initialize
     self.branches = []
   end
 
+  # return the root branch
+  def root
+    if root_name
+      find_by_name(root_name)
+    else
+      find_by_name("main") || find_by_name("master")
+    end
+  end
+
+  # find a branch by name
+  def find_by_name(name)
+    branches.find { |branch| branch.name == name }
+  end
+
   # add a branch
   def <<(branch)
     branches << branch
   end
 
-  # find a branch
-  def find(&block)
-    branches.find(&block)
-  end
-
   # iterate over each branch with object
   def each_with_object(obj, &block)
     branches.each_with_object(obj, &block)