openpull 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18f9336b198849cd6a43e88e54ea7df8d48e219
-  data.tar.gz: 3e06ef21e0af46ca5f563bb20f5d9a060f2dbe3c
+  metadata.gz: 11ac4753168a18e414bf437e328e2a6981bcb623
+  data.tar.gz: d51ca5e3ee7caa640623de403694c0c46a166315
 SHA512:
-  metadata.gz: 9b9e22a28506ac7915e22e870c8a19b2ae8d1c415907ac57cea89c17b84210447a2746634e4792b73568a4871f9e954743db7443831f685d47259876bc1882e9
-  data.tar.gz: 9e8a514a77cc057a0ab0672a7dcce096889b7939dd9f656aad343755e714ac9857acc3c088353ccdec1b91ba35ba2080025bd9665f7939538d85e63c798145ca
+  metadata.gz: 7f3741087b5ce398d095b22ca2c884f18b930441fdbd745659970115f63d53a529cfcf2f03beb6a5f9379784c7c83a58e45a5a8d8a7f4a197760544d87524ab7
+  data.tar.gz: 492bad90f158ad4c15f6314f8586b1bfb213b9befd7dce04c3a77698441f6ab768ccc19e77f18e1ebbf2a0ca4b1ebdd5f77cc98c1cbcee53493d27b6e143c3cc

data/bin/openpull

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require 'openpull'
-OpenPull::Runner.new(ARGV).run
+OpenPull::Runner.run(ARGV)

data/lib/openpull/pull_request_decorator.rb

@@ -1,5 +1,10 @@
 module OpenPull
   class PullRequestDecorator < ::SimpleDelegator
+    def as_row(username)
+      [title, user(username), labels, status, commits, comments, mergeable,
+       html_url.underline, updated_at]
+    end
+
     def title
       title = super
       return title if title.size <= 80
@@ -32,6 +37,16 @@ module OpenPull
       end
     end
 
+    def commits
+      num = rels[:commits].get.data.size
+      num == 0 ? '' : num
+    end
+
+    def comments
+      num = rels[:review_comments].get.data.size
+      num == 0 ? '' : num
+    end
+
     def mergeable
       super ? 'Yes'.green : 'No'.red
     end

data/lib/openpull/pull_request_fetcher.rb

@@ -9,9 +9,11 @@ module OpenPull
     end
 
     def fetch
-      client.org_repos(organisation).map do |repository|
+      repos = client.org_repos(organisation).map do |repository|
         Thread.new { fetch_pull_requests(repository) }
-      end.map(&:value).reject { |v| v.nil? || v.empty? }
+      end.map(&:value)
+
+      repos.reject { |v| v.nil? || v.empty? }
     end
 
     private
@@ -22,35 +24,32 @@ module OpenPull
       pull_requests = client.pull_requests(repository.id, state: 'open')
       return [] if pull_requests.empty?
 
-      headers = ["#{repository.name} (#{pull_requests.size})"]
-      headers << (repository.private ? 'private' : 'public')
-      headers += ['', '', '']
-      headers << repository.html_url
-      headers << ''
-      headers.map! { |h| h.blue.bold }
-
       results = pull_requests.map do |pr|
         Thread.new { row(pr) }
       end.map(&:value)
 
-      [headers] + results
+      [headers(repository, results.size)] + results
+    end
+
+    def headers(repository, size)
+      visibility = repository.private ? 'private' : 'public'
+
+      [
+        "#{repository.name} (#{size})",
+        visibility
+      ] +
+        [''] * 5 +
+        [
+          repository.html_url,
+          ''
+        ].map { |h| h.blue.bold }
     end
 
     def row(pr)
       print '.'.yellow
 
       pr_data = pr.rels[:self].get.data
-      deco_pr = OpenPull::PullRequestDecorator.new(pr_data)
-
-      [
-        deco_pr.title,
-        deco_pr.user(username),
-        deco_pr.labels,
-        deco_pr.status,
-        deco_pr.mergeable,
-        deco_pr.html_url.underline,
-        deco_pr.updated_at
-      ]
+      OpenPull::PullRequestDecorator.new(pr_data).as_row(username)
     end
   end
 end

data/lib/openpull/runner.rb

@@ -2,10 +2,16 @@ require 'optparse'
 
 module OpenPull
   class Runner
+    class << self
+      def run(argv = [])
+        new(argv).run
+      end
+    end
+
     attr_reader :argv
     attr_accessor :options
 
