git_helper 2.0.0 → 3.1.0

data/lib/git_helper/new_branch.rb

@@ -1,6 +1,3 @@
-require_relative './highline_cli.rb'
-require_relative './local_code.rb'
-
 module GitHelper
   class NewBranch
     def execute(new_branch_name = nil)

data/lib/git_helper/octokit_client.rb

@@ -1,6 +1,3 @@
-require 'octokit'
-require_relative './git_config_reader.rb'
-
 module GitHelper
   class OctokitClient
     def client

data/lib/git_helper/pull_request.rb

@@ -1,7 +1,3 @@
-require_relative './octokit_client.rb'
-require_relative './highline_cli.rb'
-require_relative './local_code.rb'
-
 module GitHelper
   class GitHubPullRequest
     attr_accessor :local_repo, :local_branch, :local_code, :cli, :base_branch, :new_pr_title
@@ -98,6 +94,7 @@ module GitHelper
 
     private def pr_template_options
       @pr_template_options ||= local_code.template_options({
+                                 template_directory: '.github',
                                  nested_directory_name: 'PULL_REQUEST_TEMPLATE',
                                  non_nested_file_name: 'pull_request_template'
                                })

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '2.0.0'
+  VERSION = '3.1.0'
 end

data/spec/git_helper/change_remote_spec.rb

@@ -1,22 +1,25 @@
-require_relative '../../lib/git_helper/change_remote.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::ChangeRemote do
-  let(:remote1) { 'git@github.com:github-username-old/project-1.git' }
+  let(:remote1) { "git@github.com:#{old_owner}/#{project}.git" }
+  let(:project) { Faker::Lorem.word }
+  let(:cli) { double(:highline_cli, process_directory_remotes?: true) }
+  let(:old_owner) { Faker::Internet.username }
+  let(:new_owner) { Faker::Internet.username }
+  let(:directory_entries) { [ '.', '..', project, Faker::Lorem.word, Faker::Lorem.word ] }
+
   let(:local_code) do
     double(:local_code,
       remotes: [remote1],
-      remote_name: 'origin',
+      remote_name: Faker::Lorem.word,
       ssh_remote?: true,
       https_remote?: false,
-      remote_project: 'project-1',
+      remote_project: project,
       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) }
 
@@ -27,9 +30,9 @@ describe GitHelper::ChangeRemote do
 
   describe '#execute' do
     before do
