schacon-git 1.1.1 → 1.2.0

data/lib/git.rb

@@ -26,6 +26,14 @@ require 'git/author'
 require 'git/stashes'
 require 'git/stash'
 
+minimum_version = [1, 6, 0, 0]
+current_version = Git::Lib.new(nil, nil).command_version
+if current_version[0] < minimum_version[0] || 
+   current_version[1] < minimum_version[1] ||
+   current_version[2] < minimum_version[2] ||
+   current_version[3] < minimum_version[3]
+  $stderr.puts "The git gem requires git #{minimum_version.join('.')} or later, but only found #{current_version.join('.')}. You should probably upgrad.e"
+end
 
 # Git/Ruby Library
 #
@@ -106,5 +114,47 @@ module Git
     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

data/lib/git/lib.rb

@@ -321,46 +321,76 @@ module Git
     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 = ['--']
@@ -613,7 +643,14 @@ module Git
       command('archive', arr_opts, true, (opts[:add_gzip] ? '| gzip' : '') + " > #{escape file}")
       return file
     end
-    
+
+    # returns the current version of git, as an Array of Fixnums.
+    def command_version
+      output = command('version', [], false)
+      version = output[/(\d+)\.(\d+)\.(\d+)\.(\d+)/]
+      version.split('.').collect {|i| i.to_i}
+    end
+
     private
     
     def command_lines(cmd, opts = [], chdir = true, redirect = '')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: schacon-git
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Scott Chacon
-autorequire: git
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,7 +22,7 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/git
+- lib/git.rb
 - lib/git/author.rb
 - lib/git/base.rb
 - lib/git/branch.rb
@@ -39,13 +39,13 @@ files:
 - lib/git/stashes.rb
 - lib/git/status.rb
 - lib/git/working_directory.rb
-- lib/git.rb
 - README
-has_rdoc: true
-homepage: http://github.com/schacon/ruby-git/tree/master
+has_rdoc: false
+homepage: http://github.com/schacon/ruby-git
+licenses: 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -60,12 +60,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.2.0
+requirements: 
+- git 1.6.0.0, or greater
+rubyforge_project: git
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: A package for using Git in Ruby code.
+specification_version: 3
+summary: Ruby/Git is a Ruby library that can be used to create, read and manipulate Git repositories by wrapping system calls to the git binary
 test_files: []