geet 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd623b15d744959be72ee1fd7438cbae8e8a8de8086f60c71ad6b269f457f975
-  data.tar.gz: fd84684c150029c3e0028703aa36d6834d9b0909f1872007abf82e6c75753ebf
+  metadata.gz: '08771354786ab21808618e54fc0eb487623adf32983f25239cfc14144708488f'
+  data.tar.gz: 4559d362a557121d242fa191be9263b9e2e22f987348618ab32c5a3b2ff386c5
 SHA512:
-  metadata.gz: 5f7ede545d5ba98c5ab018fe81644bf9e78c64eeecaae39c619c6407fce4ae4080e6c6be152425d4eb33d073b2514c4e6322d7be2a22403465d39c243839a016
-  data.tar.gz: 12543389e4ccbbbdd185c771acbc90669347b568f0a6d6a39bba8da4263cddd1da738d0397ef0d9991e9536052f10459ff5258752f5c03ad9ada3c36c3ed241b
+  metadata.gz: c900f0206f18cc80979128b3800c815b1c9e65bf75587a666ffb145d38aa87cee0204deed51ed915a2bdfe0d6672ca5d55c16e2b7dea547cceddee72beb2cfd8
+  data.tar.gz: 5def80bda1f7d663b125cab82ba2a309ac5c60586ae5167208cf6784cdc0672172bf8a72ad2e6b7a7a8bbd6e374c1f1abbfb150a7b6f2dda90c0a84d13d13889

data/README.md

@@ -4,32 +4,29 @@
 
 Command line interface for performing Git hosting service operations.
 