-      allow(Dir).to receive(:pwd).and_return('/Users/firstname/lastname/path/to/project')
+      allow(Dir).to receive(:pwd).and_return("/Users/#{Faker::Name.first_name}/#{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(:join).and_return("/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
       allow(File).to receive(:directory?).and_return(true)
       allow(subject).to receive(:process_dir)
     end
@@ -58,13 +61,13 @@ describe GitHelper::ChangeRemote do
     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')
+      subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
     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')
+        subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
       end
     end
 
@@ -73,7 +76,7 @@ describe GitHelper::ChangeRemote do
 
       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')
+        subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
       end
     end
   end
@@ -96,7 +99,7 @@ describe GitHelper::ChangeRemote do
     end
 
     context 'when the remote does not include the old owner' do
-      let(:remote1) { 'git@github.com:github-username-new/project-1.git' }
+      let(:remote1) { "git@github.com:#{new_owner}/#{project}.git" }
 
       it 'should not call to process the remote' do
         expect(subject).not_to receive(:process_remote)
@@ -135,10 +138,10 @@ describe GitHelper::ChangeRemote do
       let(:local_code) do
         double(:local_code,
           remotes: [remote1],
-          remote_name: 'origin',
+          remote_name: Faker::Lorem.word,
           ssh_remote?: false,
           https_remote?: false,
-          remote_project: 'project-1',
+          remote_project: project,
           remote_source: 'github.com',
           change_remote: true
         )

data/spec/git_helper/checkout_default_spec.rb

@@ -1,4 +1,5 @@
-require_relative '../../lib/git_helper/checkout_default.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::CheckoutDefault do
   let(:local_code) { double(:local_code, checkout_default: :done) }

data/spec/git_helper/clean_branches_spec.rb

@@ -1,4 +1,5 @@
-require_relative '../../lib/git_helper/clean_branches.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::CleanBranches do
   let(:local_code) { double(:local_code, clean_branches: :commit) }

data/spec/git_helper/code_request_spec.rb

@@ -1,9 +1,12 @@
-require_relative '../../lib/git_helper/code_request.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::CodeRequest do
   let(:highline_cli) { double(:highline_cli) }
-  let(:local_code) { double(:local_code, project_name: 'name', branch: 'branch') }
+  let(:local_code) { double(:local_code, project_name: Faker::Lorem.word, branch: Faker::Lorem.word) }
   let(:process_project) { double(:process_project, create: :created, merge: :merged) }
+  let(:base_branch) { Faker::Lorem.word }
+  let(:title) { Faker::Lorem.sentence }
 
   subject { GitHelper::CodeRequest.new }
 
@@ -14,8 +17,8 @@ describe GitHelper::CodeRequest do
 
   describe '#create' do
     before do
-      allow(subject).to receive(:base_branch).and_return('base')
-      allow(subject).to receive(:new_code_request_title).and_return('Title')
+      allow(subject).to receive(:base_branch).and_return(base_branch)
+      allow(subject).to receive(:new_code_request_title).and_return(title)
     end
 
     it 'should call to process the project' do
@@ -30,8 +33,8 @@ describe GitHelper::CodeRequest do
     end
 
     it 'should call base_branch and new_code_request_title' do
-      expect(subject).to receive(:base_branch).and_return('base')
-      expect(subject).to receive(:new_code_request_title).and_return('Title')
+      expect(subject).to receive(:base_branch).and_return(base_branch)
+      expect(subject).to receive(:new_code_request_title).and_return(title)
       allow(subject).to receive(:process_project).and_return(process_project)
       allow(process_project).to receive(:create)
       subject.create
@@ -131,7 +134,7 @@ describe GitHelper::CodeRequest do
 
     context 'when response is neither' do
       it 'should raise an error' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('huh?')
+        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return(Faker::Lorem.word)
         expect(subject).to receive(:exit)
         subject.send(:ask_for_clarification)
       end
@@ -170,28 +173,28 @@ describe GitHelper::CodeRequest do
     it 'should call the default branch' do
       expect(subject).to receive(:default_branch)
       allow(highline_cli).to receive(:base_branch_default?).at_least(:once)
-      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return('base')
+      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     it 'should ask the CLI to ask the user' do
       allow(subject).to receive(:default_branch)
       expect(highline_cli).to receive(:base_branch_default?).at_least(:once)
-      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return('base')
+      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     context 'if the user says no' do
-      it "definitely asks for the user's base branch" do
+      it 'definitely asks for the users base branch' do
         allow(subject).to receive(:default_branch)
         expect(highline_cli).to receive(:base_branch_default?).at_least(:once).and_return(false)
-        expect(highline_cli).to receive(:base_branch).at_least(:once).and_return('base')
+        expect(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_branch)
         subject.send(:base_branch)
       end
     end
 
     context 'if the user says yes' do
-      it "does not ask for the user's base branch" do
+      it 'does not ask for the users base branch' do
         allow(subject).to receive(:default_branch)
         expect(highline_cli).to receive(:base_branch_default?).at_least(:once).and_return(true)
         expect(highline_cli).not_to receive(:base_branch)
@@ -202,7 +205,7 @@ describe GitHelper::CodeRequest do
 
   describe '#autogenerated_title' do
     it 'should generate a title based on the branch' do
-      expect(subject).to receive(:local_branch).and_return('branch')
+      expect(subject).to receive(:local_branch).and_return(Faker::Lorem.word)
       expect(local_code).to receive(:generate_title)
       subject.send(:autogenerated_title)
     end
@@ -212,28 +215,28 @@ describe GitHelper::CodeRequest do
     it 'should call autogenerated title method' do
       expect(subject).to receive(:autogenerated_title)
       allow(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once)
-      allow(highline_cli).to receive(:title).at_least(:once).and_return('Title')
+      allow(highline_cli).to receive(:title).at_least(:once).and_return(title)
       subject.send(:new_code_request_title)
     end
 
     it 'should ask the CLI to ask the user' do
       allow(subject).to receive(:autogenerated_title)
       expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once)
