geet 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277ed0b36c021a28cc688fd768955c5639d0658885f60ff45f2a70c179a1e507
-  data.tar.gz: f181e99e34416ebf216d4fb603fd213217a9d188060d38ac2e9770e02aa5befb
+  metadata.gz: c13aed62c61e4cdaf20931f657c101daee30925b36a9b87fcce3b86d009d3c69
+  data.tar.gz: 5f13669499214cb7b13d96f05a25547a19a472e9d855e6d58967f5ce3ba3d138
 SHA512:
-  metadata.gz: 1b5a73ec3c4ffb45daf21dba976f1c6330b0c4a4f2ee0ea3065674710026745834287586dc897b7ec3a1a645e1ed7a3d60f7ca580a46b5f47dc2ed25b6031ee7
-  data.tar.gz: 0a4b834f9fcba3502c6f6408511001ab35fc08c5a5c4987b9c51ad5a4a16708ff714a7f47d993cdcd1decf0cf57dad75f4147deab2ac65363cad8cb6f37ee605
+  metadata.gz: 8cb5a717299f16140d7ce1506d0bba549b87d97e4405f1d32549ea519ba58ccb2e918ce0561ecf714fcc2d3660f1172890c6fee99fc53270216b6656c730e7b9
+  data.tar.gz: 7ad452d8d32f8e96b853925aa745ad7664a4dd14cd97754ea6ab47627718938bb8af03e52eb4db28e425d96605bff83de74332a196d79845fd78baa870cbeef9

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        = '2021-07-09'
+  s.date        = '2021-07-26'
   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/configuration.rb

@@ -96,6 +96,7 @@ module Geet
       ]
 
       PR_OPEN_OPTIONS = [
+        ['-u', '--upstream',                                'List on the upstream repository'],
         long_help: 'Open in the browser the PR for the current branch'
       ]
 

data/lib/geet/github/abstract_issue.rb

@@ -22,6 +22,9 @@ module Geet
 
       # See https://developer.github.com/v3/issues/#list-issues-for-a-repository
       #
+      # This works both for Issues and PRs, however, when the `/pulls` API (path) is used, additional
+      # information is provided (e.g. `head`).
+      #
       def self.list(api_interface, milestone: nil, assignee: nil, &type_filter)
         api_path = 'issues'
 

data/lib/geet/github/pr.rb

@@ -32,14 +32,34 @@ module Geet
 
         if head
           api_path = 'pulls'
-          request_params = { head: "#{owner}:#{head}" }
 
-          response = api_interface.send_request(api_path, params: request_params, multipage: true)
+          # Technically, the upstream approach could be used for both, but it's actually good to have
+          # both of them as reference.
+          #
+          # For upstream pulls, the owner is the authenticated user, otherwise, the repository owner.
+          #
+          response = if api_interface.upstream?
+            unfiltered_response = api_interface.send_request(api_path, multipage: true)
+
+            # VERY weird. From the docs, it's not clear if the user/org is required in the `head` parameter,
+            # but:
+            #
+            # - if it isn't included (eg. `anything`), the parameter is ignored
+            # - if it's included (eg. `saveriomiroddi:local_branch_name`), an empty resultset is returned.
+            #
+            # For this reason, we can't use that param, and have to filter manually.
+            #
+            unfiltered_response.select { |pr_data| pr_data.fetch('head').fetch('label') == "#{owner}:#{head}" }
+          else
+            request_params = { head: "#{owner}:#{head}" }
+
+            api_interface.send_request(api_path, params: request_params, multipage: true)
+          end
 
-          response.map do |issue_data|
-            number = issue_data.fetch('number')
-            title = issue_data.fetch('title')
-            link = issue_data.fetch('html_url')
+          response.map do |pr_data|
+            number = pr_data.fetch('number')
+            title = pr_data.fetch('title')
+            link = pr_data.fetch('html_url')
 
             new(number, api_interface, title, link)
           end

data/lib/geet/helpers/services_workflow_helper.rb

@@ -9,17 +9,19 @@ module Geet
     # Helper for services common workflow, for example, find the merge head.
     #
     module ServicesWorkflowHelper
-      # Requires: @git_client
-      #
-      def find_merge_head
-        [@git_client.owner, @git_client.current_branch]
-      end
-
       # Expect to find only one.
       #
       # Requires: @out, @repository.
       #
