sugarjar 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0359bbf05d9c9930fb303ddcba57fd651d00de7ce046a5640c77f596fa148531'
-  data.tar.gz: 6a505ebcdc042fb4e3b6bd6c4e55e85401787f748a1f8874b4fd18e7489600e7
+  metadata.gz: a412f3091d9ce81db841098d46c0b74f5ccf210e7f62916db5f36f68d4f9218f
+  data.tar.gz: db6f60757390c2e8decf11cada9a423f4d61284304e9db43ef4785636f621fd3
 SHA512:
-  metadata.gz: 88050a2cc342cac84d22ed6395f5fa36df8ff98361283408ae227611c4814b23881ae4a59eef276feb160bea04c9b84e81d6cd76d7eae0c8d8caac0e199dcdad
-  data.tar.gz: 932d4c9918a3eb50c078e6e3a7dd4728ea648cca222daa460954ec51ea7109fc374ea8a8517e9cf1b71d900ac5bb44c4a6120f0a7aaa581fee87d154a6be08f7
+  metadata.gz: 550d6c2792dd3b800f8fcbb3ab0d34019ba59ae09596988fc31c92452270d220c6e0a8feead9f767750f2fb529f2e0c60421a8e5756bb5c80974a7329142404b
+  data.tar.gz: b723f16e4a2640777ebc8496afa635ff146f0a5de8e0359213aa0824e43b236a312fd199c5ddea047ff5acba604848e48ea94d9716a80ff4d280210b6dc32c83

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # SugarJar Changelog
 
+## 3.0.1 (2026-06-19)
+
+* Update tests for more resiliency in various package-building environments
+* Better fallbacks for forge type
+* Add config option to disable fork-based flows
+* Fix false-positive for "primary branch doesn't match" error
+* gitlab: Handle 3-level repos better
+* gitlab: Fix `smartpullrequest` issues
+* gitlab: significant improvement to `smartclone`
+* Add `--fork-name` option to enable forking to a different repo name
+
 ## 3.0.0 (2026-06-08)
 
 * Add support for GitLab

data/README.md

@@ -115,7 +115,8 @@ https://github.com/jaymzh/sugarjar/blob/main/images/sclone.png
 
 This will:
 
-* Fork the repo to your personal org (if you don't already have a fork)
+* Fork the repo to your personal org (if you don't already have a fork,
+  and if it's not already in your personal org)
 * Clone your fork
 * Add the original as an 'upstream' remote
 
@@ -126,6 +127,9 @@ Like `git clone`, `sj smartclone` will accept an additional argument as the
 destination directory to clone to. It will also pass any other unknown options
 to `git clone` under the hood.
 
+If you don't work with fork-based workflows, you can set `use_forks: false`
+in your config, or pass in `--no-use-forks` to `sj sclone`.
+
 ### Work with stacked branches more easily
 
 It's important to break changes into reviewable chunks, but working with

data/bin/sj

@@ -103,6 +103,22 @@ parser = OptionParser.new do |opts|
     options['pr_autofill'] = autofill
   end
 
+  opts.on(
+    '--[no-]use-forks',
+    'Create (add a remote for) forks, when the organization does not match ' +
+    'the user. [default: true]',
+  ) do |val|
+    options['use_forks'] = val
+  end
+
+  opts.on(
+    '--fork-name NAME',
+    'When forking a repo (in `smartclone`), fork the repo to a different ' +
+    'name. See the help for `smartclone` below.',
+  ) do |val|
+    options['fork_name'] = val
+  end
+
   opts.on(
     '--[no-]pr-autostack',
     'When creating a PR, if this is a subfeature, should we make it a ' +
@@ -224,15 +240,40 @@ COMMANDS:
               Walk all remote branches, and try to delete them if it's safe. See
               "rbclean" for details.
 
-  smartclone, sclone
+  smartclone, sclone <repo> [<dir>]
               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
+
+              If the org of the repository is not the same as your forge user
+              then it will fork the repo for you to your account (if not
+              already done), clone the repo, and then setup your remotes
               so that "origin" is your fork and "upstream" is the upstream.
 
+              It is assumed that there will be at least one positional
+              argument, and it will be the repo in any format (git, ssh,
+              forge-style shortname [e.g. e.g. "$org/$repo"]). A second
+              positional argument will be interpreted as the directory to
+              clone into.
+
+              If you want to change the name of the repo in your fork of it,
+              you may pass in --fork-name to specify another.
+
+              Note that if you pass in additional options after ' -- ', they
+              will be passed to 'gh' in the case of GitHub, or 'git' in the
+              case of GitLab.
+
+              For example to clone foo/bar/docs on gitlab, but have the
+              repo named 'bar-docs' when it's cloned to your org, and to
+              have the directory be called 'bar-docs':
+
+                sj sclone foo/bar/docs bar-docs \
+                  --forge-type glab --fork-name bar-docs
+
+              Or for GitHub:
+
+                sj sclone bar/docs bar-docs \
+                  --forge-type github --fork-name bar-docs
+
   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

data/lib/sugarjar/commands/smartclone.rb

@@ -1,9 +1,15 @@
 class SugarJar
   class Commands
-    def smartclone(repo, dir = nil, *)
-      reponame = extract_repo(repo)
-      dir ||= reponame
+    def smartclone(repo, *args)
       org = extract_org(repo)
+      reponame = extract_repo(repo)
+      dir = if args.length.positive? && !args.first.start_with?('-')
+              args.shift
+            else
+              reponame
+            end
+
+      forkname = @fork_name || reponame
 
       SugarJar::Log.info("Cloning #{reponame}...")
 
@@ -13,37 +19,44 @@ class SugarJar
       #
       # Unless the repo is in our own org and cannot be forked, then it
       # will fail.
-      if org == @forge_user
-        git('clone', canonicalize_repo(repo), dir, *)
-      else
+      if @use_forks && @forge_user != org
         if @repo_forge == 'gitlab'
-          _gitlab_clone(org, repo, dir, *)
+          _gitlab_clone(org, repo, dir, forkname, *args)
         else
-          forge('repo', 'fork', '--clone', canonicalize_repo(repo), dir, *)
+          forge(
+            'repo', 'fork', '--clone', canonicalize_repo(repo), dir,
+            '--fork-name', forkname, *args
+          )
         end
 
         # make the main branch track upstream
         Dir.chdir dir do
           git('branch', '-u', "upstream/#{main_branch}")
         end
+      else
+        git('clone', canonicalize_repo(repo), dir, *args)
       end
 
       SugarJar::Log.info('Remotes "origin" and "upstream" configured.')
     end
     alias sclone smartclone
 
-    def _gitlab_clone(_org, repo, dir, *)
+    def _gitlab_clone(_org, repo, dir, forkname, *)
       # The gitlab CLI is much less forgiving about already-forked
       # repos, and it has no option to clone to a differently-named
       # directory. So we have to special case it.
 
+      extract_repo(repo)
+
       # glab requires a short-name for the fork command...
       shortname = repo_shortname(repo)
 
       # We call fork without --clone since --clone can't clone
       # to another directory. Also, we must specify =false, or it
       # will prompt
-      s = forge_nofail('repo', 'fork', shortname, '--clone=false')
+      s = forge_nofail(
+        'repo', 'fork', shortname, '--clone=false', '--name', forkname
+      )
 
       # It fails with:
       #    409 {message: [Project namespace name has already been taken,

data/lib/sugarjar/commands/smartpullrequest.rb

@@ -70,7 +70,7 @@ class SugarJar
         # we don't need that since it defaults to the local branch name.
         #
         # Then we need --yes for it to not prompt us
-        args.unshift('--head', "#{push_org}/#{reponame}", '--yes')
+        args.unshift('--head', "#{push_org}/#{repo_name}", '--yes')
       end
 
       bin = SugarJar::Util.which(_forge_cmd)
@@ -103,7 +103,9 @@ class SugarJar
           "\tgit remote set-head #{upstream} -a",
         )
       end
-      return if upstream_branch == 'origin'
+
+      # If we don't have an upstream and an origin, we're done
+      return if upstream == 'origin'
 
       origin_branch = main_remote_branch('origin')
       # NOTE: that on GL, forks don't fork any branches by default, even

data/lib/sugarjar/commands.rb

@@ -33,6 +33,8 @@ class SugarJar
       @pr_autofill = options['pr_autofill']
       @pr_autostack = options['pr_autostack']
       @feature_prefix = options['feature_prefix']
+      @use_forks = options['use_forks']
+      @fork_name = options['fork_name']
       @checks = {}
       @main_branch = nil
       @main_remote_branches = {}
@@ -88,27 +90,20 @@ class SugarJar
 
       # otherwise, if we're in a repo, use the hostname of the remote
       if SugarJar::Util.in_repo?
-        extract_host(remote_url_map['origin'])
-      else
-        @repo_forge == 'gitlab' ? 'gitlab.com' : 'github.com'
+        url = remote_url_map.values.first
+        return extract_host(url)
       end
+
+      @repo_forge == 'gitlab' ? 'gitlab.com' : 'github.com'
     end
 
     def repo_shortname(repo)
       # if it's already a shortname, return
       return repo unless repo.start_with?('http', 'git@')
 
-      # otherwise, parse it
-      if repo.start_with?('http')
-        bits = repo.split('/')
-      elsif repo.start_with?('git@')
-        relevant = repo.split(':').last
-        bits = relevant.split('/')
-      end
-      repo = bits[-1].gsub('.git', '')
-      org = bits[-2]
-
-      "#{org}/#{repo}"
+      repo_name = extract_repo(repo)
+      org_name = extract_org(repo)
+      [org_name, repo_name].join('/')
     end
 
     def set_commit_template
@@ -176,11 +171,7 @@ class SugarJar
     end
 
     def determine_main_branch(branches)
-      if branches.include?('main')
-        'main'
-      elsif branches.include?('master')
-        'master'
-      end
+      branches.include?('master') ? 'master' : 'main'
     end
 
     def main_branch
@@ -353,12 +344,12 @@ class SugarJar
 
     def extract_org(repo)
       if repo.start_with?('http')
-        File.basename(File.dirname(repo))
+        repo.split('://').last.split('/')[1..-2].join('/')
       elsif repo.start_with?('git@')
-        repo.split(':')[1].split('/')[0]
+        repo.split(':').last.split('/')[0..-2].join('/')
       else
-        # assume they passed in a ghcli-friendly name
-        repo.split('/').first
+        # assume they passed in a cli-friendly shortname
+        repo.split('/')[0..-2].join('/')
       end
     end
 
@@ -429,15 +420,13 @@ class SugarJar
     end
 
     def _determine_forge_type
-      return nil unless SugarJar::Util.in_repo?
-
-      if remote_url_map.values.any? do |x|
-        x.include?('gitlab')
-      end
-        'gitlab'
-      else
-        'github'
+      if SugarJar::Util.in_repo?
+        gl = remote_url_map.values.any? { |x| x.include?('gitlab') }
+        return gl ? 'gitlab' : 'github'
       end
+
+      # if all else fails, guess GH
+      'github'
     end
 
     def _forge_cmd

data/lib/sugarjar/config.rb

@@ -11,6 +11,7 @@ class SugarJar
       'pr_autofill' => true,
       'pr_autostack' => nil,
       'color' => true,
+      'use_forks' => true,
       'ignore_deprecated_options' => [],
     }.freeze
 

data/lib/sugarjar/version.rb

@@ -1,3 +1,3 @@
 class SugarJar
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sugarjar
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Phil Dibowitz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-08 00:00:00.000000000 Z
+date: 2026-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge