git-ce 1.5.0.1 → 1.5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bc16bbec18997b4b172dcae8847ac6c4547b5954690bdb76416710db4ce40e4
-  data.tar.gz: cd6876f6a7ed5a14a052d8f7909adf6dff9a49cdde045d7007cc100bc4b791fc
+  metadata.gz: 22d8d46c1afbc0662c29da86f253769d63f9a7225c442e4724010f6e347a462e
+  data.tar.gz: e8a0eab8826bd33a64cd451030616daaa02abca0b0dc2e1857ff8a8e2d270e4d
 SHA512:
-  metadata.gz: d43fe652cb38b605ae68e13a9510942762c25b13e257996e5388fed1472b4ef7596e2cbdf86b6f8c7c6cc7675a20e7d34fcf414cc99c42596ab1661fde1b76ce
-  data.tar.gz: 5b97586870190df8e93bda7550bc7a843c85cdac7c5ff7d68ef956104b2153c2abecd5c074e7b4002bac93132e45712ee50ae0ea24ba005ea0cb9e74ecab2f9d
+  metadata.gz: a409e982e0254a72a0e32b6e1fa737fb6772cf46a689cc44507cdb144775cbbcb4015a1ec57acd90e122b2e29dd5fef130292b49ab495d4ea8906bff52dc3851
+  data.tar.gz: 9b222f4523af0a13a605e4a8bf703cf59d2938bb4c532a1bc08d3989d8b28e5470e03ea6c2845f0971d8c1cca18e358f78598066e5ff87b1ac39a314aad772ea

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.5.0.2
+
+* Allow passing a `:log` to `Git.clone`
+* Allow passing a ref to `Git.ls_remote`
+* Allow passing a merge strategy to `Git.rebase`
+
 ## 1.5.0.1
 
 * Adds the rebase command

data/README.md

@@ -33,7 +33,7 @@ http://github.com/zedtux/ruby-git-ce
 
 You can install Ruby/Git like this:
 
-    $ sudo gem install git
+    $ sudo gem install git-ce
 
 ## Code Status
 

data/lib/git.rb

@@ -34,7 +34,7 @@ end
 # and more.  You should be able to do most fundamental git
 # operations with this library.
 #
-# This module provides the basic functions to open a git 
+# This module provides the basic functions to open a git
 # reference to work with. You can open a working directory,
 # open a bare repository, initialize a new repo or clone an
 # existing remote repository.
@@ -42,7 +42,7 @@ end
 # Author::    Scott Chacon (mailto:schacon@gmail.com)
 # License::   MIT License
 module Git
-  
+
   #g.config('user.name', 'Scott Chacon') # sets value
   #g.config('user.email', 'email@email.com')  # sets value
   #g.config('user.name')  # returns 'Scott Chacon'
@@ -82,7 +82,7 @@ module Git
   def self.bare(git_dir, options = {})
     Base.bare(git_dir, options)
   end
-    
+
   # clones a remote repository
   #
   # options
@@ -110,7 +110,7 @@ module Git
     repo.checkout("origin/#{options[:branch]}") if options[:branch]
     Dir.chdir(repo.dir.to_s) { FileUtils.rm_r '.git' }
   end
-  
+
   # Same as g.config, but forces it to be at the global level
   #
   #g.config('user.name', 'Scott Chacon') # sets value
@@ -139,18 +139,19 @@ module Git
   def self.init(working_dir = '.', options = {})
     Base.init(working_dir, options)
   end
-    
-  # returns a Hash containing information about the references 
+
+  # returns a Hash containing information about the references
   # of the target repository
   #
   # @param [String|NilClass] location the target repository location or nil for '.'
+  # @param [String|NilClass] ref the reference name or nil
   # @return [{String=>Hash}] the available references of the target repo.
-  def self.ls_remote(location=nil)
-    Git::Lib.new.ls_remote(location)
+  def self.ls_remote(location = nil, ref = nil)
+    Git::Lib.new.ls_remote(location, ref)
   end
 
   # open an existing git working directory
