git_helper 3.3.2 → 3.3.7

data/spec/git_helper/setup_spec.rb

@@ -4,11 +4,10 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::Setup do
-  let(:response) { double(:response, readline: true, to_s: Faker::Lorem.sentence) }
-  let(:highline_cli) { double(:highline_cli, ask: response, ask_yes_no: true) }
+  let(:highline_wrapper) { double(:highline_wrapper, ask: Faker::Lorem.word, ask_yes_no: true) }
 
   before do
-    allow(GitHelper::HighlineCli).to receive(:new).and_return(highline_cli)
+    allow(HighlineWrapper).to receive(:new).and_return(highline_wrapper)
     allow(subject).to receive(:puts)
   end
 
@@ -17,9 +16,19 @@ describe GitHelper::Setup do
   end
 
   describe '#execute' do
-    it 'should ask a question if the config file exists' do
+    it 'only asks the user one question if the config file does not exist' do
+      allow(subject).to receive(:config_file_exists?).and_return(false)
       allow(File).to receive(:exists?).and_return(true)
-      expect(highline_cli).to receive(:ask_yes_no).and_return(true)
+      expect(highline_wrapper).to receive(:ask_yes_no).and_return(true).exactly(:once)
+      allow(subject).to receive(:create_or_update_config_file).and_return(true)
+      allow(subject).to receive(:create_or_update_plugin_files)
+      subject.execute
+    end
+
+    it 'should ask two questions if the config file exists' do
+      allow(subject).to receive(:config_file_exists?).and_return(true)
+      allow(File).to receive(:exists?).and_return(true)
+      expect(highline_wrapper).to receive(:ask_yes_no).and_return(true).at_least(:twice)
       allow(subject).to receive(:create_or_update_config_file).and_return(true)
       allow(subject).to receive(:create_or_update_plugin_files)
       subject.execute
@@ -27,7 +36,7 @@ describe GitHelper::Setup do
 
     it 'should call to create or update the config file' do
       allow(File).to receive(:exists?).and_return(true)
-      allow(highline_cli).to receive(:ask_yes_no).and_return(true)
+      allow(highline_wrapper).to receive(:ask_yes_no).and_return(true)
       expect(subject).to receive(:create_or_update_config_file).and_return(true)
       allow(subject).to receive(:create_or_update_plugin_files)
       subject.execute
@@ -36,7 +45,7 @@ describe GitHelper::Setup do
     it 'should skip if the user opts not to continue' do
       allow(File).to receive(:exists?).and_return(true)
       allow(subject).to receive(:config_file_exists?).and_return(true)
-      allow(highline_cli).to receive(:ask_yes_no).and_return(false)
+      allow(highline_wrapper).to receive(:ask_yes_no).and_return(false)
       expect(subject).not_to receive(:create_or_update_config_file)
       expect(subject).not_to receive(:create_or_update_plugin_files)
       subject.execute
@@ -71,43 +80,37 @@ describe GitHelper::Setup do
 
   describe '#ask_question' do
     it 'should use highline to ask a question' do
-      expect(highline_cli).to receive(:ask).and_return(Faker::Lorem.word)
-      subject.send(:ask_question, Faker::Lorem.sentence)
-    end
-
-    it 'should recurse if the highline client gets an empty string' do
-      allow(highline_cli).to receive(:ask).and_return('', Faker::Lorem.word)
-      expect(subject).to receive(:ask_question).at_least(:twice).and_call_original
+      expect(highline_wrapper).to receive(:ask).and_return(Faker::Lorem.word)
       subject.send(:ask_question, Faker::Lorem.sentence)
     end
 
     it 'should return the answer if it is given' do
       answer = Faker::Lorem.sentence
-      allow(highline_cli).to receive(:ask).and_return(answer)
+      allow(highline_wrapper).to receive(:ask).and_return(answer)
       expect(subject.send(:ask_question, Faker::Lorem.sentence)).to be(answer)
     end
   end
 
   describe '#generate_file_contents' do
     it 'should ask two yes/no questions' do
-      expect(highline_cli).to receive(:ask_yes_no).exactly(2).times.and_return(false)
+      expect(highline_wrapper).to receive(:ask_yes_no).exactly(2).times.and_return(false)
       subject.send(:generate_file_contents)
     end
 
     it 'should ask two additional questions for each time the user says yes' do
-      allow(highline_cli).to receive(:ask_yes_no).exactly(2).times.and_return(true, false)
+      allow(highline_wrapper).to receive(:ask_yes_no).exactly(2).times.and_return(true, false)
       expect(subject).to receive(:ask_question).exactly(2).times.and_return(Faker::Lorem.word)
       subject.send(:generate_file_contents)
     end
 
     it 'should ask four additional questions for each time the user says yes' do