-      allow(highline_cli).to receive(:title).at_least(:once).and_return('Title')
+      allow(highline_cli).to receive(:title).at_least(:once).and_return(title)
       subject.send(:new_code_request_title)
     end
 
     context 'if the user says no' do
-      it "definitely asks for the user's title" do
+      it 'definitely asks for the users title' do
         allow(subject).to receive(:autogenerated_title)
         expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once).and_return(false)
-        expect(highline_cli).to receive(:title).at_least(:once).and_return('Title')
+        expect(highline_cli).to receive(:title).at_least(:once).and_return(title)
         subject.send(:new_code_request_title)
       end
     end
 
     context 'if the user says yes to original title' do
-      it "does not ask for the user's chosen title" do
+      it 'does not ask for the users chosen title' do
         allow(subject).to receive(:autogenerated_title)
         expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once).and_return(true)
         expect(highline_cli).not_to receive(:title)

data/spec/git_helper/empty_commit_spec.rb

@@ -1,4 +1,5 @@
-require_relative '../../lib/git_helper/empty_commit.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::EmptyCommit do
   let(:local_code) { double(:local_code, empty_commit: :commit) }

data/spec/git_helper/forget_local_commits_spec.rb

@@ -1,4 +1,5 @@
-require_relative '../../lib/git_helper/forget_local_commits.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::ForgetLocalCommits do
   let(:local_code) { double(:local_code, forget_local_commits: :commit) }

data/spec/git_helper/git_config_reader_spec.rb

@@ -1,13 +1,15 @@
-require_relative '../../lib/git_helper/git_config_reader.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::GitConfigReader do
-  let(:github_token) { '1234ASDF1234ASDF' }
-  let(:gitlab_token) { 'ASDF123ASDF1234' }
+  let(:github_token) { Faker::Internet.password(max_length: 10) }
+  let(:gitlab_token) { Faker::Internet.password(max_length: 10) }
+
   let(:config_file) {
     {
-      github_user: 'github-user-name',
+      github_user: Faker::Internet.username,
       github_token: github_token,
-      gitlab_user: 'gitlab-user-name',
+      gitlab_user: Faker::Internet.username,
       gitlab_token: gitlab_token
     }
   }
@@ -47,13 +49,14 @@ describe GitHelper::GitConfigReader do
 
   describe '#git_config_file_path' do
     it 'should look in the current directory' do
-      expect(Dir).to receive(:pwd).and_return('/Users/firstnamelastname/path/to/git_helper')
+      expect(Dir).to receive(:pwd).and_return("/Users/#{Faker::Name.first_name}/#{Faker::Lorem.word}")
       subject.send(:git_config_file_path)
     end
 
     it 'should return the base path with the git config file at the end' do
-      allow(Dir).to receive(:pwd).and_return('/Users/firstnamelastname/path/to/git_helper')
-      expect(subject.send(:git_config_file_path)).to eq('/Users/firstnamelastname/.git_config.yml')
+      user = Faker::Name.first_name
+      allow(Dir).to receive(:pwd).and_return("/Users/#{user}/#{Faker::Lorem.word}")
+      expect(subject.send(:git_config_file_path)).to eq("/Users/#{user}/.git_helper/config.yml")
     end
   end
 end

