geet 0.3.12 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8303d92a18b3d8e486b1475cfb20377c24a5861afe96f199f622999f0d26ed
-  data.tar.gz: d1174bcc496064b9629cfb6b0e57c11217654e631a5efd61d3375d8c5537aa12
+  metadata.gz: a475adafa9bb0791266b171ea0e8ba05caf076227f1d3b68efe75697479c2cca
+  data.tar.gz: e63c7d8d46c3f44b0962ee1c3445e3aaf076f03b41f218bfde957779decfd445
 SHA512:
-  metadata.gz: a2122ebc682e0b9cf4d2fe377234d02e390dd5492741d10029ebb49781e0e08ebc82e667cfac7a01d8b4ed4980b45b6a396011d8ee25e1cefe2947c2c0cd9410
-  data.tar.gz: 850b79ce5de169567f17164a9f1b6766f611c88ca47cc5c9b3c735706d0079628f3cdcd4c74075f809b2de1b67aeb34143d056aab9298593df5929f823c947e1
+  metadata.gz: 1d19fde0bb7c9733ee7aaea4c249378077d242c56f92055f29c1f3eb27e200de06890f2d5e97c76a58ffc604c46674ceddd8fc349b17907cee89fdfabbd029c0
+  data.tar.gz: dbdad4b310621f063af44aabfe71fb485232a836085c5729a057d350911408db3e3dd18e7a40459ceb80d4cae000f279ceaf2798a1eaf9f6caeab7b704da3fa8

data/.gitignore

@@ -1,3 +1,4 @@
 /.ruby-version
 /.ruby-gemset
 /Gemfile.lock
+/test_repos

data/.travis.yml

@@ -1,9 +1,17 @@
+dist: bionic
 language: ruby
 rvm:
   - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
+  - 3.0
+  - ruby-head
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
 # API tokens are always required, but not used in testing, since no requests are actually made.
 env:
   - GITHUB_API_TOKEN=phony GITLAB_API_TOKEN=phony

data/README.md

@@ -24,8 +24,10 @@ The functionalities currently supported are:
   - list PRs
   - merge PR
 - Github:
+  - comment PR
   - create gist
   - create issue
+  - create milestone
   - create PR
 
 ## Samples

data/bin/geet

@@ -28,37 +28,54 @@ class GeetLauncher
       filename = options.delete(:filename)
       options[:publik] = options.delete(:public) if options.key?(:public)
 
-      Services::CreateGist.new.execute(filename, options)
+      Services::CreateGist.new.execute(filename, **options)
     when ISSUE_CREATE_COMMAND
       summary = options[:summary] || Commandline::Editor.new.edit_content(help: SUMMARY_TEMPLATE)
       title, description = split_summary(summary)
 
       options = default_to_manual_selection(options, :labels, :milestone, :assignees)
 
-      Services::CreateIssue.new(repository).execute(title, description, options)
+      Services::CreateIssue.new(repository).execute(title, description, **options)
     when LABEL_CREATE_COMMAND
       name = options.delete(:name)
 
-      Services::CreateLabel.new(repository).execute(name, options)
+      Services::CreateLabel.new(repository).execute(name, **options)
     when ISSUE_LIST_COMMAND
       options = default_to_manual_selection(options, :assignee)
 
-      Services::ListIssues.new(repository).execute(options)
+      Services::ListIssues.new(repository).execute(**options)
     when LABEL_LIST_COMMAND
       Services::ListLabels.new(repository).execute
+    when MILESTONE_CLOSE_COMMAND
+      # Don't support user selection. This requires extra complexity, specifically, matching by number
+      # while displaying the titles (see AttributesSelectionManager).
+      #
+      options = {numbers: Shared::Selection::MANUAL_LIST_SELECTION_FLAG}
+
+      Services::CloseMilestones.new(repository).execute(**options)
+    when MILESTONE_CREATE_COMMAND
+      title = options.delete(:title)
+
+      Services::CreateMilestone.new(repository).execute(title)
     when MILESTONE_LIST_COMMAND
       Services::ListMilestones.new(repository).execute
+    when PR_COMMENT_COMMAND
+      comment = options.delete(:comment)
+
+      Services::CommentPr.new(repository).execute(comment, **options)
     when PR_CREATE_COMMAND
       summary = options[:summary] || edit_pr_summary(base: options[:base])
       title, description = split_summary(summary)
 
       options = default_to_manual_selection(options, :labels, :milestone, :reviewers)
 
-      Services::CreatePr.new(repository).execute(title, description, options)
+      Services::CreatePr.new(repository).execute(title, description, **options)
     when PR_LIST_COMMAND
       Services::ListPrs.new(repository).execute
     when PR_MERGE_COMMAND
-      Services::MergePr.new(repository).execute(options)
+      Services::MergePr.new(repository).execute(**options)
+    when PR_OPEN_COMMAND
+      Services::OpenPr.new(repository).execute(**options)
     else
       raise "Internal error - Unrecognized command #{command.inspect}"
     end

data/extra/anonymize_vcr_data

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+set -o errexit
+
+# We match ids with a length of 6 or more chars for simplicity - if we a generic `\d+` match is
+# performed, there are false positives (e.g. PR numbers).
+#
+# Note that since this is an associative array, there is not guaranteed ordering.
+#
+declare -A PATTERNS=(
+  ['Saverio']='Donald'
+  ['saverio']='donald'
+  ['Miroddi']='Duck'
+  ['miroddi']='duck'
+  ['("\w*id"):\d{6,}']='$1:123456'
+  ['\b(\w*id)=\d{6,}']='$1=123456'
+  ['u\/\d{6,}\b']='u\/123456'
+  ['(gravatar.com\/avatar\/)[0-9a-f]{16}']='${1}0123456789abcdef'
+)
+
+TEST_SUITES_LOCATION="$(git rev-parse --show-toplevel)/spec"
+
+if [[ "$1" == "-h" || "$1" == "--help" ]]; then
+  cat <<HELP
+Usage: $(basename "$0") [<files...>|<dirs...>]
+
+Anonymizes the private data in all the files in the project test suites subdirectory ('$TEST_SUITES_LOCATION').
+
+Before applying the changes, all the project files are added to the staging area.
+
+Private data patterns:
+
+HELP
+
+  for key in ${!PATTERNS[@]}; do
+    echo "- $key => ${PATTERNS[$key]}"
+  done
+
+  cat <<'HELP'
+HELP
+
+  exit 0
+fi
+
+if [[ ! -d "$TEST_SUITES_LOCATION" ]]; then
+  echo "The expected TEST_SUITES_LOCATION '$TEST_SUITES_LOCATION' doesn't exist!"
+  exit 1
+fi
+
+git add -A :/
+
+for pattern_from in ${!PATTERNS[@]}; do
+  pattern_to="${PATTERNS[$pattern_from]}"
+
+  grep -lP "$pattern_from" -r "$TEST_SUITES_LOCATION" | xargs -I {} perl -i -pe "s/$pattern_from/$pattern_to/g" "{}"
+done
+
+git difftool --extcmd='vim -d -c "windo set wrap" $5'

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        = '2019-03-25'
+  s.date        = '2021-01-18'
   s.email       = ['saverio.pub2@gmail.com']
   s.homepage    = 'https://github.com/saveriomiroddi/geet'
   s.summary     = 'Commandline interface for performing SCM host operations, eg. create a PR on GitHub'

data/lib/geet/commandline/commands.rb

@@ -8,10 +8,14 @@ module Geet
       LABEL_CREATE_COMMAND = 'label.create'
       ISSUE_LIST_COMMAND = 'issue.list'
       LABEL_LIST_COMMAND = 'label.list'
+      MILESTONE_CLOSE_COMMAND = 'milestone.close'
+      MILESTONE_CREATE_COMMAND = 'milestone.create'
       MILESTONE_LIST_COMMAND = 'milestone.list'
+      PR_COMMENT_COMMAND = 'pr.comment'
       PR_CREATE_COMMAND = 'pr.create'
       PR_LIST_COMMAND = 'pr.list'
       PR_MERGE_COMMAND = 'pr.merge'
+      PR_OPEN_COMMAND = 'pr.open'
     end
   end
 end

data/lib/geet/commandline/configuration.rb

@@ -45,10 +45,25 @@ module Geet
         ['-u', '--upstream',                                'List on the upstream repository'],
       ].freeze
 
+      MILESTONE_CLOSE_OPTIONS = [
+        long_help: 'Close milestones.'
+      ]
+
+      MILESTONE_CREATE_OPTIONS = [
+        'title',
+        long_help: 'Create a milestone.'
+      ]
+
       MILESTONE_LIST_OPTIONS = [
         ['-u', '--upstream',                                'List on the upstream repository'],
       ].freeze
 
