git_helper 3.2.2 → 3.3.4

data/spec/spec_helper.rb

@@ -1,4 +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`.
@@ -33,7 +36,7 @@ RSpec.configure do |config|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 
   # rspec-mocks config goes here. You can use an alternate test double

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.4
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-03-06 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: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,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
@@ -136,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 description: A set of GitHub and GitLab workflow scripts to provide a smoother development
   process for your git projects.
 email:
@@ -145,6 +173,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -159,12 +188,12 @@ 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
 - lib/git_helper/octokit_client.rb
 - lib/git_helper/pull_request.rb
+- lib/git_helper/setup.rb
 - lib/git_helper/version.rb
 - plugins.zip
 - spec/git_helper/change_remote_spec.rb
@@ -175,12 +204,12 @@ 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
 - spec/git_helper/octokit_client_spec.rb
 - spec/git_helper/pull_request_spec.rb
+- spec/git_helper/setup_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/emmahsax/git_helper
 licenses:
@@ -194,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -215,9 +244,9 @@ 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
 - spec/git_helper/octokit_client_spec.rb
 - spec/git_helper/pull_request_spec.rb
+- spec/git_helper/setup_spec.rb

data/lib/git_helper/highline_cli.rb

@@ -1,33 +0,0 @@
-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 = ''
-      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,51 +0,0 @@
-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, ['one', 'two', 'three'])
-    end
-
-    it 'should return a string from the options' do
-      expect(subject.ask_options(Faker::Lorem.sentence, ['one', 'two', 'three'])).to be_a(String)
-    end
-  end
-end