geet 0.3.14 → 0.4.0

data/spec/integration/list_issues_spec.rb

@@ -12,7 +12,7 @@ describe Geet::Services::ListIssues do
 
   context 'with github.com' do
     it 'should list the default issues' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo')
 
       expected_output = <<~STR
         5. Title 2 (https://github.com/donaldduck/testrepo/issues/5)
@@ -34,7 +34,7 @@ describe Geet::Services::ListIssues do
 
     context 'with assignee filtering' do
       it 'should list the issues' do
-        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_gh')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_gh')
 
         expected_output = <<~STR
           Finding collaborators...
@@ -57,8 +57,8 @@ describe Geet::Services::ListIssues do
     end
 
     it 'should list the upstream issues' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_2f')
-      allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_2f')
+      allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donald-fr/testrepo_u')
 
       expected_output = <<~STR
         2. Title 2 U (https://github.com/donald-fr/testrepo_u/issues/2)
@@ -81,7 +81,7 @@ describe Geet::Services::ListIssues do
 
   context 'with gitlab.com' do
     it 'should list the issues' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@gitlab.com:donaldduck/testproject')
 
       expected_output = <<~STR
         2. I like more pizza (https://gitlab.com/donaldduck/testproject/issues/2)
@@ -103,7 +103,7 @@ describe Geet::Services::ListIssues do
 
     context 'with assignee filtering' do
       it 'should list the issues' do
-        allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@gitlab.com:donaldduck/testproject')
 
         expected_output = <<~STR
           Finding collaborators...

data/spec/integration/list_labels_spec.rb

@@ -12,7 +12,7 @@ describe Geet::Services::ListLabels do
 
   context 'with github.com' do
     it 'should list the labels' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/geet')
 
       expected_output = <<~STR
         - bug (#ee0701)
@@ -34,8 +34,8 @@ describe Geet::Services::ListLabels do
     end
 
     it 'should list the upstream labels' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
-      allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck-fr/testrepo_u')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/geet')
+      allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donaldduck-fr/testrepo_u')
 
       expected_output = <<~STR
         - bug (#ee0701)
@@ -57,7 +57,7 @@ describe Geet::Services::ListLabels do
 
   context 'with gitlab.com' do
     it 'should list the labels' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@gitlab.com:donaldduck/testproject')
 
       expected_output = <<~STR
         - bug (#d9534f)

data/spec/integration/list_milestones_spec.rb

@@ -12,7 +12,7 @@ describe Geet::Services::ListMilestones do
 
   context 'with github.com' do
     it 'should list the milestones' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/geet')
 
       expected_output = <<~STR
         Finding milestones...
@@ -50,8 +50,8 @@ describe Geet::Services::ListMilestones do
     end
 
     it 'should list the upstream milestones' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donald-fr/testrepo_downstream')
-      allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck/testrepo_upstream')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donald-fr/testrepo_downstream')
+      allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donaldduck/testrepo_upstream')
 
       expected_output = <<~STR
         Finding milestones...
@@ -80,7 +80,7 @@ describe Geet::Services::ListMilestones do
 
   context 'with gitlab.com' do
     it 'should list the milestones' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@gitlab.com:donaldduck/testproject')
 
       expected_output = <<~STR
         Finding milestones...

data/spec/integration/list_prs_spec.rb

@@ -11,7 +11,7 @@ describe Geet::Services::ListPrs do
   let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client) }
 
   it 'should list the PRs' do
-    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donald-fr/testrepo_downstream')
+    allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donald-fr/testrepo_downstream')
 
     expected_output = <<~STR
       2. Add testfile3 (downstream) (https://github.com/donald-fr/testrepo_downstream/pull/2)
@@ -32,8 +32,8 @@ describe Geet::Services::ListPrs do
   end
 
   it 'should list the upstream PRs' do
-    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donald-fr/testrepo_downstream')
-    allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck/testrepo_upstream')
+    allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donald-fr/testrepo_downstream')
+    allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donaldduck/testrepo_upstream')
 
     expected_output = <<~STR
       2. Add testfile3 (upstream) (https://github.com/donaldduck/testrepo_upstream/pull/2)

data/spec/integration/merge_pr_spec.rb

@@ -5,23 +5,42 @@ require 'spec_helper'
 require_relative '../../lib/geet/git/repository'
 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
+# branch, while it's supposed to return
+#
 describe Geet::Services::MergePr do
   let(:git_client) { Geet::Utils::GitClient.new }
   let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
   let(:owner) { 'donaldduck' }
   let(:branch) { 'mybranch' }
+  let(:main_branch) { 'main' }
+
+  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(:checkout).with(main_branch)
+    expect(git_client).to receive(:rebase)
+    expect(git_client).to receive(:delete_branch).with('mybranch')
+  end
 
   context 'with github.com' do
     let(:repository_name) { 'testrepo_upstream' }
 
     it 'should merge the PR for the current branch' do
       allow(git_client).to receive(:current_branch).and_return(branch)
-      allow(git_client).to receive(:remote).with('origin').and_return("git@github.com:#{owner}/#{repository_name}")
+      allow(git_client).to receive(:main_branch).and_return(main_branch)
+      allow(git_client).to receive(:remote).with(no_args).and_return("git@github.com:#{owner}/#{repository_name}")
 
       expected_pr_number = 1
       expected_output = <<~STR
         Finding PR with head (#{owner}:#{branch})...
         Merging PR ##{expected_pr_number}...
+        Fetching repository...
+        Checking out #{main_branch}...
+        Rebasing...
+        Deleting local branch mybranch...
       STR
 
       actual_output = StringIO.new
@@ -38,13 +57,18 @@ describe Geet::Services::MergePr do
 
     it 'should merge the PR for the current branch, with branch deletion' do
       allow(git_client).to receive(:current_branch).and_return(branch)
-      allow(git_client).to receive(:remote).with('origin').and_return("git@github.com:#{owner}/#{repository_name}")
+      allow(git_client).to receive(:main_branch).and_return(main_branch)
+      allow(git_client).to receive(:remote).with(no_args).and_return("git@github.com:#{owner}/#{repository_name}")
 
       expected_pr_number = 2
       expected_output = <<~STR
         Finding PR with head (#{owner}:#{branch})...
         Merging PR ##{expected_pr_number}...
-        Deleting branch #{branch}...
+        Deleting remote branch #{branch}...
+        Fetching repository...
+        Checking out #{main_branch}...
+        Rebasing...
+        Deleting local branch mybranch...
       STR
 
       actual_output = StringIO.new
@@ -65,12 +89,17 @@ describe Geet::Services::MergePr do
 
     it 'should merge the PR for the current branch' do
       allow(git_client).to receive(:current_branch).and_return(branch)
-      allow(git_client).to receive(:remote).with('origin').and_return("git@gitlab.com:#{owner}/#{repository_name}")
+      allow(git_client).to receive(:main_branch).and_return(main_branch)
+      allow(git_client).to receive(:remote).with(no_args).and_return("git@gitlab.com:#{owner}/#{repository_name}")
 
       expected_pr_number = 4
       expected_output = <<~STR
         Finding PR with head (#{owner}:#{branch})...
         Merging PR ##{expected_pr_number}...
+        Fetching repository...
+        Checking out #{main_branch}...
+        Rebasing...
+        Deleting local branch mybranch...
       STR
 
       actual_output = StringIO.new

data/spec/integration/open_pr_spec.rb

@@ -16,7 +16,7 @@ describe Geet::Services::OpenPr do
 
     it 'should open the PR for the current branch' do
       allow(git_client).to receive(:current_branch).and_return(branch)
-      allow(git_client).to receive(:remote).with('origin').and_return("git@github.com:#{owner}/#{repository_name}")
+      allow(git_client).to receive(:remote).with(no_args).and_return("git@github.com:#{owner}/#{repository_name}")
 
       expected_pr_number = 3
       expected_output = <<~STR

data/spec/integration/open_repo_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require_relative '../../lib/geet/git/repository'
+require_relative '../../lib/geet/services/open_repo'
+
+module Geet
+  describe Services::OpenRepo do
+    let(:git_client) { Utils::GitClient.new }
+    let(:repository) { Git::Repository.new(git_client: git_client) }
+
+    OWNER = 'donaldduck'
+    REPOSITORY_NAME = 'testrepo'
+
+    REMOTE_URLS = {
+      'git' => "git@github.com:#{OWNER}/#{REPOSITORY_NAME}",
+      'https' => "https://github.com/#{OWNER}/#{REPOSITORY_NAME}",
+    }
+
+    context 'should open the PR for the current branch' do
+      REMOTE_URLS.each do |protocol, remote_url|
+        it "with #{protocol} protocol" do
+          allow(git_client).to receive(:remote).with(no_args).and_return(remote_url)
+
+          expected_url = "https://github.com/#{OWNER}/#{REPOSITORY_NAME}"
+          expected_output = ""
+
+          actual_output = StringIO.new
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+
+          expect(service_instance).to receive(:open_file_with_default_application).with(expected_url) do
+            # do nothing; just don't open the browser
+          end
+
+          execution_result = VCR.use_cassette('github_com/open_repo') do
+            service_instance.execute
+          end
+
+          expect(actual_output.string).to eql(expected_output)
+          expect(execution_result).to eql(expected_url)
+        end
+      end
+    end # context 'should open the PR for the current branch'
+  end # describe Services::OpenRepo
+end # module Geet

data/spec/vcr_cassettes/create_issue.yml

@@ -608,7 +608,7 @@ http_interactions:
     uri: https://api.github.com/repos/donaldduck/testrepo_f/issues
     body:
       encoding: UTF-8
-      string: '{"title":"Title","body":"Description","base":"master"}'
+      string: '{"title":"Title","body":"Description"}'
     headers:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3

data/spec/vcr_cassettes/create_issue_upstream.yml

@@ -152,7 +152,7 @@ http_interactions:
     uri: https://api.github.com/repos/momcorp/therepo/issues
     body:
       encoding: UTF-8
-      string: '{"title":"Title","body":"Description","base":"master"}'
+      string: '{"title":"Title","body":"Description"}'
     headers:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3

data/spec/vcr_cassettes/github_com/create_milestone.yml

@@ -0,0 +1,82 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.github.com/repos/donaldduck/testrepo_upstream/milestones
+    body:
+      encoding: UTF-8
+      string: '{"title":"my_milestone"}'
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Ruby
+      Host:
+      - api.github.com
+      Authorization:
+      - Basic <GITHUB_CREDENTIALS>
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Date:
+      - Tue, 03 Sep 2019 16:01:12 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '1506'
+      Server:
+      - GitHub.com
+      Status:
+      - 201 Created
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4927'
+      X-Ratelimit-Reset:
+      - '1567530072'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      Etag:
+      - '"21f10fbd46b93fec45025c213c4f1623"'
+      X-Oauth-Scopes:
+      - admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook,
+        delete_repo, gist, notifications, repo, user
+      X-Accepted-Oauth-Scopes:
+      - ''
+      Location:
+      - https://api.github.com/repos/donaldduck/testrepo_upstream/milestones/6
+      X-Github-Media-Type:
+      - github.v3; format=json
+      Access-Control-Expose-Headers:
+      - ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining,
+        X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval,
+        X-GitHub-Media-Type
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Frame-Options:
+      - deny
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Referrer-Policy:
+      - origin-when-cross-origin, strict-origin-when-cross-origin
+      Content-Security-Policy:
+      - default-src 'none'
+      X-Github-Request-Id:
+      - A894:36DFC:1D8B744:23F04F8:5D6E8E48
+    body:
+      encoding: UTF-8
+      string: '{"url":"https://api.github.com/repos/donaldduck/testrepo_upstream/milestones/6","html_url":"https://github.com/donaldduck/testrepo_upstream/milestone/6","labels_url":"https://api.github.com/repos/donaldduck/testrepo_upstream/milestones/6/labels","id":123456,"node_id":"MDk6TWlsZXN0b25lNDYyNTM3NQ==","number":6,"title":"my_milestone","description":null,"creator":{"login":"donaldduck","id":123456,"node_id":"MDQ6VXNlcjE1OTUzNTY=","avatar_url":"https://avatars2.githubusercontent.com/u/123456?v=4","gravatar_id":"","url":"https://api.github.com/users/donaldduck","html_url":"https://github.com/donaldduck","followers_url":"https://api.github.com/users/donaldduck/followers","following_url":"https://api.github.com/users/donaldduck/following{/other_user}","gists_url":"https://api.github.com/users/donaldduck/gists{/gist_id}","starred_url":"https://api.github.com/users/donaldduck/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/donaldduck/subscriptions","organizations_url":"https://api.github.com/users/donaldduck/orgs","repos_url":"https://api.github.com/users/donaldduck/repos","events_url":"https://api.github.com/users/donaldduck/events{/privacy}","received_events_url":"https://api.github.com/users/donaldduck/received_events","type":"User","site_admin":false},"open_issues":0,"closed_issues":0,"state":"open","created_at":"2019-09-03T16:01:12Z","updated_at":"2019-09-03T16:01:12Z","due_on":null,"closed_at":null}'
+    http_version: 
+  recorded_at: Tue, 03 Sep 2019 16:01:12 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.4.0
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -88,6 +88,7 @@ files:
 - lib/geet/github/label.rb
 - lib/geet/github/milestone.rb
 - lib/geet/github/pr.rb
+- lib/geet/github/remote_repository.rb
 - lib/geet/github/user.rb
 - lib/geet/gitlab/api_interface.rb
 - lib/geet/gitlab/issue.rb
@@ -101,10 +102,13 @@ files:
 - lib/geet/helpers/summary_helper.rb
 - lib/geet/resources/templates/edit_summary.md
 - lib/geet/services/abstract_create_issue.rb
+- lib/geet/services/add_upstream_repo.rb
+- lib/geet/services/close_milestones.rb
 - lib/geet/services/comment_pr.rb
 - lib/geet/services/create_gist.rb
 - lib/geet/services/create_issue.rb
 - lib/geet/services/create_label.rb
+- lib/geet/services/create_milestone.rb
 - lib/geet/services/create_pr.rb
 - lib/geet/services/list_issues.rb
 - lib/geet/services/list_labels.rb
@@ -112,6 +116,7 @@ files:
 - lib/geet/services/list_prs.rb
 - lib/geet/services/merge_pr.rb
 - lib/geet/services/open_pr.rb
+- lib/geet/services/open_repo.rb
 - lib/geet/shared/http_error.rb
 - lib/geet/shared/repo_permissions.rb
 - lib/geet/shared/selection.rb
@@ -124,6 +129,7 @@ files:
 - spec/integration/create_gist_spec.rb
 - spec/integration/create_issue_spec.rb
 - spec/integration/create_label_spec.rb
+- spec/integration/create_milestone_spec.rb
 - spec/integration/create_pr_spec.rb
 - spec/integration/list_issues_spec.rb
 - spec/integration/list_labels_spec.rb
@@ -131,6 +137,7 @@ files:
 - spec/integration/list_prs_spec.rb
 - spec/integration/merge_pr_spec.rb
 - spec/integration/open_pr_spec.rb
+- spec/integration/open_repo_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/create_gist_private.yml
 - spec/vcr_cassettes/create_gist_public.yml
@@ -140,6 +147,7 @@ files:
 - spec/vcr_cassettes/github_com/create_label.yml
 - spec/vcr_cassettes/github_com/create_label_upstream.yml
 - spec/vcr_cassettes/github_com/create_label_with_random_color.yml
+- spec/vcr_cassettes/github_com/create_milestone.yml
 - spec/vcr_cassettes/github_com/create_pr.yml
 - spec/vcr_cassettes/github_com/create_pr_in_auto_mode_create_upstream.yml
 - spec/vcr_cassettes/github_com/create_pr_in_auto_mode_with_push.yml
@@ -182,8 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.2.19
 signing_key: 
 specification_version: 4
 summary: Commandline interface for performing SCM host operations, eg. create a PR