-  # 
+  #
   # this will most likely be the most common way to create
   # a git reference, referring to a working directory.
   # if not provided in the options, the library will assume
@@ -162,5 +163,5 @@ module Git
   def self.open(working_dir, options = {})
     Base.open(working_dir, options)
   end
-    
+
 end

data/lib/git/base.rb

@@ -1,7 +1,7 @@
 require 'git/base/factory'
 
 module Git
-  
+
   class Base
 
     include Git::Base::Factory
@@ -10,7 +10,7 @@ module Git
     def self.bare(git_dir, opts = {})
       self.new({:repository => git_dir}.merge(opts))
     end
-    
+
     # clones a git repository locally
     #
     #  repository - http://repo.or.cz/w/sinatra.git
@@ -20,15 +20,15 @@ module Git
     #   :repository
     #
     #    :bare
-    #   or 
+    #   or
     #    :working_directory
     #    :index_file
     #
     def self.clone(repository, name, opts = {})
-      # run git-clone 
+      # run git-clone
       self.new(Git::Lib.new.clone(repository, name, opts))
     end
-    
+
     # Returns (and initialize if needed) a Git::Config instance
     #
     # @return [Git::Config] the current config instance.
@@ -44,17 +44,17 @@ module Git
     #  :repository
     #
     def self.init(working_dir, opts = {})
-      opts[:working_directory] ||= working_dir 
+      opts[:working_directory] ||= working_dir
       opts[:repository] ||= File.join(opts[:working_directory], '.git')
-      
+
       FileUtils.mkdir_p(opts[:working_directory]) if opts[:working_directory] && !File.directory?(opts[:working_directory])
-      
+
       init_opts = {
         :bare => opts[:bare]
       }
 
       opts.delete(:working_directory) if opts[:bare]
-      
+
       # Submodules have a .git *file* not a .git folder.
       # This file's contents point to the location of
       # where the git refs are held (In the parent repo)
@@ -65,16 +65,16 @@ module Git
       end
 
       Git::Lib.new(opts).init(init_opts)
-       
+
       self.new(opts)
     end
-    
+
     # opens a new Git Project from a working directory
     # you can specify non-standard git_dir and index file in the options
     def self.open(working_dir, opts={})
       self.new({:working_directory => working_dir}.merge(opts))
     end
-    
+
     def initialize(options = {})
       if working_dir = options[:working_directory]
         options[:repository] ||= File.join(working_dir, '.git')
@@ -86,17 +86,17 @@ module Git
       else
         @logger = nil
       end
-     
+
       @working_directory = options[:working_directory] ? Git::WorkingDirectory.new(options[:working_directory]) : nil
-      @repository = options[:repository] ? Git::Repository.new(options[:repository]) : nil 
+      @repository = options[:repository] ? Git::Repository.new(options[:repository]) : nil
       @index = options[:index] ? Git::Index.new(options[:index], false) : nil
     end
-    
+
     # changes current working directory for a block
     # to the git working directory
     #
     # example
-    #  @git.chdir do 
+    #  @git.chdir do
     #    # write files
     #    @git.add
     #    @git.commit('message')
@@ -106,7 +106,7 @@ module Git
         yield dir.path
       end
     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'
@@ -123,14 +123,14 @@ module Git
         lib.config_list
       end
     end
-  
+
     # returns a reference to the working directory
     #  @git.dir.path
     #  @git.dir.writeable?
     def dir
       @working_directory
     end
-    
+
     # returns reference to the git index file
     def index
       @index
@@ -141,24 +141,24 @@ module Git
     def repo
       @repository
     end
-    
+
     # returns the repository size in bytes
     def repo_size
       Dir.chdir(repo.path) do
         return `du -s`.chomp.split.first.to_i
       end
     end
