pra 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f854d2dbd12cfe0df0d280e0b4c48cf5389acc1c
-  data.tar.gz: 95a6f5c7dce502ab33aeacee0957a22c00425e22
+  metadata.gz: 5d8d6958b72e8f36437ec53d445f6f2ebf534109
+  data.tar.gz: aa381045ea18651af3ebc0bec87e0c6257bc92bf
 SHA512:
-  metadata.gz: f35294303b1581e0e51c34ffac26dc70c255ed5a76b253e393f890ab57d8b26074529a41f6174cb12434f5f6ed90302d9061fc8b224c8a5783a59402b400c68e
-  data.tar.gz: ec7edb303f591bc50e2884906aa3b95b371d3266df854ef213e4158eb5480b4eafd78e9d31477f088cf61a2188c0da9fd97314c1d19868c7de4cdfd23912ffa6
+  metadata.gz: 0b0848e6357f350b38a3d7f48472f339d6a004020aa01f45697014d5a6e2387d172b654f6fbb14d49796b748fe9cdff431f5aa9d0af28a67ce1b0f33f8860d67
+  data.tar.gz: 11cd8fd6da709723581b2e1e3137f278a9e1b0a5f5c5b2ce7d7123653d9edae27cc9b6e016df3ae65d041ef485a5f875607a2bbf27d64d67f02008ea5f8e8900

data/ChangeLog.md

@@ -6,6 +6,12 @@ versions as well as provide a rough history.
 
 #### Next Release
 
+#### v1.2.0
+
+* Added Assignee blacklisting so that when you have a group user that
+  represents a team assignment it can be blacklisted so that it doesn't show
+  up as assigned.
+
 #### v1.1.0
 
 * Added "Assignee" column so that users can see which pull requests have

data/README.md

@@ -21,6 +21,11 @@ directory. The following is an example config that can be used as a starter.
 **your.stash.server**, and the **repositories** sections of each of the pull
 sources.
 
+#### Assignee Blacklist
+
+Reduces noise to more easily determine which pull requests are unassigned. Names
+added will not appear in the assignee column.
+
     {
       "pull_sources": [
         {
@@ -49,6 +54,10 @@ sources.
             ]
           }
         }
+      ],
+      "assignee_blacklist": [
+        "IPT-Capture",
+        "IPT-Core Services"
       ]
     }
 

data/lib/pra/config.rb

@@ -40,5 +40,9 @@ module Pra
     def pull_sources
       @initial_config["pull_sources"]
     end
+
+    def assignee_blacklist
+      @initial_config["assignee_blacklist"]
+    end
   end
 end

data/lib/pra/curses_pull_request_presenter.rb

@@ -0,0 +1,53 @@
+require 'pra/config'
+
+module Pra
+  class CursesPullRequestPresenter
+    def initialize(pull_request)
+      @pull_request = pull_request
+    end
+
+    def repository
+      force_length(@pull_request.repository, 15)
+    end
+
+    def title
+      force_length(@pull_request.title, 20)
+    end
+
+    def from_reference
+      force_length(@pull_request.from_reference, 20)
+    end
+
+    def to_reference
+      force_length(@pull_request.to_reference, 20)
+    end
+
+    def author
+      force_length(@pull_request.author, 20)
+    end
+
+    def assignee
+      return force_length('', 20) if @pull_request.assignee.nil? || blacklisted?(@pull_request.assignee)
+      force_length(@pull_request.assignee, 20)
+    end
+
+    def service_id
+      force_length(@pull_request.service_id, 10)
+    end
+
+    def assignee_blacklist
+      config = Pra::Config.load_config
+      config.assignee_blacklist
+    end
+
+    private
+
+    def force_length(string, length)
+      string.ljust(length)[0..length - 1]
+    end
+
+    def blacklisted?(assignee)
+      assignee_blacklist.include?(assignee)
+    end
+  end
+end

data/lib/pra/curses_window_system.rb

@@ -1,4 +1,5 @@
 require 'pra/window_system'
+require 'pra/curses_pull_request_presenter'
 require 'pra/config'
 require 'launchy'
 require 'curses'
@@ -71,7 +72,7 @@ module Pra
       Curses.curs_set(0)
       Curses.init_pair(1, Curses::COLOR_CYAN, Curses::COLOR_BLACK)
     end
-    
+
     def output_string(row, col, str)
       Curses.setpos(row, col)
       Curses.clrtoeol
@@ -114,7 +115,7 @@ module Pra
         output_string(3, 0, "#{@current_pull_requests.length} Pull Requests")
         output_string(HEADER_LINE, 0, "repository      title                   from_reference          to_reference            author                  assignee                service")
         output_string(HEADER_LINE + 1, 0, "-----------------------------------------------------------------------------------------------------------------------------------------------")
-        
+
         (LIST_START_LINE...LIST_START_LINE+@previous_number_of_pull_requests).each do |i|
           Curses.setpos(i,0)
           Curses.clrtoeol
@@ -122,10 +123,11 @@ module Pra
         end
 
         @current_pull_requests.each_with_index do |pull_request, index|
+          pull_request_presenter = Pra::CursesPullRequestPresenter.new(pull_request)
           if index == @selected_pull_request_index
-            output_highlighted_string(LIST_START_LINE + index, 0, "#{pull_request.repository.ljust(15)[0..14]}\t#{pull_request.title.ljust(20)[0..19]}\t#{pull_request.from_reference.ljust(20)[0..19]}\t#{pull_request.to_reference.ljust(20)[0..19]}\t#{pull_request.author.ljust(20)[0..19]}\t#{pull_request.assignee.ljust(20)[0..19]}\t#{pull_request.service_id.ljust(10)[0..9]}")
+            output_highlighted_string(LIST_START_LINE + index, 0, "#{pull_request_presenter.repository}\t#{pull_request_presenter.title}\t#{pull_request_presenter.from_reference}\t#{pull_request_presenter.to_reference}\t#{pull_request_presenter.author}\t#{pull_request_presenter.assignee}\t#{pull_request_presenter.service_id}")
           else
-            output_string(LIST_START_LINE + index, 0, "#{pull_request.repository.ljust(15)[0..14]}\t#{pull_request.title.ljust(20)[0..19]}\t#{pull_request.from_reference.ljust(20)[0..19]}\t#{pull_request.to_reference.ljust(20)[0..19]}\t#{pull_request.author.ljust(20)[0..19]}\t#{pull_request.assignee.ljust(20)[0..19]}\t#{pull_request.service_id.ljust(10)[0..9]}")
+            output_string(LIST_START_LINE + index, 0, "#{pull_request_presenter.repository}\t#{pull_request_presenter.title}\t#{pull_request_presenter.from_reference}\t#{pull_request_presenter.to_reference}\t#{pull_request_presenter.author}\t#{pull_request_presenter.assignee}\t#{pull_request_presenter.service_id}")
           end
         end
       }

data/lib/pra/pull_request.rb

@@ -1,3 +1,5 @@
+require 'pra/config'
+
 module Pra
   class PullRequest
     attr_accessor :title, :from_reference, :to_reference, :author, :assignee, :link, :service_id, :repository
@@ -12,9 +14,5 @@ module Pra
       @service_id = attributes[:service_id]
       @repository = attributes[:repository]
     end
-
-    def assignee
-      @assignee || ""
-    end
   end
 end

data/lib/pra/version.rb

@@ -1,3 +1,3 @@
 module Pra
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/lib/pra/config_spec.rb

@@ -134,4 +134,12 @@ describe Pra::Config do
       subject.pull_sources.should eq(pull_source_configs)
     end
   end
+
+  describe "#assignee_blacklist" do
+    it "returns the assignee blacklist value out of the config" do
+      assignee_blacklist_configs = double('assignee blacklist configs')
+      subject.instance_variable_set(:@initial_config, { "assignee_blacklist" => assignee_blacklist_configs })
+      subject.assignee_blacklist.should eq(assignee_blacklist_configs)
+    end
+  end
 end

data/spec/lib/pra/curses_pull_request_presenter_spec.rb

@@ -0,0 +1,136 @@
+require_relative '../../../lib/pra/curses_pull_request_presenter'
+
+describe Pra::CursesPullRequestPresenter do
+  describe '.new' do
+    it 'construct given pull request' do
+      pull_request = double('pull request')
+      Pra::CursesPullRequestPresenter.new(pull_request)
+    end
+
+    it 'assigns pull request to an instance variable' do
+      pull_request = double('pull request')
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(pull_request)
+      expect(curses_pull_request.instance_variable_get(:@pull_request)).to eq pull_request
+    end
+  end
+
+  describe '#force_length' do
+    it 'right pads the given string up to the specified length' do
+      pull_request = double
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(pull_request)
+      expect(curses_pull_request.send(:force_length, 'capture_api', 15)).to eq 'capture_api    '
+    end
+
+    it 'truncates the given string down to the specified length' do
+      pull_request = double
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(pull_request)
+      expect(curses_pull_request.send(:force_length, 'capture_api_012345678912345', 15)).to eq 'capture_api_012'
+    end
+  end
+
+  describe '#repository' do
+    it 'forces the repository length to 15' do
+      repository = double
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull request', repository: repository))
+      expect(curses_pull_request).to receive(:force_length).with(repository, 15)
+      curses_pull_request.repository
+    end
+  end
+
+  describe '#title' do
+    it 'forces the title length to 20' do
+      title = double
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull request', title: title))
+      expect(curses_pull_request).to receive(:force_length).with(title, 20)
+      curses_pull_request.title
+    end
+  end
+
+  describe '#from_reference' do
+    it 'forces the from_reference length to 20' do
+      from_reference = double
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull request', from_reference: from_reference))
+      expect(curses_pull_request).to receive(:force_length).with(from_reference, 20)
+      curses_pull_request.from_reference
+    end
+  end
+
+  describe '#to_reference' do
+    it 'forces the to_reference length to 20' do
+      to_reference = double
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull request', to_reference: to_reference))
+      expect(curses_pull_request).to receive(:force_length).with(to_reference, 20)
+      curses_pull_request.to_reference
+    end
+  end
+
+  describe '#author' do
+    it 'forces the author length to 20' do
+      author = double
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull request', author: author))
+      expect(curses_pull_request).to receive(:force_length).with(author, 20)
+      curses_pull_request.author
+    end
+  end
+
+  describe '#assignee' do
+    context 'when assignee is nil' do
+      it 'returns an empty string with length of 20' do
+        curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull_request', assignee: nil))
+        expect(curses_pull_request.assignee).to eq(' '*20)
+      end
+    end
+
+    context 'when assignee is NOT nil' do
+      context 'when assignee is blacklisted' do
+        it 'returns an empty string with length of 20' do
+          curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull_request', assignee: nil))
+          expect(curses_pull_request.assignee).to eq(' '*20)
+        end
+      end
+    end
+
+    context 'when assignee is NOT blacklisted' do
+      it 'returns assignee with a length of 20' do
+        curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull_request', assignee: 'IPT-Capture'))
+        allow(curses_pull_request).to receive(:assignee_blacklist).and_return(['IPT'])
+        expect(curses_pull_request.assignee).to eq('IPT-Capture         ')
+      end
+    end
+
+    context 'when assignee IS blacklisted' do
+      it 'returns an empty string with length of 20' do
+        curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull_request', assignee: 'IPT-Capture'))
+        allow(curses_pull_request).to receive(:assignee_blacklist).and_return(['IPT-Capture'])
+        expect(curses_pull_request.assignee).to eq(' '*20)
+      end
+    end
+  end
+
+  describe '#service_id' do
+    it 'forces the service_id length to 20' do
+      service_id = double
+      curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull request', service_id: service_id))
+      expect(curses_pull_request).to receive(:force_length).with(service_id, 10)
+      curses_pull_request.service_id
+    end
+  end
+
+  describe '#blacklisted?' do
+    context 'when assignee IS blacklisted' do
+      it 'returns true' do
+        curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull request', assignee: 'IPT-Capture'))
+        allow(curses_pull_request).to receive(:assignee_blacklist).and_return(['IPT-Capture'])
+        expect(curses_pull_request.send(:blacklisted?, 'IPT-Capture')).to eq true
+      end
+    end
+
+    context 'when assignee IS not blacklisted' do
+      it 'returns false' do
+        curses_pull_request = Pra::CursesPullRequestPresenter.new(double('pull request', assignee: 'IPT-Capture'))
+        allow(curses_pull_request).to receive(:assignee_blacklist).and_return(['IPT'])
+        expect(curses_pull_request.send(:blacklisted?, 'IPT-Capture')).to eq false
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pra
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew De Ponte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/pra.rb
 - lib/pra/app.rb
 - lib/pra/config.rb
+- lib/pra/curses_pull_request_presenter.rb
 - lib/pra/curses_window_system.rb
 - lib/pra/error_log.rb
 - lib/pra/github_pull_source.rb
@@ -116,6 +117,7 @@ files:
 - pra.gemspec
 - spec/lib/pra/app_spec.rb
 - spec/lib/pra/config_spec.rb
+- spec/lib/pra/curses_pull_request_presenter_spec.rb
 - spec/lib/pra/curses_window_system_spec.rb
 - spec/lib/pra/error_log_spec.rb
 - spec/lib/pra/github_pull_source_spec.rb
@@ -155,6 +157,7 @@ summary: CLI tool that shows open pull-requests across systems.
 test_files:
 - spec/lib/pra/app_spec.rb
 - spec/lib/pra/config_spec.rb
+- spec/lib/pra/curses_pull_request_presenter_spec.rb
 - spec/lib/pra/curses_window_system_spec.rb
 - spec/lib/pra/error_log_spec.rb
 - spec/lib/pra/github_pull_source_spec.rb