-      def checked_find_branch_pr(owner, head)
+      def checked_find_branch_pr
+        owner = if @repository.upstream?
+          @repository.authenticated_user.username
+        else
+          @git_client.owner
+        end
+
+        head = @git_client.current_branch
+
         @out.puts "Finding PR with head (#{owner}:#{head})..."
 
         prs = @repository.prs(owner: owner, head: head)

data/lib/geet/services/comment_pr.rb

@@ -20,8 +20,7 @@ module Geet
       end
 
       def execute(comment, no_open_pr: nil)
-        merge_owner, merge_head = find_merge_head
-        pr = checked_find_branch_pr(merge_owner, merge_head)
+        pr = checked_find_branch_pr
         pr.comment(comment)
         open_file_with_default_application(pr.link) unless no_open_pr
         pr

data/lib/geet/services/create_pr.rb

@@ -37,7 +37,7 @@ module Geet
           selected_labels, selected_milestone, selected_reviewers = find_and_select_attributes(labels, milestone, reviewers)
         end
 
-        sync_with_upstream_branch if automated_mode
+        sync_with_remote_branch if automated_mode
 
         pr = create_pr(title, description, base: base, draft: draft)
 
@@ -81,17 +81,17 @@ module Geet
         selection_manager.select_attributes
       end
 
-      def sync_with_upstream_branch
-        if @git_client.upstream_branch
-          @out.puts "Pushing to upstream branch..."
+      def sync_with_remote_branch
+        if @git_client.remote_branch
+          @out.puts "Pushing to remote branch..."
 
           @git_client.push
         else
-          upstream_branch = @git_client.current_branch
+          remote_branch = @git_client.current_branch
 
-          @out.puts "Creating upstream branch #{upstream_branch.inspect}..."
+          @out.puts "Creating remote branch #{remote_branch.inspect}..."
 
-          @git_client.push(upstream_branch: upstream_branch)
+          @git_client.push(remote_branch: remote_branch)
         end
       end
 

data/lib/geet/services/merge_pr.rb

@@ -23,8 +23,7 @@ module Geet
       end
 
       def execute(delete_branch: false)
-        merge_owner, merge_head = find_merge_head
-        pr = checked_find_branch_pr(merge_owner, merge_head)
+        pr = checked_find_branch_pr
 
         merge_pr(pr)
 
@@ -36,7 +35,7 @@ module Geet
 
         fetch_repository
 
-        if upstream_branch_gone?
+        if remote_branch_gone?
           pr_branch = @git_client.current_branch
           main_branch = @git_client.main_branch
 
@@ -72,8 +71,8 @@ module Geet
         @git_client.fetch
       end
 
-      def upstream_branch_gone?
-        @git_client.upstream_branch_gone?
+      def remote_branch_gone?
+        @git_client.remote_branch_gone?
       end
 
       def checkout_branch(branch)

data/lib/geet/services/open_pr.rb

@@ -19,9 +19,8 @@ module Geet
         @git_client = git_client
       end
 
-      def execute(delete_branch: false)
-        merge_owner, merge_head = find_merge_head
-        pr = checked_find_branch_pr(merge_owner, merge_head)
+      def execute(delete_branch: false, **)
+        pr = checked_find_branch_pr
         open_file_with_default_application(pr.link)
         pr
       end

data/lib/geet/utils/git_client.rb

@@ -34,7 +34,7 @@ module Geet
         \Z
       }x
 
-      UPSTREAM_BRANCH_REGEX = %r{\A[^/]+/([^/]+)\Z}
+      REMOTE_BRANCH_REGEX = %r{\A[^/]+/(.+)\Z}
 
       MAIN_BRANCH_CONFIG_ENTRY = 'custom.development-branch'
 
@@ -65,25 +65,23 @@ module Geet
         branch
       end
 
-      # Not to be confused with `upstream` repository!
-      #
       # This API doesn't reveal if the remote branch is gone.
       #
-      # return: nil, if the upstream branch is not configured.
+      # return: nil, if the remote branch is not configured.
       #
-      def upstream_branch
+      def remote_branch
         head_symbolic_ref = execute_git_command("symbolic-ref -q HEAD")
 
-        raw_upstream_branch = execute_git_command("for-each-ref --format='%(upstream:short)' #{head_symbolic_ref.shellescape}").strip
+        raw_remote_branch = execute_git_command("for-each-ref --format='%(upstream:short)' #{head_symbolic_ref.shellescape}").strip
 
-        if raw_upstream_branch != ''
-          raw_upstream_branch[UPSTREAM_BRANCH_REGEX, 1] || raise("Unexpected upstream format: #{raw_upstream_branch}")
+        if raw_remote_branch != ''
+          raw_remote_branch[REMOTE_BRANCH_REGEX, 1] || raise("Unexpected remote branch format: #{raw_remote_branch}")
         else
           nil
         end
       end
 
-      # TODO: May be merged with :upstream_branch, although it would require designing how a gone
+      # TODO: May be merged with :remote_branch, although it would require designing how a gone
       # remote branch is expressed.
       #
       # Sample command output:
@@ -91,7 +89,7 @@ module Geet
       #     ## add_milestone_closing...origin/add_milestone_closing [gone]
       #      M spec/integration/merge_pr_spec.rb
       #
-      def upstream_branch_gone?
+      def remote_branch_gone?
         git_command = "status -b --porcelain"
         status_output = execute_git_command(git_command)
 
@@ -216,12 +214,12 @@ module Geet
         execute_git_command("rebase")
       end
 
-      # upstream_branch: create an upstream branch.
+      # remote_branch: create an upstream branch.
       #
-      def push(upstream_branch: nil)
-        upstream_branch_option = "-u #{ORIGIN_NAME} #{upstream_branch.shellescape}" if upstream_branch
+      def push(remote_branch: nil)
+        remote_branch_option = "-u #{ORIGIN_NAME} #{remote_branch.shellescape}" if remote_branch
 
-        execute_git_command("push #{upstream_branch_option}")
+        execute_git_command("push #{remote_branch_option}")
       end
 
       # Performs pruning.

data/lib/geet/version.rb

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

data/spec/integration/create_pr_spec.rb

@@ -133,17 +133,17 @@ describe Geet::Services::CreatePr do
         expect(actual_output.string).to eql(expected_output)
       end
 
-      it 'should push to the upstream branch' do
+      it 'should push to the remote branch' do
         allow(git_client).to receive(:working_tree_clean?).and_return(true)
         allow(git_client).to receive(:current_branch).and_return('mybranch')
         allow(git_client).to receive(:main_branch).and_return('master')
-        expect(git_client).to receive(:upstream_branch).and_return('mybranch')
+        expect(git_client).to receive(:remote_branch).and_return('mybranch')
         expect(git_client).to receive(:push)
 
         allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
 
         expected_output = <<~STR
-          Pushing to upstream branch...
+          Pushing to remote branch...
           Creating PR...
           Assigning authenticated user...
           PR address: https://github.com/donaldduck/testrepo_f/pull/2
@@ -159,17 +159,17 @@ describe Geet::Services::CreatePr do
         expect(actual_output.string).to eql(expected_output)
       end
 
-      it "should create an upstream branch, when there isn't one (is not tracked)" do
+      it "should create a remote branch, when there isn't one (is not tracked)" do
         allow(git_client).to receive(:working_tree_clean?).and_return(true)
         allow(git_client).to receive(:current_branch).and_return('mybranch')
         allow(git_client).to receive(:main_branch).and_return('master')
-        expect(git_client).to receive(:upstream_branch).and_return(nil)
-        expect(git_client).to receive(:push).with(upstream_branch: 'mybranch')
+        expect(git_client).to receive(:remote_branch).and_return(nil)
+        expect(git_client).to receive(:push).with(remote_branch: 'mybranch')
 
         allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
 
         expected_output = <<~STR
-          Creating upstream branch "mybranch"...
+          Creating remote branch "mybranch"...
           Creating PR...
           Assigning authenticated user...
           PR address: https://github.com/donaldduck/testrepo_f/pull/4

data/spec/integration/merge_pr_spec.rb

@@ -7,7 +7,7 @@ require_relative '../../lib/geet/services/merge_pr'
 
 # Currently disabled: it requires updates following the addition of the automatic removal of the local
 # branch.
-# Specifically, `GitClient#upstream_branch_gone?` needs to be handled, since it returns the current
+# Specifically, `GitClient#remote_branch_gone?` needs to be handled, since it returns the current
 # branch, while it's supposed to return
 #
 describe Geet::Services::MergePr do
@@ -19,7 +19,7 @@ describe Geet::Services::MergePr do
 
   before :each do
     expect(git_client).to receive(:fetch)
-    expect(git_client).to receive(:upstream_branch_gone?).and_return(true)
+    expect(git_client).to receive(:remote_branch_gone?).and_return(true)
     expect(git_client).to receive(:checkout).with(main_branch)
     expect(git_client).to receive(:rebase)
     expect(git_client).to receive(:delete_branch).with('mybranch')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Commandline interface for performing SCM host operations, eg. create a PR