sugarjar 0.0.7 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fefe2bc9c94d95d3c869f8636bbabf433ec6196ae8d68b7ac131b4a955a882b
-  data.tar.gz: 5237f94836f686a0e82a8a18543b54179e7190ce874d481e59ae5fe685aa26d9
+  metadata.gz: a1c65749738fac53cfb69c3ec42007433f7598e3e43dd36e33217c8c0efbbb2e
+  data.tar.gz: 50288abc1d21962e793731a937a8dd886bd2674db269ed62fbb0f89bb4121850
 SHA512:
-  metadata.gz: d8ade9a12c3ba79a5ba591123179a80aeff6db7cbd4ab48c42cc27ecd5f5f4c3bcd713b99a04654b7c28e4fca715c3f6535f9938a97f3c55fc41169791f8d6a6
-  data.tar.gz: cbe9733235652a2ee5d777e53eed4a0f7deb9ffdcb69b0825b89c7831c52e5317e1e854b61e038d1a27fd92c85326e560c287e9e162d3068abcd246bc0e9ee48
+  metadata.gz: 97ca2433bccc9e15d8c86ab141fa74e8f441f62cdb2be16e3131e2dcf71b37319ed0399990a96cb8c34ee4c55e75f1eca8a652cd5c7031f272493eec3fdb0f9a
+  data.tar.gz: 5395379c1ca16bc50c900cd75a4b72665c0079dfe48f8717d38640d4ba610cc571c5f407333e088c0c387f19dc620039e3a406f03d6d6ea4a72a7348b98e7a41

data/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2020-present Phil Dibowitz
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -1,6 +1,7 @@
 # SugarJar
 
 [![Lint](https://github.com/jaymzh/sugarjar/workflows/Lint/badge.svg)](https://github.com/jaymzh/sugarjar/actions?query=workflow%3ALint)
+[![Unittest](https://github.com/jaymzh/sugarjar/workflows/Unittests/badge.svg)](https://github.com/jaymzh/sugarjar/actions?query=workflow%3AUnittests)
 [![DCO](https://github.com/jaymzh/sugarjar/workflows/DCO%20Check/badge.svg)](https://github.com/jaymzh/sugarjar/actions?query=workflow%3A%22DCO+Check%22)
 [![Gem Version](https://badge.fury.io/rb/sugarjar.svg)](https://badge.fury.io/rb/sugarjar)
 
@@ -8,7 +9,7 @@ Welcome to SugarJar - a git/github helper. It leverages the amazing GitHub cli,
 [hub](https://hub.github.com/), so you'll need that installed.
 
 SugarJar is inspired by [arcanist](https://github.com/phacility/arcanist), and
-it's replacement at Facebook, JellyFish. Many of the features they provide for
+its replacement at Facebook, JellyFish. Many of the features they provide for
 the Phabricator workflow this aims to bring to the GitHub workflow.
 
 In particular there are a lot of helpers for using a squash-merge workflow that
@@ -27,7 +28,7 @@ doesn't work. Git will tell you the branch isn't fully merged. You can, of
 course `git branch -D <branch>`, but that does no safety checks at all, it
 forces the deletion.
 
-Enter `sj bclean` - it determines of the contents of your branch has been merge
+Enter `sj bclean` - it determines if the contents of your branch has been merge
 and safely deletes if so.
 
 ``` shell
@@ -119,7 +120,7 @@ small lint issue? Not anymore! SJ can be configured to run things before
 pushing. For example,in the SugarJar repo, we have it run Rubocop (ruby lint)
 and Markdownlint "on_push". If those fail, it lets you know and doesn't push.
 
-You can configure SugarJar to tell how how to run both lints and unittests for
+You can configure SugarJar to tell it how to run both lints and unittests for
 a given repo and if one or both should be run prior to pushing.
 
 The details on the config file format is below, but we provide three commands:
@@ -190,6 +191,13 @@ $ sj feature dependent-feature test-branch
 Created feature branch dependent-feature based on test-branch
 ```
 
+## Smartlog
+
+Smartlog will show you a tree diagram of your branches! Simply run `sj
+smartlog` or `sj sl` for short.
+
+![smartlog screenshot](https://github.com/jaymzh/sugarjar/blob/master/smartlog.png)
+
 ## And more!
 
 See `sj help` for more commands!
@@ -236,8 +244,8 @@ yaml file is a straight key-value pair of options without their '--'. For
 example:
 
 ```yaml
-debug: true
-github-user: jaymzh
+log_level: debug
+github_user: jaymzh
 ```
 
 In addition, the environment variable `SUGARJAR_DEBUG` can be defined to set
@@ -304,6 +312,22 @@ sj clone jaymzh/sugarjar --github-host githuh.com
 We will add the `hub.host` to the `sugarjar` clone so that future `hub` or `sj`
 commands work without needing to specify..
 
+## Installing
+
+There are many ways to install SugarJar. The easiest is to use one of the
+packages we provide in the
+[releases](https://github.com/jaymzh/sugarjar/releases) section. Currently we
+provide packages for Fedora, CentOS, Debian, and Ubuntu, but if you want
+others, file an Issue. Since these packages are
+[omnibus](https://github.com/chef/omnibus) packages which means they are bundled
+with all of their dependencies. This means these packages will likely work as-is
+on later releases of these distros or any similar distros.
+
+We also distribute SugarJar via [RubyGems](https://rubygems.org/gems/sugarjar/),
+so you can install it as a gem either via system ruby or via rvm/rbenv.
+
+Finally you can clone the git repo and run it from within the repo if you'd like.
+
 ## FAQ
 
 Why the name SugarJar?

data/bin/sj

@@ -13,7 +13,7 @@ SugarJar::Log.level = Logger::INFO
 
 # Don't put defaults here, put them in SugarJar::Config - otherwise
 # these defaults overwrite whatever is in config files.
-options = {}
+options = { 'color' => true }
 # If ENV['SUGARJAR_DEBUG'] is set, it overrides the config file,
 # but not the command line options, so set that one here. Also
 # start the logger at that level, in case we are debugging option loading
@@ -53,14 +53,6 @@ parser = OptionParser.new do |opts|
     exit
   end
 
-  opts.on(
-    '--log-level LEVEL',
-    'Set logging level (fatal, error, warning, info, debug, trace). Default: ' +
-    'info',
-  ) do |level|
-    options['log_level'] = level
-  end
-
   opts.on(
     '--ignore-dirty',
     'Tell command that check for a dirty repo to carry on anyway.',
@@ -75,6 +67,18 @@ parser = OptionParser.new do |opts|
     options['ignore_prerun_failure'] = true
   end
 
+  opts.on(
+    '--log-level LEVEL',
+    'Set logging level (fatal, error, warning, info, debug, trace). Default: ' +
+    'info',
+  ) do |level|
+    options['log_level'] = level
+  end
+
+  opts.on('--[no-]use-color', 'Enable color. [default: true]') do |color|
+    options['color'] = color
+  end
+
   opts.on('--version') do
     puts SugarJar::VERSION
     exit
@@ -133,6 +137,11 @@ COMMANDS:
               your account (if not already done) and then setup your remotes
               so that "origin" is your fork and "upstream" is the upstream.
 
+  smartlog, sl
+              Inspired by Facebook's "sl" extension to Mercurial, this command
+              will show you a tree of all your local branches relative to your
+              upstream.
+
   smartpullrequest, smartpr, spr
               A smart wrapper to "hub pull-request" that checks if your repo
               is dirty before creating the pull request.
@@ -173,19 +182,23 @@ extra_opts = []
 config = SugarJar::Config.config
 
 valid_commands = sj.public_methods - Object.public_methods
-
-is_valid_command = ARGV.any? { |arg| valid_commands.include?(arg.to_s.to_sym) }
+possible_valid_command = ARGV.any? do |arg|
+  valid_commands.include?(arg.to_s.to_sym)
+end
 
 # if we're configured to fall thru and the subcommand isn't one
 # we recognize, don't parse the options as they may be different
 # than git's. For example `git config -l` - we error because we
 # require an arguement to `-l`.
-if config['fallthru'] && !is_valid_command
+if config['fallthru'] && !possible_valid_command
   SugarJar::Log.debug(
     'Skipping option parsing: fall-thru is set and we do not recognize ' +
     'any subcommands',
   )
 else
+  SugarJar::Log.debug(
+    'We MIGHT have a valid command... parse-command line options',
+  )
   # We want to allow people to pass in extra args to be passed to
   # git commands, but OptionParser doesn't easily allow this. So we
   # loop over it, catching exceptions.
@@ -231,6 +244,7 @@ SugarJar::Log.level = options['log_level'].to_sym if options['log_level']
 sj = SugarJar::Commands.new(options)
 
 subcommand = argv_copy.reject { |x| x.start_with?('-') }.first
+is_valid_command = valid_commands.include?(subcommand.to_sym)
 argv_copy.delete(subcommand)
 SugarJar::Log.debug("subcommand is #{subcommand}")
 

data/lib/sugarjar/commands.rb

@@ -12,6 +12,8 @@ class SugarJar
   class Commands
     include SugarJar::Util
 
+    MAIN_BRANCHES = %w{master main}.freeze
+
     def initialize(options)
       SugarJar::Log.debug("Commands.initialize options: #{options}")
       @ghuser = options['github_user']
@@ -19,6 +21,7 @@ class SugarJar
       @ignore_dirty = options['ignore_dirty']
       @ignore_prerun_failure = options['ignore_prerun_failure']
       @repo_config = SugarJar::RepoConfig.config
+      @color = options['color']
       return if options['no_change']
 
       set_hub_host if @ghhost
@@ -29,58 +32,66 @@ class SugarJar
       assert_in_repo
       SugarJar::Log.debug("Feature: #{name}, #{base}")
       die("#{name} already exists!") if all_branches.include?(name)
-      base ||= most_master
+      base ||= most_main
       base_pieces = base.split('/')
       hub('fetch', base_pieces[0]) if base_pieces.length > 1
       hub('checkout', '-b', name, base)
-      SugarJar::Log.info("Created feature branch #{name} based on #{base}")
+      SugarJar::Log.info(
+        "Created feature branch #{color(name, :green)} based on " +
+        color(base, :green),
+      )
     end
 
     def bclean(name = nil)
       assert_in_repo
       name ||= current_branch
-      # rubocop:disable Style/GuardClause
-      unless clean_branch(name)
+      if clean_branch(name)
+        SugarJar::Log.info("#{name}: #{color('reaped', :green)}")
+      else
         die(
-          "Cannot clean #{name} - there are unmerged commits; use " +
-          "'git branch -D #{name}' to forcefully delete it.",
+          "#{color("Cannot clean #{name}", :red)}! there are unmerged " +
+          "commits; use 'git branch -D #{name}' to forcefully delete it.",
         )
       end
-      # rubocop:enable Style/GuardClause
     end
 
     def bcleanall
       assert_in_repo
       curr = current_branch
       all_branches.each do |branch|
-        next if branch == 'master'
+        if MAIN_BRANCHES.include?(branch)
+          SugarJar::Log.debug("Skipping #{branch}")
+          next
+        end
 
-        # rubocop:disable Style/Next
-        unless clean_branch(branch)
-          SugarJar::Log.info(
-            "Skipping branch #{branch} - there are unmerged commits; use " +
-            "'git branch -D #{branch}' to forcefully delete it.",
+        if clean_branch(branch)
+          SugarJar::Log.info("#{branch}: #{color('reaped', :green)}")
+        else
+          SugarJar::Log.info("#{branch}: skipped")
+          SugarJar::Log.debug(
+            "There are unmerged commits; use 'git branch -D #{branch}' to " +
+            'forcefully delete it)',
           )
         end
-        # rubocop:enable Style/Next
       end
 
-      # Return to the branch we were on, or master
+      # Return to the branch we were on, or main
       if all_branches.include?(curr)
         hub('checkout', curr)
       else
-        hub('checkout', 'master')
+        checkout_main_branch
       end
     end
 
     def co(*args)
       assert_in_repo
-      hub('checkout', *args)
+      s = hub('checkout', *args)
+      SugarJar::Log.info(s.stderr + s.stdout.chomp)
     end
 
     def br
       assert_in_repo
-      puts hub('branch', '-v').stdout
+      SugarJar::Log.info(hub('branch', '-v').stdout.chomp)
     end
 
     def binfo
@@ -88,16 +99,38 @@ class SugarJar
       SugarJar::Log.info(hub(
         'log', '--graph', '--oneline', '--decorate', '--boundary',
         "#{tracked_branch}.."
-      ).stdout)
+      ).stdout.chomp)
+    end
+
+    # binfo for all branches
+    def smartlog
+      assert_in_repo
+      SugarJar::Log.info(hub(
+        'log', '--graph', '--oneline', '--decorate', '--boundary',
+        '--branches', "#{most_main}.."
+      ).stdout.chomp)
     end
 
+    alias sl smartlog
+
     def up
       assert_in_repo
+      # get a copy of our current branch, if rebase fails, we won't
+      # be able to determine it without backing out
+      curr = current_branch
       result = gitup
-      if result
-        SugarJar::Log.info("Rebased branch on #{result}")
+      if result['so'].error?
+        die(
+          "#{color(curr, :red)}: Failed to rebase on " +
+          "#{result['base']}. Leaving the repo as-is. You can get out of " +
+          'this with a `git rebase --abort`. Output from failed rebase is: ' +
+          "\nSTDOUT:\n#{result['so'].stdout.lines.map { |x| "\t#{x}" }.join}" +
+          "\nSTDERR:\n#{result['so'].stderr.lines.map { |x| "\t#{x}" }.join}",
+        )
       else
-        die('Failed to rebase current branch')
+        SugarJar::Log.info(
+          "#{color(current_branch, :green)} rebased on #{result['base']}",
+        )
       end
     end
 
@@ -117,18 +150,21 @@ class SugarJar
     def upall
       assert_in_repo
       all_branches.each do |branch|
-        next if branch == 'master'
+        next if MAIN_BRANCHES.include?(branch)
 
         hub('checkout', branch)
         result = gitup
-        if result
-          SugarJar::Log.info("Rebased #{branch} on #{result}")
-        else
+        if result['so'].error?
           SugarJar::Log.error(
-            "Failed to rebase #{branch}, aborting that and moving to next " +
-            'branch',
+            "#{color(branch, :red)} failed rebase. Reverting attempt and " +
+            'moving to next branch. Try `sj up` manually on that branch.',
           )
           hub('rebase', '--abort')
+        else
+          SugarJar::Log.info(
+            "#{color(branch, :green)} rebased on " +
+            color(result['base'], :green).to_s,
+          )
         end
       end
     end
@@ -141,7 +177,7 @@ class SugarJar
       reponame = File.basename(repo, '.git')
       dir ||= reponame
       SugarJar::Log.info("Cloning #{reponame}...")
-      hub('clone', repo, dir, *args)
+      hub('clone', canonicalize_repo(repo), dir, *args)
 
       Dir.chdir dir do
         # Now that we have a repo, if we have a hub host set it.
@@ -156,12 +192,26 @@ class SugarJar
 
         s = hub_nofail('fork', '--remote-name=origin')
         if s.error?
-          # if the fork command failed, we already have one, so we have
-          # to swap the remote names ourselves
-          # newer 'hub's don't fail and do the right thing...
-          SugarJar::Log.info("Fork (#{@ghuser}/#{reponame}) detected.")
-          hub('remote', 'rename', 'origin', 'upstream')
-          hub('remote', 'add', 'origin', forked_path(repo, @ghuser))
+          if s.stdout.include?('SAML enforcement')
+            SugarJar::Log.info(
+              'Forking the repo failed because the repo requires SAML ' +
+              "authentication. Full output:\n\n\t#{s.stdout}",
+            )
+            exit(1)
+          else
+            # In old versions of hub, it would fail if the upstream fork
+            # already existed. If we got an error, but didn't recognize
+            # that, we'll assume that's what happened and try to add the
+            # remote ourselves.
+            SugarJar::Log.info("Fork (#{@ghuser}/#{reponame}) detected.")
+            SugarJar::Log.debug(
+              'The above is a bit of a lie. "hub" failed to fork and it was ' +
+              'not a SAML error, so our best guess is that a fork exists ' +
+              'and so we will try to configure it.',
+            )
+            hub('remote', 'rename', 'origin', 'upstream')
+            hub('remote', 'add', 'origin', forked_repo(repo, @ghuser))
+          end
         else
           SugarJar::Log.info("Forked #{reponame} to #{@ghuser}")
         end
@@ -260,24 +310,36 @@ class SugarJar
       s.error?
     end
 
-    def extract_org(path)
-      if path.start_with?('http')
-        File.basename(File.dirname(path))
-      elsif path.start_with?('git@')
-        path.split(':')[1].split('/')[0]
+    def extract_org(repo)
+      if repo.start_with?('http')
+        File.basename(File.dirname(repo))
+      elsif repo.start_with?('git@')
+        repo.split(':')[1].split('/')[0]
       else
         # assume they passed in a hub-friendly name
-        path.split('/').first
+        repo.split('/').first
       end
     end
 
-    def forked_path(path, username)
-      repo = if path.start_with?('http', 'git@')
-               File.basename(path)
+    def forked_repo(repo, username)
+      repo = if repo.start_with?('http', 'git@')
+               File.basename(repo)
              else
-               "#{File.basename(path)}.git"
+               "#{File.basename(repo)}.git"
              end
-      "git@github.com:#{username}/#{repo}"
+      "git@#{@ghhost || 'github.com'}:#{username}/#{repo}"
+    end
+
+    # Hub will default to https, but we should always default to SSH
+    # unless otherwise specified since https will cause prompting.
+    def canonicalize_repo(repo)
+      # if they fully-qualified it, we're good
+      return repo if repo.start_with?('http', 'git@')
+
+      # otherwise, ti's a shortname
+      cr = "git@#{@ghhost || 'github.com'}:#{repo}.git"
+      SugarJar::Log.debug("canonicalized #{repo} to #{cr}")
+      cr
     end
 
     def set_hub_host
@@ -352,21 +414,55 @@ class SugarJar
       end
       Dir.chdir repo_root do
         @repo_config[type].each do |check|
-          SugarJar::Log.info("Running #{type} #{check}")
+          SugarJar::Log.debug("Running #{type} #{check}")
 
-          unless File.exist?(check)
-            SugarJar::Log.error("Configured #{type} #{check} does not exist!")
+          short = check.split.first
+          unless File.exist?(short)
+            SugarJar::Log.error("Configured #{type} #{short} does not exist!")
             return false
           end
           s = Mixlib::ShellOut.new(check).run_command
-          next unless s.error?
 
+          # Linters auto-correct, lets handle that gracefully
+          if type == 'lint' && dirty?
+            SugarJar::Log.info(
+              "[#{type}] #{short}: #{color('Corrected', :yellow)}",
+            )
+            SugarJar::Log.warn(
+              "The linter modified the repo. Here's the diff:\n",
+            )
+            puts hub('diff').stdout
+            loop do
+              $stdout.print(
+                "\nWould you like to\n\t[q]uit and inspect\n\t[a]mend the " +
+                "changes to the current commit and re-run\n  > ",
+              )
+              ans = $stdin.gets.strip
+              case ans
+              when /^q/
+                SugarJar::Log.info('Exiting at user request.')
+                exit(1)
+              when /^a/
+                qamend('-a')
+                # break here, if we get out of this loop we 'redo', assuming
+                # the user chose this option
+                break
+              end
+            end
+            redo
+          end
+
+          if s.error?
+            SugarJar::Log.info(
+              "[#{type}] #{short} #{color('failed', :red)}, output follows " +
+              "(see debug for more)\n#{s.stdout}",
+            )
+            SugarJar::Log.debug(s.format_for_exception)
+            return false
+          end
           SugarJar::Log.info(
-            "#{type} #{check} failed, output follows (use debug for more)\n" +
-            s.stdout.to_s,
+            "[#{type}] #{short}: #{color('OK', :green)}",
           )
-          SugarJar::Log.debug(s.format_for_exception)
-          return false
         end
       end
     end
@@ -375,7 +471,7 @@ class SugarJar
       @repo_config['on_push']&.each do |item|
         SugarJar::Log.debug("Running on_push check type #{item}")
         unless send(:run_check, item)
-          SugarJar::Log.info("Push check #{item} failed.")
+          SugarJar::Log.info("[prepush]: #{item} #{color('failed', :red)}.")
           return false
         end
       end
@@ -391,25 +487,30 @@ class SugarJar
       die('sugarjar must be run from inside a git repo') unless in_repo
     end
 
+    def main_branch
+      @main_branch = all_branches.include?('main') ? 'main' : 'master'
+    end
+
+    def checkout_main_branch
+      hub('checkout', main_branch)
+    end
+
     def clean_branch(name)
-      die('Cannot remove master branch') if name == 'master'
+      die("Cannot remove #{name} branch") if MAIN_BRANCHES.include?(name)
       SugarJar::Log.debug('Fetch relevant remote...')
       fetch_upstream
       return false unless safe_to_clean(name)
 
       SugarJar::Log.debug('branch deemed safe to delete...')
-      hub('checkout', 'master')
+      checkout_main_branch
       hub('branch', '-D', name)
       gitup
-      SugarJar::Log.info("Reaped branch #{name}")
       true
     end
 
     def all_branches
       branches = []
       hub('branch', '--format', '%(refname)').stdout.lines.each do |line|
-        next if line == 'master'
-
         branches << line.strip.split('/')[2]
       end
       branches
@@ -433,7 +534,7 @@ class SugarJar
 
       # if the "easy" check didn't work, it's probably because there
       # was a squash-merge. To check for that we make our own squash
-      # merge to upstream/master and see if that has any delta
+      # merge to upstream/main and see if that has any delta
 
       # First we need a temp branch to work on
       tmpbranch = "_sugar_jar.#{Process.pid}"
@@ -442,8 +543,8 @@ class SugarJar
       s = hub_nofail('merge', '--squash', branch)
       if s.error?
         cleanup_tmp_branch(tmpbranch, branch)
-        SugarJar::Log.error(
-          'Failed to merge changes into current master. This means we could ' +
+        SugarJar::Log.debug(
+          'Failed to merge changes into current main. This means we could ' +
           'not figure out if this is merged or not. Check manually and use ' +
           "'git branch -D #{branch}' if it is safe to do so.",
         )
@@ -461,7 +562,7 @@ class SugarJar
         true
       else
         SugarJar::Log.debug(
-          'After squash-merging, this branch is NOT fully merged to master',
+          'After squash-merging, this branch is NOT fully merged to main',
         )
         false
       end
@@ -486,9 +587,8 @@ class SugarJar
       SugarJar::Log.debug('Fetching upstream')
       fetch_upstream
       curr = current_branch
-      SugarJar::Log.debug('Rebasing')
       base = tracked_branch
-      if curr != 'master' && base == "origin/#{curr}"
+      if !MAIN_BRANCHES.include?(curr) && base == "origin/#{curr}"
         SugarJar::Log.warn(
           "This branch is tracking origin/#{curr}, which is probably your " +
           'downstream (where you push _to_) as opposed to your upstream ' +
@@ -497,8 +597,12 @@ class SugarJar
           'to do a "git branch -u upstream".',
         )
       end
+      SugarJar::Log.debug('Rebasing')
       s = hub_nofail('rebase', base)
-      s.error? ? nil : base
+      {
+        'so' => s,
+        'base' => base,
+      }
     end
 
     def tracked_branch
@@ -506,18 +610,18 @@ class SugarJar
         'rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'
       )
       if s.error?
-        most_master
+        most_main
       else
         s.stdout.strip
       end
     end
 
-    def most_master
+    def most_main
       us = upstream
       if us
-        "#{us}/master"
+        "#{us}/#{main_branch}"
       else
-        master
+        main_branch
       end
     end
 
@@ -541,5 +645,20 @@ class SugarJar
       end
       @remote
     end
+
+    def color(string, *colors)
+      if @color
+        pastel.decorate(string, *colors)
+      else
+        string
+      end
+    end
+
+    def pastel
+      @pastel ||= begin
+        require 'pastel'
+        Pastel.new
+      end
+    end
   end
 end

data/lib/sugarjar/util.rb

@@ -27,6 +27,10 @@ class SugarJar
     end
 
     def hub_nofail(*args)
+      if %w{diff log grep branch}.include?(args[0]) &&
+         args.none? { |x| x.include?('color') }
+        args << (@color ? '--color' : '--no-color')
+      end
       SugarJar::Log.trace("Running: hub #{args.join(' ')}")
       s = Mixlib::ShellOut.new([which('hub')] + args).run_command
       if s.error?
@@ -48,7 +52,8 @@ class SugarJar
           end
           SugarJar::Log.info('Re-running original hub command...')
           s = Mixlib::ShellOut.new([which('hub')] + args).run_command
-        when /^fatal: could not read Username/
+        when /^fatal: could not read Username/, /Anonymous access denied/
+
           # On http(s) URLs, git may prompt for username/passwd
           SugarJar::Log.info(
             'Hub was run but git prompted for authentication. This probably ' +

data/lib/sugarjar/version.rb

@@ -1,3 +1,3 @@
 class SugarJar
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.10'.freeze
 end

data/sugarjar.gemspec

@@ -19,4 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'mixlib-log'
   spec.add_dependency 'mixlib-shellout'
+  spec.add_dependency 'pastel'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true',
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sugarjar
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.10
 platform: ruby
 authors:
 - Phil Dibowitz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -38,7 +38,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - phil@ipom.com
 executables:
@@ -64,8 +78,9 @@ files:
 homepage: https://github.com/jaymzh/sugarjar
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: A git/github helper script
 test_files: []