gitlab-grit 2.6.12 → 2.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
 - data/VERSION +1 -1
 - data/lib/grit/git-ruby/git_object.rb +6 -0
 - data/lib/grit/git.rb +5 -13
 - metadata +2 -2
 
    
        checksums.yaml
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            ---
         
     | 
| 
       2 
2 
     | 
    
         
             
            SHA1:
         
     | 
| 
       3 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       4 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 3 
     | 
    
         
            +
              metadata.gz: a46a0e0bf5c550caf7f4db44b5505e699a930345
         
     | 
| 
      
 4 
     | 
    
         
            +
              data.tar.gz: 2120d214b617440c5f3605c8772cc01cadc73fd4
         
     | 
| 
       5 
5 
     | 
    
         
             
            SHA512:
         
     | 
| 
       6 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       7 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 6 
     | 
    
         
            +
              metadata.gz: 84b6d5b015b01887daa17289ab9ed38fb6ca8724e8a84c8b73d9f9b6e2f5dff332bd49c7397303c1d5e5680f1b64a6699b6d29212c368badad3843561cee345c
         
     | 
| 
      
 7 
     | 
    
         
            +
              data.tar.gz: 614ac2617db5cf9ea7ba800406e493921b42d2544e5d59712dd3ab635ddbeb00d17edaaad040a4cdba3e1560f583e7173918d0c4e09b56965ca2ed0f2468e8c7
         
     | 
    
        data/VERSION
    CHANGED
    
    | 
         @@ -1 +1 @@ 
     | 
|
| 
       1 
     | 
    
         
            -
            2. 
     | 
| 
      
 1 
     | 
    
         
            +
            2.7.0
         
     | 
| 
         @@ -255,6 +255,9 @@ module Grit 
     | 
|
| 
       255 
255 
     | 
    
         
             
                      author = UserInfo.new(value)
         
     | 
| 
       256 
256 
     | 
    
         
             
                    when "committer"
         
     | 
| 
       257 
257 
     | 
    
         
             
                      committer = UserInfo.new(value)
         
     | 
| 
      
 258 
     | 
    
         
            +
                    else
         
     | 
| 
      
 259 
     | 
    
         
            +
                      warn "unknown header '%s' in commit %s" % \
         
     | 
| 
      
 260 
     | 
    
         
            +
                        [key, rawobject.sha1.unpack("H*")[0]]
         
     | 
| 
       258 
261 
     | 
    
         
             
                    end
         
     | 
| 
       259 
262 
     | 
    
         
             
                  end
         
     | 
| 
       260 
263 
     | 
    
         
             
                  if not tree && author && committer
         
     | 
| 
         @@ -319,6 +322,9 @@ module Grit 
     | 
|
| 
       319 
322 
     | 
    
         
             
                      tag = value
         
     | 
| 
       320 
323 
     | 
    
         
             
                    when "tagger"
         
     | 
| 
       321 
324 
     | 
    
         
             
                      tagger = UserInfo.new(value)
         
     | 
| 
      
 325 
     | 
    
         
            +
                    else
         
     | 
| 
      
 326 
     | 
    
         
            +
                      warn "unknown header '%s' in tag" % \
         
     | 
| 
      
 327 
     | 
    
         
            +
                        [key, rawobject.sha1.unpack("H*")[0]]
         
     | 
| 
       322 
328 
     | 
    
         
             
                    end
         
     | 
| 
       323 
329 
     | 
    
         
             
                  end
         
     | 
| 
       324 
330 
     | 
    
         | 
    
        data/lib/grit/git.rb
    CHANGED
    
    | 
         @@ -23,18 +23,14 @@ module Grit 
     | 
|
| 
       23 
23 
     | 
    
         
             
                  # The integer exit status.
         
     | 
| 
       24 
24 
     | 
    
         
             
                  attr_reader :exitstatus
         
     | 
| 
       25 
25 
     | 
    
         | 
| 
       26 
     | 
    
         
            -
                  # Everything output on the command's stdout as a String.
         
     | 
| 
       27 
     | 
    
         
            -
                  attr_reader :out
         
     | 
| 
       28 
     | 
    
         
            -
             
     | 
| 
       29 
26 
     | 
    
         
             
                  # Everything output on the command's stderr as a String.
         
     | 
