Make default collapse setting configurable

Author: wteuber

README.md

@@ -49,6 +49,11 @@ Set the indentation as you like, default is 4.
 git config --global status-tree.indent <indent>
 ```
 
+Set whether to collapse directories by default, default is false.
+```
+git config --global status-tree.collapse <true|false>
+```
+
 ## Try it
 ```
 gem install git-status-tree
@@ -63,6 +68,7 @@ echo "add staged" > test/staged.txt
 git add test/staged.txt
 git mv lib/version.rb lib/git_tree_version.rb
 git mv test/node/test_node_class.rb test/node_class_test.rb
+
 git tree
 .
 ├── lib
@@ -75,19 +81,15 @@ git tree
 ├── DELETEME.txt (D+)
 └── README.md (M)
 
-# Example with --collapse option for deeply nested structures
-mkdir -p domains/foo/bar/module/api/src/main/java/com/company/service
-echo "Service.java" > domains/foo/bar/module/api/src/main/java/com/company/service/Service.java
-git add domains
-git tree --collapse
+git tree -ci 2
 .
-├── domains/foo/bar/module/api/src/main/java/com/company/service/Service.java (A+)
-├── lib/version.rb -> git_tree_version.rb (R+)
-├── test/node/test_node_class.rb -> test/node_class_test.rb (R+)
-├── test/staged.txt (A+)
-├── test/untracked.txt (?)
-├── DELETEME.txt (D+)
-└── README.md (M)
+├ lib/version.rb -> git_tree_version.rb (R+)
+├ test
+│ ├ node/test_node_class.rb -> test/node_class_test.rb (R+)
+│ ├ staged.txt (A+)
+│ └ untracked.txt (?)
+├ DELETEME.txt (D+)
+└ README.md (M)
 
 # reset repo
 git reset HEAD --hard

bin/git_add_alias_tree

@@ -5,6 +5,7 @@ BIN_DIR=`pwd`
 popd > /dev/null
 
 git config --global status-tree.indent 4
+git config --global status-tree.collapse false
 git config --global alias.tree "!exec $BIN_DIR/git-status-tree"
 echo '#############################'
 echo '# "git tree" has been added #'

src/git_status_tree.rb

@@ -12,7 +12,7 @@ class GitStatusTree
 
   def initialize(options = {})
     Node.indent = indent(options)
-    Node.collapse_dirs = options[:collapse] || false
+    Node.collapse_dirs = collapse(options)
     @files = `git status --porcelain`.split("\n")
     @nodes = files.map { |file| Node.create_from_string file }
     @tree = nodes.reduce { |a, i| (a + i).nodes[0] }
@@ -35,8 +35,20 @@ def indent(options)
     indent
   end
 
+  def collapse(options)
+    # Command line option takes precedence, then git config, then default (false)
+    return options[:collapse] if options.key?(:collapse)
+
+    config_collapse?
+  end
+
   def config
     config = `git config --global status-tree.indent`.strip
     config =~ /\A\d+\z/ ? config.to_i : nil
   end
+
+  def config_collapse?
+    config = `git config --global status-tree.collapse`.strip
+    config == 'true'
+  end
 end

test/integration/test_git_status_tree_class.rb

@@ -74,6 +74,36 @@ def test_indent_default_when_no_config
     assert_equal(4, Node.indent)
   end
 
+  def test_collapse_from_git_config_true
+    `git config --global status-tree.collapse true`
+    GitStatusTree.new
+    assert_equal(true, Node.collapse_dirs)
+  ensure
+    `git config --global --unset status-tree.collapse 2>/dev/null`
+  end
+
+  def test_collapse_from_git_config_false
+    `git config --global status-tree.collapse false`
+    GitStatusTree.new
+    assert_equal(false, Node.collapse_dirs)
+  ensure
+    `git config --global --unset status-tree.collapse 2>/dev/null`
+  end
+
+  def test_collapse_default_when_no_config
+    `git config --global --unset status-tree.collapse 2>/dev/null`
+    GitStatusTree.new
+    assert_equal(false, Node.collapse_dirs)
+  end
+
+  def test_collapse_command_line_overrides_config
+    `git config --global status-tree.collapse false`
+    GitStatusTree.new(collapse: true)
+    assert_equal(true, Node.collapse_dirs)
+  ensure
+    `git config --global --unset status-tree.collapse 2>/dev/null`
+  end
+
   def test_multiple_files_and_directories
     Dir.mkdir('src')
     File.write('src/main.rb', 'puts "hello"')