-This tool is very similar to [Hub](https://github.com/github/hub), but it supports a different set of operations, fully specified via command line.
+This tool is a provider-independent version of [Hub](https://github.com/github/hub) and [Lab](https://github.com/zaquestion/lab).
 
-Please see the [development status](#development-status) section for informations about the current development.
+## Development status/plan
 
-## Development status
+The current focus is implementing Gitlab functionalities (0.3.x series).
 
-Geet is (again) under active development. The current focus is implementing Gitlab functionalities.
+Everything is tracked in detail via [issues](https://github.com/saveriomiroddi/geet/issues) and [milestones](https://github.com/saveriomiroddi/geet/milestones).
 
 ## Operation/providers support
 
 The functionalities currently supported are:
 
-- Github:
-  - create gist
-  - create issue
+- Github/Gitlab:
   - create label
-  - create PR
   - list issues
   - list labels
   - list milestones
   - list PRs
+- Github:
+  - create gist
+  - create issue
+  - create PR
   - merge PR
-- Gitlab:
-  - list issues
-  - list labels
-  - list milestones
 
 ## Samples
 

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-07-01'
+  s.date        = '2018-07-05'
   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).'

data/lib/geet/github/pr.rb

@@ -26,6 +26,8 @@ module Geet
         new(number, api_interface, title, link)
       end
 
+      # See https://developer.github.com/v3/pulls/#list-pull-requests
+      #
       def self.list(api_interface, milestone: nil, assignee: nil, head: nil)
         check_list_params!(milestone, assignee, head)
 

data/lib/geet/gitlab/api_interface.rb

@@ -89,7 +89,7 @@ module Geet
           request = http_class.new(uri)
 
           request['Private-Token'] = @api_token
-          request.body = data.to_json if data
+          request.body = URI.encode_www_form(data) if data
 
           http.request(request)
         end

data/lib/geet/gitlab/label.rb

@@ -22,6 +22,16 @@ module Geet
           new(name, color)
         end
       end
+
+      # See https://docs.gitlab.com/ee/api/labels.html#create-a-new-label
+      def self.create(name, color, api_interface)
+        api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/labels"
+        request_data = { name: name, color: "##{color}" }
+
+        api_interface.send_request(api_path, data: request_data)
+
+        new(name, color)
+      end
     end
   end
 end

data/lib/geet/gitlab/{PR.rb → pr.rb}

@@ -5,8 +5,9 @@ module Geet
     class PR
       attr_reader :number, :title, :link
 
-      def initialize(number, title, link)
+      def initialize(number, api_interface, title, link)
         @number = number
+        @api_interface = api_interface
         @title = title
         @link = link
       end
@@ -14,13 +15,12 @@ module Geet
       # See https://docs.gitlab.com/ee/api/merge_requests.html#list-merge-requests
       #
       def self.list(api_interface, milestone: nil, assignee: nil, head: nil)
-        raise ":head parameter currently unsupported!" if head
-
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/merge_requests"
 
         request_params = {}
         request_params[:assignee_id] = assignee.id if assignee
         request_params[:milestone] = milestone.title if milestone
+        request_params[:source_branch] = head if head
 
         response = api_interface.send_request(api_path, params: request_params, multipage: true)
 
@@ -29,9 +29,17 @@ module Geet
           title = issue_data.fetch('title')
           link = issue_data.fetch('web_url')
 
-          new(number, title, link)
+          new(number, api_interface, title, link)
         end
       end
+
+      # See https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr
+      #
+      def merge
+        api_path = "projects/#{@api_interface.path_with_namespace(encoded: true)}/merge_requests/#{number}/merge"
+
+        @api_interface.send_request(api_path, http_method: :put)
+      end
     end # PR
   end # Gitlab
 end # Geet

data/lib/geet/helpers/os_helper.rb

@@ -44,7 +44,7 @@ module Geet
             puts stderr_content if stderr_content != '' && !silent_stderr
 
             if !wait_thread.value.success?
-              error_message = stderr_content.lines.first.strip
+              error_message = stderr_content.lines.first&.strip || "Error running command #{command.inspect}"
               raise "Error#{description_message}: #{error_message}"
             end
 

data/lib/geet/services/merge_pr.rb

@@ -2,6 +2,12 @@
 
 module Geet
   module Services
+    # Merges the PR for the current branch.
+    #
+    # The workflow of this services is oriented to the a commondline usage: the user doesn't need
+    # to lookup the merge for the working branch; this comes at the cost of extra operations and
+    # constraints, but speeds up the workflow.
+    #
     class MergePr
       DEFAULT_GIT_CLIENT = Geet::Utils::GitClient.new
 

data/lib/geet/version.rb

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

data/spec/integration/create_label_spec.rb

@@ -10,76 +10,100 @@ describe Geet::Services::CreateLabel do
   let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
   let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client) }
 
-  context 'with user-specified color' do
-    it 'should create a label' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+  context 'with github.com' do
+    context 'with user-specified color' do
+      it 'should create a label' do
+        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
-      expected_output = <<~STR
-        Creating label...
-        Created with color #c64c64
-      STR
+        expected_output = <<~STR
+          Creating label...
+          Created with color #c64c64
+        STR
 
-      actual_output = StringIO.new
+        actual_output = StringIO.new
 
-      actual_created_label = VCR.use_cassette('create_label') do
-        described_class.new(repository, out: actual_output).execute('my_label', color: 'c64c64')
+        actual_created_label = VCR.use_cassette('github_com/create_label') do
+          described_class.new(repository, out: actual_output).execute('my_label', color: 'c64c64')
+        end
+
+        expect(actual_output.string).to eql(expected_output)
+
+        expect(actual_created_label.name).to eql('my_label')
+        expect(actual_created_label.color).to eql('c64c64')
       end
 
-      expect(actual_output.string).to eql(expected_output)
+      context 'upstream' do
+        it 'should create a label' do
+          allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+          allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck-fr/testrepo_gh')
 
-      expect(actual_created_label.name).to eql('my_label')
-      expect(actual_created_label.color).to eql('c64c64')
+          expected_output = <<~STR
+            Creating label...
+            Created with color #c64c64
+          STR
+
+          actual_output = StringIO.new
+
+          actual_created_label = VCR.use_cassette('github_com/create_label_upstream') do
+            described_class.new(upstream_repository, out: actual_output).execute('my_label', color: 'c64c64')
+          end
+
+          expect(actual_output.string).to eql(expected_output)
+
+          expect(actual_created_label.name).to eql('my_label')
+          expect(actual_created_label.color).to eql('c64c64')
+        end
+      end
     end
 
-    context 'upstream' do
+    context 'with auto-generated color' do
       it 'should create a label' do
         allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
-        allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck-fr/testrepo_gh')
 
-        expected_output = <<~STR
+        actual_output = StringIO.new
+
+        service_instance = described_class.new(repository, out: actual_output)
+
+        expect(service_instance).to receive(:rand).with(2**24).and_return(38911)
+
+        expected_output_template = <<~STR
           Creating label...
-          Created with color #c64c64
+          Created with color #0097ff
         STR
 
-        actual_output = StringIO.new
-
-        actual_created_label = VCR.use_cassette('create_label_upstream') do
-          described_class.new(upstream_repository, out: actual_output).execute('my_label', color: 'c64c64')
+        actual_created_label = VCR.use_cassette('github_com/create_label_with_random_color') do
+          service_instance.execute('my_label')
         end
 
+        expected_output = format(expected_output_template, color: actual_created_label.color)
+
         expect(actual_output.string).to eql(expected_output)
 
         expect(actual_created_label.name).to eql('my_label')
-        expect(actual_created_label.color).to eql('c64c64')
+        expect(actual_created_label.color).to eql('0097ff')
       end
     end
-  end
+  end # context 'with github.com'
 
-  context 'with auto-generated color' do
+  context 'with gitlab.com' do
     it 'should create a label' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
-
-      actual_output = StringIO.new
-
-      service_instance = described_class.new(repository, out: actual_output)
+      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
 
-      expect(service_instance).to receive(:rand).with(2**24).and_return(38911)
-
-      expected_output_template = <<~STR
+      expected_output = <<~STR
         Creating label...
-        Created with color #0097ff
+        Created with color #123456
       STR
 
-      actual_created_label = VCR.use_cassette('create_label_with_random_color') do
-        service_instance.execute('my_label')
-      end
+      actual_output = StringIO.new
 
-      expected_output = format(expected_output_template, color: actual_created_label.color)
+      actual_created_label = VCR.use_cassette('gitlab_com/create_label') do
+        described_class.new(repository, out: actual_output).execute('my_label', color: '123456')
+      end
 
       expect(actual_output.string).to eql(expected_output)
 
       expect(actual_created_label.name).to eql('my_label')
-      expect(actual_created_label.color).to eql('0097ff')
+      expect(actual_created_label.color).to eql('123456')
     end
   end
 end

data/spec/integration/create_pr_spec.rb

@@ -10,173 +10,175 @@ describe Geet::Services::CreatePr do
   let(:repository) { Geet::Git::Repository.new(git_client: git_client, warnings: false) }
   let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client, warnings: false) }
 