| 
       30 
27 
     | 
    
         
             
                  attr_reader :err
         
     | 
| 
       31 
28 
     | 
    
         | 
| 
       32 
     | 
    
         
            -
                  def initialize(command, exitstatus=nil, err='' 
     | 
| 
      
 29 
     | 
    
         
            +
                  def initialize(command, exitstatus=nil, err='')
         
     | 
| 
       33 
30 
     | 
    
         
             
                    if exitstatus
         
     | 
| 
       34 
31 
     | 
    
         
             
                      @command = command
         
     | 
| 
       35 
32 
     | 
    
         
             
                      @exitstatus = exitstatus
         
     | 
| 
       36 
33 
     | 
    
         
             
                      @err = err
         
     | 
| 
       37 
     | 
    
         
            -
                      @out = out
         
     | 
| 
       38 
34 
     | 
    
         
             
                      message = "Command failed [#{exitstatus}]: #{command}"
         
     | 
| 
       39 
35 
     | 
    
         
             
                      message << "\n\n" << err unless err.nil? || err.empty?
         
     | 
| 
       40 
36 
     | 
    
         
             
                      super message
         
     | 
| 
         @@ -90,13 +86,9 @@ module Grit 
     | 
|
| 
       90 
86 
     | 
    
         | 
| 
       91 
87 
     | 
    
         
             
                def self.with_timeout(timeout = 10)
         
     | 
| 
       92 
88 
     | 
    
         
             
                  old_timeout = Grit::Git.git_timeout
         
     | 
| 
       93 
     | 
    
         
            -
             
     | 
| 
       94 
     | 
    
         
            -
                   
     | 
| 
       95 
     | 
    
         
            -
             
     | 
| 
       96 
     | 
    
         
            -
                    yield
         
     | 
| 
       97 
     | 
    
         
            -
                  ensure
         
     | 
| 
       98 
     | 
    
         
            -
                    Grit::Git.git_timeout = old_timeout
         
     | 
| 
       99 
     | 
    
         
            -
                  end
         
     | 
| 
      
 89 
     | 
    
         
            +
                  Grit::Git.git_timeout = timeout
         
     | 
| 
      
 90 
     | 
    
         
            +
                  yield
         
     | 
| 
      
 91 
     | 
    
         
            +
                  Grit::Git.git_timeout = old_timeout
         
     | 
| 
       100 
92 
     | 
    
         
             
                end
         
     | 
| 
       101 
93 
     | 
    
         | 
| 
       102 
94 
     | 
    
         
             
                attr_accessor :git_dir, :bytes_read, :work_tree
         
     | 
| 
         @@ -352,7 +344,7 @@ module Grit 
     | 
|
| 
       352 
344 
     | 
    
         | 
| 
       353 
345 
     | 
    
         
             
                  status = process.status
         
     | 
| 
       354 
346 
     | 
    
         
             
                  if raise_errors && !status.success?
         
     | 
| 
       355 
     | 
    
         
            -
                    raise CommandFailed.new(argv.join(' '), status.exitstatus, process.err 
     | 
| 
      
 347 
     | 
    
         
            +
                    raise CommandFailed.new(argv.join(' '), status.exitstatus, process.err)
         
     | 
| 
       356 
348 
     | 
    
         
             
                  elsif process_info
         
     | 
| 
       357 
349 
     | 
    
         
             
                    [status.exitstatus, process.out, process.err]
         
     | 
| 
       358 
350 
     | 
    
         
             
                  else
         
     | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: gitlab-grit
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 2. 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 2.7.0
         
     | 
| 
       5 
5 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       6 
6 
     | 
    
         
             
            authors:
         
     | 
| 
       7 
7 
     | 
    
         
             
            - Tom Preston-Werner
         
     | 
| 
         @@ -10,7 +10,7 @@ authors: 
     | 
|
| 
       10 
10 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       11 
11 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       12 
12 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       13 
     | 
    
         
            -
            date: 2014- 
     | 
| 
      
 13 
     | 
    
         
            +
            date: 2014-07-14 00:00:00.000000000 Z
         
     | 
| 
       14 
14 
     | 
    
         
             
            dependencies:
         
     | 
| 
       15 
15 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       16 
16 
     | 
    
         
             
              name: charlock_holmes
         
     |