pra 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4c0d01126812263dbcf4816f1dcd3383e99d702
-  data.tar.gz: 99804a97e1c2dc20cc06510e52a1c4abd9fae6ad
+SHA256:
+  metadata.gz: 628ec63b7b6715945d212db42ded43948f96cfe621bf5ed1b3bfe8f48a41c1dd
+  data.tar.gz: 8a3ce401aa27302455cff5aaf71736961fed6cdf9f6c36abb7bdcca99ddfc2c2
 SHA512:
-  metadata.gz: 1b2e1d2f91e56a3954cc2a8236e0ddf481b19da67f108173bb3a52a4e545639040b6168b1901896d6368dd0223a523540a7e4232b0c0f716578133d5da55750f
-  data.tar.gz: 80296a40d2becad79596672025d243d58b300cfbbc58419b6d3b246f00fa3c75b68b1d43c37ababc8e4d10c53be99f173bdf195f062ea3e25782932d11f556af
+  metadata.gz: cac38d7aaaefa5d6ed64db23c8be9faa2f31413d6d0802ad88a8fdf318c63bdae8b0621feb853eb55b45f58f0f7191601e1a6e0f119bbe83dfd52682297ecdb4
+  data.tar.gz: 1fccbbd25588d6252f18035a239d6394f8de7d5cda848c07483e88cdcbf48b5ae1430bed4fc231e7f40d9b9c74a3b898dd5127f9ba4a0d7b3ac4d5b23388c3ca

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+3.3.3

data/{ChangeLog.md → CHANGELOG.md}

@@ -6,7 +6,12 @@ versions as well as provide a rough history.
 
 #### Next Release
 
+#### v2.1.0
+
+* Added filtering of current list of pull requests
+
 #### v2.0.0
+
 * Added ability to refresh pull requests
 * Added pagination when there are more pull requests than can be displayed
 * Added support for github organizations

data/README.md

@@ -23,7 +23,7 @@ purposes when pra starts.
 
 ## Configuration
 
-`pra` requires one configuration, `~/.pra.json`, to exist in your home
+`pra` requires one configuration, `~/.pra/config.json`, to exist in your home
 directory. The following is an example config that can be used as a starter.
 *Note:* You will need to replace **your.username**, **your.password**,
 **your.stash.server**, and the **repositories** and **organizations** sections
@@ -130,7 +130,7 @@ authentication enabled.
 Simply go to your GitHub **Account Settings**, select **Applications**, click
 the **Create new token** button in the **Personal Access Token** section. Give
 it the name "Pra" and submit. This will generate your personal access token.
-Then simply put your personal access token in the `~/.pra.json` as your GitHub
+Then simply put your personal access token in the `~/.pra/config.json` as your GitHub
 username and "x-oauth-basic" as your GitHub password.
 
 ## Usage
@@ -167,6 +167,13 @@ To force a refresh press the `r` key.
 To move between pages press `n` to go to the next page, and `p` to go to the
 previous page.
 
+### Filter
+
+To filter the list of you pull requests you can press `/` and start typing. The
+list will start filtering as you type. Once you have completed typing your
+filter you can press `Return` and go back to interacting with the list of pull
+requests. Refreshing by pressing `r` will clear out the filter.
+
 ### Quit
 
 If you decide you have had enough and  want to exit `pra` press the `q` key.

data/lib/pra/config.rb

@@ -26,7 +26,7 @@ module Pra
     end
 
     def self.config_path
-      if File.exists?(File.join(self.users_home_directory, '.pra', 'config.json'))
+      if File.exist?(File.join(self.users_home_directory, '.pra', 'config.json'))
         return File.join(self.users_home_directory, '.pra', 'config.json')
       else
         return File.join(self.users_home_directory, '.pra.json')
@@ -34,7 +34,7 @@ module Pra
     end
 
     def self.log_path
-      unless Dir.exists?(File.join(self.users_home_directory, '.pra', 'logs'))
+      unless Dir.exist?(File.join(self.users_home_directory, '.pra', 'logs'))
         FileUtils.mkdir_p(File.join(self.users_home_directory, '.pra', 'logs'))
       end
       return File.join(self.users_home_directory, '.pra', 'logs', '.pra.log')

data/lib/pra/curses_window_system.rb

@@ -8,6 +8,8 @@ require 'thread'
 module Pra
   class CursesWindowSystem < Pra::WindowSystem
     ENTER_KEY = 10
+    ESC_KEY = 27
+    BACKSPACE_KEY = 127
 
     def initialize
       @selected_pull_request_page_index = 0
@@ -19,6 +21,8 @@ module Pra
       @last_updated_access_lock = Mutex.new
       @force_update = true
       @force_update_access_lock = Mutex.new
+      @filter_mode = false
+      @filter_string = ""
     end
 
     def last_updated
@@ -72,23 +76,55 @@ module Pra
     def run_loop
       c = Curses.getch()
       while (c != 'q') do
-        case c
-        when 'j', Curses::Key::DOWN
-          move_selection_down
-          draw_current_pull_requests
-        when 'k', Curses::Key::UP
-          move_selection_up
-          draw_current_pull_requests
-        when 'r'
-          @force_update = true
-        when 'o', ENTER_KEY
-          @state_lock.synchronize {
-            Launchy.open(@current_pull_requests[selected_pull_request_loc].link)
-          }
-        when 'n'
-          load_next_page
-        when 'p'
-          load_prev_page
+        if @filter_mode
+          case c
+          when ESC_KEY
+            @filter_mode = false
+            @filter_string = ""
+            Curses.setpos(5, 0)
+            Curses.clrtoeol
+            @current_pull_requests = @original_pull_requests.dup
+            @original_pull_requests = nil
+            draw_current_pull_requests
+          when ENTER_KEY
+            @filter_mode = false
+            @filter_string = ""
+          when "\b", BACKSPACE_KEY, Curses::KEY_BACKSPACE
+            @filter_string.chop!
+            output_string(5, 0, "Filter: #{@filter_string}")
+            clear_pull_requests
+            filter_current_pull_requests(@filter_string)
+          when String
+            @filter_string += c
+            output_string(5, 0, "Filter: #{@filter_string}")
+            clear_pull_requests
+            filter_current_pull_requests(@filter_string)
+          end
+        else
+          case c
+          when 'j', Curses::Key::DOWN
+            move_selection_down
+            draw_current_pull_requests
+          when 'k', Curses::Key::UP
+            move_selection_up
+            draw_current_pull_requests
+          when 'r'
+            @force_update = true
+            Curses.setpos(5, 0)
+            Curses.clrtoeol
+          when 'o', ENTER_KEY
+            @state_lock.synchronize {
+              Launchy.open(@current_pull_requests[selected_pull_request_loc].link)
+            }
+          when 'n'
+            load_next_page
+          when 'p'
+            load_prev_page
+          when '/'
+            @filter_mode = true
+            @original_pull_requests = @current_pull_requests.dup
+            output_string(5, 0, "Filter: #{@filter_string}")
+          end
         end
         c = Curses.getch()
       end
@@ -123,7 +159,7 @@ module Pra
 
     def display_instructions
       output_string(0, 0, "Pra: Helping you own pull requests")
-      output_string(1, 0, "quit: q, up: k|#{"\u25B2".encode("UTF-8")}, down: j|#{"\u25BC".encode("UTF-8")}, open: o|#{"\u21A9".encode("UTF-8")}, refresh: r, next page: n, prev page: p")
+      output_string(1, 0, "quit: q, up: k|#{"\u25B2".encode("UTF-8")}, down: j|#{"\u25BC".encode("UTF-8")}, open: o|#{"\u21A9".encode("UTF-8")}, refresh: r, next page: n, prev page: p, filter: /")
     end
 
     def move_selection_up
@@ -212,6 +248,22 @@ module Pra
       Curses.refresh
     end
 
+    def filter_current_pull_requests(input_string)
+      pull_reqs = @original_pull_requests.dup.keep_if do |pr|
+        columns.any? do |col|
+          presenter = Pra::CursesPullRequestPresenter.new(pr)
+          pr_attr_value = presenter.send(col[:name])
+          if input_string == input_string.downcase
+            pr_attr_value.to_s.downcase.include?(input_string)
+          else
+            pr_attr_value.to_s.include?(input_string)
+          end
+        end
+      end
+
+      refresh_pull_requests(pull_reqs)
+    end
+
     def draw_current_pull_requests
       @state_lock.synchronize {
         output_string(3, 0, "#{@current_pull_requests.length} Pull Requests @ #{@last_updated} : Page #{@current_page} of #{pull_request_pages}")

data/lib/pra/github_pull_source.rb

@@ -19,8 +19,10 @@ module Pra
 
     def fetch_pull_requests
       pull_requests_json = "[]"
-      conn = Faraday.new
-      conn.basic_auth(@config['username'], @config['password'])
+      conn = Faraday.new do |faraday|
+        faraday.request :authorization, :basic, @config['username'], @config['password']
+      end
+      # conn.basic_auth(@config['username'], @config['password'])
       resp = conn.get do |req|
         req.url rest_api_search_issues_url
         req.params['q'] = "is:pr is:open sort:updated-desc #{repos_for_query}"

data/lib/pra/version.rb

@@ -1,3 +1,3 @@
 module Pra
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/pra.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["cyphactor@gmail.com"]
   spec.description   = %q{Command Line utility to make you aware of open pull-requests across systems at all times.}
   spec.summary       = %q{CLI tool that shows open pull-requests across systems.}
-  spec.homepage      = "http://github.com/codebreakdown/pra"
+  spec.homepage      = "http://github.com/drewdeponte/pra"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.1"
-  spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "timecop", "~> 0.8"
+  spec.add_development_dependency "bundler", "~> 2.5"
+  spec.add_development_dependency "rake", "~> 13.2"
+  spec.add_development_dependency "rspec", "~> 3.13"
+  spec.add_development_dependency "timecop", "~> 0.9"
 
-  spec.add_dependency "faraday", "~> 0.9"
-  spec.add_dependency "launchy", "~> 2.4"
-  spec.add_dependency "curses", "~> 1.0"
+  spec.add_dependency "faraday", "~> 2.11"
+  spec.add_dependency "launchy", "~> 3.0"
+  spec.add_dependency "curses", "~> 1.4"
   spec.add_dependency "time-lord", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pra
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Andrew De Ponte
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: time-lord
   requirement: !ruby/object:Gem::Requirement
@@ -133,8 +133,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- ChangeLog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -159,11 +159,11 @@ files:
 - lib/pra/window_system.rb
 - lib/pra/window_system_factory.rb
 - pra.gemspec
-homepage: http://github.com/codebreakdown/pra
+homepage: http://github.com/drewdeponte/pra
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,9 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.5.14
+signing_key:
 specification_version: 4
 summary: CLI tool that shows open pull-requests across systems.
 test_files: []