-  context 'with labels, reviewers and milestones' do
-    it 'should create a PR' do
-      allow(git_client).to receive(:current_branch).and_return('mybranch')
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
-
-      expected_output = <<~STR
-        Finding labels...
-        Finding milestones...
-        Finding collaborators...
-        Creating PR...
-        Assigning authenticated user...
-        Adding labels bug, invalid...
-        Setting milestone 0.0.1...
-        Requesting review from donald-fr...
-        PR address: https://github.com/donaldduck/testrepo_f/pull/1
-      STR
-
-      actual_output = StringIO.new
-
-      actual_created_pr = VCR.use_cassette('create_pr') do
-        service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
-        service_instance.execute(
-          'Title', 'Description',
-          labels: 'bug,invalid', milestone: '0.0.1', reviewers: 'donald-fr',
-          no_open_pr: true, output: actual_output
-        )
-      end
+  context 'with github.com' do
+    context 'with labels, reviewers and milestones' do
+      it 'should create a PR' do
+        allow(git_client).to receive(:current_branch).and_return('mybranch')
+        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+
+        expected_output = <<~STR
+          Finding labels...
+          Finding milestones...
+          Finding collaborators...
+          Creating PR...
+          Assigning authenticated user...
+          Adding labels bug, invalid...
+          Setting milestone 0.0.1...
+          Requesting review from donald-fr...
+          PR address: https://github.com/donaldduck/testrepo_f/pull/1
+        STR
+
+        actual_output = StringIO.new
+
+        actual_created_pr = VCR.use_cassette('github_com/create_pr') do
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance.execute(
+            'Title', 'Description',
+            labels: 'bug,invalid', milestone: '0.0.1', reviewers: 'donald-fr',
+            no_open_pr: true, output: actual_output
+          )
+        end
 
-      expect(actual_output.string).to eql(expected_output)
+        expect(actual_output.string).to eql(expected_output)
 
-      expect(actual_created_pr.number).to eql(1)
-      expect(actual_created_pr.title).to eql('Title')
-      expect(actual_created_pr.link).to eql('https://github.com/donaldduck/testrepo_f/pull/1')
+        expect(actual_created_pr.number).to eql(1)
+        expect(actual_created_pr.title).to eql('Title')
+        expect(actual_created_pr.link).to eql('https://github.com/donaldduck/testrepo_f/pull/1')
+      end
     end
-  end
 
-  context 'on an upstream repository' do
-    it 'should create an upstream PR' do
-      allow(git_client).to receive(:current_branch).and_return('mybranch')
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
-      allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+    context 'on an upstream repository' do
+      it 'should create an upstream PR' do
+        allow(git_client).to receive(:current_branch).and_return('mybranch')
+        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+        allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
 
-      expected_output = <<~STR
-        Creating PR...
-        Assigning authenticated user...
-        PR address: https://github.com/donald-fr/testrepo_u/pull/8
-      STR
+        expected_output = <<~STR
+          Creating PR...
+          Assigning authenticated user...
+          PR address: https://github.com/donald-fr/testrepo_u/pull/8
+        STR
 
-      actual_output = StringIO.new
+        actual_output = StringIO.new
 
-      actual_created_pr = VCR.use_cassette('create_pr_upstream') do
-        service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
-        service_instance.execute('Title', 'Description', no_open_pr: true, output: actual_output)
-      end
+        actual_created_pr = VCR.use_cassette('github_com/create_pr_upstream') do
+          service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
+          service_instance.execute('Title', 'Description', no_open_pr: true, output: actual_output)
+        end
 
-      expect(actual_output.string).to eql(expected_output)
+        expect(actual_output.string).to eql(expected_output)
 
-      expect(actual_created_pr.number).to eql(8)
-      expect(actual_created_pr.title).to eql('Title')
-      expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/8')
-    end
+        expect(actual_created_pr.number).to eql(8)
+        expect(actual_created_pr.title).to eql('Title')
+        expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/8')
+      end
 
-    # It would be more consistent to have this UT outside of an upstream context, however this use
-    # case is actually a typical real-world one
-    #
-    context 'without write permissions' do
-      context 'without labels, reviewers and milestones' do
-        it 'should create a PR' do
-          allow(git_client).to receive(:current_branch).and_return('mybranch')
-          allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
-          allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
-
-          expected_output = <<~STR
-            Creating PR...
-            PR address: https://github.com/donald-fr/testrepo_u/pull/9
-          STR
-
-          actual_output = StringIO.new
-
-          actual_created_pr = VCR.use_cassette('create_pr_upstream_without_write_permissions') do
-            service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
-            service_instance.execute(
-              'Title', 'Description',
-              labels: '<ignored>',
-              no_open_pr: true, output: actual_output
-            )
+      # It would be more consistent to have this UT outside of an upstream context, however this use
+      # case is actually a typical real-world one
+      #
+      context 'without write permissions' do
+        context 'without labels, reviewers and milestones' do
+          it 'should create a PR' do
+            allow(git_client).to receive(:current_branch).and_return('mybranch')
+            allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+            allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+
+            expected_output = <<~STR
+              Creating PR...
+              PR address: https://github.com/donald-fr/testrepo_u/pull/9
+            STR
+
+            actual_output = StringIO.new
+
+            actual_created_pr = VCR.use_cassette('github_com/create_pr_upstream_without_write_permissions') do
+              service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
+              service_instance.execute(
+                'Title', 'Description',
+                labels: '<ignored>',
+                no_open_pr: true, output: actual_output
+              )
+            end
+
+            expect(actual_output.string).to eql(expected_output)
+
+            expect(actual_created_pr.number).to eql(9)
+            expect(actual_created_pr.title).to eql('Title')
+            expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/9')
           end
-
-          expect(actual_output.string).to eql(expected_output)
-
-          expect(actual_created_pr.number).to eql(9)
-          expect(actual_created_pr.title).to eql('Title')
-          expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/9')
         end
       end
     end
-  end
 
-  context 'in automated mode' do
-    it 'should raise an error when the working tree is dirty' do
-      allow(git_client).to receive(:working_tree_clean?).and_return(false)
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+    context 'in automated mode' do
+      it 'should raise an error when the working tree is dirty' do
+        allow(git_client).to receive(:working_tree_clean?).and_return(false)
+        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
 
-      expected_output = <<~STR
-        Error! Saved summary to /tmp/last_geet_edited_summary.md
-      STR
+        expected_output = <<~STR
+          Error! Saved summary to /tmp/last_geet_edited_summary.md
+        STR
 
-      actual_output = StringIO.new
+        actual_output = StringIO.new
 
-      operation = -> do
-        service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
-        service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
-      end
+        operation = -> do
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
+        end
 
-      expect(operation).to raise_error(RuntimeError, 'The working tree is not clean!')
+        expect(operation).to raise_error(RuntimeError, 'The working tree is not clean!')
 
-      expect(actual_output.string).to eql(expected_output)
-    end
+        expect(actual_output.string).to eql(expected_output)
+      end
 
-    it 'should push to the upstream branch' do
-      allow(git_client).to receive(:working_tree_clean?).and_return(true)
-      allow(git_client).to receive(:current_branch).and_return('mybranch')
-      expect(git_client).to receive(:upstream_branch).and_return('mybranch')
-      expect(git_client).to receive(:push)
+      it 'should push to the upstream branch' do
+        allow(git_client).to receive(:working_tree_clean?).and_return(true)
+        allow(git_client).to receive(:current_branch).and_return('mybranch')
+        expect(git_client).to receive(:upstream_branch).and_return('mybranch')
+        expect(git_client).to receive(:push)
 
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
 
-      expected_output = <<~STR
-        Pushing to upstream branch...
-        Creating PR...
-        Assigning authenticated user...
-        PR address: https://github.com/donaldduck/testrepo_f/pull/2
-      STR
+        expected_output = <<~STR
+          Pushing to upstream branch...
+          Creating PR...
+          Assigning authenticated user...
+          PR address: https://github.com/donaldduck/testrepo_f/pull/2
+        STR
 
-      actual_output = StringIO.new
+        actual_output = StringIO.new
 
-      actual_created_pr = VCR.use_cassette('create_pr_in_auto_mode_with_push') do
-        service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
-        service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
+        actual_created_pr = VCR.use_cassette('github_com/create_pr_in_auto_mode_with_push') do
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
+        end
+
+        expect(actual_output.string).to eql(expected_output)
       end
 
-      expect(actual_output.string).to eql(expected_output)
-    end
+      it "should create an upstream 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')
+        expect(git_client).to receive(:upstream_branch).and_return(nil)
+        expect(git_client).to receive(:push).with(upstream_branch: 'mybranch')
 
-    it "should create an upstream 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')
-      expect(git_client).to receive(:upstream_branch).and_return(nil)
-      expect(git_client).to receive(:push).with(upstream_branch: 'mybranch')
+        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
 
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+        expected_output = <<~STR
+          Creating upstream branch "mybranch"...
+          Creating PR...
+          Assigning authenticated user...
+          PR address: https://github.com/donaldduck/testrepo_f/pull/4
+        STR
 
-      expected_output = <<~STR
-        Creating upstream branch "mybranch"...
-        Creating PR...
-        Assigning authenticated user...
-        PR address: https://github.com/donaldduck/testrepo_f/pull/4
-      STR
+        actual_output = StringIO.new
 
-      actual_output = StringIO.new
+        actual_created_pr = VCR.use_cassette('github_com/create_pr_in_auto_mode_create_upstream') do
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
+        end
 
-      actual_created_pr = VCR.use_cassette('create_pr_in_auto_mode_create_upstream') do
-        service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
-        service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
+        expect(actual_output.string).to eql(expected_output)
       end
-
-      expect(actual_output.string).to eql(expected_output)
     end
-  end
+  end # context 'with github.com'
 end

data/spec/integration/merge_pr_spec.rb

@@ -9,48 +9,74 @@ describe Geet::Services::MergePr do
   let(:git_client) { Geet::Utils::GitClient.new }
   let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
 
-  it 'should merge the PR for the current branch' do
-    allow(git_client).to receive(:current_branch).and_return('mybranch1')
-    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+  context 'with github.com' do
+    it 'should merge the PR for the current branch' do
+      allow(git_client).to receive(:current_branch).and_return('mybranch1')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
-    expected_output = <<~STR
-      Finding PR with head (mybranch1)...
-      Merging PR #3...
-    STR
-    expected_pr_number = 3
+      expected_output = <<~STR
+        Finding PR with head (mybranch1)...
+        Merging PR #3...
+      STR
+      expected_pr_number = 3
 
