git_helper 1.3.0 → 3.0.0

data/lib/git_helper/checkout_default.rb

@@ -1,7 +1,7 @@
 module GitHelper
   class CheckoutDefault
     def execute
-      system("git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\")")
+      GitHelper::LocalCode.new.checkout_default
     end
   end
 end

data/lib/git_helper/clean_branches.rb

@@ -1,10 +1,7 @@
 module GitHelper
   class CleanBranches
     def execute
-      system("git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\")")
-      system("git pull")
-      system("git fetch -p")
-      system("git branch -vv | grep \"origin/.*: gone]\" | awk '{print \$1}' | grep -v \"*\" | xargs git branch -D")
+      GitHelper::LocalCode.new.clean_branches
     end
   end
 end

data/lib/git_helper/code_request.rb

@@ -0,0 +1,95 @@
+module GitHelper
+  class CodeRequest
+    def create
+      process_project.create({
+        base_branch: base_branch,
+        new_title: new_code_request_title
+      })
+    end
+
+    def merge
+      process_project.merge
+    end
+
+    private def process_project
+      if local_code.github_repo? # GitHub remotes are found
+        # If GitLab remotes are also found, ask for clarification, else proceed with GitHub
+        local_code.gitlab_project? ? ask_for_clarification : github_pull_request
+      elsif local_code.gitlab_project? # Only GitLab remotes are found
+        gitlab_merge_request
+      else # Neither GitHub nor GitLab remotes are found
+        puts 'Could not locate GitHub or GitLab remote URLs.'
+        exit
+      end
+    end
+
+    private def ask_for_clarification
+      resp = cli.conflicting_remote_clarification
+      if resp.include?('hub')
+        github_pull_request
+      elsif resp.include?('lab')
+        gitlab_merge_request
+      else
+        puts 'The answer we received was not parseable.'
+        exit
+      end
+    end
+
+    private def github_pull_request
+      @github_pull_request ||= GitHelper::GitHubPullRequest.new(options)
+    end
+
+    private def gitlab_merge_request
+      @gitlab_merge_request ||= GitHelper::GitLabMergeRequest.new(options)
+    end
+
+    private def options
+      {
+        local_project: local_project,
+        local_branch: local_branch,
+        local_code: local_code,
+        cli: cli
+      }
+    end
+
+    private def local_project
+      @local_project ||= local_code.project_name
+    end
+
+    private def default_branch
+      @default_branch ||= local_code.default_branch
+    end
+
+    private def base_branch
+      @base_branch ||= if cli.base_branch_default?(default_branch)
+                         default_branch
+                       else
+                         cli.base_branch
+                       end
+    end
+
+    private def local_branch
+      @local_branch ||= local_code.branch
+    end
+
+    private def autogenerated_title
+      @autogenerated_title ||= local_code.generate_title(local_branch)
+    end
+
+    private def new_code_request_title
+      @new_code_request_title ||= if cli.accept_autogenerated_title?(autogenerated_title)
+                                    autogenerated_title
+                                  else
+                                    cli.title
+                                  end
+    end
+
+    private def cli
+      @cli ||= GitHelper::HighlineCli.new
+    end
+
+    private def local_code
+      @local_code ||= GitHelper::LocalCode.new
+    end
+  end
+end

data/lib/git_helper/empty_commit.rb

@@ -1,7 +1,7 @@
 module GitHelper
   class EmptyCommit
     def execute
-      system("git commit --allow-empty -m \"Empty commit\"")
+      GitHelper::LocalCode.new.empty_commit
     end
   end
 end

data/lib/git_helper/forget_local_commits.rb

@@ -0,0 +1,7 @@
+module GitHelper
+  class ForgetLocalCommits
+    def execute
+      GitHelper::LocalCode.new.forget_local_commits
+    end
+  end
+end

data/lib/git_helper/git_config_reader.rb

@@ -19,7 +19,7 @@ module GitHelper
     end
 
     private def git_config_file
-      '.git_config.yml'
+      '.git_helper/config.yml'
     end
   end
 end

data/lib/git_helper/gitlab_client.rb

@@ -1,5 +1,4 @@
 require 'gitlab'
-require_relative './git_config_reader.rb'
 
 module GitHelper
   class GitLabClient

data/lib/git_helper/highline_cli.rb

@@ -6,6 +6,15 @@ module GitHelper
       ask('New branch name?')
     end
 
+    def process_directory_remotes?(directory)
+      answer = ask("Found git directory: #{directory}. Do you wish to proceed in updating #{directory}'s remote URLs? (y/n)")
+      answer.empty? ? true : !!(answer =~ /^y/i)
+    end
+
+    def conflicting_remote_clarification
+      ask('Found git remotes for both GitHub and GitLab. Would you like to proceed with GitLab or GitHub? (github/gitlab)').downcase
+    end
+
     def title
       ask('Title?')
     end
@@ -14,44 +23,39 @@ module GitHelper
       ask('Base branch?')
     end
 
-    def merge_request_id
-      ask('Merge Request ID?')
-    end
-
-    def pull_request_id
-      ask('Pull Request ID?')
+    def code_request_id(request_type)
+      ask("#{request_type} Request ID?")
     end
 
     def accept_autogenerated_title?(autogenerated_title)
       return false unless autogenerated_title
-      answer = ask("Accept the autogenerated merge request title '#{autogenerated_title}'? (y/n)")
-      !!(answer =~ /^y/i)
+      answer = ask("Accept the autogenerated code request title '#{autogenerated_title}'? (y/n)")
+      answer.empty? ? true : !!(answer =~ /^y/i)
     end
 
     def base_branch_default?(default_branch)
-      answer = ask("Is '#{default_branch}' the correct base branch for your new merge request? (y/n)")
-      !!(answer =~ /^y/i)
+      answer = ask("Is '#{default_branch}' the correct base branch for your new code request? (y/n)")
+      answer.empty? ? true : !!(answer =~ /^y/i)
     end
 
     def squash_merge_request?
       answer = ask('Squash merge request? (y/n)')
-      !!(answer =~ /^y/i)
+      answer.empty? ? true : !!(answer =~ /^y/i)
     end
 
     def remove_source_branch?
       answer = ask('Remove source branch after merging? (y/n)')
-      !!(answer =~ /^y/i)
+      answer.empty? ? true : !!(answer =~ /^y/i)
     end
 
-    def merge_method
-      merge_options = [ 'merge', 'squash', 'rebase' ]
+    def merge_method(merge_options)
       index = ask_options("Merge method?", merge_options)
       merge_options[index]
     end
 
-    def apply_template?(template_file_name)
-      answer = ask("Apply the merge request template from #{template_file_name}? (y/n)")
-      !!(answer =~ /^y/i)
+    def apply_template?(template_file_name, request_type)
+      answer = ask("Apply the #{request_type} request template from #{template_file_name}? (y/n)")
+      answer.empty? ? true : !!(answer =~ /^y/i)
     end
 
     def template_to_apply(template_options, request_type)

data/lib/git_helper/local_code.rb

@@ -1,5 +1,25 @@
 module GitHelper
   class LocalCode
+    def checkout_default
+      system("git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\")")
+    end
+
+    def forget_local_commits
+      system("git pull")
+      system("git reset --hard origin/HEAD")
+    end
+
+    def empty_commit
+      system("git commit --allow-empty -m \"Empty commit\"")
+    end
+
+    def clean_branches
+      system("git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\")")
+      system("git pull")
+      system("git fetch -p")
+      system("git branch -vv | grep \"origin/.*: gone]\" | awk '{print \$1}' | grep -v \"*\" | xargs git branch -D")
+    end
+
     def new_branch(branch_name)
       system("git pull")
       system("git branch --no-track #{branch_name}")
@@ -7,7 +27,51 @@ module GitHelper
       system("git push --set-upstream origin #{branch_name}")
     end
 
-    def name
+    def change_remote(remote_name, remote_url)
+      `git remote set-url #{remote_name} #{remote_url}`
+    end
+
+    def remotes
+      `git remote -v`.split("\n")
+    end
+
+    def remote_name(remote)
+      remote.scan(/([a-zA-z]+)/).first.first
+    end
+
+    def ssh_remote?(remote)
+      remote.scan(/(git@)/).any?
+    end
+
+    def https_remote?(remote)
+      remote.scan(/(https:\/\/)/).any?
+    end
+
+    def remote_project(remote)
+      if https_remote?(remote)
+        remote.scan(/https:\/\/[\S]+\/([\S]*).git/).first.first
+      elsif ssh_remote?(remote)
+        remote.scan(/\/([\S]*).git/).first.first
+      end
+    end
+
+    def remote_source(remote)
+      if https_remote?(remote)
+        remote.scan(/https:\/\/([a-zA-z.]+)\//).first.first
+      elsif ssh_remote?(remote)
+        remote.scan(/git@([a-zA-z.]+):/).first.first
+      end
+    end
+
+    def github_repo?
+      remotes.select { |remote| remote.include?('github') }.any?
+    end
+
+    def gitlab_project?
+      remotes.select { |remote| remote.include?('gitlab') }.any?
+    end
+
+    def project_name
       # Get the repo/project name by looking in the remote URLs for the full name
       `git remote -v`.scan(/\S[\s]*[\S]+.com[\S]{1}([\S]*).git/).first.first
     end
@@ -17,24 +81,8 @@ module GitHelper
       `git branch`.scan(/\*\s([\S]*)/).first.first
     end
 
-    def default_branch(project_name, external_client, client_type)
-      if client_type == :octokit # GitHub repository
-        external_client.repository(project_name).default_branch
-      elsif client_type == :gitlab # GitLab project
-        page_number = 1
-        counter = 1
-        branches = []
-
-        while counter > 0
-          break if default_branch = branches.select { |branch| branch.default }.first
-          page_branches = external_client.branches(project_name, page: page_number, per_page: 100)
-          branches = page_branches
-          counter = page_branches.count
-          page_number += 1
-        end
-
-        default_branch.name
-      end
+    def default_branch
+      `git symbolic-ref refs/remotes/origin/HEAD | sed "s@^refs/remotes/origin/@@" | tr -d "\n"`
     end
 
     def template_options(template_identifiers)

data/lib/git_helper/merge_request.rb

@@ -1,17 +1,24 @@
-require_relative './gitlab_client.rb'
-require_relative './highline_cli.rb'
-require_relative './local_code.rb'
-
 module GitHelper
   class GitLabMergeRequest
-    def create
+    attr_accessor :local_project, :local_branch, :local_code, :cli, :base_branch, :new_mr_title
+
+    def initialize(options)
+      @local_project = options[:local_project]
+      @local_branch = options[:local_branch]
+      @local_code = options[:local_code]
+      @cli = options[:cli]
+    end
+
+    def create(options)
+      @base_branch = options[:base_branch]
+      @new_mr_title = options[:new_title]
+
       begin
-        # Ask these questions right away
-        base_branch
-        new_mr_title
         options = {
           source_branch: local_branch,
           target_branch: base_branch,
+          squash: squash_merge_request,
+          remove_source_branch: remove_source_branch,
           description: new_mr_body
         }
 
@@ -34,16 +41,27 @@ module GitHelper
 
     def merge
       begin
-        # Ask these questions right away
         mr_id
-        options = {}
-        options[:should_remove_source_branch] = remove_source_branch
-        options[:squash] = squash_merge_request
-        options[:squash_commit_message] = existing_mr_title
+        options = {
+          should_remove_source_branch: existing_mr.should_remove_source_branch || existing_mr.force_remove_source_branch,
+          squash: existing_mr.squash,
+          squash_commit_message: existing_mr.title
+        }
 
         puts "Merging merge request: #{mr_id}"
         merge = gitlab_client.accept_merge_request(local_project, mr_id, options)
-        puts "Merge request successfully merged: #{merge.merge_commit_sha}"
+
+        if merge.merge_commit_sha.nil?
+          options[:squash] = true
+          merge = gitlab_client.accept_merge_request(local_project, mr_id, options)
+        end
+
+        if merge.merge_commit_sha.nil?
+          puts 'Could not merge merge request:'
+          puts "  #{merge.merge_error}"
+        else
+          puts "Merge request successfully merged: #{merge.merge_commit_sha}"
+        end
       rescue Gitlab::Error::MethodNotAllowed => e
         puts 'Could not merge merge request:'
         puts '  The merge request is not mergeable'
@@ -56,31 +74,36 @@ module GitHelper
       end
     end
 
-    private def local_project
-      @local_project ||= local_code.name
+    private def new_mr_body
+      @new_mr_body ||= template_name_to_apply ? local_code.read_template(template_name_to_apply) : ''
     end
 
-    private def local_branch
-      @local_branch ||= local_code.branch
-    end
+    private def template_name_to_apply
+      return @template_name_to_apply if @template_name_to_apply
+      @template_name_to_apply = nil
 
-    private def autogenerated_title
-      @autogenerated_title ||= local_code.generate_title(local_branch)
-    end
+      unless mr_template_options.empty?
+        if mr_template_options.count == 1
+          apply_single_template = cli.apply_template?(mr_template_options.first, 'merge')
+          @template_name_to_apply = mr_template_options.first if apply_single_template
+        else
+          response = cli.template_to_apply(mr_template_options, 'merge')
+          @template_name_to_apply = response unless response == 'None'
+        end
+      end
 
-    private def default_branch
-      @default_branch ||= local_code.default_branch(local_project, gitlab_client, :gitlab)
+      @template_name_to_apply
     end
 
     private def mr_template_options
       @mr_template_options ||= local_code.template_options({
-                                 nested_directory_name: "merge_request_templates",
-                                 non_nested_file_name: "merge_request_template"
+                                 nested_directory_name: 'merge_request_templates',
+                                 non_nested_file_name: 'merge_request_template'
                                })
     end
 
     private def mr_id
-      @mr_id ||= cli.merge_request_id
+      @mr_id ||= cli.code_request_id('Merge')
     end
 
     private def squash_merge_request
@@ -88,60 +111,19 @@ module GitHelper
     end
 
     private def remove_source_branch
-      @remove_source_branch ||= cli.remove_source_branch?
-    end
-
-    private def new_mr_title
-      @new_mr_title ||= if cli.accept_autogenerated_title?(autogenerated_title)
-                          autogenerated_title
-                        else
-                          cli.title
-                        end
+      @remove_source_branch ||= existing_project.remove_source_branch_after_merge || cli.remove_source_branch?
     end
 
-    private def base_branch
-      @base_branch ||= if cli.base_branch_default?(default_branch)
-                         default_branch
-                       else
-                         cli.base_branch
-                       end
-    end
-
-    private def new_mr_body
-      @new_mr_body ||= template_name_to_apply ? local_code.read_template(template_name_to_apply) : ''
-    end
-
-    private def template_name_to_apply
-      return @template_name_to_apply if @template_name_to_apply
-      @template_name_to_apply = nil
-
-      unless mr_template_options.empty?
-        if mr_template_options.count == 1
-          apply_single_template = cli.apply_template?(mr_template_options.first)
-          @template_name_to_apply = mr_template_options.first if apply_single_template
-        else
-          response = cli.template_to_apply(mr_template_options, 'merge')
-          @template_name_to_apply = response unless response == "None"
-        end
-      end
-
-      @template_name_to_apply
+    private def existing_project
+      @existing_project ||= gitlab_client.project(local_project)
     end
 
-    private def existing_mr_title
-      @existing_mr_title ||= gitlab_client.merge_request(local_project, mr_id).title
+    private def existing_mr
+      @existing_mr ||= gitlab_client.merge_request(local_project, mr_id)
     end
 
     private def gitlab_client
       @gitlab_client ||= GitHelper::GitLabClient.new.client
     end
-
-    private def cli
-      @cli ||= GitHelper::HighlineCli.new
-    end
-
-    private def local_code
-      @local_code ||= GitHelper::LocalCode.new
-    end
   end
 end