-    def initialize(argv)
+    def initialize(argv = [])
       @argv    = argv
       @options = {}
     end
@@ -13,64 +19,90 @@ module OpenPull
     def run
       op = option_parser
       op.parse!
-      exit unless check_options(op)
+      check_options(op)
 
       puts OpenPull::Client.new(@options[:access_token],
                                 @options[:organisation],
                                 @options[:username]).show_table
-
     end
 
     private
 
     def option_parser
       OptionParser.new do |opts|
-        opts.banner = 'Usage: openpull [options]'
-
-        opts.separator ''
-        opts.separator 'Organisation and username can also be set in the ' \
-                       'environment as GITHUB_ORGANISATION and GITHUB_USERNAME.'
-        opts.separator ''
-
-        opts.separator 'Options:'
-
-        opts.on_tail('-h', '--help', 'Show this message') do
-          puts opts
-          exit
-        end
-
-        opts.on_tail('--version', 'Show version') do
-          puts OpenPull::VERSION
-          exit
-        end
-
-        @options[:organisation] = ENV['GITHUB_ORGANISATION']
-        opts.on('-o', '--organisation [ORG]', String, 'The Github organisation') do |o|
-          @options[:organisation] = o
-        end
-
-        @options[:username] = ENV['GITHUB_USERNAME']
-        opts.on('-u', '--username [USER]', String, 'Your Github username') do |u|
-          @options[:username] = u
-        end
+        parse_banner(opts)
+        parse_options(opts)
+        parse_values(opts)
       end
     end
 
-    def check_options(op)
-      @options[:access_token] = ENV['GITHUB_ACCESS_TOKEN']
+    def parse_banner(opts)
+      opts.banner = 'Usage: openpull [options]'
+
+      opts.separator ''
+      opts.separator 'Organisation and username can also be set in the ' \
+                     'environment as GITHUB_ORGANISATION and GITHUB_USERNAME.'
+      opts.separator ''
+    end
+
+    def parse_options(opts)
+      opts.separator 'Options:'
+
+      opts.on_tail('-h', '--help', 'Show this message') do
+        puts opts
+        exit
+      end
+
+      opts.on_tail('--version', 'Show version') do
+        puts OpenPull::VERSION
+        exit
+      end
+    end
+
+    def parse_values(opts)
+      parse_organisation(opts)
+      parse_username(opts)
+    end
 
-      if @options[:access_token].nil?
-        puts 'You need to set the GitHub access token in your environment. ' \
-             '(GITHUB_ACCESS_TOKEN)'
-        return false
-      elsif @options[:organisation].nil?
-        puts 'You need to either pass GitHub organisation or set it in your ' \
-             'environment. (GITHUB_ORGANISATION)'
-        puts "\n#{op}"
-        return false
+    def parse_organisation(opts)
+      @options[:organisation] = ENV['GITHUB_ORGANISATION']
+      opts.on('-o',
+              '--organisation [ORG]',
+              String,
+              'The Github organisation') do |o|
+        @options[:organisation] = o
       end
+    end
+
+    def parse_username(opts)
+      @options[:username] = ENV['GITHUB_USERNAME']
+      opts.on('-u',
+              '--username [USER]',
+              String,
+              'Your Github username') do |u|
+        @options[:username] = u
+      end
+    end
+
+    def check_options(op)
+      check_access_token
+      check_organisation(op)
+    end
+
+    def check_access_token
+      @options[:access_token] = ENV['GITHUB_ACCESS_TOKEN']
+      return unless @options[:access_token].nil?
+      puts 'You need to set the GitHub access token in your environment. ' \
+           '(GITHUB_ACCESS_TOKEN)'
+      exit
+    end
 
-      return true
+    def check_organisation(op)
+      return unless @options[:organisation].nil?
+      puts 'You need to either pass GitHub organisation or set it in your ' \
+           'environment. (GITHUB_ORGANISATION)'
+      puts "\n#{op}"
+      exit
     end
   end
 end

data/lib/openpull/table.rb

@@ -1,6 +1,8 @@
 module OpenPull
   class Table
-    HEADINGS = %w(title user labels status mergeable url updated)
+    HEADINGS = %w(
+      title user labels status commits comments mergeable url updated
+    )
 
     class << self
       def rewind!

data/lib/openpull/version.rb

@@ -1,3 +1,3 @@
 module OpenPull
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openpull
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mads Ohm Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.31'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.31'
 description: Fetches open pull-requests, with status and mergability, in your organisation.
 email: mads.ohm@gmail.com
 executables: