sugarjar 0.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: d2c4dd59aaf4843033f5c38df43b3fdfa556298708bc7f437f2923e00f9133c8
+  data.tar.gz: 5edeeb730db94059fd10b115b192ed239782b797473eb3b1fcf5aa749ca23e95
+SHA512:
+  metadata.gz: 3869512549691df320f1dc344424b65944cd8cb501e25cd1a982f9b8d4d92cf608531147a8c5eb7a7437eee7644683ef9cf57e6035c44b61e4d247eec3331e03
+  data.tar.gz: 159e663e59a6c2aa939a5e9aecb90ce811bb9a168476d842ced28eab7a9968b760daec22661455a7bdaf3ac75ecc11a1c706e2ea07a6368ab653bcc3a222a597

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -0,0 +1,149 @@
+# SugjarJar
+
+![CI](https://github.com/jaymzh/sugarjar/workflows/CI/badge.svg)
+
+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
+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
+is poorly handled by the standard toolsets.
+
+## Commands
+
+### amend
+
+Amend the current commit. Alias for `git commit --amend`.  Accepts other
+arguments such as `-a` or files.
+
+### amendq, qamend
+
+Same as `amend` but without changing the message. Alias for `git commit --amend
+--no-edit`.
+
+### bclean
+
+If safe, delete the current branch. Unlike `git branch -d`, bclean can handle
+squash-merged branches. Think of it as a smarter `git branch -d`.
+
+### bcleanall
+
+Walk all branches, and try to delete them if it's safe. See `bclean` for
+details.
+
+### binfo
+
+Verbose information about the current branch.
+
+### br
+
+Verbose branch list. An alias for `git branch -v`.
+
+### feature
+
+Create a "feature branch." It's morally equivalent to `git checkout -b` except
+it defaults to creating it based on some form of 'master' instead of your
+current branch. In order of preference it will be `upstream/master`,
+`origin/master`, or `master`, depending upon what remotes are available.
+
+### forcepush, fpush
+
+The same as `smartpush`, but uses `--force-with-lease`. This is a "safer" way
+of doing force-pushes and is the recommended way to push after rebasing or
+amending. Never do this to shared branches. Very convenient for keeping the
+branch behind a pull-request clean.
+
+### lint
+
+Run any linters configured in `.sugarjar.yaml`.
+
+### smartclone, sclone
+
+A smart wrapper to `git clone` that handles forking and managing remotes for
+you.  It will clone a git repository using hub-style short name (`$org/$repo`).
+If the org of the repository is not the same as your github-user then it will
+fork the repo for you to your account (if not already done) and then setup your
+remotes so that `origin` is your fork and `upstream` is the upstream.
+
+### smartpush, spush
+
+A smart wrapper to `git push` that runs whatever is defined in `on_push` in
+`.sugarjar.yml`, and only pushes if they succeed.
+
+It will also allow you to not specify a remote or branch, and will default to
+`origin` and whatever your current local branch name is.
+
+### unit
+
+Run any unitests configured in `.sugarjar.yaml`.
+
+### up
+
+Rebase the current branch on the branch it's tracking, or if it's tracking one
+then, otherise `upstream/master` if it exists, or `origin/master`.
+
+### upall
+
+Same as `up`, but for all branches.
+
+## User Configuration
+
+Sugarjar will read in both a system-level config file
+(`/etc/sugarjar/config.yaml`) and a user-level config file
+`~/.config/sugarjar/config.yaml`, if they exist. Anything in the user config
+will override the system config, and command-line options override both. The
+yaml file is a straight key-value pair of options without their '--'. For
+example:
+
+```yaml
+debug: true
+github-user: jaymzh
+```
+
+In addition, the environment variable `SUGARJAR_DEBUG` can be defined to set
+debug on. This is primarily used as a way to turn debug on earlier in order to
+troubleshoot configuration parsing.
+
+## Repository Configuration
+
+Sugarjar looks for a `.sugarjar.yaml` in the root of the repository to tell it
+how to handle repo-specific things. Currently there are only three
+configurations accepted:
+
+* lint - A list of scripts to run on `sj lint`. These should be linters like
+  rubocop or pyflake.
+* unit - A list of scripts to run on `sj unit`. These should be unittest
+  runners like rspec or pyunit.
+* on_push - A list of types (`lint`, `unit`) of checks to run before pushing.
+  It is highly recommended this is only `lint`. The goal here is to allow for
+  the user to get quick stylistic feedback before pushing their branch to avoid
+  the push-fix-push-fix loop.
+
+Example configuration:
+
+```yaml
+lint:
+  - scripts/lint
+unit:
+  - scripts/unit
+on_push:
+  - lint
+```
+
+## FAQ
+
+Why the name SugarJar?
+
+It's mostly a backranym. Like jellyfish, I wanted two letters that were on
+home row on different sides of the keyboard to make it easy to type. I looked
+at the possible options that where there and not taken and tried to find one
+I could make an appropriate name out of. Since this utility adds lots of sugar
+to git and github, it seemed appropriate.
+
+Why did you use `hub` instead of the newer `gh` CLI?
+
+`gh` is less feature-rich (currently). I'm also considering making this optionally
+act as a wrapper to `hub` the way `hub` can be a wrapper to `git`.

data/lib/sugarjar/commands.rb

@@ -0,0 +1,396 @@
+require_relative 'util'
+require_relative 'repoconfig'
+require_relative 'log'
+require_relative 'version'
+
+class SugarJar
+  # This is the workhorse of SugarJar. Short of #initialize, all other public
+  # methods are "commands". Anything in private is internal implementation
+  # details.
+  class Commands
+    include SugarJar::Util
+
+    def initialize(options)
+      @ghuser = options['github_user']
+      @ghhost = options['github_host']
+      @repo_config = SugarJar::RepoConfig.config
+      set_hub_host if @ghhost
+    end
+
+    def feature(name, base = nil)
+      assert_in_repo
+      SugarJar::Log.debug("Feature: #{name}, #{base}")
+      die("#{name} already exists!") if all_branches.include?(name)
+      base ||= most_master
+      hub('checkout', '-b', name, base)
+      SugarJar::Log.info("Created feature branch #{name} based on #{base}")
+    end
+
+    def bclean(name = nil)
+      assert_in_repo
+      name ||= current_branch
+      # rubocop:disable Style/GuardClause
+      unless clean_branch(name)
+        die("Cannot clean #{name} - there are unmerged commits")
+      end
+      # rubocop:enable Style/GuardClause
+    end
+
+    def bcleanall
+      assert_in_repo
+      all_branches.each do |branch|
+        next if branch == 'master'
+
+        # rubocop:disable Style/Next
+        unless clean_branch(branch)
+          SugarJar::Log.info(
+            "Skipping branch #{branch} - there are unmerged commits"
+          )
+        end
+        # rubocop:enable Style/Next
+      end
+    end
+
+    def co(name)
+      assert_in_repo
+      hub('checkout', name)
+    end
+
+    def br
+      assert_in_repo
+      puts hub('branch', '-v').stdout
+    end
+
+    def binfo
+      assert_in_repo
+      SugarJar::Log.info(hub(
+        'log', '--graph', '--oneline', '--decorate', '--boundary',
+        "#{tracked_branch}.."
+      ).stdout)
+    end
+
+    def up
+      assert_in_repo
+      result = gitup
+      if result
+        SugarJar::Log.info("Rebased branch on #{result}")
+      else
+        die('Failed to rebase current branch')
+      end
+    end
+
+    def amend(*args)
+      assert_in_repo
+      # This cannot use shellout since we need a full terminal for the editor
+      exit(system('/usr/bin/git', 'commit', '--amend', *args))
+    end
+
+    def qamend(*args)
+      assert_in_repo
+      SugarJar::Log.info(hub('commit', '--amend', '--no-edit', *args).stdout)
+    end
+
+    alias amendq qamend
+
+    def upall
+      assert_in_repo
+      all_branches.each do |branch|
+        next if branch == 'master'
+
+        hub('checkout', branch)
+        result = gitup
+        if result
+          SugarJar::Log.info("Rebased #{branch} on #{result}")
+        else
+          SugarJar::Log.error(
+            "Failed to rebase #{branch}, aborting that and moving to next " +
+            'branch'
+          )
+          hub('rebase', '--abort')
+        end
+      end
+    end
+
+    def smartclone(repo, dir = nil, *args)
+      # If the user has specified a hub host, set the environment variable
+      # since we don't have a repo to configure yet
+      ENV['GITHUB_HOST'] = @ghhost if @ghhost
+
+      reponame = File.basename(repo, '.git')
+      dir ||= reponame
+      SugarJar::Log.info("Cloning #{reponame}...")
+      hub('clone', repo, dir, *args)
+
+      Dir.chdir dir do
+        # Now that we have a repo, if we have a hub host set it.
+        set_hub_host if @ghhost
+
+        org = File.basename(File.dirname(repo))
+        if org == @ghuser
+          put 'Cloned forked or self-owned repo. Not creating "upstream".'
+          return
+        end
+
+        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
+          SugarJar::Log.info("Fork (#{@ghuser}/#{reponame}) detected.")
+          hub('remote', 'rename', 'origin', 'upstream')
+          hub('remote', 'add', 'origin', repo.gsub("#{org}/", "#{@ghuser}/"))
+        else
+          SugarJar::Log.info("Forked #{reponame} to #{@ghuser}")
+        end
+        SugarJar::Log.info('Remotes "origin" and "upstream" configured.')
+      end
+    end
+
+    alias sclone smartclone
+
+    def lint
+      exit(1) unless run_check('lint')
+    end
+
+    def unit
+      exit(1) unless run_check('lint')
+    end
+
+    def smartpush(remote = nil, branch = nil)
+      unless remote && branch
+        remote ||= 'origin'
+        branch ||= current_branch
+      end
+
+      if run_prepush
+        puts hub('push', remote, branch).stderr
+      else
+        SugarJar::Log.error('Pre-push checks failed. Not pushing.')
+      end
+    end
+
+    alias spush smartpush
+
+    def forcepush(remote = nil, branch = nil)
+      unless remote && branch
+        remote ||= 'origin'
+        branch ||= current_branch
+      end
+      if run_prepush
+        puts hub('push', '--force-with-lease', remote, branch).stderr
+      else
+        SugarJar::Log.error('Pre-push checks failed. Not pushing.')
+      end
+    end
+
+    alias fpush forcepush
+
+    def version
+      puts "sugarjar version #{SugarJar::VERSION}"
+      puts hub('version').stdout
+    end
+
+    private
+
+    def set_hub_host
+      return unless in_repo
+
+      s = hub_nofail('config', '--local', '--get', 'hub.host')
+      if s.error?
+        SugarJar::Log.info("Setting repo hub.host = #{@ghhost}")
+      else
+        current = s.stdout
+        if current == @ghost
+          SugarJar::Log.debug('Repo hub.host already set correctly')
+        else
+          SugarJar::Log.info(
+            "Overwriting repo hub.host from #{current} to #{@ghhost}"
+          )
+        end
+      end
+      hub('config', '--local', '--add', 'hub.host', @ghhost)
+    end
+
+    def run_check(type)
+      unless @repo_config[type]
+        SugarJar::Log.debug("No #{type} configured. Returning success")
+        return true
+      end
+      Dir.chdir repo_root do
+        @repo_config[type].each do |check|
+          SugarJar::Log.info("Running #{type} #{check}")
+
+          unless File.exist?(check)
+            SugarJar::Log.error("Configured #{type} #{check} does not exist!")
+            return false
+          end
+          s = Mixlib::ShellOut.new(check).run_command
+          if s.error?
+            SugarJar::Log.info("#{type} #{check} failed\n#{s.stdout}")
+            return false
+          end
+        end
+      end
+    end
+
+    def run_prepush
+      @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.")
+          return false
+        end
+      end
+      true
+    end
+
+    def die(msg)
+      SugarJar::Log.fatal(msg)
+      exit(1)
+    end
+
+    def assert_in_repo
+      die('sugarjar must be run from inside a git repo') unless in_repo
+    end
+
+    def clean_branch(name)
+      die('Cannot remove master branch') if name == 'master'
+      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')
+      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
+    end
+
+    def safe_to_clean(branch)
+      # cherry -v will output 1 line per commit on the target branch
+      # prefixed by a - or + - anything with a - can be dropped, anything
+      # else cannot.
+      out = hub(
+        'cherry', '-v', tracked_branch, branch
+      ).stdout.lines.reject do |line|
+        line.start_with?('-')
+      end
+      if out.length.zero?
+        SugarJar::Log.debug(
+          "cherry-pick shows branch #{branch} obviously safe to delete"
+        )
+        return true
+      end
+
+      # 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
+
+      # First we need a temp branch to work on
+      tmpbranch = "_sugar_jar.#{Process.pid}"
+
+      hub('checkout', '-b', tmpbranch, tracked_branch)
+      s = hub_nofail('merge', '--squash', branch)
+      if s.error?
+        cleanup_tmp_branch(tmpbranch, branch)
+        error(
+          'Failed to merge changes into current master. 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."
+        )
+        return false
+      end
+
+      s = hub('diff', '--staged')
+      out = s.stdout
+      SugarJar::Log.debug("Squash-merged diff: #{out}")
+      cleanup_tmp_branch(tmpbranch, branch)
+      if out.empty?
+        SugarJar::Log.debug(
+          'After squash-merging, this branch appears safe to delete'
+        )
+        true
+      else
+        SugarJar::Log.debug(
+          'After squash-merging, this branch is NOT fully merged to master'
+        )
+        false
+      end
+    end
+
+    def cleanup_tmp_branch(tmp, backto)
+      hub('reset', '--hard', tracked_branch)
+      hub('checkout', backto)
+      hub('branch', '-D', tmp)
+    end
+
+    def current_branch
+      hub('symbolic-ref', 'HEAD').stdout.strip.split('/')[2]
+    end
+
+    def fetch_upstream
+      us = upstream
+      hub('fetch', us) if us
+    end
+
+    def gitup
+      SugarJar::Log.debug('Fetching upstream')
+      fetch_upstream
+      SugarJar::Log.debug('Rebasing')
+      base = tracked_branch
+      s = hub_nofail('rebase', base)
+      s.error? ? nil : base
+    end
+
+    def tracked_branch
+      s = hub_nofail(
+        'rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'
+      )
+      if s.error?
+        most_master
+      else
+        s.stdout.strip
+      end
+    end
+
+    def most_master
+      us = upstream
+      if us
+        "#{us}/master"
+      else
+        master
+      end
+    end
+
+    def upstream
+      return @remote if @remote
+
+      s = hub('remote')
+
+      remotes = s.stdout.lines.map(&:strip)
+      SugarJar::Log.debug("remotes is #{remotes}")
+      if remotes.empty?
+        @remote = nil
+      elsif remotes.length == 1
+        @remote = remotes[0]
+      elsif remotes.include?('upstream')
+        @remote = 'upstream'
+      elsif remotes.include?('origin')
+        @remote = 'origin'
+      else
+        raise 'Could not determine "upstream" remote to use...'
+      end
+      @remote
+    end
+  end
+end

data/lib/sugarjar/config.rb

@@ -0,0 +1,31 @@
+require 'yaml'
+require_relative 'log'
+
+class SugarJar
+  # This parses SugarJar configs (not to be confused with repoconfigs).
+  # This is stuff like log level, github-user, etc.
+  class Config
+    DEFAULTS = {
+      'ghuser' => ENV['USER'],
+      'fallthru' => true,
+    }.freeze
+
+    def self._find_ordered_files
+      [
+        '/etc/sugarjar/config.yaml',
+        "#{ENV['HOME']}/.config/sugarjar/config.yaml"
+      ].select { |f| File.exist?(f) }
+    end
+
+    def self.config
+      SugarJar::Log.debug("Defaults: #{DEFAULTS}")
+      c = DEFAULTS.dup
+      _find_ordered_files.each do |f|
+        SugarJar::Log.debug("Loading config #{f}")
+        c.merge!(YAML.safe_load(File.read(f)))
+        SugarJar::Log.debug("Modified config: #{c}")
+      end
+      c
+    end
+  end
+end

data/lib/sugarjar/log.rb

@@ -0,0 +1,24 @@
+require 'mixlib/log'
+
+module Mixlib
+  module Log
+    # A simple formatter so that 'info' is just like 'puts'
+    # but everything else gets a severity
+    class Formatter
+      def call(severity, _time, _progname, msg)
+        if severity == 'INFO'
+          "#{msg2str(msg)}\n"
+        else
+          "#{severity}: #{msg2str(msg)}\n"
+        end
+      end
+    end
+  end
+end
+
+class SugarJar
+  # Our singleton logger
+  class Log
+    extend Mixlib::Log
+  end
+end

data/lib/sugarjar/repoconfig.rb

@@ -0,0 +1,32 @@
+require_relative 'util'
+require_relative 'log'
+require 'yaml'
+
+class SugarJar
+  # This parses SugarJar repoconfigs (not to be confused with configs).
+  # This is lint/unit/on_push configs.
+  class RepoConfig
+    extend SugarJar::Util
+
+    CONFIG_NAME = '.sugarjar.yaml'.freeze
+
+    def self.repo_config
+      ::File.join(repo_root, CONFIG_NAME)
+    end
+
+    def self.config
+      unless in_repo
+        SugarJar::Log.debug('Not in repo, skipping repoconfig load')
+        return {}
+      end
+      config = repo_config
+      if File.exist?(config)
+        SugarJar::Log.debug("Loading repo config: #{config}")
+        YAML.safe_load(File.read(repo_config))
+      else
+        SugarJar::Log.debug("No repo config (#{config}), returning empty hash")
+        {}
+      end
+    end
+  end
+end

data/lib/sugarjar/util.rb

@@ -0,0 +1,26 @@
+require_relative 'log'
+
+class SugarJar
+  # Some common methods needed by other classes
+  module Util
+    def hub_nofail(*args)
+      SugarJar::Log.trace("Running: hub #{args.join(' ')}")
+      Mixlib::ShellOut.new(['/usr/bin/hub'] + args).run_command
+    end
+
+    def hub(*args)
+      s = hub_nofail(*args)
+      s.error!
+      s
+    end
+
+    def in_repo
+      s = hub_nofail('rev-parse', '--is-inside-work-tree')
+      !s.error? && s.stdout.strip == 'true'
+    end
+
+    def repo_root
+      hub('rev-parse', '--show-toplevel').stdout.strip
+    end
+  end
+end

data/lib/sugarjar/version.rb

@@ -0,0 +1,3 @@
+class SugarJar
+  VERSION = '0.0.1'.freeze
+end

metadata

@@ -0,0 +1,137 @@
+--- !ruby/object:Gem::Specification
+name: sugarjar
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- Phil Dibowitz
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2020-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mixlib-log
+  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'
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  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'
+- !ruby/object:Gem::Dependency
+  name: yaml
+  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'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mdl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 
+email:
+- phil@ipom.com
+executables: []
+extensions: []
+extra_rdoc_files:
+- README.md
+- LICENSE
+files:
+- LICENSE
+- README.md
+- lib/sugarjar/commands.rb
+- lib/sugarjar/config.rb
+- lib/sugarjar/log.rb
+- lib/sugarjar/repoconfig.rb
+- lib/sugarjar/util.rb
+- lib/sugarjar/version.rb
+homepage: https://github.com/jaymzh/sugarjar
+licenses:
+- Apache-2.0
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.0.3
+signing_key: 
+specification_version: 4
+summary: A git/github helper script
+test_files: []