git_helper 3.6.2 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64c4ad9b8acf74b29b341f534243721f4bf168d1d15c524e052a201b867e9c6d
-  data.tar.gz: '01228b5f41daa653e47e11a33f5cde747edfc795759ab5b7c0b474d655538431'
+  metadata.gz: c9226b3191cd9f55de0c9bb238dab97419db8c37e5f77c88d4e6a15898d7618d
+  data.tar.gz: 4177017b7370efbd05a7948c5cae06061cf0d6cfd7d9ae8a11bf9400aa547740
 SHA512:
-  metadata.gz: 90f31e2053f842aaa9a536de4a79c9e2e066fd08c8703367520b2728e39a3b9aa88374230fbc2211993c709077cc573272e2e79dc996d5009dbdd864986c0541
-  data.tar.gz: e683017056105ba89126467da7cea039ee7c0d88350f8971ed0e130d85fcc0e2ea383600e7e88c01806d68540e2183bb5e30f6a8130d9fbabdce4bcbba545ab8
+  metadata.gz: 30efc1f7f69ce974227d7e1c8bc80ab0fde658626eed6b2bd8fb98ebc628f0ccace6c322ad448574aa981316dd421ff34d3e33ba2b1f2b318bf5b46019b7252b
+  data.tar.gz: e1fe72d9ea6bd3766024ac6cddfd5ae7db7d3baa2dd38cc76e30e624cf29b9baea7ac730d3247cb6552660c7451edfd2fd04de46067fd59c6168eaefd396ff3c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_helper (3.6.1.pre.test)
+    git_helper (3.6.4)
       gli (~> 2.13)
       highline_wrapper (~> 1.1)
 
@@ -10,9 +10,9 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    faker (3.0.0)
+    faker (3.1.1)
       i18n (>= 1.8.11, < 2)
     ffi (1.15.5)
     formatador (1.1.0)
