Merge branch 'master' of github.com:schacon/ruby-git

Author: bsedat

.travis.yml

@@ -4,11 +4,10 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.1
+  - 2.1.2
   - jruby-18mode
   - jruby-19mode
-  - jruby-head
-#  - rbx-18mode
-#  - rbx-19mode
   - ree
 matrix:
   allow_failures:

CHANGELOG

@@ -0,0 +1,75 @@
+== 1.2.9
+
+* Adding Git.configure (to configure the git env)
+* Adding Git.ls_remote [Git.ls_remote(repo_path_or_url='.')]
+* Adding Git.describe [repo.describe(objectish, opts)]
+* Adding Git.show [repo.show(objectish=nil, path=nil)]
+* Fixing Git::Diff to support default references (implicit references)
+* Fixing Git::Diff to support diff over git .patch files
+* Fixing Git.checkout when using :new_branch opt
+* Fixing Git::Object::Commit to preserve its sha after fetching metadata
+* Fixing Git.is_remote_branch? to actually check against remote branches
+* Improvements over how ENV variables are modified
+* Improving thrade safety (using --git-dir and --work-tree git opts)
+* Improving Git::Object::Tag. Adding annotated?, tagger and message
+* Supporting a submodule path as a valid repo
+* Git.checkout - supporting -f and -b
+* Git.clone - supporting --branch 
+* Git.fetch - supporting --prune
+* Git.tag - supporting 
+
+== 1.2.8
+
+* Keeping the old escape format for windows users
+* revparse: Supporting ref names containing SHA like substrings (40-hex strings)
+* Fix warnings on Ruby 2.1.2
+
+== 1.2.7 
+
+* Fixing mesages encoding
+* Fixing -f flag in git push
+* Fixing log parser for multiline messages
+* Supporting object references on Git.add_tag
+* Including dotfiles on Git.status
+* Git.fetch - supporting --tags
+* Git.clean - supporting -x
+* Git.add_tag options - supporting -a, -m and -s
+* Added Git.delete_tag
+
+== 1.2.6
+
+* Ruby 1.9.X/2.0 fully supported
+* JRuby 1.8/1.9 support
+* Rubinius support
+* Git.clone - supporting --recursive and --config
+* Git.log - supporting last and [] over the results
+* Git.add_remote - supporting -f and -t
+* Git.add - supporting --fore
+* Git.init - supporting --bare
+* Git.commit - supporting --all and --amend
+* Added Git.remote_remote, Git.revert and Git.clean 
+* Added Bundler to the formula
+* Travis configuration 
+* Licence included with the gem
+
+== 1.0.4
+
+* added camping/gitweb.rb frontend
+* added a number of speed-ups
+
+== 1.0.3
+
+* Sped up most of the operations
+* Added some predicate functions (commit?, tree?, etc)
+* Added a number of lower level operations (read-tree, write-tree, checkout-index, etc)
+* Fixed a bug with using bare repositories
+* Updated a good amount of the documentation
+
+== 1.0.2
+
+* Added methods to the git objects that might be helpful
+
+== 1.0.1
+
+* Initial version
+

History.txt

@@ -57,6 +57,20 @@ Require the 'git' gem.
     require 'git'
 ```
 
+Git env config
+
+```ruby
+  Git.configure do |config|
+    # If you want to use a custom git binary
+    config.binary_path = '/git/bin/path'
+
+    # If you need to use a custom SSH script
+    config.git_ssh = '/path/to/ssh/script'
+  end
+
+```
+
+
 Here are the operations that need read permission only.
 
 ```ruby
@@ -113,7 +127,10 @@ Here are the operations that need read permission only.
     g.grep('hello')  # implies HEAD
     g.blob('v2.5:Makefile').grep('hello')
     g.tag('v2.5').grep('hello', 'docs/')
-
+    g.describe() 
+    g.describe('0djf2aa')
+    g.describe('HEAD', {:all => true, :tags => true})
+  
     g.diff(commit1, commit2).size
     g.diff(commit1, commit2).stats
     g.gtree('v2.5').diff('v2.6').insertions
@@ -132,6 +149,15 @@ Here are the operations that need read permission only.
     g.config # returns whole config hash
 
     g.tags # returns array of Git::Tag objects
+    
+    g.show()
+    g.show('HEAD')
+    g.show('v2.8', 'README.md')
+
+    Git.ls_remote('https://github.com/schacon/ruby-git.git') # returns a hash containing the available references of the repo.
+    Git.ls_remote('/path/to/local/repo')
+    Git.ls_remote() # same as Git.ls_remote('.')
+
 ```
 
 And here are the operations that will need to write to your git repository.
@@ -140,8 +166,8 @@ And here are the operations that will need to write to your git repository.
       g = Git.init
        Git.init('project')
        Git.init('/home/schacon/proj',
-        { :git_dir => '/opt/git/proj.git',
-           :index_file => '/tmp/index'} )
+        { :repository => '/opt/git/proj.git',
+           :index => '/tmp/index'} )
 
      g = Git.clone(URI, NAME, :path => '/tmp/checkout')
      g.config('user.name', 'Scott Chacon')

README.md

@@ -1 +1 @@
-1.2.6
+1.2.9.1

VERSION

@@ -1,35 +1,36 @@
-require 'date'
-
-require "#{File.expand_path(File.dirname(__FILE__))}/lib/git/version"
-
 Gem::Specification.new do |s|
   s.authors = ['Scott Chacon']
-  s.date = Date.today.to_s
+  s.date = '2015-01-13' 
   s.email = '[email protected]'
   s.homepage = 'http://github.com/schacon/ruby-git'
   s.license = 'MIT'
   s.name = 'git'
   s.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.'
-  s.version = Git::VERSION
+  s.version = '1.2.9.1'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ['lib']
   s.requirements = ['git 1.6.0.0, or greater']
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'test-unit', '>=2', '< 4'
 
   s.extra_rdoc_files = ['README.md']
   s.rdoc_options = ['--charset=UTF-8']
 
   s.files = [
+    'CHANGELOG',
     'LICENSE',
+    'README.md',
+    'VERSION',
     'lib/git.rb',
     'lib/git/author.rb',
     'lib/git/base.rb',
+    'lib/git/base/factory.rb',
     'lib/git/branch.rb',
     'lib/git/branches.rb',
+    'lib/git/config.rb',
     'lib/git/diff.rb',
     'lib/git/index.rb',
     'lib/git/lib.rb',

git.gemspec

@@ -7,6 +7,7 @@
 require 'git/base'
 require 'git/branch'
 require 'git/branches'
+require 'git/config'
 require 'git/diff'
 require 'git/index'
 require 'git/lib'
@@ -60,6 +61,14 @@ def config(name = nil, value = nil)
     end
   end
 
+  def self.configure
+    yield Base.config
+  end
+
+  def self.config
+    return Base.config
+  end
+
   def global_config(name = nil, value = nil)
     self.class.global_config(name, value)
   end
@@ -130,6 +139,15 @@ def self.global_config(name = nil, value = nil)
   def self.init(working_dir = '.', options = {})
     Base.init(working_dir, options)
   end
+    
+  # returns a Hash containing information about the references 
+  # of the target repository
+  #
+  # @param [String|NilClass] location the target repository location or nil for '.'
+  # @return [{String=>Hash}] the available references of the target repo.
+  def self.ls_remote(location=nil)
+    Git::Lib.new.ls_remote(location)
+  end
 
   # open an existing git working directory
   # 

lib/git.rb

@@ -11,4 +11,4 @@ def initialize(author_string)
     end
 
   end
-end
+end