git-pulls 0.3.9 → 0.3.10

data/lib/git-pulls.rb

@@ -51,8 +51,8 @@ class GitPulls
   def usage
     puts <<-USAGE
 Usage: git pulls update
-   or: git pulls list [--reverse]
-   or: git pulls show <number> [--full]
+   or: git pulls list [state] [--reverse]
+   or: git pulls show <number> [--comments] [--full]
    or: git pulls browse <number>
    or: git pulls merge <number>
    or: git pulls checkout [--force]
@@ -96,22 +96,38 @@ Usage: git pulls update
 
   def show
     num = @args.shift
-    option = @args.shift
+    optiona = @args.shift
+    optionb = @args.shift
     if p = pull_num(num)
+      comments = []
+      if optiona == '--comments' || optionb == '--comments'
+        i_comments = Octokit.issue_comments("#{@user}/#{@repo}", num)
+        p_comments = Octokit.pull_request_comments("#{@user}/#{@repo}", num)
+        c_comments = Octokit.commit_comments(p['head']['repo']['full_name'], p['head']['sha'])
+        comments = (i_comments | p_comments | c_comments).sort_by {|i| i['created_at']}
+      end
       puts "Number   : #{p['number']}"
       puts "Label    : #{p['head']['label']}"
+      puts "Creator  : #{p['user']['login']}"
       puts "Created  : #{p['created_at']}"
-      puts "Votes    : #{p['votes']}"
-      puts "Comments : #{p['comments']}"
       puts
       puts "Title    : #{p['title']}"
-      puts "Body     :"
       puts
       puts p['body']
       puts
       puts '------------'
       puts
-      if option == '--full'
+      comments.each do |c|
+        puts "Comment  : #{c['user']['login']}"
+        puts "Created  : #{c['created_at']}"
+        puts "File     : #{c['path']}:L#{c['line'] || c['position'] || c['original_position']}" unless c['path'].nil?
+        puts
+        puts c['body']
+        puts
+        puts '------------'
+        puts
+      end
+      if optiona == '--full' || optionb == '--full'
         exec "git diff --color=always HEAD...#{p['head']['sha']}"
       else
         puts "cmd: git diff HEAD...#{p['head']['sha']}"
@@ -132,10 +148,17 @@ Usage: git pulls update
   end
 
   def list
-    option = @args.shift
+    state = @args.shift
+
+    if not ['open', 'closed'].include?(state)
+      state = 'open'
+      option = state
+    else
+      option = @args.shift
+    end
 
-    puts "Open Pull Requests for #{@user}/#{@repo}"
-    pulls = get_pull_info
+    puts state.capitalize + " Pull Requests for #{@user}/#{@repo}"
+    pulls = state == 'open' ? get_open_pull_info : get_closed_pull_info
     pulls.reverse! if option == '--reverse'
 
     count = 0
@@ -153,13 +176,13 @@ Usage: git pulls update
       end
     end
     if count == 0
-      puts ' -- no open pull requests --'
+      puts ' -- no ' + state + ' pull requests --'
     end
   end
 
   def checkout
     puts "Checking out all open pull requests for #{@user}/#{@repo}"
-    pulls = get_pull_info
+    pulls = get_open_pull_info
     pulls.each do |pull|
       branch_ref = pull['head']['ref']
       puts "> #{branch_ref} into pull-#{branch_ref}"
@@ -176,7 +199,7 @@ Usage: git pulls update
 
   def fetch_stale_forks
     puts "Checking for forks in need of fetching"
-    pulls = get_pull_info
+    pulls = get_open_pull_info | get_closed_pull_info
     repos = {}
     pulls.each do |pull|
       next if pull['head']['repository'].nil? # Fork has been deleted
@@ -264,8 +287,12 @@ Usage: git pulls update
     true
   end
 
-  def get_pull_info
-    get_data(PULLS_CACHE_FILE)['pulls']
+  def get_closed_pull_info
+    get_data(PULLS_CACHE_FILE)['closed']
+  end
+
+  def get_open_pull_info
+    get_data(PULLS_CACHE_FILE)['open']
   end
 
   def get_data(file)
@@ -273,8 +300,9 @@ Usage: git pulls update
   end
 
   def cache_pull_info
-    response = Octokit.pull_requests("#{@user}/#{@repo}")
-    save_data({'pulls' => response}, PULLS_CACHE_FILE)
+    response_o = Octokit.pull_requests("#{@user}/#{@repo}")
+    response_c = Octokit.pull_requests("#{@user}/#{@repo}", 'closed')
+    save_data({'open' => response_o, 'closed' => response_c}, PULLS_CACHE_FILE)
   end
 
   def save_data(data, file)
@@ -284,8 +312,9 @@ Usage: git pulls update
   end
 
   def pull_num(num)
-    data = get_pull_info
-    data.select { |p| p['number'].to_s == num.to_s }.first
+    pull = get_open_pull_info.select { |p| p['number'].to_s == num.to_s }.first
+    pull ||= get_closed_pull_info.select { |p| p['number'].to_s == num.to_s }.first
+    pull
   end
 
   def github_insteadof_matching(c, u)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-pulls
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json