git 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8ae61e2cc8dfe5b4e96126181c895d68649c751
-  data.tar.gz: 84e328f3fee9f5eba51e60152a53f483dc0f3af1
+  metadata.gz: e73a59980e39d1594016c2f8964e0455ef7c25d3
+  data.tar.gz: 2e33fbe0fb5bb3174b3e79bbc86ecf343576dfb5
 SHA512:
-  metadata.gz: 4f78b935161f2e5a3d317c55886eba65240bafcc5d5543600f25d4659fc5a0d040557ed14c2a81f1d27bd81a8fbd3d2c1ff951243fb1684635320433951c7985
-  data.tar.gz: 6d4de38fa866933ab99af3fc5e8980a2feec5a69cf9f17612f1d394badd9dc0fd5c49597a2d1aa3d2b429409cbefd5502ba6b8aab624f8e03445b08c247a1a25
+  metadata.gz: 0a833f95f5c969ba1c9b71320037cb9b9ba885daaace2a9aa99bbcd545e8887f997904cf592e4c4ee384c01b537623220e5ad5c3d1265845d6a3ec04167128b1
+  data.tar.gz: 463f0488b4ea9691599983646e18c6f96d593ed262b83b175307477e91f03b9b8fd79ab55c4088247391c2faba607b45e91a7e735f44c3ae7e40e9fbda75fa51

data/README.md