+      PR_COMMENT_OPTIONS = [
+        ['-n', '--no-open-pr',                              "Don't open the PR link in the browser after creation"],
+        'comment',
+        long_help: 'Add a comment to the PR for the current branch.'
+      ]
+
       PR_CREATE_OPTIONS = [
         ['-A', '--automated-mode',                          "Automate the branch operations (see long help)"],
         ['-n', '--no-open-pr',                              "Don't open the PR link in the browser after creation"],
@@ -79,6 +94,10 @@ module Geet
         long_help: 'Merge the PR for the current branch'
       ]
 
+      PR_OPEN_OPTIONS = [
+        long_help: 'Open in the browser the PR for the current branch'
+      ]
+
       # Commands decoding table
 
       COMMANDS_DECODING_TABLE = {
@@ -94,12 +113,16 @@ module Geet
           'list' => LABEL_LIST_OPTIONS,
         },
         'milestone' => {
+          'close' => MILESTONE_CLOSE_OPTIONS,
+          'create' => MILESTONE_CREATE_OPTIONS,
           'list' => MILESTONE_LIST_OPTIONS,
         },
         'pr' => {
+          'comment' => PR_COMMENT_OPTIONS,
           'create' => PR_CREATE_OPTIONS,
           'list' => PR_LIST_OPTIONS,
           'merge' => PR_MERGE_OPTIONS,
+          'open' => PR_OPEN_OPTIONS,
         },
       }
 

data/lib/geet/git/repository.rb

@@ -58,6 +58,10 @@ module Geet
         attempt_provider_call(:Issue, :list, api_interface, assignee: assignee, milestone: milestone)
       end
 
+      def create_milestone(title)
+        attempt_provider_call(:Milestone, :create, title, api_interface)
+      end
+
       def milestone(number)
         attempt_provider_call(:Milestone, :find, number, api_interface)
       end
@@ -66,6 +70,10 @@ module Geet
         attempt_provider_call(:Milestone, :list, api_interface)
       end
 
+      def close_milestone(number)
+        attempt_provider_call(:Milestone, :close, number, api_interface)
+      end
+
       def create_pr(title, description, head, base: nil)
         confirm(LOCAL_ACTION_ON_UPSTREAM_REPOSITORY_MESSAGE) if local_action_on_upstream_repository? && @warnings
         confirm(ACTION_ON_PROTECTED_REPOSITORY_MESSAGE) if action_on_protected_repository? && @warnings
@@ -115,7 +123,11 @@ module Geet
             raise "The functionality invoked (#{class_name}.#{meth}) is not currently supported!"
           end
 
-          klass.send(meth, *args)
+          # Can't use ruby2_keywords, because the method definitions use named keyword arguments.
+          #
+          kwargs = args.last.is_a?(Hash) ? args.pop : {}
+
+          klass.send(meth, *args, **kwargs)
         else
           raise "The class referenced (#{full_class_name}) is not currently supported!"
         end

data/lib/geet/github/abstract_issue.rb

@@ -61,6 +61,15 @@ module Geet
         @api_interface.send_request(api_path, data: request_data)
       end
 
+      # See https://developer.github.com/v3/issues/comments/#create-a-comment
+      #
+      def comment(comment)
+        api_path = "issues/#{@number}/comments"
+        request_data = { body: comment }
+
+        @api_interface.send_request(api_path, data: request_data)
+      end
+
       # See https://developer.github.com/v3/issues/#edit-an-issue
       #
       def edit(milestone:)

data/lib/geet/github/branch.rb

@@ -5,7 +5,7 @@ module Geet
     class Branch
       # See https://developer.github.com/v3/git/refs/#delete-a-reference
       #
-      def self.delete(name, api_interface)
+      def self.delete(name, api_interface, **)
         api_path = "git/refs/heads/#{name}"
 
         api_interface.send_request(api_path, http_method: :delete)

data/lib/geet/github/issue.rb

@@ -6,7 +6,7 @@ module Geet
     autoload :AbstractIssue, File.expand_path('abstract_issue', __dir__)
 
     class Issue < Geet::Github::AbstractIssue
-      def self.create(title, description, api_interface)
+      def self.create(title, description, api_interface, **)
         api_path = 'issues'
         request_data = { title: title, body: description, base: 'master' }
 

data/lib/geet/github/label.rb

@@ -11,7 +11,7 @@ module Geet
       end
 
       # Returns a flat list of names in string form.
-      def self.list(api_interface)
+      def self.list(api_interface, **)
         api_path = 'labels'
         response = api_interface.send_request(api_path, multipage: true)
 
@@ -24,7 +24,7 @@ module Geet
       end
 
       # See https://developer.github.com/v3/issues/labels/#create-a-label
-      def self.create(name, color, api_interface)
+      def self.create(name, color, api_interface, **)
         api_path = 'labels'
         request_data = { name: name, color: color }
 

data/lib/geet/github/milestone.rb

@@ -7,6 +7,8 @@ module Geet
     class Milestone
       attr_reader :number, :title, :due_on
 
+      STATE_CLOSED = 'closed'
+
       class << self
         private
 
@@ -21,9 +23,23 @@ module Geet
         @api_interface = api_interface
       end
 
+      # See https://developer.github.com/v3/issues/milestones/#create-a-milestone
+      def self.create(title, api_interface, **)
+        api_path = 'milestones'
+        request_data = { title: title }
+
+        response = api_interface.send_request(api_path, data: request_data)
+
+        number = response.fetch('number')
+        title = response.fetch('title')
+        due_on = nil
+
+        new(number, title, due_on, api_interface)
+      end
+
       # See https://developer.github.com/v3/issues/milestones/#get-a-single-milestone
       #
-      def self.find(number, api_interface)
+      def self.find(number, api_interface, **)
         api_path = "milestones/#{number}"
 
         response = api_interface.send_request(api_path)
@@ -37,7 +53,7 @@ module Geet
 
       # See https://developer.github.com/v3/issues/milestones/#list-milestones-for-a-repository
       #
-      def self.list(api_interface)
+      def self.list(api_interface, **)
         api_path = 'milestones'
 
         response = api_interface.send_request(api_path, multipage: true)
@@ -50,6 +66,17 @@ module Geet
           new(number, title, due_on, api_interface)
         end
       end
+
+      # See https://docs.github.com/en/free-pro-team@latest/rest/reference/issues#update-a-milestone
+      #
+      # This is a convenience method; the underlying operation is a generic update.
+      #
+      def self.close(number, api_interface, **)
+        api_path = "milestones/#{number}"
+        request_data = { state: STATE_CLOSED }
+
+        api_interface.send_request(api_path, data: request_data)
+      end
     end
   end
 end

data/lib/geet/github/user.rb

@@ -45,7 +45,7 @@ module Geet
 
       # See https://developer.github.com/v3/users/#get-the-authenticated-user
       #
-      def self.authenticated(api_interface)
+      def self.authenticated(api_interface, **_)
         api_path = '/user'
 
         response = api_interface.send_request(api_path)
@@ -55,7 +55,7 @@ module Geet
 
       # Returns an array of User instances
       #
-      def self.list_collaborators(api_interface)
+      def self.list_collaborators(api_interface, **)
         api_path = 'collaborators'
         response = api_interface.send_request(api_path, multipage: true)
 

data/lib/geet/gitlab/label.rb

@@ -11,7 +11,7 @@ module Geet
       end
 
       # Returns a flat list of names in string form.
-      def self.list(api_interface)
+      def self.list(api_interface, **)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/labels"
         response = api_interface.send_request(api_path, multipage: true)
 
@@ -24,7 +24,7 @@ module Geet
       end
 
       # See https://docs.gitlab.com/ee/api/labels.html#create-a-new-label
-      def self.create(name, color, api_interface)
+      def self.create(name, color, api_interface, **)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/labels"
         request_data = { name: name, color: "##{color}" }
 

data/lib/geet/gitlab/milestone.rb

@@ -17,7 +17,7 @@ module Geet
 
       # See https://docs.gitlab.com/ee/api/milestones.html#list-project-milestones
       #
-      def self.list(api_interface)
+      def self.list(api_interface, **)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/milestones"
 
         response = api_interface.send_request(api_path, multipage: true)

data/lib/geet/gitlab/user.rb

@@ -13,7 +13,7 @@ module Geet
 
       # Returns an array of User instances
       #
-      def self.list_collaborators(api_interface)
+      def self.list_collaborators(api_interface, **)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/members"
 
         response = api_interface.send_request(api_path, multipage: true)