-    
+
     def set_index(index_file, check = true)
       @lib = nil
       @index = Git::Index.new(index_file.to_s, check)
     end
-    
+
     def set_working(work_dir, check = true)
       @lib = nil
       @working_directory = Git::WorkingDirectory.new(work_dir.to_s, check)
     end
-    
+
     # returns +true+ if the branch exists locally
     def is_local_branch?(branch)
       branch_names = self.branches.local.map {|b| b.name}
@@ -177,15 +177,15 @@ module Git
       branch_names.include?(branch)
     end
 
-    # this is a convenience method for accessing the class that wraps all the 
+    # this is a convenience method for accessing the class that wraps all the
     # actual 'git' forked system calls.  At some point I hope to replace the Git::Lib
     # class with one that uses native methods or libgit C bindings
     def lib
       @lib ||= Git::Lib.new(self, @logger)
     end
-    
+
     # will run a grep for 'string' on the HEAD of the git repository
-    # 
+    #
     # to be more surgical in your grep, you can call grep() off a specific
     # git object.  for example:
     #
@@ -206,7 +206,7 @@ module Git
     def grep(string, path_limiter = nil, opts = {})
       self.object('HEAD').grep(string, path_limiter, opts)
     end
-    
+
     # updates the repository index using the working directory content
     #
     #    @git.add('path/to/file')
@@ -282,7 +282,7 @@ module Git
     end
 
     # commits all pending changes in the index file to the git repository
-    # 
+    #
     # options:
     #   :all
     #   :allow_empty
@@ -292,10 +292,10 @@ module Git
     def commit(message, opts = {})
       self.lib.commit(message, opts)
     end
-        
+
     # commits all pending changes in the index file to the git repository,
     # but automatically adds all modified files without having to explicitly
-    # calling @git.add() on them.  
+    # calling @git.add() on them.
     def commit_all(message, opts = {})
       opts = {:add_all => true}.merge(opts)
       self.lib.commit(message, opts)
@@ -305,7 +305,7 @@ module Git
     def checkout(branch = 'master', opts = {})
       self.lib.checkout(branch, opts)
     end
-    
+
     # checks out an old version of a file
     def checkout_file(version, file)
       self.lib.checkout_file(version,file)
@@ -328,7 +328,7 @@ module Git
 
       self.lib.push(remote, branch, opts)
     end
-    
+
     # merges one or more branches into the current working branch
     #
     # you can specify more than one branch to merge by passing an array of branches
@@ -336,8 +336,9 @@ module Git
       self.lib.merge(branch, message)
     end
 
-    def rebase(branch)
-      self.lib.rebase(branch)
+    # rebases the current branch on top of the given branch
+    def rebase(branch, opts = {})
+      self.lib.rebase(branch, opts)
     end
 
     # iterates over the files which are unmerged
@@ -354,7 +355,7 @@ module Git
     def pull(remote='origin', branch='master')
 			self.lib.pull(remote, branch)
     end
-    
+
     # returns an array of Git:Remote objects
     def remotes
       self.lib.remotes.map { |r| Git::Remote.new(self, r) }
@@ -362,7 +363,7 @@ module Git
 
     # adds a new remote to this repository
     # url can be a git url or a Git::Base object if it's a local reference
-    # 
+    #
     #  @git.add_remote('scotts_git', 'git://repo.or.cz/rubygit.git')
     #  @git.fetch('scotts_git')
     #  @git.merge('scotts_git/master')
@@ -411,37 +412,37 @@ module Git
     #   :f             -> true
     #   :m | :message  -> String
     #   :s             -> true
-    #   
+    #
     def add_tag(name, *opts)
       self.lib.tag(name, *opts)
       self.tag(name)
     end
- 
-    # deletes a tag 
-    def delete_tag(name) 
+
+    # deletes a tag
+    def delete_tag(name)
       self.lib.tag(name, {:d => true})
     end
-    
+
     # creates an archive file of the given tree-ish
     def archive(treeish, file = nil, opts = {})
       self.object(treeish).archive(file, opts)
     end
