geet 0.1.8 → 0.1.9

data/lib/geet/services/create_pr.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../helpers/os_helper.rb'
-require_relative '../git/repository.rb'
 
 module Geet
   module Services
@@ -13,21 +12,21 @@ module Geet
       #   :reviewer_patterns
       #   :no_open_pr
       #
-      def execute(repository, title, description, label_patterns: nil, milestone_pattern: nil, reviewer_patterns: nil, no_open_pr: nil, **)
-        labels_thread = select_labels(repository, label_patterns) if label_patterns
-        milestone_thread = find_milestone(repository, milestone_pattern) if milestone_pattern
-        reviewers_thread = select_reviewers(repository, reviewer_patterns) if reviewer_patterns
+      def execute(repository, title, description, label_patterns: nil, milestone_pattern: nil, reviewer_patterns: nil, no_open_pr: nil, output: $stdout, **)
+        labels_thread = select_labels(repository, label_patterns, output) if label_patterns
+        milestone_thread = find_milestone(repository, milestone_pattern, output) if milestone_pattern
+        reviewers_thread = select_reviewers(repository, reviewer_patterns, output) if reviewer_patterns
 
         selected_labels = labels_thread&.join&.value
         reviewers = reviewers_thread&.join&.value
         milestone = milestone_thread&.join&.value
 
-        pr = create_pr(repository, title, description)
+        pr = create_pr(repository, title, description, output)
 
-        assign_user_thread = assign_authenticated_user(pr, repository)
-        add_labels_thread = add_labels(pr, selected_labels) if selected_labels
-        set_milestone_thread = set_milestone(pr, milestone) if milestone
-        request_review_thread = request_review(pr, reviewers) if reviewers
+        assign_user_thread = assign_authenticated_user(pr, repository, output)
+        add_labels_thread = add_labels(pr, selected_labels, output) if selected_labels
+        set_milestone_thread = set_milestone(pr, milestone, output) if milestone
+        request_review_thread = request_review(pr, reviewers, output) if reviewers
 
         assign_user_thread.join
         add_labels_thread&.join
@@ -35,18 +34,20 @@ module Geet
         request_review_thread&.join
 
         if no_open_pr
-          puts "PR address: #{pr.link}"
+          output.puts "PR address: #{pr.link}"
         else
           os_open(pr.link)
         end
+
+        pr
       end
 
       private
 
       # Internal actions
 
-      def select_labels(repository, label_patterns)
-        puts 'Finding labels...'
+      def select_labels(repository, label_patterns, output)
+        output.puts 'Finding labels...'
 
         Thread.new do
           all_labels = repository.labels
@@ -55,8 +56,8 @@ module Geet
         end
       end
 
-      def find_milestone(repository, milestone_pattern)
-        puts 'Finding milestone...'
+      def find_milestone(repository, milestone_pattern, output)
+        output.puts 'Finding milestone...'
 
         Thread.new do
           if milestone_pattern =~ /\A\d+\Z/
@@ -69,8 +70,8 @@ module Geet
         end
       end
 
-      def select_reviewers(repository, reviewer_patterns)
-        puts 'Finding collaborators...'
+      def select_reviewers(repository, reviewer_patterns, output)
+        output.puts 'Finding collaborators...'
 
         Thread.new do
           all_collaborators = repository.collaborators
@@ -79,38 +80,38 @@ module Geet
         end
       end
 
-      def create_pr(repository, title, description)
-        puts 'Creating PR...'
+      def create_pr(repository, title, description, output)
+        output.puts 'Creating PR...'
 
         repository.create_pr(title, description, repository.current_branch)
       end
 
-      def assign_authenticated_user(pr, repository)
-        puts 'Assigning authenticated user...'
+      def assign_authenticated_user(pr, repository, output)
+        output.puts 'Assigning authenticated user...'
 
         Thread.new do
           pr.assign_users(repository.authenticated_user)
         end
       end
 
-      def add_labels(pr, selected_labels)
-        puts "Adding labels #{selected_labels.join(', ')}..."
+      def add_labels(pr, selected_labels, output)
+        output.puts "Adding labels #{selected_labels.join(', ')}..."
 
         Thread.new do
           pr.add_labels(selected_labels)
         end
       end
 
-      def set_milestone(pr, milestone)
-        puts "Setting milestone #{milestone.title}..."
+      def set_milestone(pr, milestone, output)
+        output.puts "Setting milestone #{milestone.title}..."
 
         Thread.new do
           pr.edit(milestone: milestone.number)
         end
       end
 
-      def request_review(pr, reviewers)
-        puts "Requesting review from #{reviewers.join(', ')}..."
+      def request_review(pr, reviewers, output)
+        output.puts "Requesting review from #{reviewers.join(', ')}..."
 
         Thread.new do
           pr.request_review(reviewers)

data/lib/geet/services/list_issues.rb

@@ -3,11 +3,11 @@
 module Geet
   module Services
     class ListIssues
-      def execute(repository)
+      def execute(repository, output: $stdout)
         issues = repository.issues
 
         issues.each do |issue|
-          puts "#{issue.number}. #{issue.title} (#{issue.link})"
+          output.puts "#{issue.number}. #{issue.title} (#{issue.link})"
         end
       end
     end

data/lib/geet/services/list_labels.rb

@@ -3,11 +3,11 @@
 module Geet
   module Services
     class ListLabels
-      def execute(repository)
+      def execute(repository, output: $stdout)
         labels = repository.labels
 
         labels.each do |label|
-          puts "- #{label}"
+          output.puts "- #{label}"
         end
       end
     end

data/lib/geet/services/list_milestones.rb

@@ -3,19 +3,19 @@
 module Geet
   module Services
     class ListMilestones
-      def execute(repository)
-        milestones = find_milestones(repository)
-        issues_by_milestone_number = find_milestone_issues(repository, milestones)
+      def execute(repository, output: $stdout)
+        milestones = find_milestones(repository, output)
+        issues_by_milestone_number = find_milestone_issues(repository, milestones, output)
 
-        puts
+        output.puts
 
         milestones.each do |milestone|
-          puts milestone_description(milestone)
+          output.puts milestone_description(milestone)
 
           milestone_issues = issues_by_milestone_number[milestone.number]
 
           milestone_issues.each do |issue|
-            puts "  #{issue.number}. #{issue.title} (#{issue.link})"
+            output.puts "  #{issue.number}. #{issue.title} (#{issue.link})"
           end
         end
       end
@@ -30,14 +30,14 @@ module Geet
         description
       end
 
-      def find_milestones(repository)
-        puts 'Finding milestones...'
+      def find_milestones(repository, output)
+        output.puts 'Finding milestones...'
 
         repository.milestones
       end
 
-      def find_milestone_issues(repository, milestones)
-        puts 'Finding issues...'
+      def find_milestone_issues(repository, milestones, output)
+        output.puts 'Finding issues...'
 
         # Interestingly, on MRI, concurrent hash access is not a problem without mutex,
         # since due to the GIL, only one thread at a time will actually access it.

data/lib/geet/services/list_prs.rb

@@ -3,11 +3,11 @@
 module Geet
   module Services
     class ListPrs
-      def execute(repository)
+      def execute(repository, output: $stdout)
         prs = repository.prs
 
         prs.each do |pr|
-          puts "#{pr.number}. #{pr.title} (#{pr.link})"
+          output.puts "#{pr.number}. #{pr.title} (#{pr.link})"
         end
       end
     end

data/lib/geet/services/merge_pr.rb

@@ -3,10 +3,11 @@
 module Geet
   module Services
     class MergePr
-      def execute(repository)
+      def execute(repository, output: $stdout)
         merge_head = find_merge_head(repository)
-        pr = checked_find_branch_pr(repository, merge_head)
-        merge_pr(pr)
+        pr = checked_find_branch_pr(repository, merge_head, output)
+        merge_pr(pr, output)
+        pr
       end
 
       private
@@ -16,8 +17,8 @@ module Geet
       end
 
       # Expect to find only one.
-      def checked_find_branch_pr(repository, head)
-        puts "Finding PR with head (#{head})..."
+      def checked_find_branch_pr(repository, head, output)
+        output.puts "Finding PR with head (#{head})..."
 
         prs = repository.prs(head: head)
 
@@ -26,8 +27,8 @@ module Geet
         prs[0]
       end
 
-      def merge_pr(pr)
-        puts "Merging PR ##{pr.number}..."
+      def merge_pr(pr, output)
+        output.puts "Merging PR ##{pr.number}..."
 
         pr.merge
       end

data/lib/geet/version.rb

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

data/spec/integration/create_gist_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'tempfile'
+
+require_relative '../../lib/geet/git/repository'
+require_relative '../../lib/geet/services/create_gist'
+
+describe Geet::Services::CreateGist do
+  let(:repository) { Geet::Git::Repository.new(ENV.fetch('GITHUB_API_TOKEN')) }
+  let(:tempfile) { Tempfile.open('geet_gist') { |file| file << "testcontent" } }
+
+  it 'should create a public gist' do
+    expected_output = <<~STR
+      Creating a public gist...
+      Gist address: https://gist.github.com/b01dface
+    STR
+
+    actual_output = StringIO.new
+
+    VCR.use_cassette("create_gist_public") do
+      described_class.new.execute(
+        repository, tempfile.path,
+        description: 'testdescription', publik: true, no_browse: true, output: actual_output
+      )
+    end
+
+    expect(actual_output.string).to eql(expected_output)
+  end
+
+  it 'should create a private gist' do
+    expected_output = <<~STR
+      Creating a private gist...
+      Gist address: https://gist.github.com/deadbeef
+    STR
+
+    actual_output = StringIO.new
+
+    VCR.use_cassette("create_gist_private") do
+      described_class.new.execute(
+        repository, tempfile.path,
+        description: 'testdescription', no_browse: true, output: actual_output
+      )
+    end
+
+    expect(actual_output.string).to eql(expected_output)
+  end
+end

data/spec/integration/create_issue_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+require_relative '../../lib/geet/git/repository'
+require_relative '../../lib/geet/services/create_issue'
+
+describe Geet::Services::CreateIssue do
+  let(:repository) { Geet::Git::Repository.new(ENV.fetch('GITHUB_API_TOKEN')) }
+  let(:upstream_repository) { Geet::Git::Repository.new(ENV.fetch('GITHUB_API_TOKEN'), upstream: true) }
+
+  context 'with labels, assignees and milestones' do
+    it 'should create an issue' do
+      allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+
+      expected_output = <<~STR
+        Finding labels...
+        Finding milestone...
+        Finding collaborators...
+        Creating the issue...
+        Adding labels bug, invalid...
+        Setting milestone 0.0.1...
+        Assigning users donald-ts, donald-fr...
+        Issue address: https://github.com/donaldduck/testrepo/issues/1
+      STR
+
+      actual_output = StringIO.new
+
+      actual_created_issue = VCR.use_cassette("create_issue") do
+        described_class.new.execute(
+          repository, 'Title', 'Description',
+          label_patterns: 'bug,invalid', milestone_pattern: '0.0.1', assignee_patterns: 'nald-ts,nald-fr',
+          no_open_issue: true, output: actual_output
+        )
+      end
+
+      expect(actual_output.string).to eql(expected_output)
+
+      expect(actual_created_issue.number).to eql(1)
+      expect(actual_created_issue.title).to eql('Title')
+      expect(actual_created_issue.link).to eql('https://github.com/donaldduck/testrepo/issues/1')
+    end
+  end
+
+  it 'should create an upstream issue' do
+    allow(upstream_repository).to receive(:current_branch).and_return('mybranch')
+    allow(upstream_repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+    allow(upstream_repository).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+
+    expected_output = <<~STR
+      Creating the issue...
+      Assigning authenticated user...
+      Issue address: https://github.com/donald-fr/testrepo_u/issues/7
+    STR
+
+    actual_output = StringIO.new
+
+    actual_created_issue = VCR.use_cassette("create_issue_upstream") do
+      described_class.new.execute(upstream_repository, 'Title', 'Description', no_open_issue: true, output: actual_output)
+    end
+
+    expect(actual_output.string).to eql(expected_output)
+
+    expect(actual_created_issue.number).to eql(7)
+    expect(actual_created_issue.title).to eql('Title')
+    expect(actual_created_issue.link).to eql('https://github.com/donald-fr/testrepo_u/issues/7')
+  end
+end

data/spec/integration/create_pr_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+require_relative '../../lib/geet/git/repository'
+require_relative '../../lib/geet/services/create_pr'
+
+describe Geet::Services::CreatePr do
+  let(:repository) { Geet::Git::Repository.new(ENV.fetch('GITHUB_API_TOKEN')) }
+  let(:upstream_repository) { Geet::Git::Repository.new(ENV.fetch('GITHUB_API_TOKEN'), upstream: true) }
+
+  context 'with labels, reviewers and milestones' do
+    it 'should create a PR' do
+      allow(repository).to receive(:current_branch).and_return('mybranch1')
+      allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+
+      expected_output = <<~STR
+        Finding labels...
+        Finding milestone...
+        Finding collaborators...
+        Creating PR...
+        Assigning authenticated user...
+        Adding labels other_bug, invalid...
+        Setting milestone 0.0.1...
+        Requesting review from donald-ts, donald-fr...
+        PR address: https://github.com/donaldduck/testrepo/pull/3
+      STR
+
+      actual_output = StringIO.new
+
+      actual_created_pr = VCR.use_cassette("create_pr") do
+        described_class.new.execute(
+          repository, 'Title', 'Description',
+          label_patterns: '_bug,invalid', milestone_pattern: '0.0.1', reviewer_patterns: 'nald-ts,nald-fr',
+          no_open_pr: true, output: actual_output
+        )
+      end
+
+      expect(actual_output.string).to eql(expected_output)
+
+      expect(actual_created_pr.number).to eql(3)
+      expect(actual_created_pr.title).to eql('Title')
+      expect(actual_created_pr.link).to eql('https://github.com/donaldduck/testrepo/pull/3')
+    end
+  end
+
+  it 'should create an upstream PR' do
+    allow(upstream_repository).to receive(:current_branch).and_return('mybranch')
+    allow(upstream_repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_2f')
+    allow(upstream_repository).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/4
+    STR
+
+    actual_output = StringIO.new
+
+    actual_created_pr = VCR.use_cassette("create_pr_upstream") do
+      described_class.new.execute(upstream_repository, 'Title', 'Description', no_open_pr: true, output: actual_output)
+    end
+
+    expect(actual_output.string).to eql(expected_output)
+
+    expect(actual_created_pr.number).to eql(4)
+    expect(actual_created_pr.title).to eql('Title')
+    expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/4')
+  end
+end