git_helper 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c80aa14abd85f6ebcff1a7c6592e71e4222273c8239c14c45ef905c4a3e549
-  data.tar.gz: 973f3831d8587d46d5e37c7738b50b5f8bab12bab9b2ec3d8ef34379b61917ea
+  metadata.gz: be948f58bc902f2e3036bfc3379279afcc74012af9cb56ee1b1f8586ba9c0fa2
+  data.tar.gz: c4f8655fcaef1db1fba03ebb731932da6d185bb89c46ebc366781309b76ebd1d
 SHA512:
-  metadata.gz: 4515350964ec6a6e998a912d5b53cc49c8f90bd6d9cf9acfa5a3d499ffbad71638068266716971924efd76d6692a7aa1a1523cbcefc5c20eaeaf8e99805689aa
-  data.tar.gz: bfee7c84bc7d5a9a54172779bccbdbb56e0ad22f3776f8dc2d00228149ffcdf5de4dc5f3b5182aa92c6add8eec30cb0a70b7f8184fb5e1a8c8a2da2bf621007b
+  metadata.gz: d19cf35a128b640a265aa89f229022fd7be3629e6e8ae5f6f08504494b1ccc5231af4ff1e39fbd3014ddb78e8757dd1a9413110872bdd7c8da8ae86525e7776a
+  data.tar.gz: d50eb1904c56c2269c139f7275321eef5516c70de6973fb2b11f8ea0f6681f5db5389f3f629c8b16718a7390442031e4999d8620a3814647b64dae340c01b8d1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_helper (3.3.0)
+    git_helper (3.3.1)
       gitlab (~> 4.16)
       gli (~> 2.13)
       highline (~> 2.0)

data/lib/git_helper/git_config_reader.rb

@@ -4,10 +4,18 @@ module GitHelper
       config_file[:gitlab_token]
     end
 
+    def gitlab_user
+      config_file[:gitlab_user]
+    end
+
     def github_token
       config_file[:github_token]
     end
 
+    def github_user
+      config_file[:github_user]
+    end
+
     def git_config_file_path
       Dir.pwd.scan(/\A\/[\w]*\/[\w]*\//).first << git_config_file
     end

data/lib/git_helper/setup.rb

@@ -10,7 +10,10 @@ module GitHelper
 
       create_or_update_config_file if answer
 
-      answer = highline.ask_yes_no("Do you wish to set up the Git Helper plugins? (y/n)")
+      answer = highline.ask_yes_no(
+        "Do you wish to set up the Git Helper plugins? (y/n) (This process will " \
+        "attempt to use your GitHub personal access token to authenticate)"
+      )
 
       if answer
         create_or_update_plugin_files
@@ -61,27 +64,33 @@ module GitHelper
       end
     end
 
-    private def highline
-      @highline ||= GitHelper::HighlineCli.new
-    end
-
-    private def config_file
-      GitHelper::GitConfigReader.new.git_config_file_path
-    end
-
     private def create_or_update_plugin_files
       plugins_dir = "#{Dir.pwd.scan(/\A\/[\w]*\/[\w]*\//).first}/.git_helper/plugins"
       plugins_url = 'https://api.github.com/repos/emmahsax/git_helper/contents/plugins'
       header = 'Accept: application/vnd.github.v3.raw'
+      token = git_config_reader.github_token
+      user = git_config_reader.github_user
 
       Dir.mkdir(plugins_dir) unless File.exists?(plugins_dir)
 
-      all_plugins = JSON.parse(`curl -s -H "#{header}" -L "#{plugins_url}"`)
+      all_plugins = JSON.parse(`curl -s -u #{user}:#{token} -H "#{header}" -L "#{plugins_url}"`)
 
       all_plugins.each do |plugin|
-        plugin_content = `curl -s -H "#{header}" -L "#{plugins_url}/#{plugin['name']}"`
+        plugin_content = `curl -s -u #{user}:#{token} -H "#{header}" -L "#{plugins_url}/#{plugin['name']}"`
         File.open("#{plugins_dir}/#{plugin['name']}", 'w') { |file| file.puts plugin_content }
       end
     end
+
+    private def config_file
+      git_config_reader.git_config_file_path
+    end
+
+    private def git_config_reader
+      @git_config_reader ||= GitHelper::GitConfigReader.new
+    end
+
+    private def highline
+      @highline ||= GitHelper::HighlineCli.new
+    end
   end
 end

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

data/spec/git_helper/git_config_reader_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::GitConfigReader do
+  let(:github_user) { Faker::Internet.username }
   let(:github_token) { Faker::Internet.password(max_length: 10) }
+  let(:gitlab_user) { Faker::Internet.username }
   let(:gitlab_token) { Faker::Internet.password(max_length: 10) }
 
   let(:config_file) {
     {
-      github_user: Faker::Internet.username,
+      github_user: github_user,
       github_token: github_token,
-      gitlab_user: Faker::Internet.username,
+      gitlab_user: gitlab_user,
       gitlab_token: gitlab_token
     }
   }
@@ -40,6 +42,30 @@ describe GitHelper::GitConfigReader do
     end
   end
 
+  describe '#github_user' do
+    it 'should locate the github_user' do
+      expect(subject).to receive(:config_file).and_return(config_file)
+      expect(subject.github_user).to eq(github_user)
+    end
+
+    it 'should call the config file' do
+      expect(subject).to receive(:config_file).and_return(config_file)
+      subject.github_user
+    end
+  end
+
+  describe '#gitlab_user' do
+    it 'should locate the gitlab_user' do
+      expect(subject).to receive(:config_file).and_return(config_file)
+      expect(subject.gitlab_user).to eq(gitlab_user)
+    end
+
+    it 'should call the config file' do
+      expect(subject).to receive(:config_file).and_return(config_file)
+      subject.gitlab_user
+    end
+  end
+
   describe '#config_file' do
     it 'should yaml load the file path' do
       expect(YAML).to receive(:load_file)

data/spec/git_helper/setup_spec.rb

@@ -133,6 +133,11 @@ describe GitHelper::Setup do
       ]"
     end
 
+    before do
+      allow_any_instance_of(GitHelper::GitConfigReader).to receive(:github_token).and_return(Faker::Internet.password)
+      allow_any_instance_of(GitHelper::GitConfigReader).to receive(:github_user).and_return(Faker::Internet.username)
+    end
+
     it 'should create the directory if it does not exist' do
       allow(File).to receive(:exists?).and_return(false)
       allow(File).to receive(:open).and_return(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Emma Sax