-    
+
     # repacks the repository
     def repack
       self.lib.repack
     end
-    
+
     def gc
       self.lib.gc
     end
-    
+
     def apply(file)
       if File.exist?(file)
         self.lib.apply(file)
       end
     end
-    
+
     def apply_mail(file)
       self.lib.apply_mail(file) if File.exist?(file)
     end
@@ -454,9 +455,9 @@ module Git
     def show(objectish=nil, path=nil)
       self.lib.show(objectish, path)
     end
-    
+
     ## LOWER LEVEL INDEX OPERATIONS ##
-    
+
     def with_index(new_index) # :yields: new_index
       old_index = @index
       set_index(new_index, false)
@@ -464,10 +465,10 @@ module Git
       set_index(old_index)
       return_value
     end
-    
+
     def with_temp_index &blk
       # Workaround for JRUBY, since they handle the TempFile path different.
-      # MUST be improved to be safer and OS independent. 
+      # MUST be improved to be safer and OS independent.
       if RUBY_PLATFORM == 'java'
         temp_path = "/tmp/temp-index-#{(0...15).map{ ('a'..'z').to_a[rand(26)] }.join}"
       else
@@ -479,29 +480,29 @@ module Git
 
       with_index(temp_path, &blk)
     end
-    
+
     def checkout_index(opts = {})
       self.lib.checkout_index(opts)
     end
-    
+
     def read_tree(treeish, opts = {})
       self.lib.read_tree(treeish, opts)
     end
-    
+
     def write_tree
       self.lib.write_tree
     end
-    
+
     def write_and_commit_tree(opts = {})
       tree = write_tree
       commit_tree(tree, opts)
     end
-      
+
     def update_ref(branch, commit)
       branch(branch).update_ref(commit)
     end
-    
-    
+
+
     def ls_files(location=nil)
       self.lib.ls_files(location)
     end
@@ -509,14 +510,14 @@ module Git
     def with_working(work_dir) # :yields: the Git::WorkingDirectory
       return_value = false
       old_working = @working_directory
-      set_working(work_dir) 
+      set_working(work_dir)
       Dir.chdir work_dir do
         return_value = yield @working_directory
       end
       set_working(old_working)
       return_value
     end
-    
+
     def with_temp_working &blk
       tempfile = Tempfile.new("temp-workdir")
       temp_dir = tempfile.path
@@ -525,8 +526,8 @@ module Git
       Dir.mkdir(temp_dir, 0700)
       with_working(temp_dir, &blk)
     end
-    
-    
+
+
     # runs git rev-parse to convert the objectish to a full sha
     #
     #   @git.revparse("HEAD^^")
@@ -536,11 +537,11 @@ module Git
     def revparse(objectish)
       self.lib.revparse(objectish)
     end
-    
+
     def ls_tree(objectish)
       self.lib.ls_tree(objectish)
     end
-    
+
     def cat_file(objectish)
       self.lib.object_contents(objectish)
     end
@@ -549,7 +550,7 @@ module Git
     def current_branch
       self.lib.branch_current
     end
-    
+
   end
-  
+
 end

data/lib/git/branch.rb

@@ -3,9 +3,9 @@ require 'git/path'
 module Git
 
   class Branch < Path
-    
+
     attr_accessor :full, :remote, :name
-    
+
     def initialize(base, name)
       @full = name
       @base = base
@@ -13,25 +13,25 @@ module Git
       @stashes = nil
       @remote, @name = parse_name(name)
     end
-    
+
     def gcommit
       @gcommit ||= @base.gcommit(@full)
       @gcommit
     end
-    
+
     def stashes
       @stashes ||= Git::Stashes.new(@base)
     end
-    
+
     def checkout
       check_if_create
       @base.checkout(@full)
     end
-    
+
     def archive(file, opts = {})
       @base.lib.archive(@full, file, opts)
     end
