geet 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 810fe20ea861a01c88e0cad7fc14bfbb92ee7bf1
-  data.tar.gz: 6aebe64e41a3fc69e6e6e8628d1d3d4bf74a2723
+  metadata.gz: 37b511c318e9f2cb1c18ecf1a1f247236c841040
+  data.tar.gz: 61aeabbdbd6e3616e49247acf47ffbbbf18d8085
 SHA512:
-  metadata.gz: 37d3ef70153f9ff4fa010c3e28883e4e3f5d1ba896e737c6f6597cdfceb9d8e986ab5f1c5cdf2d5c4f1dd179bd1a871e0edf6cf89f98b655b3ab83ca890f5329
-  data.tar.gz: c76276bb1bf6d9147e17fa92eb49baca3cd7f96a90a3c1786b4b6c60964ab24c6daca1df5e1a7164f69f3bebe09cb3683de26c1498b538b1c8f243a8575680d9
+  metadata.gz: 6692e7597431f0d0ef9d194030086112985f7f1f2e4e0b6b8caf3c6dbeea565fd3d22b7b0033cf3290bf156e6f331e4e70ea6b3cf3be962e45110aa32ffdf05c
+  data.tar.gz: e57f240a2c9a3b0ecb65a874efa7f3c4c61e0102cd365c7a53ac6b2579367c37c95dae072014f33ac5d6077ca75df649aff0dd4e7912a92502503e5a6a0e554e

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gem 'simple_scripting', '~> 0.9.3'
+gem 'temp-fork-tp-filter', '= 0.0.3'
 
 group :development, :test do
   gem 'byebug', '~> 9.1.0'

data/Gemfile.lock

@@ -8,11 +8,17 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
+    equatable (0.5.0)
     hashdiff (0.3.7)
+    hitimes (1.2.6)
+    necromancer (0.4.0)
     parallel (1.12.1)
     parseconfig (1.0.8)
     parser (2.4.0.2)
       ast (~> 2.3)
+    pastel (0.7.2)
+      equatable (~> 0.5.0)
+      tty-color (~> 0.4.0)
     powerpack (0.1.1)
     public_suffix (3.0.1)
     rainbow (3.0.0)
@@ -41,12 +47,28 @@ GEM
     safe_yaml (1.0.4)
     simple_scripting (0.9.3)
       parseconfig (~> 1.0)
+    temp-fork-tp-filter (0.0.3)
+      necromancer (~> 0.4.0)
+      pastel (~> 0.7.0)
+      timers (~> 4.1.2)
+      tty-cursor (~> 0.5.0)
+      tty-reader (~> 0.2.0)
+    timers (4.1.2)
+      hitimes
+    tty-color (0.4.2)
+    tty-cursor (0.5.0)
+    tty-reader (0.2.0)
+      tty-cursor (~> 0.5.0)
+      tty-screen (~> 0.6.4)
+      wisper (~> 2.0.0)
+    tty-screen (0.6.4)
     unicode-display_width (1.3.0)
     vcr (3.0.3)
     webmock (3.1.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    wisper (2.0.0)
 
 PLATFORMS
   ruby
@@ -57,8 +79,9 @@ DEPENDENCIES
   rspec (~> 3.7.0)
   rubocop (~> 0.52.0)
   simple_scripting (~> 0.9.3)
+  temp-fork-tp-filter (= 0.0.3)
   vcr (~> 3.0.3)
   webmock (~> 3.1.1)
 
 BUNDLED WITH
-   1.16.0.pre.3
+   1.16.1

data/geet.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.3.0'
   s.authors     = ['Saverio Miroddi']
-  s.date        = '2018-01-14'
+  s.date        = '2018-01-19'
   s.email       = ['saverio.pub2@gmail.com']
   s.homepage    = 'https://github.com/saveriomiroddi/geet'
   s.summary     = 'Commandline interface for performing SCM (eg. GitHub) operations (eg. PR creation).'
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.license     = 'GPL-3.0'
 
   s.add_runtime_dependency 'simple_scripting', '~> 0.9.3'
+  s.add_runtime_dependency 'temp-fork-tp-filter', '= 0.0.3'
 
   s.files         = `git ls-files`.split("\n")
   s.executables   << 'geet'

data/lib/geet/commandline/configuration.rb

@@ -23,7 +23,7 @@ module Geet
       ISSUE_CREATE_OPTIONS = [
         ['-n', '--no-open-issue',                           "Don't open the issue link in the browser after creation"],
         ['-l', '--label-patterns "bug,help wanted"',        'Label patterns'],
-        ['-m', '--milestone number_or_pattern',             'Milestone number or description pattern'],
+        ['-m', '--milestone 1.5.0',                         'Milestone title pattern'],
         ['-a', '--assignee-patterns john,tom,adrian,kevin', 'Assignee login patterns. Defaults to authenticated user'],
         ['-u', '--upstream',                                'Create on the upstream repository'],
         long_help: 'The default editor will be opened for editing title and description.'
@@ -46,7 +46,7 @@ module Geet
       PR_CREATE_OPTIONS = [
         ['-n', '--no-open-pr',                              "Don't open the PR link in the browser after creation"],
         ['-l', '--label-patterns "legacy,code review"',     'Label patterns'],
-        ['-m', '--milestone number_or_pattern',             'Milestone number or description pattern'],
+        ['-m', '--milestone 1.5.0',                         'Milestone title pattern'],
         ['-r', '--reviewer-patterns john,tom,adrian,kevin', 'Reviewer login patterns'],
         ['-u', '--upstream',                                'Create on the upstream repository'],
         long_help: 'The default editor will be opened for editing title and description; if the PR adds one commit only, '\

data/lib/geet/services/create_issue.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require_relative '../helpers/os_helper.rb'
+require_relative '../utils/manual_list_selection.rb'
+require_relative '../utils/pattern_matching_selection.rb'
 
 module Geet
   module Services
     class CreateIssue
       include Geet::Helpers::OsHelper
 
+      MANUAL_LIST_SELECTION_FLAG = '-'.freeze
+
       # options:
       #   :label_patterns
       #   :milestone_pattern:     number or description pattern.
@@ -18,30 +22,17 @@ module Geet
           label_patterns: nil, milestone_pattern: nil, assignee_patterns: nil, no_open_issue: nil,
           output: $stdout, **
       )
-        labels_thread = select_labels(repository, label_patterns, output) if label_patterns
-        milestone_thread = find_milestone(repository, milestone_pattern, output) if milestone_pattern
-        assignees_thread = select_assignees(repository, assignee_patterns, output) if assignee_patterns
+        all_labels, all_milestones, all_collaborators = find_all_attribute_entries(
+          repository, label_patterns, milestone_pattern, assignee_patterns, output
+        )
 
-        selected_labels = labels_thread&.join&.value
-        assignees = assignees_thread&.join&.value
-        milestone = milestone_thread&.join&.value
+        labels = select_entries('label', all_labels, label_patterns, :multiple, :name) if label_patterns
+        milestone, _ = select_entries('milestone', all_milestones, milestone_pattern, :single, :title) if milestone_pattern
+        assignees = select_entries('collaborator', all_collaborators, assignee_patterns, :multiple, nil) if assignee_patterns
 
-        output.puts 'Creating the issue...'
+        issue = create_issue(repository, title, description, output)
 
-        issue = repository.create_issue(title, description)
-
-        add_labels_thread = add_labels(issue, selected_labels, output) if selected_labels
-        set_milestone_thread = set_milestone(issue, milestone, output) if milestone
-
-        if assignees
-          assign_users_thread = assign_users(issue, assignees, output)
-        else
-          assign_users_thread = assign_authenticated_user(repository, issue, output)
-        end
-
-        add_labels_thread&.join
-        set_milestone_thread&.join
-        assign_users_thread.join
+        edit_issue(repository, issue, labels, milestone, assignees, output)
 
         if no_open_issue
           output.puts "Issue address: #{issue.link}"
@@ -56,38 +47,48 @@ module Geet
 
       # Internal actions
 
-      def select_labels(repository, label_patterns, output)
-        output.puts 'Finding labels...'
-
-        Thread.new do
-          all_labels = repository.labels
+      def find_all_attribute_entries(repository, label_patterns, milestone_pattern, assignee_patterns, output)
+        if label_patterns
+          output.puts 'Finding labels...'
+          labels_thread = Thread.new { repository.labels }
+        end
 
-          select_entries(all_labels, label_patterns, type: 'labels', instance_method: :name)
+        if milestone_pattern
+          output.puts 'Finding milestone...'
+          milestone_thread = Thread.new { repository.milestones }
         end
-      end
 
-      def find_milestone(repository, milestone_pattern, output)
-        output.puts 'Finding milestone...'
+        if assignee_patterns
+          output.puts 'Finding collaborators...'
+          reviewers_thread = Thread.new { repository.collaborators }
+        end
 
-        Thread.new do
-          if milestone_pattern =~ /\A\d+\Z/
-            repository.milestone(milestone_pattern)
-          else
-            all_milestones = repository.milestones
+        labels = labels_thread&.value
+        milestones = milestone_thread&.value
+        reviewers = reviewers_thread&.value
 
-            select_entries(all_milestones, milestone_pattern, type: 'milestones', instance_method: :title).first
-          end
-        end
+        [labels, milestones, reviewers]
       end
 
-      def select_assignees(repository, assignee_patterns, output)
-        output.puts 'Finding collaborators...'
+      def create_issue(repository, title, description, output)
+        output.puts 'Creating the issue...'
 
-        Thread.new do
-          all_collaborators = repository.collaborators
+        issue = repository.create_issue(title, description)
+      end
+
+      def edit_issue(repository, issue, labels, milestone, assignees, output)
+        add_labels_thread = add_labels(issue, labels, output) if labels
+        set_milestone_thread = set_milestone(issue, milestone, output) if milestone
 
-          select_entries(all_collaborators, assignee_patterns, type: 'collaborators')
+        if assignees
+          assign_users_thread = assign_users(issue, assignees, output)
+        else
+          assign_users_thread = assign_authenticated_user(repository, issue, output)
         end
+
+        add_labels_thread&.join
+        set_milestone_thread&.join
+        assign_users_thread.join
       end
 
       def add_labels(issue, selected_labels, output)
@@ -126,23 +127,11 @@ module Geet
 
       # Generic helpers
 
-      def select_entries(entries, raw_patterns, type: 'entries', instance_method: nil)
-        patterns = raw_patterns.split(',')
-
-        patterns.map do |pattern|
-          entries_found = entries.select do |entry|
-            entry = entry.send(instance_method) if instance_method
-            entry =~ /#{pattern}/i
-          end
-
-          case entries_found.size
-          when 1
-            entries_found.first
-          when 0
-            raise "No #{type} found for pattern: #{pattern.inspect}"
-          else
-            raise "Multiple #{type} found for pattern #{pattern.inspect}: #{entries_found}"
-          end
+      def select_entries(entry_type, entries, raw_patterns, selection_type, instance_method)
+        if raw_patterns == MANUAL_LIST_SELECTION_FLAG
+          Geet::Utils::ManualListSelection.new.select(entry_type, entries, selection_type, instance_method: instance_method)
+        else
+          Geet::Utils::PatternMatchingSelection.new.select(entry_type, entries, raw_patterns, instance_method: instance_method)
         end
       end
     end

data/lib/geet/services/create_pr.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require_relative '../helpers/os_helper.rb'
+require_relative '../utils/manual_list_selection.rb'
+require_relative '../utils/pattern_matching_selection.rb'
 
 module Geet
   module Services
     class CreatePr
       include Geet::Helpers::OsHelper
 
+      MANUAL_LIST_SELECTION_FLAG = '-'.freeze
+
       # options:
       #   :label_patterns
       #   :reviewer_patterns
@@ -16,25 +20,17 @@ module Geet
         repository, title, description, label_patterns: nil, milestone_pattern: nil, reviewer_patterns: nil,
         no_open_pr: nil, output: $stdout, **
       )
-        labels_thread = select_labels(repository, label_patterns, output) if label_patterns
-        milestone_thread = find_milestone(repository, milestone_pattern, output) if milestone_pattern
-        reviewers_thread = select_reviewers(repository, reviewer_patterns, output) if reviewer_patterns
+        all_labels, all_milestones, all_collaborators = find_all_attribute_entries(
+          repository, label_patterns, milestone_pattern, reviewer_patterns, output
+        )
 
-        selected_labels = labels_thread&.join&.value
-        reviewers = reviewers_thread&.join&.value
-        milestone = milestone_thread&.join&.value
+        labels = select_entries('label', all_labels, label_patterns, :multiple, :name) if label_patterns
+        milestone, _ = select_entries('milestone', all_milestones, milestone_pattern, :single, :title) if milestone_pattern
+        reviewers = select_entries('collaborator', all_collaborators, reviewer_patterns, :multiple, nil) if reviewer_patterns
 
         pr = create_pr(repository, title, description, output)
 
-        assign_user_thread = assign_authenticated_user(pr, repository, output)
-        add_labels_thread = add_labels(pr, selected_labels, output) if selected_labels
-        set_milestone_thread = set_milestone(pr, milestone, output) if milestone
-        request_review_thread = request_review(pr, reviewers, output) if reviewers
-
-        assign_user_thread.join
-        add_labels_thread&.join
-        set_milestone_thread&.join
-        request_review_thread&.join
+        edit_pr(repository, pr, labels, milestone, reviewers, output)
 
         if no_open_pr
           output.puts "PR address: #{pr.link}"
@@ -49,38 +45,27 @@ module Geet
 
       # Internal actions
 
-      def select_labels(repository, label_patterns, output)
-        output.puts 'Finding labels...'
-
-        Thread.new do
-          all_labels = repository.labels
-
-          select_entries(all_labels, label_patterns, type: 'labels', instance_method: :name)
+      def find_all_attribute_entries(repository,label_patterns, milestone_pattern, reviewer_patterns, output)
+        if label_patterns
+          output.puts 'Finding labels...'
+          labels_thread = Thread.new { repository.labels }
         end
-      end
-
-      def find_milestone(repository, milestone_pattern, output)
-        output.puts 'Finding milestone...'
-
-        Thread.new do
-          if milestone_pattern =~ /\A\d+\Z/
-            repository.milestone(milestone_pattern)
-          else
-            all_milestones = repository.milestones
 
-            select_entries(all_milestones, milestone_pattern, type: 'milestones', instance_method: :title).first
-          end
+        if milestone_pattern
+          output.puts 'Finding milestone...'
+          milestone_thread = Thread.new { repository.milestones }
         end
-      end
 
-      def select_reviewers(repository, reviewer_patterns, output)
-        output.puts 'Finding collaborators...'
+        if reviewer_patterns
+          output.puts 'Finding collaborators...'
+          reviewers_thread = Thread.new { repository.collaborators }
+        end
 
-        Thread.new do
-          all_collaborators = repository.collaborators
+        labels = labels_thread&.value
+        milestones = milestone_thread&.value
+        reviewers = reviewers_thread&.value
 
-          select_entries(all_collaborators, reviewer_patterns, type: 'collaborators')
-        end
+        [labels, milestones, reviewers]
       end
 
       def create_pr(repository, title, description, output)
@@ -89,6 +74,19 @@ module Geet
         repository.create_pr(title, description, repository.current_branch)
       end
 
+      def edit_pr(repository, pr, labels, milestone, reviewers, output)
+        assign_user_thread = assign_authenticated_user(pr, repository, output)
+
+        add_labels_thread = add_labels(pr, labels, output) if labels
+        set_milestone_thread = set_milestone(pr, milestone, output) if milestone
+        request_review_thread = request_review(pr, reviewers, output) if reviewers
+
+        assign_user_thread.join
+        add_labels_thread&.join
+        set_milestone_thread&.join
+        request_review_thread&.join
+      end
+
       def assign_authenticated_user(pr, repository, output)
         output.puts 'Assigning authenticated user...'
 
@@ -125,23 +123,11 @@ module Geet
 
       # Generic helpers
 
-      def select_entries(entries, raw_patterns, type: 'entries', instance_method: nil)
-        patterns = raw_patterns.split(',')
-
-        patterns.map do |pattern|
-          entries_found = entries.select do |entry|
-            entry = entry.send(instance_method) if instance_method
-            entry =~ /#{pattern}/i
-          end
-
-          case entries_found.size
-          when 1
-            entries_found.first
-          when 0
-            raise "No #{type} found for pattern: #{pattern.inspect}"
-          else
-            raise "Multiple #{type} found for pattern #{pattern.inspect}: #{entries_found}"
-          end
+      def select_entries(entry_type, entries, raw_patterns, selection_type, instance_method)
+        if raw_patterns == MANUAL_LIST_SELECTION_FLAG
+          Geet::Utils::ManualListSelection.new.select(entry_type, entries, selection_type, instance_method: instance_method)
+        else
+          Geet::Utils::PatternMatchingSelection.new.select(entry_type, entries, raw_patterns, instance_method: instance_method)
         end
       end
     end

data/lib/geet/utils/manual_list_selection.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'temp-fork-tp-filter'
+
+module Geet
+  module Utils
+    class ManualListSelection
+      PAGER_SIZE = 16
+
+      PROMPT_METHODS = {
+        single: :select,
+        multiple: :multi_select,
+      }
+
+      # selection_type: :single or :multiple
+      def select(entry_type, entries, selection_type, instance_method: nil)
+        raise "No #{entry_type} provided!" if entries.empty?
+
+        prompt_method = find_prompt_method(selection_type)
+        prompt_title = "Please select the #{entry_type}(s):"
+
+        if instance_method
+          entries = entries.each_with_object({}) do |entry, current_map|
+            current_map[entry.send(instance_method)] = entry
+          end
+        end
+
+        selected_entries = TTY::Prompt.new.send(prompt_method, prompt_title, entries, filter: true, per_page: PAGER_SIZE)
+
+        if selected_entries.is_a?(Array)
+          raise "No #{entry_type} selected!" if selected_entries.empty?
+        else
+          raise "No #{entry_type} selected!" if selected_entries.nil?
+        end
+
+        selected_entries
+      end
+
+      private
+
+      def find_prompt_method(selection_type)
+        PROMPT_METHODS[selection_type] || raise("Unrecognized selection_type: #{selection_type}")
+      end
+    end
+  end
+end

data/lib/geet/utils/pattern_matching_selection.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Geet
+  module Utils
+    class PatternMatchingSelection
+      def select(entry_type, entries, raw_patterns, instance_method: nil)
+        patterns = raw_patterns.split(',')
+
+        patterns.map do |pattern|
+          entries_found = entries.select do |entry|
+            entry = entry.send(instance_method) if instance_method
+            entry =~ /#{pattern}/i
+          end
+
+          case entries_found.size
+          when 1
+            entries_found.first
+          when 0
+            raise "No entry found for #{entry_type} pattern: #{pattern.inspect}"
+          else
+            raise "Multiple entries found for #{entry_type} pattern #{pattern.inspect}: #{entries_found}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/geet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geet
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-14 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: temp-fork-tp-filter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: Commandline interface for performing SCM (eg. GitHub) operations (eg.
   PR creation).
 email:
@@ -76,6 +90,8 @@ files:
 - lib/geet/services/list_prs.rb
 - lib/geet/services/merge_pr.rb
 - lib/geet/utils/git.rb
+- lib/geet/utils/manual_list_selection.rb
+- lib/geet/utils/pattern_matching_selection.rb
 - lib/geet/version.rb
 - spec/integration/create_gist_spec.rb
 - spec/integration/create_issue_spec.rb
@@ -126,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Commandline interface for performing SCM (eg. GitHub) operations (eg. PR