data/spec/git_helper/gitlab_client_spec.rb

@@ -1,4 +1,5 @@
-require_relative '../../lib/git_helper/gitlab_client.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::GitLabClient do
   let(:git_config_reader) { double(:git_config_reader, gitlab_token: :token) }

data/spec/git_helper/highline_cli_spec.rb

@@ -1,4 +1,5 @@
-require_relative '../../lib/git_helper/highline_cli.rb'
+require 'spec_helper'
+require 'git_helper'
 
 describe GitHelper::HighlineCli do
   let(:response) { double(:response, readline: true, to_i: 5) }
@@ -11,7 +12,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#new_branch_name' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).with('New branch name?')
       subject.new_branch_name
     end
@@ -22,34 +23,34 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#process_directory_remotes' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).and_return('y')
-      subject.process_directory_remotes?('directory')
+      subject.process_directory_remotes?(Faker::Lorem.word)
     end
 
     it 'should be a boolean at the end' do
       allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.process_directory_remotes?('directory'))
+      expect([true, false]).to include(subject.process_directory_remotes?(Faker::Lorem.word))
     end
 
     it 'should come out as a true boolean if somebody responds y' do
       allow(subject).to receive(:ask).and_return('y')
-      expect(subject.process_directory_remotes?('directory')).to eq(true)
+      expect(subject.process_directory_remotes?(Faker::Lorem.word)).to eq(true)
     end
 
     it 'should come out as a false boolean if somebody responds n' do
       allow(subject).to receive(:ask).and_return('n')
-      expect(subject.process_directory_remotes?('directory')).to eq(false)
+      expect(subject.process_directory_remotes?(Faker::Lorem.word)).to eq(false)
     end
 
     it 'should come out as true if somebody presses enter' do
       allow(subject).to receive(:ask).and_return('')
-      expect(subject.accept_autogenerated_title?('directory')).to eq(true)
+      expect(subject.accept_autogenerated_title?(Faker::Lorem.word)).to eq(true)
     end
   end
 
   describe '#conflicting_remote_clarification' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).with('Found git remotes for both GitHub and GitLab. Would you like to proceed with GitLab or GitHub? (github/gitlab)').and_return('gitlab')
       subject.conflicting_remote_clarification
     end
@@ -60,7 +61,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#title' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).with('Title?')
       subject.title
     end
@@ -71,7 +72,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#base_branch' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).with('Base branch?')
       subject.base_branch
     end
@@ -82,92 +83,94 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#code_request_id' do
-    it "should ask the subject's ask method" do
-      expect(subject).to receive(:ask).with('Example Request ID?')
-      subject.code_request_id('Example')
+    let(:phrase) { Faker::Lorem.sentence }
+
+    it 'should ask the subjects ask method' do
+      expect(subject).to receive(:ask).with("#{phrase} Request ID?")
+      subject.code_request_id(phrase)
     end
 
     it 'should come out a string' do
-      expect(subject.code_request_id('Example')).to be_a(String)
+      expect(subject.code_request_id(phrase)).to be_a(String)
     end
   end
 
   describe '#accept_autogenerated_title' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).and_return('y')
-      subject.accept_autogenerated_title?('Title Example')
+      subject.accept_autogenerated_title?(Faker::Lorem.sentence)
     end
 
     it 'should be a boolean at the end' do
       allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.accept_autogenerated_title?('Title Example'))
+      expect([true, false]).to include(subject.accept_autogenerated_title?(Faker::Lorem.sentence))
     end
 
     it 'should come out as a true boolean if somebody responds y' do
       allow(subject).to receive(:ask).and_return('y')
-      expect(subject.accept_autogenerated_title?('Title Example')).to eq(true)
+      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
     end
 
     it 'should come out as a true boolean if somebody responds n' do
       allow(subject).to receive(:ask).and_return('n')