@@ -18,6 +18,7 @@ You can install Ruby/Git like this:
 
 * [![Build Status](https://api.travis-ci.org/schacon/ruby-git.png)](https://travis-ci.org/schacon/ruby-git)
 * [![Code Climate](https://codeclimate.com/github/schacon/ruby-git.png)](https://codeclimate.com/github/schacon/ruby-git)
+* [![Gem Version](https://badge.fury.io/rb/git.png)](http://badge.fury.io/rb/git)
 * [![Dependencies](https://gemnasium.com/schacon/ruby-git.png?travis)](https://gemnasium.com/schacon/ruby-git)
 
 ## Major Objects
@@ -130,7 +131,7 @@ Here are the operations that need read permission only.
     g.config('user.name')  # returns 'Scott Chacon'
     g.config # returns whole config hash
 
-    g.tag # returns array of Git::Tag objects
+    g.tags # returns array of Git::Tag objects
 ```
 
 And here are the operations that will need to write to your git repository.
@@ -139,8 +140,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')
@@ -202,6 +203,18 @@ And here are the operations that will need to write to your git repository.
      g.pull(Git::Repo, Git::Branch) # fetch and a merge
 
      g.add_tag('tag_name') # returns Git::Tag
+     g.add_tag('tag_name', 'object_reference')
+     g.add_tag('tag_name', 'object_reference', {:options => 'here'})
+     g.add_tag('tag_name', {:options => 'here'})
+
+     Options:
+       :a | :annotate
+       :d
+       :f
+       :m | :message
+       :s
+
+     g.delete_tag('tag_name')
 
      g.repack
 

data/lib/git/base.rb

@@ -332,8 +332,8 @@ module Git
 
     # fetches changes from a remote branch - this does not modify the working directory,
     # it just gets the changes from the remote if there are any
-    def fetch(remote = 'origin')
-      self.lib.fetch(remote)
+    def fetch(remote = 'origin', opts={})
+      self.lib.fetch(remote, opts)
     end
 
     # pushes changes to a remote repository - easiest if this is a cloned repository,
@@ -341,8 +341,11 @@ module Git
     #
     #  @git.config('remote.remote-name.push', 'refs/heads/master:refs/heads/master')
     #
-    def push(remote = 'origin', branch = 'master', tags = false)
-      self.lib.push(remote, branch, tags)
+    def push(remote = 'origin', branch = 'master', opts = {})
+      # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
+      opts = {:tags => opts} if [true, false].include?(opts)
+
+      self.lib.push(remote, branch, opts)
     end
     
     # merges one or more branches into the current working branch
@@ -405,10 +408,27 @@ module Git
       Git::Object.new(self, tag_name, 'tag', true)
     end
 
-    # creates a new git tag (Git::Tag)
-    def add_tag(tag_name)
-      self.lib.tag(tag_name)
-      tag(tag_name)
+    # Creates a new git tag (Git::Tag)
+    # Usage:
+    #     repo.add_tag('tag_name', object_reference)
+    #     repo.add_tag('tag_name', object_reference, {:options => 'here'})
+    #     repo.add_tag('tag_name', {:options => 'here'})
+    #
+    # Options:
+    #   :a | :annotate -> true
+    #   :d             -> true
+    #   :f             -> true
+    #   :m | :message  -> String
+    #   :s             -> true
+    #   
+    def add_tag(name, *opts)
+      self.lib.tag(name, *opts)
+      tag(name)
+    end
+ 
+    # deletes a tag 
+    def delete_tag(name) 
+      self.lib.tag(name, {:d => true})
     end
     
     # creates an archive file of the given tree-ish

data/lib/git/lib.rb

@@ -93,10 +93,9 @@ module Git
       arr_opts += log_path_options(opts)
       
       full_log = command_lines('log', arr_opts, true)
-      process_commit_data(full_log)
-    end
-
 
+      process_commit_log_data(full_log)
+    end
     
     def revparse(string)
       return string if string =~ /[A-Fa-f0-9]{40}/  # passing in a sha - just no-op it
@@ -129,43 +128,66 @@ module Git
     end
     
     def process_commit_data(data, sha = nil, indent = 4)
+      hsh = {
+        'sha'     => sha,
+        'message' => '',
+        'parent'  => []
+      }
+      
+      loop do
+        key, *value = data.shift.split
+
+        break if key.nil?
+
+        if key == 'parent'
+          hsh['parent'] << value.join(' ')
+        else
+          hsh[key] = value.join(' ')
+        end
+      end
+      
+      hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
+
+      return hsh
+    end
+    
+    def process_commit_log_data(data)
       in_message = false
             
-      if sha
-        hsh = {'sha' => sha, 'message' => '', 'parent' => []}
-      else
-        hsh_array = []        
-      end
+      hsh_array = []       
+
+      hsh = nil
     
       data.each do |line|
         line = line.chomp
-        if line == ''
-          in_message = !in_message
-        elsif in_message
-          hsh['message'] << line[indent..-1] << "\n"
-        else
-          data = line.split
-          key = data.shift
-          value = data.join(' ')
-          if key == 'commit'
-            sha = value
+        
+        if line[0].nil?
+          in_message = !in_message 
+          next
+        end
+       
+        if in_message
+          hsh['message'] << "#{line[4..-1]}\n"
+          next
+        end
+
+        key, *value = line.split
+        value = value.join(' ')
+        
+        case key
+          when 'commit'
             hsh_array << hsh if hsh
-            hsh = {'sha' => sha, 'message' => '', 'parent' => []}
-          end
-          if key == 'parent'
-            hsh[key] << value
+            hsh = {'sha' => value, 'message' => '', 'parent' => []}
+          when 'parent'
+            hsh['parent'] << value
           else
             hsh[key] = value
-          end
         end
       end
       
-      if hsh_array
-        hsh_array << hsh if hsh
-        hsh_array
-      else
-        hsh
-      end
+      hsh_array << hsh if hsh
+        
+      return hsh_array
     end
     
     def object_contents(sha, &block)
@@ -428,7 +450,8 @@ module Git
       arr_opts = [] 
       arr_opts << '--force' if opts[:force]
       arr_opts << '-d' if opts[:d]
-      
+      arr_opts << '-x' if opts[:x]
+
       command('clean', arr_opts)
     end
     
@@ -561,23 +584,51 @@ module Git
       command_lines('tag')
     end
 
-    def tag(tag)
-      command('tag', tag)
+    def tag(name, *opts)
+      target = opts[0].instance_of?(String) ? opts[0] : nil
+      
+      opts = opts.last.instance_of?(Hash) ? opts.last : {}
+
+      if (opts[:a] || opts[:annotate]) && !(opts[:m] || opts[:message])
+        raise  "Can not create an [:a|:annotate] tag without the precense of [:m|:message]."
+      end
+
+      arr_opts = []
+
+      arr_opts << '-f' if opts[:force] || opts[:f]
+      arr_opts << '-a' if opts[:a] || opts[:annotate]
+      arr_opts << '-s' if opts[:s] || opts[:sign]
+      arr_opts << '-d' if opts[:d] || opts[:delete]
+      arr_opts << name
+      arr_opts << target if target
+      arr_opts << "-m #{opts[:m] || opts[:message]}" if opts[:m] || opts[:message]
+      
+      command('tag', arr_opts)
     end
 
     
-    def fetch(remote)
-      command('fetch', remote)
+    def fetch(remote, opts)
+      arr_opts = [remote]
+      arr_opts << '--tags' if opts[:t] || opts[:tags]
+
+      command('fetch', arr_opts)
     end
     
-    def push(remote, branch = 'master', tags = false)
-      command('push', [remote, branch])
-      command('push', ['--tags', remote]) if tags
+    def push(remote, branch = 'master', opts = {})
+      # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
+      opts = {:tags => opts} if [true, false].include?(opts) 
+      
+      arr_opts = []
+      arr_opts << '--force'  if opts[:force] || opts[:f]
+      arr_opts << remote
+
+      command('push', arr_opts + [branch])
+      command('push', ['--tags'] + arr_opts) if opts[:tags]
     end
 
-		def pull(remote='origin', branch='master')
-			command('pull', [remote, branch])
-		end
+    def pull(remote='origin', branch='master')
+      command('pull', [remote, branch])
+    end
 
     def tag_sha(tag_name)
       head = File.join(@git_dir, 'refs', 'tags', tag_name)
@@ -668,17 +719,11 @@ module Git
     end
 
     def required_command_version
-      [1, 6, 0, 0]
+      [1, 6]
     end
 
     def meets_required_version?
-      current_version  = self.current_command_version
-      required_version = self.required_command_version
-
-      return current_version[0] >= required_version[0] && 
-             current_version[1] >= required_version[1] &&
-             (current_version[2] ? current_version[2] >= required_version[2] : true) &&
-             (current_version[3] ? current_version[3] >= required_version[3] : true)
+      (self.current_command_version <=>  self.required_command_version) >= 0
     end
 
 
@@ -703,6 +748,7 @@ module Git
       if chdir && (Dir.getwd != path)
         Dir.chdir(path) { out = run_command(git_cmd, &block) } 
       else
+
         out = run_command(git_cmd, &block)
       end
       
@@ -783,8 +829,7 @@ module Git
     end
 
     def escape(s)
-      escaped = s.to_s.gsub('\'', '\'\\\'\'')
-      %Q{"#{escaped}"}
+      "'#{s && s.to_s.gsub('\'','\'"\'"\'')}'"
     end
 
   end

data/lib/git/object.rb

@@ -94,12 +94,11 @@ module Git
   
     class Tree < AbstractObject
       
-      @trees = nil
-      @blobs = nil
-      
       def initialize(base, sha, mode = nil)
         super(base, sha)
         @mode = mode
+        @trees = nil
+        @blobs = nil
       end
             
       def children
@@ -107,14 +106,12 @@ module Git
       end
       
       def blobs
-        check_tree
-        @blobs
+        @blobs ||= check_tree[:blobs]
       end
       alias_method :files, :blobs
       
       def trees
-        check_tree
-        @trees
+        @trees ||= check_tree[:trees]
       end
       alias_method :subtrees, :trees
       alias_method :subdirectories, :trees
@@ -135,13 +132,23 @@ module Git
 
         # actually run the git command
         def check_tree
-          unless @trees
-            @trees = {}
-            @blobs = {}
-            data = @base.lib.ls_tree(@objectish)
-            data['tree'].each { |k, d| @trees[k] = Git::Object::Tree.new(@base, d[:sha], d[:mode]) }
-            data['blob'].each { |k, d| @blobs[k] = Git::Object::Blob.new(@base, d[:sha], d[:mode]) }
+          @trees = {}
+          @blobs = {}
+          
+          data = @base.lib.ls_tree(@objectish)
+
+          data['tree'].each do |key, tree| 
+            @trees[key] = Git::Object::Tree.new(@base, tree[:sha], tree[:mode]) 
           end
+          
+          data['blob'].each do |key, blob| 
+            @blobs[key] = Git::Object::Blob.new(@base, blob[:sha], blob[:mode]) 
+          end
+
+          {
+            :trees => @trees,
+            :blobs => @blobs
+          }
         end
       
     end

data/lib/git/remote.rb

@@ -11,8 +11,8 @@ module Git
       @fetch_opts = config['fetch']
     end
     
-    def fetch
-      @base.fetch(@name)
+    def fetch(opts={})
+      @base.fetch(@name, opts)
     end
     
     # merge this remote locally

data/lib/git/status.rb

@@ -27,17 +27,22 @@ module Git
     def pretty
       out = ''
       self.each do |file|
-        out << file.path
-        out << "\n\tsha(r) " + file.sha_repo.to_s + ' ' + file.mode_repo.to_s
-        out << "\n\tsha(i) " + file.sha_index.to_s + ' ' + file.mode_index.to_s
-        out << "\n\ttype   " + file.type.to_s
-        out << "\n\tstage  " + file.stage.to_s
-        out << "\n\tuntrac " + file.untracked.to_s
-        out << "\n"
+        out << pretty_file(file)
       end
       out << "\n"
       out
     end
+
+    def pretty_file(file)
+      <<FILE
+#{file.path}
+\tsha(r) #{file.sha_repo.to_s} #{file.mode_repo.to_s}
+\tsha(i) #{file.sha_index.to_s} #{file.mode_index.to_s}
+\ttype   #{file.type.to_s}
+\tstage  #{file.stage.to_s}
+\tuntrac #{file.untracked.to_s}
+FILE
+    end
     
     # enumerable method
     
@@ -85,8 +90,10 @@ module Git
         
         # find untracked in working dir
         Dir.chdir(@base.dir.path) do
-          Dir.glob('**/*') do |file|
-            @files[file] = {:path => file, :untracked => true} unless @files[file] || File.directory?(file) || ignore.include?(file)
+          Dir.glob('**/*', File::FNM_DOTMATCH) do |file|
+            next if @files[file] || File.directory?(file) || ignore.include?(file) || file =~ /^.git\/.+/
+
+            @files[file] = {:path => file, :untracked => true}
           end
         end
         

data/lib/git/version.rb

@@ -2,6 +2,6 @@ module Git
 
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.2.6'
+  VERSION='1.2.7'
 
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -60,6 +60,7 @@ extra_rdoc_files:
 - README.md
 files:
 - LICENSE
+- README.md
 - lib/git.rb
 - lib/git/author.rb
 - lib/git/base.rb
@@ -78,33 +79,31 @@ files:
 - lib/git/status.rb
 - lib/git/version.rb
 - lib/git/working_directory.rb
-- README.md
 homepage: http://github.com/schacon/ruby-git
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - git 1.6.0.0, or greater
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 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: []
-has_rdoc: