git_helper 1.1.0 → 2.0.0

data/lib/git_helper/empty_commit.rb

@@ -1,7 +1,9 @@
+require_relative './local_code.rb'
+
 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,9 @@
+require_relative './local_code.rb'
+
+module GitHelper
+  class ForgetLocalCommits
+    def execute
+      GitHelper::LocalCode.new.forget_local_commits
+    end
+  end
+end

data/lib/git_helper/highline_cli.rb

@@ -2,24 +2,90 @@ require 'highline'
 
 module GitHelper
   class HighlineCli
-    def ask(prompt)
-      cli.ask(prompt) do |conf|
+    def new_branch_name
+      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
+
+    def base_branch
+      ask('Base branch?')
+    end
+
+    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 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 code request? (y/n)")
+      answer.empty? ? true : !!(answer =~ /^y/i)
+    end
+
+    def squash_merge_request?
+      answer = ask('Squash merge request? (y/n)')
+      answer.empty? ? true : !!(answer =~ /^y/i)
+    end
+
+    def remove_source_branch?
+      answer = ask('Remove source branch after merging? (y/n)')
+      answer.empty? ? true : !!(answer =~ /^y/i)
+    end
+
+    def merge_method(merge_options)
+      index = ask_options("Merge method?", merge_options)
+      merge_options[index]
+    end
+
+    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)
+      complete_options = template_options << 'None'
+      index = ask_options("Which #{request_type} request template should be applied?", complete_options)
+      complete_options[index]
+    end
+
+    #######################
+    ### GENERAL METHODS ###
+    #######################
+
+    private def ask(prompt)
+      highline_client.ask(prompt) do |conf|
         conf.readline = true
       end.to_s
     end
 
-    def ask_options(prompt, choices)
+    private def ask_options(prompt, choices)
       choices_as_string_options = ''
       choices.each { |choice| choices_as_string_options << "#{choices.index(choice) + 1}. #{choice}\n" }
       compiled_prompt = "#{prompt}\n#{choices_as_string_options.strip}"
 
-      cli.ask(compiled_prompt) do |conf|
+      highline_client.ask(compiled_prompt) do |conf|
         conf.readline = true
       end.to_i - 1
     end
 
-    private def cli
-      @cli ||= HighLine.new
+    private def highline_client
+      @highline_client ||= HighLine.new
     end
   end
 end

data/lib/git_helper/local_code.rb

@@ -0,0 +1,124 @@
+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}")
+      system("git checkout #{branch_name}")
+      system("git push --set-upstream origin #{branch_name}")
+    end
+
+    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
+
+    def branch
+      # Get the current branch by looking in the list of branches for the *
+      `git branch`.scan(/\*\s([\S]*)/).first.first
+    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)
+      nested_templates = Dir.glob(
+        File.join("**/#{template_identifiers[:nested_directory_name]}", "*.md"),
+        File::FNM_DOTMATCH | File::FNM_CASEFOLD
+      )
+      non_nested_templates = Dir.glob(
+        File.join("**", "#{template_identifiers[:non_nested_file_name]}.md"),
+        File::FNM_DOTMATCH | File::FNM_CASEFOLD
+      )
+      nested_templates.concat(non_nested_templates).uniq
+    end
+
+    def read_template(file_name)
+      File.open(file_name).read
+    end
+
+    def generate_title(local_branch)
+      branch_arr = local_branch.split(local_branch.include?('_') ? '_' : '-')
+
+      return if branch_arr.empty?
+
+      if branch_arr.length == 1
+        branch_arr.first.capitalize
+      elsif branch_arr[0].scan(/([\w]+)/).any? && branch_arr[1].scan(/([\d]+)/).any? # branch includes jira_123 at beginning
+        issue = "#{branch_arr[0].upcase}-#{branch_arr[1]}"
+        description = branch_arr[2..-1].join(' ')
+        "#{issue} #{description.capitalize}"
+      elsif branch_arr[0].scan(/([\w]+-[\d]+)/).any? # branch includes string jira-123 at beginning
+        issue = branch_arr[0].upcase
+        description = branch_arr[1..-1].join(' ')
+        "#{issue} #{description.capitalize}"
+      else # plain words
+        branch_arr[0..-1].join(' ').capitalize
+      end
+    end
+  end
+end

data/lib/git_helper/merge_request.rb

@@ -1,21 +1,33 @@
 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
         }
 
         puts "Creating merge request: #{new_mr_title}"
-        mr = gitlab_client.create_merge_request(local_repo, new_mr_title, options)
+        mr = gitlab_client.create_merge_request(local_project, new_mr_title, options)
 
         if mr.diff_refs.base_sha == mr.diff_refs.head_sha
           puts "Merge request was created, but no commits have been pushed to GitLab: #{mr.web_url}"
