git_helper 3.2.0 → 3.3.2

data/lib/git_helper/empty_commit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   class EmptyCommit
     def execute

data/lib/git_helper/forget_local_commits.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   class ForgetLocalCommits
     def execute

data/lib/git_helper/git_config_reader.rb

@@ -1,23 +1,29 @@
+# frozen_string_literal: true
+
 module GitHelper
   class GitConfigReader
     def gitlab_token
       config_file[:gitlab_token]
     end
 
+    def gitlab_user
+      config_file[:gitlab_user]
+    end
+
     def github_token
       config_file[:github_token]
     end
 
-    private def config_file
-      YAML.load_file(git_config_file_path)
+    def github_user
+      config_file[:github_user]
     end
 
-    private def git_config_file_path
-      Dir.pwd.scan(/\A\/[\w]*\/[\w]*\//).first << git_config_file
+    def git_config_file_path
+      "#{Dir.pwd.scan(%r{\A/\w*/\w*/}).first}.git_helper/config.yml"
     end
 
-    private def git_config_file
-      '.git_helper/config.yml'
+    private def config_file
+      YAML.load_file(git_config_file_path)
     end
   end
 end

data/lib/git_helper/gitlab_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   class GitLabClient
     def client

data/lib/git_helper/highline_cli.rb

@@ -1,85 +1,31 @@
+# frozen_string_literal: true
+
 module GitHelper
   class HighlineCli
-    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]
+    def ask(prompt)
+      highline_client.ask(prompt) do |conf|
+        conf.readline = true
+      end.to_s
     end
 
-    #######################
-    ### GENERAL METHODS ###
-    #######################
-
-    private def ask(prompt)
-      highline_client.ask(prompt) do |conf|
+    def ask_yes_no(prompt)
+      answer = highline_client.ask(prompt) do |conf|
         conf.readline = true
       end.to_s
+
+      answer.empty? ? true : !!(answer =~ /^y/i)
     end
 
-    private def ask_options(prompt, choices)
-      choices_as_string_options = ''
+    def ask_options(prompt, choices)
+      choices_as_string_options = ''.dup
       choices.each { |choice| choices_as_string_options << "#{choices.index(choice) + 1}. #{choice}\n" }
       compiled_prompt = "#{prompt}\n#{choices_as_string_options.strip}"
 
-      highline_client.ask(compiled_prompt) do |conf|
+      index = highline_client.ask(compiled_prompt) do |conf|
         conf.readline = true
       end.to_i - 1
+
+      choices[index]
     end
 
     private def highline_client

data/lib/git_helper/local_code.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   class LocalCode
     def checkout_default
@@ -44,20 +46,20 @@ module GitHelper
     end
 
     def https_remote?(remote)
-      remote.scan(/(https:\/\/)/).any?
+      remote.scan(%r{(https://)}).any?
     end
 
     def remote_project(remote)
       if https_remote?(remote)
-        remote.scan(/https:\/\/[\S]+\/([\S]*).git/).first.first
+        remote.scan(%r{https://\S+/(\S*).git}).first.first
       elsif ssh_remote?(remote)
-        remote.scan(/\/([\S]*).git/).first.first
+        remote.scan(%r{/(\S*).git}).first.first
       end
     end
 
     def remote_source(remote)
       if https_remote?(remote)
-        remote.scan(/https:\/\/([a-zA-z.]+)\//).first.first
+        remote.scan(%r{https://([a-zA-z.]+)/}).first.first
       elsif ssh_remote?(remote)
         remote.scan(/git@([a-zA-z.]+):/).first.first
       end
@@ -73,18 +75,20 @@ module GitHelper
 
     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
+      `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
+      `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
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def template_options(identifiers)
       nested_templates = Dir.glob(
         File.join("#{identifiers[:template_directory]}/#{identifiers[:nested_directory_name]}", '*.md'),
@@ -100,11 +104,15 @@ module GitHelper
       )
       nested_templates.concat(non_nested_templates).concat(root_templates).uniq
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
 
     def read_template(file_name)
       File.open(file_name).read
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def generate_title(local_branch)
       branch_arr = local_branch.split(local_branch.include?('_') ? '_' : '-')
 
@@ -112,11 +120,11 @@ module GitHelper
 
       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
+      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
+      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}"
@@ -124,5 +132,7 @@ module GitHelper
         branch_arr[0..-1].join(' ').capitalize
       end
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/git_helper/merge_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   class GitLabMergeRequest
     attr_accessor :local_project, :local_branch, :local_code, :cli, :base_branch, :new_mr_title
@@ -9,70 +11,74 @@ module GitHelper
       @cli = options[:cli]
     end
 
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def create(options)
       @base_branch = options[:base_branch]
       @new_mr_title = options[:new_title]
 
-      begin
-        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_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}"
-        else
-          puts "Merge request successfully created: #{mr.web_url}"
-        end
-      rescue Gitlab::Error::Conflict => e
-        puts 'Could not create merge request:'
-        puts '  A merge request already exists for this branch'
-      rescue Exception => e
-        puts 'Could not create merge request:'
-        puts e.message
+      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_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}"
+      else
+        puts "Merge request successfully created: #{mr.web_url}"
       end
+    rescue Gitlab::Error::Conflict
+      puts 'Could not create merge request:'
+      puts '  A merge request already exists for this branch'
+    rescue StandardError => e
+      puts 'Could not create merge request:'
+      puts e.message
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def merge
-      begin
-        mr_id
-        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}"
+      mr_id
+      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)
+
+      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?
-          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'
-      rescue Gitlab::Error::NotFound => e
+      if merge.merge_commit_sha.nil?
         puts 'Could not merge merge request:'
-        puts "  Could not a locate a merge request to merge with ID #{mr_id}"
-      rescue Exception => e
-        puts 'Could not merge merge request:'
-        puts e.message
+        puts "  #{merge.merge_error}"
+      else
+        puts "Merge request successfully merged: #{merge.merge_commit_sha}"
       end
+    rescue Gitlab::Error::MethodNotAllowed
+      puts 'Could not merge merge request:'
+      puts '  The merge request is not mergeable'
+    rescue Gitlab::Error::NotFound
+      puts 'Could not merge merge request:'
+      puts "  Could not a locate a merge request to merge with ID #{mr_id}"
+    rescue StandardError => e
+      puts 'Could not merge merge request:'
+      puts e.message
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     private def new_mr_body
       @new_mr_body ||= template_name_to_apply ? local_code.read_template(template_name_to_apply) : ''
@@ -80,39 +86,53 @@ module GitHelper
 
     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, '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
+      determine_template unless mr_template_options.empty?
 
       @template_name_to_apply
     end
 
+    # rubocop:disable Metrics/MethodLength
+    private def determine_template
+      if mr_template_options.count == 1
+        apply_single_template = cli.ask_yes_no(
+          "Apply the merge request template from #{mr_template_options.first}? (y/n)"
+        )
+        @template_name_to_apply = mr_template_options.first if apply_single_template
+      else
+        response = cli.ask_options(
+          'Which merge request template should be applied?', mr_template_options << 'None'
+        )
+        @template_name_to_apply = response unless response == 'None'
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+
     private def mr_template_options
-      @mr_template_options ||= local_code.template_options({
-                                 template_directory: '.gitlab',
-                                 nested_directory_name: 'merge_request_templates',
-                                 non_nested_file_name: 'merge_request_template'
-                               })
+      @mr_template_options ||= local_code.template_options(
+        {
+          template_directory: '.gitlab',
+          nested_directory_name: 'merge_request_templates',
+          non_nested_file_name: 'merge_request_template'
+        }
+      )
     end
 
     private def mr_id
-      @mr_id ||= cli.code_request_id('Merge')
+      @mr_id ||= cli.ask('Merge Request ID?')
     end
 
     private def squash_merge_request
-      @squash_merge_request ||= cli.squash_merge_request?
+      @squash_merge_request ||= cli.ask_yes_no('Squash merge request? (y/n)')
     end
 
     private def remove_source_branch
-      @remove_source_branch ||= existing_project.remove_source_branch_after_merge || cli.remove_source_branch?
+      @remove_source_branch ||=
+        existing_project.remove_source_branch_after_merge || cli.ask_yes_no(
+          'Remove source branch after merging? (y/n)'
+        )
     end
 
     private def existing_project