-      allow(highline_cli).to receive(:ask_yes_no).exactly(2).times.and_return(true)
+      allow(highline_wrapper).to receive(:ask_yes_no).exactly(2).times.and_return(true)
       expect(subject).to receive(:ask_question).exactly(4).times.and_return(Faker::Lorem.word)
       subject.send(:generate_file_contents)
     end
 
     it 'should return a string no matter what' do
-      allow(highline_cli).to receive(:ask_yes_no).exactly(2).times.and_return(true)
+      allow(highline_wrapper).to receive(:ask_yes_no).exactly(2).times.and_return(true)
       allow(subject).to receive(:ask_question).exactly(4).times.and_return(Faker::Lorem.word)
       expect(subject.send(:generate_file_contents)).to be_a(String)
     end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'faker'
+require 'pry'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.7
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: highline_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.18'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +168,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 description: A set of GitHub and GitLab workflow scripts to provide a smoother development
   process for your git projects.
 email:
@@ -174,7 +202,6 @@ files:
 - lib/git_helper/forget_local_commits.rb
 - lib/git_helper/git_config_reader.rb
 - lib/git_helper/gitlab_client.rb
-- lib/git_helper/highline_cli.rb
 - lib/git_helper/local_code.rb
 - lib/git_helper/merge_request.rb
 - lib/git_helper/new_branch.rb
@@ -191,7 +218,6 @@ files:
 - spec/git_helper/forget_local_commits_spec.rb
 - spec/git_helper/git_config_reader_spec.rb
 - spec/git_helper/gitlab_client_spec.rb
-- spec/git_helper/highline_cli_spec.rb
 - spec/git_helper/local_code_spec.rb
 - spec/git_helper/merge_request_spec.rb
 - spec/git_helper/new_branch_spec.rb
@@ -218,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A set of GitHub and GitLab workflow scripts.
@@ -232,7 +258,6 @@ test_files:
 - spec/git_helper/forget_local_commits_spec.rb
 - spec/git_helper/git_config_reader_spec.rb
 - spec/git_helper/gitlab_client_spec.rb
-- spec/git_helper/highline_cli_spec.rb
 - spec/git_helper/local_code_spec.rb
 - spec/git_helper/merge_request_spec.rb
 - spec/git_helper/new_branch_spec.rb

data/lib/git_helper/highline_cli.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module GitHelper
-  class HighlineCli
-    def ask(prompt)
-      highline_client.ask(prompt) do |conf|
-        conf.readline = true
-      end.to_s
-    end
-
-    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
-
-    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}"
-
-      index = highline_client.ask(compiled_prompt) do |conf|
-        conf.readline = true
-      end.to_i - 1
-
-      choices[index]
-    end
-
-    private def highline_client
-      @highline_client ||= HighLine.new
-    end
-  end
-end

data/spec/git_helper/highline_cli_spec.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'git_helper'
-
-describe GitHelper::HighlineCli do
-  let(:response) { double(:response, readline: true, to_i: 3) }
-  let(:highline_client) { double(:highline_cli, ask: response) }
-
-  subject { GitHelper::HighlineCli.new }
-
-  before do
-    allow(HighLine).to receive(:new).and_return(highline_client)
-  end
-
-  describe '#ask' do
-    it 'should ask the highline client ask' do
-      expect(highline_client).to receive(:ask)
-      subject.ask(Faker::Lorem.sentence)
-    end
-
-    it 'should return a string' do
-      expect(subject.ask(Faker::Lorem.sentence)).to be_a(String)
-    end
-  end
-
-  describe '#ask_yes_no' do
-    it 'should ask the highline client ask' do
-      expect(highline_client).to receive(:ask)
-      subject.ask_yes_no(Faker::Lorem.sentence)
-    end
-
-    it 'should return a boolean' do
-      expect(subject.ask_yes_no(Faker::Lorem.sentence)).to be_falsey
-    end
-
-    it 'should return true if we say yes' do
-      allow(response).to receive(:to_s).and_return('y')
-      expect(subject.ask_yes_no(Faker::Lorem.sentence)).to be_truthy
-    end
-  end
-
-  describe '#ask_options' do
-    it 'should ask the highline client ask' do
-      expect(highline_client).to receive(:ask)
-      subject.ask_options(Faker::Lorem.sentence, %w[one two three])
-    end
-
-    it 'should return a string from the options' do
-      expect(subject.ask_options(Faker::Lorem.sentence, %w[one two three])).to be_a(String)
-    end
-  end
-end