@@ -33,16 +45,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_repo, mr_id, options)
-        puts "Merge request successfully merged: #{merge.merge_commit_sha}"
+        merge = gitlab_client.accept_merge_request(local_project, mr_id, options)
+
+        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'
@@ -55,100 +78,56 @@ module GitHelper
       end
     end
 
-    private def local_repo
-      # Get the repository by looking in the remote URLs for the full repository name
-      remotes = `git remote -v`
-      return remotes.scan(/\S[\s]*[\S]+.com[\S]{1}([\S]*).git/).first.first
-    end
-
-    private def local_branch
-      # Get the current branch by looking in the list of branches for the *
-      branches = `git branch`
-      return branches.scan(/\*\s([\S]*)/).first.first
-    end
-
-    private def read_template
-      if mr_template_options.count == 1
-        apply_template?(mr_template_options.first) ? File.open(mr_template_options.first).read : ''
-      else
-        template_file_name_to_apply = template_to_apply
-        template_file_name_to_apply == "None" ? '' : File.open(template_file_name_to_apply).read
-      end
-    end
-
-    private def mr_id
-      @mr_id ||= cli.ask('Merge Request ID?')
-    end
-
-    private def existing_mr_title
-      @existing_mr_title ||= gitlab_client.merge_request(local_repo, mr_id).title
-    end
-
-    private def new_mr_title
-      @new_mr_title ||= accept_autogenerated_title? ? autogenerated_title : cli.ask('Title?')
-    end
-
     private def new_mr_body
-      @new_mr_body ||= mr_template_options.empty? ? '' : read_template
+      @new_mr_body ||= template_name_to_apply ? local_code.read_template(template_name_to_apply) : ''
     end
 
-    private def base_branch
-      @base_branch ||= base_branch_default? ? default_branch : cli.ask('Base 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_branch.split('_')[0..-1].join(' ').capitalize
-    end
-
-    private def default_branch
-      @default_branch ||= gitlab_client.branches(local_repo).select { |branch| branch.default }.first.name
-    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 template_to_apply
-      return @template_to_apply if @template_to_apply
-      complete_options = mr_template_options << 'None'
-      index = cli.ask_options("Which merge request template should be applied?", complete_options)
-      @template_to_apply = complete_options[index]
+      @template_name_to_apply
     end
 
     private def mr_template_options
-      return @mr_template_options if @mr_template_options
-      nested_templates = Dir.glob(File.join("**/merge_request_templates", "*.md"), File::FNM_DOTMATCH | File::FNM_CASEFOLD)
-      non_nested_templates = Dir.glob(File.join("**", "merge_request_template.md"), File::FNM_DOTMATCH | File::FNM_CASEFOLD)
-      @mr_template_options = nested_templates.concat(non_nested_templates)
+      @mr_template_options ||= local_code.template_options({
+                                 nested_directory_name: 'merge_request_templates',
+                                 non_nested_file_name: 'merge_request_template'
+                               })
     end
 
-    private def base_branch_default?
-      answer = cli.ask("Is '#{default_branch}' the correct base branch for your new merge request? (y/n)")
-      !!(answer =~ /^y/i)
+    private def mr_id
+      @mr_id ||= cli.code_request_id('Merge')
     end
 
-    private def accept_autogenerated_title?
-      answer = cli.ask("Accept the autogenerated merge request title '#{autogenerated_title}'? (y/n)")
-      !!(answer =~ /^y/i)
+    private def squash_merge_request
+      @squash_merge_request ||= cli.squash_merge_request?
     end
 
-    private def squash_merge_request?
-      answer = cli.ask('Squash merge request? (y/n)')
-      !!(answer =~ /^y/i)
+    private def remove_source_branch
+      @remove_source_branch ||= existing_project.remove_source_branch_after_merge || cli.remove_source_branch?
     end
 
-    private def remove_source_branch?
-      answer = cli.ask('Remove source branch after merging? (y/n)')
-      !!(answer =~ /^y/i)
+    private def existing_project
+      @existing_project ||= gitlab_client.project(local_project)
     end
 
-    private def apply_template?(template_file_name)
-      answer = cli.ask("Apply the merge request template from #{template_file_name}? (y/n)")
-      !!(answer =~ /^y/i)
+    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
   end
 end

data/lib/git_helper/new_branch.rb

@@ -1,18 +1,12 @@
 require_relative './highline_cli.rb'
+require_relative './local_code.rb'
 
 module GitHelper
   class NewBranch
     def execute(new_branch_name = nil)
-      branch_name = new_branch_name || cli.ask('New branch name?')
+      branch_name = new_branch_name || GitHelper::HighlineCli.new.new_branch_name
       puts "Attempting to create a new branch: #{branch_name}"
-      system("git pull")
-      system("git branch --no-track #{branch_name}")
-      system("git checkout #{branch_name}")
-      system("git push --set-upstream origin #{branch_name}")
-    end
-
-    private def cli
-      @cli ||= GitHelper::HighlineCli.new
+      GitHelper::LocalCode.new.new_branch(branch_name)
     end
   end
 end