git_helper 1.2.0 → 2.0.2

data/lib/git_helper/new_branch.rb

@@ -1,18 +1,9 @@
-require_relative './highline_cli.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

data/lib/git_helper/octokit_client.rb

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

data/lib/git_helper/pull_request.rb

@@ -1,13 +1,19 @@
-require_relative './octokit_client.rb'
-require_relative './highline_cli.rb'
-
 module GitHelper
   class GitHubPullRequest
-    def create
+    attr_accessor :local_repo, :local_branch, :local_code, :cli, :base_branch, :new_pr_title
+
+    def initialize(options)
+      @local_repo = 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_pr_title = options[:new_title]
+
       begin
-        # Ask these questions right away
-        base_branch
-        new_pr_title
         new_pr_body
 
         puts "Creating pull request: #{new_pr_title}"
@@ -30,12 +36,11 @@ module GitHelper
 
     def merge
       begin
-        # Ask these questions right away
         pr_id
         merge_method
 
         puts "Merging pull request: #{pr_id}"
-        merge = octokit_client.merge_pull_request(local_repo, pr_id, existing_pr_title, { merge_method: merge_method })
+        merge = octokit_client.merge_pull_request(local_repo, pr_id, existing_pr.title, { merge_method: merge_method })
         puts "Pull request successfully merged: #{merge.sha}"
       rescue Octokit::UnprocessableEntity => e
         puts 'Could not merge pull request:'
@@ -66,131 +71,61 @@ 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 pr_template_options.count == 1
-        apply_template?(pr_template_options.first) ? File.open(pr_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 merge_options
-      [ 'merge', 'squash', 'rebase' ]
-    end
-
-    private def pr_id
-      @pr_id ||= cli.ask('Pull Request ID?')
-    end
-
-    private def existing_pr_title
-      @existing_pr_title ||= octokit_client.pull_request(local_repo, pr_id).title
-    end
-
-    private def new_pr_title
-      @new_pr_title ||= accept_autogenerated_title? ? autogenerated_title : cli.ask('Title?')
-    end
-
     private def new_pr_body
-      @new_pr_body ||= pr_template_options.empty? ? '' : read_template
-    end
-
-    private def base_branch
-      @base_branch ||= base_branch_default? ? default_branch : cli.ask('Base branch?')
+      @new_pr_body ||= template_name_to_apply ? local_code.read_template(template_name_to_apply) : ''
     end
 
-    private def autogenerated_title
-      @autogenerated_title ||= generate_title
-    end
-
-    private def generate_title
-      branch_arr = local_branch.split(local_branch.include?('_') ? '_' : '-')
-
-      return if branch_arr.empty?
+    private def template_name_to_apply
+      return @template_name_to_apply if @template_name_to_apply
+      @template_name_to_apply = nil
 
-      if branch_arr.length == 1
-        return branch_arr.first.capitalize
-      end
-
-      if branch_arr[0].scan(/([\w]+)/).empty? || branch_arr[1].scan(/([\d]+)/).empty?
-        branch_arr[0..-1].join(' ').capitalize
-      else
-        issue = branch_arr[0].upcase
-
-        if issue.include?('-')
-          description = branch_arr[1..-1].join(' ')
+      unless pr_template_options.empty?
+        if pr_template_options.count == 1
+          apply_single_template = cli.apply_template?(pr_template_options.first, 'pull')
+          @template_name_to_apply = pr_template_options.first if apply_single_template
         else
-          issue = "#{issue}-#{branch_arr[1]}"
-          description = branch_arr[2..-1].join(' ')
+          response = cli.template_to_apply(pr_template_options, 'pull')
+          @template_name_to_apply = response unless response == 'None'
         end
-
-        "#{issue} #{description.capitalize}"
       end
-    end
 
-    private def default_branch
-      @default_branch ||= octokit_client.repository(local_repo).default_branch
+      @template_name_to_apply
     end
 
-    private def merge_method
-      return @merge_method if @merge_method
-      index = cli.ask_options("Merge method?", merge_options)
-      @merge_method = merge_options[index]
+    private def pr_template_options
+      @pr_template_options ||= local_code.template_options({
+                                 nested_directory_name: 'PULL_REQUEST_TEMPLATE',
+                                 non_nested_file_name: 'pull_request_template'
+                               })
     end
 
-    private def template_to_apply
-      return @template_to_apply if @template_to_apply
-      complete_options = pr_template_options << 'None'
-      index = cli.ask_options("Which pull request template should be applied?", complete_options)
-      @template_to_apply = complete_options[index]
+    private def pr_id
+      @pr_id ||= cli.code_request_id('Pull')
     end
 
-    private def pr_template_options
-      return @pr_template_options if @pr_template_options
-      nested_templates = Dir.glob(File.join("**/PULL_REQUEST_TEMPLATE", "*.md"), File::FNM_DOTMATCH | File::FNM_CASEFOLD)
-      non_nested_templates = Dir.glob(File.join("**", "pull_request_template.md"), File::FNM_DOTMATCH | File::FNM_CASEFOLD)
-      @pr_template_options = nested_templates.concat(non_nested_templates)
+    private def merge_method
+      @merge_method ||= merge_options.length == 1 ? merge_options.first : cli.merge_method(merge_options)
     end
 
-    private def base_branch_default?
-      answer = cli.ask("Is '#{default_branch}' the correct base branch for your new pull request? (y/n)")
-      !!(answer =~ /^y/i)
+    private def merge_options
+      return @merge_options if @merge_options
+      merge_options = []
+      merge_options << 'merge' if existing_project.allow_merge_commit
+      merge_options << 'squash' if existing_project.allow_squash_merge
+      merge_options << 'rebase' if existing_project.allow_rebase_merge
+      @merge_options = merge_options
     end
 
-    private def accept_autogenerated_title?
-      title = autogenerated_title
-
-      if title
-        answer = cli.ask("Accept the autogenerated merge request title '#{title}'? (y/n)")
-        !!(answer =~ /^y/i)
-      else
-        false
-      end
+    private def existing_project
+      @existing_project ||= octokit_client.repository(local_repo)
     end
 
-    private def apply_template?(template_file_name)
-      answer = cli.ask("Apply the pull request template from #{template_file_name}? (y/n)")
-      !!(answer =~ /^y/i)
+    private def existing_pr
+      @existing_pr ||= octokit_client.pull_request(local_repo, pr_id)
     end
 
     private def octokit_client
       @octokit_client ||= GitHelper::OctokitClient.new.client
     end
-
-    private def cli
-      @cli ||= GitHelper::HighlineCli.new
-    end
   end
 end

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '1.2.0'
+  VERSION = '2.0.2'
 end

data/spec/git_helper/change_remote_spec.rb

@@ -0,0 +1,173 @@
+require 'spec_helper'
+require 'git_helper'
+
+describe GitHelper::ChangeRemote do
+  let(:remote1) { 'git@github.com:github-username-old/project-1.git' }
+  let(:local_code) do
+    double(:local_code,
+      remotes: [remote1],
+      remote_name: 'origin',
+      ssh_remote?: true,
+      https_remote?: false,
+      remote_project: 'project-1',
+      remote_source: 'github.com',
+      change_remote: true
+    )
+  end
+  let(:cli) { double(:highline_cli, process_directory_remotes?: true) }
+  let(:old_owner) { 'github-username-old' }
+  let(:new_owner) { 'github-username-new' }
+  let(:directory_entries) { [ '.', '..', 'project-1', 'project-2', 'project-3' ] }
+
+  subject { GitHelper::ChangeRemote.new(old_owner, new_owner) }
+
+  before do
+    allow(GitHelper::HighlineCli).to receive(:new).and_return(cli)
+    allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
+  end
+
+  describe '#execute' do
+    before do
+      allow(Dir).to receive(:pwd).and_return('/Users/firstname/lastname/path/to/project')
+      allow(Dir).to receive(:entries).and_return(directory_entries)
+      allow(File).to receive(:join).and_return('/Users/firstname/lastname/path/to/project/project-1')
+      allow(File).to receive(:directory?).and_return(true)
+      allow(subject).to receive(:process_dir)
+    end
+
+    it 'should call to process at least one directory' do
+      expect(subject).to receive(:process_dir).at_least(:once)
+      subject.execute
+    end
+
+    it 'should definitely look in the file structure' do
+      expect(Dir).to receive(:pwd)
+      expect(Dir).to receive(:entries)
+      expect(File).to receive(:join)
+      expect(File).to receive(:directory?)
+      subject.execute
+    end
+  end
+
+  describe '#process_dir' do
+    before do
+      allow(Dir).to receive(:chdir).and_return(nil)
+      allow(File).to receive(:exist?).and_return(true)
+      allow(subject).to receive(:process_git_repository)
+    end
+
+    it 'should definitely look in the file structure' do
+      expect(Dir).to receive(:chdir)
+      expect(File).to receive(:exist?)
+      subject.send(:process_dir, '/Users/firstname/lastname/path/to/project', '/Users/firstname/lastname/path/to/project/project-1')
+    end
+
+    context 'when the user says to process the directory' do
+      it 'should call to process the git repository at least once' do
+        expect(subject).to receive(:process_git_repository).at_least(:once)
+        subject.send(:process_dir, '/Users/firstname/lastname/path/to/project', '/Users/firstname/lastname/path/to/project/project-1')
+      end
+    end
+
+    context 'when the user says not to process the directory' do
+      let(:cli) { double(:highline_cli, process_directory_remotes?: false) }
+
+      it 'should not call to process the directory' do
+        expect(subject).not_to receive(:process_git_repository)
+        subject.send(:process_dir, '/Users/firstname/lastname/path/to/project', '/Users/firstname/lastname/path/to/project/project-1')
+      end
+    end
+  end
+
+  describe '#process_git_repository' do
+    before do
+      allow(subject).to receive(:process_remote).and_return(nil)
+    end
+
+    it 'should call local_code' do
+      expect(GitHelper::LocalCode).to receive(:new)
+      subject.send(:process_git_repository)
+    end
+
+    context 'when the remote includes the old owner' do
+      it 'should call to process the remote' do
+        expect(subject).to receive(:process_remote)
+        subject.send(:process_git_repository)
+      end
+    end
+
+    context 'when the remote does not include the old owner' do
+      let(:remote1) { 'git@github.com:github-username-new/project-1.git' }
+
+      it 'should not call to process the remote' do
+        expect(subject).not_to receive(:process_remote)
+        subject.send(:process_git_repository)
+      end
+    end
+  end
+
+  describe '#process_remote' do
+    it 'should always get the remote name' do
+      expect(local_code).to receive(:remote_name)
+      subject.send(:process_remote, remote1)
+    end
+
+    it 'should always attempt to change the remote' do
+      expect(local_code).to receive(:change_remote)
+      subject.send(:process_remote, remote1)
+    end
+
+    it 'should attempt to get the remote repo exactly once' do
+      expect(local_code).to receive(:remote_project).exactly(:once)
+      subject.send(:process_remote, remote1)
+    end
+
+    it 'should attempt to get the remote source exactly once' do
+      expect(local_code).to receive(:remote_source).exactly(:once)
+      subject.send(:process_remote, remote1)
+    end
+
+    it 'should ask if the remote is SSH' do
+      expect(local_code).to receive(:ssh_remote?)
+      subject.send(:process_remote, remote1)
+    end
+
+    context 'https remote' do
+      let(:local_code) do
+        double(:local_code,
+          remotes: [remote1],
+          remote_name: 'origin',
+          ssh_remote?: false,
+          https_remote?: false,
+          remote_project: 'project-1',
+          remote_source: 'github.com',
+          change_remote: true
+        )
+      end
+
+      it 'should ask if the remote is SSH' do
+        expect(local_code).to receive(:ssh_remote?)
+        subject.send(:process_remote, remote1)
+      end
+
+      it 'should ask if the remote is https' do
+        expect(local_code).to receive(:https_remote?)
+        subject.send(:process_remote, remote1)
+      end
+    end
+  end
+
+  describe '#local_code' do
+    it 'should create a new local code instance' do
+      expect(GitHelper::LocalCode).to receive(:new)
+      subject.send(:local_code)
+    end
+  end
+
+  describe '#cli' do
+    it 'should create a new highline CLI instance' do
+      expect(GitHelper::HighlineCli).to receive(:new)
+      subject.send(:cli)
+    end
+  end
+end

data/spec/git_helper/checkout_default_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'git_helper'
+
+describe GitHelper::CheckoutDefault do
+  let(:local_code) { double(:local_code, checkout_default: :done) }
+
+  subject { GitHelper::CheckoutDefault.new }
+
+  it 'should call GitHelper::LocalCode' do
+    expect(GitHelper::LocalCode).to receive(:new).and_return(local_code)
+    subject.execute
+  end
+
+  it 'should call the checkout_default method from the local code class' do
+    allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
+    expect(local_code).to receive(:checkout_default)
+    subject.execute
+  end
+end

data/spec/git_helper/clean_branches_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'git_helper'
+
+describe GitHelper::CleanBranches do
+  let(:local_code) { double(:local_code, clean_branches: :commit) }
+
+  subject { GitHelper::CleanBranches.new }
+
+  it 'should call GitHelper::LocalCode' do
+    expect(GitHelper::LocalCode).to receive(:new).and_return(local_code)
+    subject.execute
+  end
+
+  it 'should call the clean_branches method from the local code class' do
+    allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
+    expect(local_code).to receive(:clean_branches)
+    subject.execute
+  end
+end