-      expect(subject.accept_autogenerated_title?('Title Example')).to eq(false)
+      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(false)
     end
 
     it 'should come out as a true boolean if somebody responds yes' do
       allow(subject).to receive(:ask).and_return('yes')
-      expect(subject.accept_autogenerated_title?('Title Example')).to eq(true)
+      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
     end
 
     it 'should come out as a false boolean if somebody responds no' do
       allow(subject).to receive(:ask).and_return('no')
-      expect(subject.accept_autogenerated_title?('Title Example')).to eq(false)
+      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(false)
     end
 
     it 'should come out as true if somebody presses enter' do
       allow(subject).to receive(:ask).and_return('')
-      expect(subject.accept_autogenerated_title?('Title Example')).to eq(true)
+      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
     end
   end
 
   describe '#base_branch_default' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).and_return('y')
-      subject.base_branch_default?('default_branch')
+      subject.base_branch_default?(Faker::Lorem.word)
     end
 
     it 'should be a boolean at the end' do
       allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.base_branch_default?('default_branch'))
+      expect([true, false]).to include(subject.base_branch_default?(Faker::Lorem.word))
     end
 
     it 'should come out as a true boolean if somebody responds y' do
       allow(subject).to receive(:ask).and_return('y')
-      expect(subject.base_branch_default?('default_branch')).to eq(true)
+      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
     end
 
     it 'should come out as a true boolean if somebody responds n' do
       allow(subject).to receive(:ask).and_return('n')
-      expect(subject.base_branch_default?('default_branch')).to eq(false)
+      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(false)
     end
 
     it 'should come out as a true boolean if somebody responds yes' do
       allow(subject).to receive(:ask).and_return('yes')
-      expect(subject.base_branch_default?('default_branch')).to eq(true)
+      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
     end
 
     it 'should come out as a false boolean if somebody responds no' do
       allow(subject).to receive(:ask).and_return('no')
-      expect(subject.base_branch_default?('default_branch')).to eq(false)
+      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(false)
     end
 
     it 'should come out as true if somebody presses enter' do
       allow(subject).to receive(:ask).and_return('')
-      expect(subject.base_branch_default?('default_branch')).to eq(true)
+      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
     end
   end
 
   describe '#merge_method' do
-    it "should ask the subject's ask_options method" do
+    it 'should ask the subjects ask_options method' do
       expect(subject).to receive(:ask_options).and_return(3)
       subject.merge_method(['1', '2', '3'])
     end
@@ -179,7 +182,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#template_to_apply' do
-    it "should ask the subject's ask_options method" do
+    it 'should ask the subjects ask_options method' do
       expect(subject).to receive(:ask_options).and_return(3)
       subject.template_to_apply(['option1', 'option2', 'option3'], 'example type')
     end
@@ -193,22 +196,22 @@ describe GitHelper::HighlineCli do
   describe '#ask' do
     it 'should ask the highline client ask'do
       expect(highline_client).to receive(:ask)
-      subject.send(:ask, 'prompt goes here')
+      subject.send(:ask, Faker::Lorem.sentence)
     end
 
     it 'should return a string' do
-      expect(subject.send(:ask, 'prompt goes here')).to be_a(String)
+      expect(subject.send(:ask, Faker::Lorem.sentence)).to be_a(String)
     end
   end
 
   describe '#ask_options' do
     it 'should ask the highline client ask'do
       expect(highline_client).to receive(:ask)
-      subject.send(:ask_options, 'prompt goes here', ['1', '2', '3'])
+      subject.send(:ask_options, Faker::Lorem.sentence, ['1', '2', '3'])
     end
 
     it 'should return an integer' do
-      expect(subject.send(:ask_options, 'prompt goes here', ['1', '2', '3'])).to be_a(Integer)
+      expect(subject.send(:ask_options, Faker::Lorem.sentence, ['1', '2', '3'])).to be_a(Integer)
     end
   end
 end