blackwinter-git 1.2.5 → 1.2.6

data/lib/git/base.rb

@@ -324,6 +324,10 @@ module Git
       fetch(remote)
       merge(branch, message)
     end
+
+    def pullpull(remote = 'origin', branch = 'master')
+      lib.pull(remote, branch)
+    end
     
     # returns an array of Git:Remote objects
     def remotes

data/lib/git/lib.rb

@@ -237,13 +237,16 @@ module Git
       grep_opts = ['-n']
       grep_opts << '-i' if opts[:ignore_case]
       grep_opts << '-v' if opts[:invert_match]
-      grep_opts << '-e'
-      grep_opts << string
+      grep_opts << '-l' if opts[:name_only]
+      grep_opts << '-e' << string
       grep_opts << opts[:object] if opts[:object].is_a?(String)
       grep_opts << '--' << opts[:path_limiter] if opts[:path_limiter].is_a? String
 
+      matches = command_lines('grep', grep_opts)
+      return matches if opts[:name_only]
+
       hsh = {}
-      command_lines('grep', grep_opts).each do |line|
+      matches.each do |line|
         if m = /(.*)\:(\d+)\:(.*)/.match(line)        
           hsh[m[1]] ||= []
           hsh[m[1]] << [m[2].to_i, m[3]] 
@@ -581,6 +584,10 @@ module Git
     def fetch(remote)
       command('fetch', remote)
     end
+
+    def pull(remote, branch = 'master')
+      command('pull', [remote, branch])
+    end
     
     def push(remote, branch = 'master', tags = false)
       command('push', [remote, branch])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blackwinter-git
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Scott Chacon
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +02:00
+date: 2010-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: []