-    actual_output = StringIO.new
+      actual_output = StringIO.new
 
-    service_result = VCR.use_cassette('merge_pr') do
-      described_class.new(repository, out: actual_output, git_client: git_client).execute
+      service_result = VCR.use_cassette('github_com/merge_pr') do
+        described_class.new(repository, out: actual_output, git_client: git_client).execute
+      end
+
+      actual_pr_number = service_result.number
+
+      expect(actual_output.string).to eql(expected_output)
+      expect(actual_pr_number).to eql(expected_pr_number)
     end
 
-    actual_pr_number = service_result.number
+    it 'should merge the PR for the current branch, with branch deletion' do
+      allow(git_client).to receive(:current_branch).and_return('mybranch')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
-    expect(actual_output.string).to eql(expected_output)
-    expect(actual_pr_number).to eql(expected_pr_number)
-  end
+      expected_output = <<~STR
+        Finding PR with head (mybranch)...
+        Merging PR #3...
+        Deleting branch mybranch...
+      STR
+      expected_pr_number = 3
 
-  it 'should merge the PR for the current branch, with branch deletion' do
-    allow(git_client).to receive(:current_branch).and_return('mybranch')
-    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+      actual_output = StringIO.new
 
-    expected_output = <<~STR
-      Finding PR with head (mybranch)...
-      Merging PR #3...
-      Deleting branch mybranch...
-    STR
-    expected_pr_number = 3
+      service_result = VCR.use_cassette('github_com/merge_pr_with_branch_deletion') do
+        described_class.new(repository, out: actual_output, git_client: git_client).execute(delete_branch: true)
+      end
 
-    actual_output = StringIO.new
+      actual_pr_number = service_result.number
 
-    service_result = VCR.use_cassette('merge_pr_with_branch_deletion') do
-      described_class.new(repository, out: actual_output, git_client: git_client).execute(delete_branch: true)
+      expect(actual_output.string).to eql(expected_output)
+      expect(actual_pr_number).to eql(expected_pr_number)
     end
+  end # context 'with github.com'
+
+  context 'with gitlab.com' do
+    it 'should merge the PR for the current branch' do
+      allow(git_client).to receive(:current_branch).and_return('mybranch')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+
+      expected_output = <<~STR
+        Finding PR with head (mybranch)...
+        Merging PR #2...
+      STR
+      expected_pr_number = 2
 
-    actual_pr_number = service_result.number
+      actual_output = StringIO.new
 
-    expect(actual_output.string).to eql(expected_output)
-    expect(actual_pr_number).to eql(expected_pr_number)
-  end
+      service_result = VCR.use_cassette('gitlab_com/merge_pr') do
+        described_class.new(repository, out: actual_output, git_client: git_client).execute
+      end
+
+      actual_pr_number = service_result.number
+
+      expect(actual_output.string).to eql(expected_output)
+      expect(actual_pr_number).to eql(expected_pr_number)
+    end
+  end # context 'with gitlab.com'
 end

data/spec/vcr_cassettes/gitlab_com/create_label.yml

@@ -0,0 +1,64 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/labels
+    body:
+      encoding: US-ASCII
+      string: name=my_label&color=%23123456
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Host:
+      - gitlab.com
+      Private-Token:
+      - "<GITLAB_CREDENTIALS>"
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 03 Jul 2018 16:44:14 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '180'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"9ccd74bc7bedefbbc67c4783b163c8fc"
+      Vary:
+      - Origin
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Request-Id:
+      - fb041fb4-a96d-4230-9eac-514d9db1a9f0
+      X-Runtime:
+      - '0.253058'
+      Strict-Transport-Security:
+      - max-age=31536000
+      Ratelimit-Limit:
+      - '600'
+      Ratelimit-Observed:
+      - '2'
+      Ratelimit-Remaining:
+      - '598'
+      Ratelimit-Reset:
+      - '1530636314'
+      Ratelimit-Resettime:
+      - Wed, 03 Jul 2018 16:45:14 GMT
+    body:
+      encoding: UTF-8
+      string: '{"id":1234565,"name":"my_label","color":"#123456","description":null,"open_issues_count":0,"closed_issues_count":0,"open_merge_requests_count":0,"priority":null,"subscribed":false}'
+    http_version: 
+  recorded_at: Tue, 03 Jul 2018 16:44:15 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr_cassettes/gitlab_com/merge_pr.yml

@@ -0,0 +1,144 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests?source_branch=mybranch
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Host:
+      - gitlab.com
+      Private-Token:
+      - "<GITLAB_CREDENTIALS>"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 05 Jul 2018 10:26:02 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '1115'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"e988027264fe5cf0c30640e4212fea0c"
+      Link:
+      - <https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests?id=donaldduck%2Ftestproject&order_by=created_at&page=1&per_page=20&sort=desc&source_branch=mybranch&state=all>;
+        rel="first", <https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests?id=donaldduck%2Ftestproject&order_by=created_at&page=1&per_page=20&sort=desc&source_branch=mybranch&state=all>;
+        rel="last"
+      Vary:
+      - Origin
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Next-Page:
+      - ''
+      X-Page:
+      - '1'
+      X-Per-Page:
+      - '20'
+      X-Prev-Page:
+      - ''
+      X-Request-Id:
+      - 11dea779-d74a-449f-baad-57b1a54e52f5
+      X-Runtime:
+      - '0.128214'
+      X-Total:
+      - '1'
+      X-Total-Pages:
+      - '1'
+      Strict-Transport-Security:
+      - max-age=31536000
+      Ratelimit-Limit:
+      - '600'
+      Ratelimit-Observed:
+      - '1'
+      Ratelimit-Remaining:
+      - '599'
+      Ratelimit-Reset:
+      - '1530786422'
+      Ratelimit-Resettime:
+      - Fri, 05 Jul 2018 10:27:02 GMT
+    body:
+      encoding: UTF-8
+      string: '[{"id":12345600,"iid":2,"project_id":1234569,"title":"Test PR","description":"","state":"opened","created_at":"2018-07-05T10:25:10.670Z","updated_at":"2018-07-05T10:25:10.670Z","target_branch":"master","source_branch":"mybranch","upvotes":0,"downvotes":0,"author":{"id":1234561,"name":"Donald
+        Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"assignee":null,"source_project_id":1234569,"target_project_id":1234569,"labels":[],"work_in_progress":false,"milestone":null,"merge_when_pipeline_succeeds":false,"merge_status":"can_be_merged","sha":"8c5971f670b5915c8a1c11448b36ed65ddbf4e33","merge_commit_sha":null,"user_notes_count":0,"discussion_locked":null,"should_remove_source_branch":null,"force_remove_source_branch":false,"web_url":"https://gitlab.com/donaldduck/testproject/merge_requests/2","time_stats":{"time_estimate":0,"total_time_spent":0,"human_time_estimate":null,"human_total_time_spent":null},"squash":false,"approvals_before_merge":null}]'
+    http_version: 
+  recorded_at: Thu, 05 Jul 2018 10:26:02 GMT
+- request:
+    method: put
+    uri: https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests/2/merge
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Host:
+      - gitlab.com
+      Private-Token:
+      - "<GITLAB_CREDENTIALS>"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 05 Jul 2018 10:26:04 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '1805'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"6c6d3084301470b5561b5106f5ce1da1"
+      Vary:
+      - Origin
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Request-Id:
+      - 998cef6c-2c57-4e0a-8513-f187b555a43b
+      X-Runtime:
+      - '1.395083'
+      Strict-Transport-Security:
+      - max-age=31536000
+      Ratelimit-Limit:
+      - '600'
+      Ratelimit-Observed:
+      - '2'
+      Ratelimit-Remaining:
+      - '598'
+      Ratelimit-Reset:
+      - '1530786424'
+      Ratelimit-Resettime:
+      - Fri, 05 Jul 2018 10:27:04 GMT
+    body:
+      encoding: UTF-8
+      string: '{"id":12345600,"iid":2,"project_id":1234569,"title":"Test PR","description":"","state":"merged","created_at":"2018-07-05T10:25:10.670Z","updated_at":"2018-07-05T10:26:03.813Z","target_branch":"master","source_branch":"mybranch","upvotes":0,"downvotes":0,"author":{"id":1234561,"name":"Donald
+        Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"assignee":null,"source_project_id":1234569,"target_project_id":1234569,"labels":[],"work_in_progress":false,"milestone":null,"merge_when_pipeline_succeeds":false,"merge_status":"can_be_merged","sha":"8c5971f670b5915c8a1c11448b36ed65ddbf4e33","merge_commit_sha":"8f98cc2323509d78326184b0b961c3e182165983","user_notes_count":0,"discussion_locked":null,"should_remove_source_branch":null,"force_remove_source_branch":false,"web_url":"https://gitlab.com/donaldduck/testproject/merge_requests/2","time_stats":{"time_estimate":0,"total_time_spent":0,"human_time_estimate":null,"human_total_time_spent":null},"squash":false,"subscribed":true,"changes_count":"1","merged_by":{"id":1234561,"name":"Donald
+        Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"merged_at":"2018-07-05T10:26:03.863Z","closed_by":null,"closed_at":null,"latest_build_started_at":null,"latest_build_finished_at":null,"first_deployed_to_production_at":null,"pipeline":null,"diff_refs":{"base_sha":"f2fd3bd4f6acfc2256a3163b19c54dbbdd138709","head_sha":"8c5971f670b5915c8a1c11448b36ed65ddbf4e33","start_sha":"f2fd3bd4f6acfc2256a3163b19c54dbbdd138709"},"approvals_before_merge":null}'
+    http_version: 
+  recorded_at: Thu, 05 Jul 2018 10:26:04 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.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-01 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -87,11 +87,11 @@ files:
 - lib/geet/github/milestone.rb
 - lib/geet/github/pr.rb
 - lib/geet/github/user.rb
-- lib/geet/gitlab/PR.rb
 - lib/geet/gitlab/api_interface.rb
 - lib/geet/gitlab/issue.rb
 - lib/geet/gitlab/label.rb
 - lib/geet/gitlab/milestone.rb
+- lib/geet/gitlab/pr.rb
 - lib/geet/gitlab/user.rb
 - lib/geet/helpers/json_helper.rb
 - lib/geet/helpers/os_helper.rb
@@ -129,29 +129,31 @@ files:
 - spec/vcr_cassettes/create_gist_public.yml
 - spec/vcr_cassettes/create_issue.yml
 - spec/vcr_cassettes/create_issue_upstream.yml
-- spec/vcr_cassettes/create_label.yml
-- spec/vcr_cassettes/create_label_upstream.yml
-- spec/vcr_cassettes/create_label_with_random_color.yml
-- spec/vcr_cassettes/create_pr.yml
-- spec/vcr_cassettes/create_pr_in_auto_mode_create_upstream.yml
-- spec/vcr_cassettes/create_pr_in_auto_mode_with_push.yml
-- spec/vcr_cassettes/create_pr_upstream.yml
-- spec/vcr_cassettes/create_pr_upstream_without_write_permissions.yml
+- 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_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
+- spec/vcr_cassettes/github_com/create_pr_upstream.yml
+- spec/vcr_cassettes/github_com/create_pr_upstream_without_write_permissions.yml
 - spec/vcr_cassettes/github_com/list_issues.yml
 - spec/vcr_cassettes/github_com/list_issues_upstream.yml
 - spec/vcr_cassettes/github_com/list_issues_with_assignee.yml
 - spec/vcr_cassettes/github_com/list_labels.yml
 - spec/vcr_cassettes/github_com/list_labels_upstream.yml
 - spec/vcr_cassettes/github_com/list_milestones.yml
+- spec/vcr_cassettes/github_com/merge_pr.yml
+- spec/vcr_cassettes/github_com/merge_pr_with_branch_deletion.yml
+- spec/vcr_cassettes/gitlab_com/create_label.yml
 - spec/vcr_cassettes/gitlab_com/list_issues.yml
 - spec/vcr_cassettes/gitlab_com/list_issues_with_assignee.yml
 - spec/vcr_cassettes/gitlab_com/list_labels.yml
 - spec/vcr_cassettes/gitlab_com/list_milestones.yml
+- spec/vcr_cassettes/gitlab_com/merge_pr.yml
 - spec/vcr_cassettes/list_milestones_upstream.yml
 - spec/vcr_cassettes/list_prs.yml
 - spec/vcr_cassettes/list_prs_upstream.yml
-- spec/vcr_cassettes/merge_pr.yml
-- spec/vcr_cassettes/merge_pr_with_branch_deletion.yml
 homepage: https://github.com/saveriomiroddi/geet
 licenses:
 - GPL-3.0