@@ -31,13 +31,13 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    highline (2.0.3)
+    highline (2.1.0)
     highline_wrapper (1.3.1)
       highline (~> 2.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
@@ -47,46 +47,46 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.1.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.6.1)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.40.0)
+    rubocop (1.48.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     shellany (0.0.1)
     thor (1.2.1)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   arm64-darwin-21
@@ -102,4 +102,4 @@ DEPENDENCIES
   rubocop (~> 1.10)
 
 BUNDLED WITH
-   2.3.26
+   2.4.8

data/README.md

@@ -6,32 +6,37 @@
 gem install git_helper
 ```
 
-Some of the commands in this gem can be used without any additional configuration. However, others utilize special GitHub or GitLab configuration. To provide access tokens for this, create a `~/.git_helper/config.yml` file. The contents should look like this:
-
-```
-:github_user:  GITHUB-USERNAME
-:github_token: GITHUB-TOKEN
-:gitlab_user:  GITLAB-USERNAME
-:gitlab_token: GITLAB-TOKEN
-```
-
-To create or see what access tokens you have, look [here for GitHub personal access tokens](https://github.com/settings/tokens) and [here for GitLab access tokens](https://gitlab.com/profile/personal_access_tokens). You could either have one set of tokens for each computer you use, or just have one set of tokens for all computers that you rotate periodically.
-
 Once the gem is installed, run this to view the help screen:
+
 ```bash
 git-helper --help
 ```
 
-To see what version of git_helper you're running, run:
+To see what version of Git Helper you're running, run:
+
 ```bash
 git-helper --version
 ```
 
-To help you create the `~/.git_helper/config.yml` file and set up the plugins (see below), run this command and allow the command to walk you through the prompts:
+Some of the commands in this gem can be used without any additional configuration. However, others utilize special GitHub or GitLab configuration. To set up access with GitHub/GitLab, run:
+
 ```bash
 git-helper setup
 ```
 
+This will give you the option to set up credentials at GitHub and/or GitLab, as well as give you the choice to set up Git Helper as a plugin or not (see below).
+
+The final result will be a `~/.git_helper/config.yml` file with the contents in this form:
+
+```
+:github_user:  GITHUB-USERNAME
+:github_token: GITHUB-TOKEN
+:gitlab_user:  GITLAB-USERNAME
+:gitlab_token: GITLAB-TOKEN
+```
+
+To create or see what access tokens you have, look [here for GitHub personal access tokens](https://github.com/settings/tokens) and [here for GitLab access tokens](https://gitlab.com/profile/personal_access_tokens). You could either have one set of tokens for each computer you use, or just have one set of tokens for all computers that you rotate periodically.
+
 ## Plugin Usage
 
 As an additional option, you can set each of the following commands to be a git plugin, meaning you can call them in a way that feels even more git-native:
@@ -42,21 +47,12 @@ git-helper clean-branches             git clean-branches
 git-helper code-request               git code-request
 ```
 
-To do this, download the `plugins.zip` file in the root of this directory. Unzip and place the contents in the appropriate location:
+Running the `setup` command will give you the option to set this up:
 
 ```bash
-mkdir ~/.git_helper
-unzip path/to/downloaded/plugins.zip -d ~/.git_helper
-```
-
-Now, the plugins will live in `~/.git_helper/plugins/*`. Add the following line to your `~/.bash_profile`:
-
-```bash
-export PATH=/path/to/computer/home/.git_helper/plugins:$PATH
+git-helper setup
 ```
 
-And then run `source ~/.bash_profile`.
-
 ## Alias Usage
 
 To make the commands even shorter, I recommend setting aliases. You can either set aliases through git itself, like this (only possible if you also use the plugin option):
@@ -67,7 +63,7 @@ git config --global alias.nb new-branch
 
 And then running `git nb` maps to `git new-branch`, which through the plugin, maps to `git-helper new-branch`.
 
-Or you can set the alias through your `~/.bashrc` (which is my preferred method because it can make the command even shorter, and doesn't require the plugin usage). To do this, add lines like this to the `~/.bashrc` file and run `source ~/.bashrc`:
+Or you can set the alias through your `~/.zshrc` (which is my preferred method because it can make the command even shorter, and doesn't require the plugin usage). To do this, add lines like this to the `~/.zshrc` file and run `source ~/.zshrc`:
 
 ```bash
 alias gnb="git new-branch"

data/lib/git_helper/git_config_reader.rb

@@ -19,7 +19,7 @@ module GitHelper
     end
 
     def git_config_file_path
-      "#{Dir.pwd.scan(%r{\A/\w*/\w*/}).first}.git_helper/config.yml"
+      "#{Dir.home}/.git_helper/config.yml"
     end
 
     private def config_file

data/lib/git_helper/setup.rb

@@ -24,22 +24,22 @@ module GitHelper
 
     private def execute_plugins
       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)',
+        'Do you wish to set up the Git Helper plugins? (y/n)',
         { required: true }
       )
 
       return unless answer
 
       create_or_update_plugin_files
-      puts "\nNow add this line to your ~/.bash_profile:\n  " \
-           'export PATH=/path/to/computer/home/.git_helper/plugins:$PATH'
+      puts "\nNow add this line to your ~/.zshrc:\n  " \
+           'export PATH="$HOME/.git_helper/plugins:$PATH"'
       puts "\nDone!"
     end
 
     private def create_or_update_config_file
       contents = generate_file_contents
       puts "Creating or updating your #{config_file} file..."
+      FileUtils.mkdir_p("#{Dir.home}/.git_helper")
       File.open(config_file, 'w') { |file| file.puts contents }
       puts "\nDone!\n\n"
     end
@@ -80,24 +80,20 @@ module GitHelper
       highline.ask(prompt, { required: true, secret: secret })
     end
 
-    # rubocop:disable Metrics/MethodLength
     private def create_or_update_plugin_files
-      plugins_dir = "#{Dir.pwd.scan(%r{\A/\w*/\w*/}).first}.git_helper/plugins"
+      plugins_dir = "#{Dir.home}/.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
 
       FileUtils.mkdir_p(plugins_dir)
 
-      all_plugins = JSON.parse(`curl -s -u #{user}:#{token} -H "#{header}" -L "#{plugins_url}"`)
+      all_plugins = JSON.parse(`curl -s -H "#{header}" -L "#{plugins_url}"`)
 
       all_plugins.each do |plugin|
-        plugin_content = `curl -s -u #{user}:#{token} -H "#{header}" -L "#{plugins_url}/#{plugin['name']}"`
+        plugin_content = `curl -s -H "#{header}" -L "#{plugins_url}/#{plugin['name']}"`
         File.open("#{plugins_dir}/#{plugin['name']}", 'w') { |file| file.puts plugin_content }
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     private def config_file
       git_config_reader.git_config_file_path

data/lib/git_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHelper
-  VERSION = '3.6.2'
+  VERSION = '3.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.4
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -153,7 +153,6 @@ files:
 - lib/git_helper/pull_request.rb
 - lib/git_helper/setup.rb
 - lib/git_helper/version.rb
-- plugins.zip
 - renovate.json
 homepage: https://github.com/emmahsax/git_helper
 licenses:
@@ -175,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: A set of GitHub and GitLab workflow scripts