-    
+
     # g.branch('new_branch').in_branch do
     #   # create new file
     #   # do other stuff
@@ -47,26 +47,26 @@ module Git
       end
       @base.checkout(old_current)
     end
-    
+
     def create
       check_if_create
     end
-    
+
     def delete
       @base.lib.branch_delete(@name)
     end
-    
+
     def current
       determine_current
     end
-    
+
     def contains?(commit)
       !@base.lib.branch_contains(commit, self.name).empty?
     end
-    
+
     def merge(branch = nil, message = nil)
       if branch
-        in_branch do 
+        in_branch do
           @base.merge(branch, message)
           false
         end
@@ -77,33 +77,33 @@ module Git
       end
     end
 
-    def rebase(branch)
-      @base.rebase(branch)
+    def rebase(branch, opts = {})
+      @base.rebase(branch, opts)
     end
 
-    
+
     def update_ref(commit)
       @base.lib.update_ref(@full, commit)
     end
-    
+
     def to_a
       [@full]
     end
-    
+
     def to_s
       @full
     end
-    
-    private 
+
+    private
 
       def check_if_create
         @base.lib.branch_new(@name) rescue nil
       end
-      
+
       def determine_current
         @base.lib.branch_current == @name
       end
-    
+
       # Given a full branch name return an Array containing the remote and branch names.
       #
       # Removes 'remotes' from the beggining of the name (if present).
@@ -114,10 +114,10 @@ module Git
       #   parse_name('master') #=> [nil, 'master']
       #   parse_name('origin/master') #=> ['origin', 'master']
       #   parse_name('remotes/origin/master') #=> ['origin', 'master']
-      #   parse_name('origin/master/v2') #=> ['origin', 'master/v2'] 
+      #   parse_name('origin/master/v2') #=> ['origin', 'master/v2']
       #
       # param [String] name branch full name.
-      # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names. 
+      # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names.
       def parse_name(name)
         if name.match(/^(?:remotes)?\/([^\/]+)\/(.+)/)
           return [Git::Remote.new(@base, $1), $2]
@@ -125,7 +125,7 @@ module Git
 
         return [nil, name]
       end
-    
+
   end
-  
+
 end

data/lib/git/lib.rb

@@ -76,7 +76,13 @@ module Git
 
       command('clone', arr_opts)
 
-      (opts[:bare] or opts[:mirror]) ? {:repository => clone_dir} : {:working_directory => clone_dir}
+      return_opts = if (opts[:bare] or opts[:mirror])
+                      {:repository => clone_dir}
+                    else
+                      {:working_directory => clone_dir}
+                    end
+      return_opts[:log] = opts[:log] if opts.key?(:log)
+      return_opts
     end
 
 
@@ -411,10 +417,10 @@ module Git
       hsh
     end
 
-    def ls_remote(location=nil)
+    def ls_remote(location = nil, ref = nil)
       location ||= '.'
       Hash.new{ |h,k| h[k] = {} }.tap do |hsh|
-        command_lines('ls-remote', [location], false).each do |line|
+        command_lines('ls-remote', [location, ref].compact, false).each do |line|
           (sha, info) = line.split("\t")
           (ref, type, name) = info.split('/', 3)
           type ||= 'head'
@@ -666,8 +672,15 @@ module Git
       command('merge', arr_opts)
     end
 
-    def rebase(branch)
-      command('rebase', [branch])
+    def rebase(branch, opts = {})
+      arr_opts = []
+      arr_opts << branch
+      if opts[:strategy_option]
+        arr_opts << '--merge'
+        arr_opts << '--strategy-option' << opts[:strategy_option]
+      end
+
+      command('rebase', arr_opts)
     end
 
     def unmerged

data/lib/git/version.rb

@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.5.0.1'
+  VERSION='1.5.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-ce
 version: !ruby/object:Gem::Version
-  version: 1.5.0.1
+  version: 1.5.0.2
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake