Improved support for configuration.

technicalpickles · technicalpickles · commit b86cbd6205b7 · 2009-08-01T17:48:53.000-04:00
- Use `git config` directly, because it will normalize extra spaces,
  quotations, etc.
- Added support for a global configuration.
diff --git a/lib/git.rb b/lib/git.rb
@@ -106,5 +106,47 @@ def self.export(repository, name, options = {})
     repo.checkout("origin/#{options[:branch]}") if options[:branch]
     Dir.chdir(repo.dir.to_s) { FileUtils.rm_r '.git' }
   end
+
+  #g.config('user.name', 'Scott Chacon') # sets value
+  #g.config('user.email', 'email@email.com')  # sets value
+  #g.config('user.name')  # returns 'Scott Chacon'
+  #g.config # returns whole config hash
+  def config(name = nil, value = nil)
+    lib = Git::Lib.new
+    if(name && value)
+      # set value
+      lib.config_set(name, value)
+    elsif (name)
+      # return value
+      lib.config_get(name)
+    else
+      # return hash
+      lib.config_list
+    end
+  end
+
+  # Same as g.config, but forces it to be at the global level
+  #
+  #g.config('user.name', 'Scott Chacon') # sets value
+  #g.config('user.email', 'email@email.com')  # sets value
+  #g.config('user.name')  # returns 'Scott Chacon'
+  #g.config # returns whole config hash
+  def self.global_config(name = nil, value = nil)
+    lib = Git::Lib.new(nil, nil)
+    if(name && value)
+      # set value
+      lib.global_config_set(name, value)
+    elsif (name)
+      # return value
+      lib.global_config_get(name)
+    else
+      # return hash
+      lib.global_config_list
+    end
+  end
+
+  def global_config(name = nil, value = nil)
+    self.class.global_config(name, value)
+  end
     
 end
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -321,46 +321,76 @@ def config_remote(name)
     end
 
     def config_get(name)
-      config_list[name]
-      #command('config', ['--get', name])
+      do_get = lambda do
+        command('config', ['--get', name])
+      end
+
+      if @git_dir
+        Dir.chdir(@git_dir, &do_get)
+      else
+        build_list.call
+      end
+    end
+
+    def global_config_get(name)
+      command('config', ['--global', '--get', name], false)
     end
     
     def config_list
-      config = {}
-      config.merge!(parse_config('~/.gitconfig'))
-      config.merge!(parse_config(File.join(@git_dir, 'config')))
-      #hsh = {}
-      #command_lines('config', ['--list']).each do |line|
-      #  (key, value) = line.split('=')
-      #  hsh[key] = value
-      #end
-      #hsh
+      build_list = lambda do
+        parse_config_list command_lines('config', ['--list'])
+      end
+      
+      if @git_dir
+        Dir.chdir(@git_dir, &build_list)
+      else
+        build_list.call
+      end
+    end
+
+    def global_config_list
+      parse_config_list command_lines('config', ['--global', '--list'], false)
     end
     
-    def parse_config(file)
+    def parse_config_list(lines)
       hsh = {}
-      file = File.expand_path(file)
-      if File.file?(file)
-        current_section = nil
-        File.readlines(file).each do |line|
-          if m = /\[(\w+)\]/.match(line)
-            current_section = m[1]
-          elsif m = /\[(\w+?) "(.*?)"\]/.match(line)
-            current_section = "#{m[1]}.#{m[2]}"
-          elsif m = /(\w+?) = (.*)/.match(line)
-            key = "#{current_section}.#{m[1]}"
-            hsh[key] = m[2] 
-          end
-        end
+      lines.each do |line|
+        (key, *values) = line.split('=')
+        hsh[key] = values.join('=')
       end
       hsh
     end
+
+    def parse_config(file)
+      hsh = {}
+      parse_config_list command_lines('config', ['--list', '--file', file], false)
+      #hsh = {}
+      #file = File.expand_path(file)
+      #if File.file?(file)
+      #  current_section = nil
+      #  File.readlines(file).each do |line|
+      #    if m = /\[(\w+)\]/.match(line)
+      #      current_section = m[1]
+      #    elsif m = /\[(\w+?) "(.*?)"\]/.match(line)
+      #      current_section = "#{m[1]}.#{m[2]}"
+      #    elsif m = /(\w+?) = (.*)/.match(line)
+      #      key = "#{current_section}.#{m[1]}"
+      #      hsh[key] = m[2] 
+      #    end
+      #  end
+      #end
+      #hsh
+    end
     
     ## WRITE COMMANDS ##
         
     def config_set(name, value)
       command('config', [name, value])
     end
+
+    def global_config_set(name, value)
+      command('config', ['--global', name, value], false)
+    end
           
     def add(path = '.')
       arr_opts = ['--']
