sugarjar 2.0.0.beta.1 → 2.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +181 -0
- data/CONTRIBUTING.md +37 -0
- data/README.md +148 -193
- data/bin/sj +62 -9
- data/examples/sample_config.yaml +24 -0
- data/examples/sample_repoconfig.yaml +77 -0
- data/lib/sugarjar/commands/amend.rb +17 -0
- data/lib/sugarjar/commands/bclean.rb +233 -0
- data/lib/sugarjar/commands/branch.rb +42 -0
- data/lib/sugarjar/commands/checks.rb +141 -0
- data/lib/sugarjar/commands/debuginfo.rb +16 -0
- data/lib/sugarjar/commands/feature.rb +35 -0
- data/lib/sugarjar/commands/pullsuggestions.rb +35 -0
- data/lib/sugarjar/commands/push.rb +55 -0
- data/lib/sugarjar/commands/smartclone.rb +30 -0
- data/lib/sugarjar/commands/smartpullrequest.rb +102 -0
- data/lib/sugarjar/commands/up.rb +124 -0
- data/lib/sugarjar/commands.rb +335 -5
- data/lib/sugarjar/repoconfig.rb +2 -4
- data/lib/sugarjar/util.rb +20 -309
- data/lib/sugarjar/version.rb +1 -1
- data/sugarjar.gemspec +11 -5
- metadata +26 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d0f9fa156720c59e1fc95f289273950176cad61ab82a67018d836a0ee878d81e
|
|
4
|
+
data.tar.gz: 6bec27c224878e6faee0e5801dec631e39db36170b759b6bf335a045cdda75a0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e4a5e2900d551ce1bb4bc8f9899e37dff28d6faaa7c9a46e96c140febb3e8b240465499e491054525aed0c470e8892af2f8d3d546f8c19925c070d283df45478
|
|
7
|
+
data.tar.gz: 979dce6e20a27fb94a11432fa5a39912693539de948f0a6278eb6662f68a6f62846e2d94667506094588592e99d5aba7fe57843e41771a55b128699a09595dce
|
data/CHANGELOG.md
ADDED
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
# SugarJar Changelog
|
|
2
|
+
|
|
3
|
+
## 2.0.2 (2026-01-08)
|
|
4
|
+
|
|
5
|
+
* Fix `branchclean` logic to properly compare with the target branch
|
|
6
|
+
(might have refused to clean branches that could be cleaned)
|
|
7
|
+
* Add new commands to handle remote branch cleanup as well as rename
|
|
8
|
+
`bclean` (keeping backwards compatible aliases):
|
|
9
|
+
* `localbranchclean` / `lbclean` - local branch clean. aliased as
|
|
10
|
+
`bclean` for back-comat
|
|
11
|
+
* `localbranchcleanall` / `lbcleanall` - local all branch clean aliased
|
|
12
|
+
as `bcleanall` for back-compat
|
|
13
|
+
* `remotebranchclean` / `rbclean` - remote branch clean
|
|
14
|
+
* `remotebranchcleanall` / `rbcleanall` - remote all branch clean
|
|
15
|
+
* `globalbranchclean` / `gbclean` - local+remote branch clean
|
|
16
|
+
* `globalbranchcleanall` / `gbcleanall` - local+remote all branch clean
|
|
17
|
+
* Added new `sync` command to aid syncing branches across multiple workstations,
|
|
18
|
+
see help for details.
|
|
19
|
+
* Fix meta-ref handling which fixes crashes when using `smartlog` during rebases
|
|
20
|
+
* Handle worktress gracefully when doing branch cleans
|
|
21
|
+
* Make unittests work properly outside of git repos
|
|
22
|
+
|
|
23
|
+
## 2.0.1 (2025-05-12)
|
|
24
|
+
|
|
25
|
+
* Fix gemspec to include new library files
|
|
26
|
+
|
|
27
|
+
## 2.0.0 (2025-05-11)
|
|
28
|
+
|
|
29
|
+
* Fix smartlog when on detached head
|
|
30
|
+
* Drop support for `hub`, and thus also `fallthru` mode
|
|
31
|
+
* Fix GHE handling when using `gh`
|
|
32
|
+
* Support `github_host` and `github_user` in repoconfig
|
|
33
|
+
* Replace `version` subcommand with `debuginfo` subcommand (`--version` still
|
|
34
|
+
exists)
|
|
35
|
+
* `smartclone`: set upstream for main branch to upstream remote when applicable
|
|
36
|
+
* Warn when deprecated options found in config file
|
|
37
|
+
* Fix handling of `--color` in some cornercases
|
|
38
|
+
* `subfeature` PRs: Fix bug where we would incorrectly deterine base branch
|
|
39
|
+
* Checks: Fix bug where we would lint even if repo was dirty causing confusing
|
|
40
|
+
output
|
|
41
|
+
* `feature` prefixes: Fix bug where we didn't look for the prefix on the base
|
|
42
|
+
branch when specified
|
|
43
|
+
* Better handle creating PRs to branches other than "main"
|
|
44
|
+
* Significantly improve unittest coverage
|
|
45
|
+
* Bump required Ruby to 3.2
|
|
46
|
+
|
|
47
|
+
## 1.1.3 (2025-02-20)
|
|
48
|
+
|
|
49
|
+
* smartpullrequest: When working with `gh`, bypass its attempt to push,
|
|
50
|
+
bypassing unnecessary prompts and branch track mangling
|
|
51
|
+
* smartpullrequest: Better support for autofill
|
|
52
|
+
* smartpullrequest: Don't attempt to stack when in forked repo
|
|
53
|
+
|
|
54
|
+
## 1.1.2 (2024-04-25)
|
|
55
|
+
|
|
56
|
+
* Add support for 'subfeatures'
|
|
57
|
+
* Add support for building stacked PRs based on 'subfeatures'
|
|
58
|
+
* smartpullrequest: only autofill in the PR when a single commit exists between
|
|
59
|
+
the base and us
|
|
60
|
+
* smartpullrequest: Add `--fill` option to let people opt-out of autofilling the
|
|
61
|
+
PR
|
|
62
|
+
* smartpullrequest: State that we're autofilling the PR when we do
|
|
63
|
+
* feature: Fix some corner cases where feature-prefixing didn't work
|
|
64
|
+
* pullsuggestions: Print the diff in the correct order
|
|
65
|
+
* feature/subfeature: set tracked branch for the user
|
|
66
|
+
* subfeature: automatically update tracked branch when previous tracked branch
|
|
67
|
+
disappears
|
|
68
|
+
|
|
69
|
+
## 1.1.1 (2024-02-12)
|
|
70
|
+
|
|
71
|
+
* Relax ruby requirements to allow for easier packaging
|
|
72
|
+
* Handle aborted rebases better
|
|
73
|
+
* Add bash-completion script
|
|
74
|
+
* Various doc updates
|
|
75
|
+
|
|
76
|
+
## 1.1.0 (2023-12-31)
|
|
77
|
+
|
|
78
|
+
* Fix include path for unittests for downstream packagers
|
|
79
|
+
* Bump ruby min versions
|
|
80
|
+
* Include Gemfile.lock for downstream packagers
|
|
81
|
+
|
|
82
|
+
## 1.0.1 (2023-12-20)
|
|
83
|
+
|
|
84
|
+
* `co` support for featureprefix
|
|
85
|
+
* Add `include_from` and `overwrite_from` support to repoconfig
|
|
86
|
+
* Support relative paths for lints/units
|
|
87
|
+
* `smartpr` now uses `--fill`
|
|
88
|
+
|
|
89
|
+
## 1.0.0 (2023-10-22)
|
|
90
|
+
|
|
91
|
+
* Add new "feature prefix" feature
|
|
92
|
+
* Implement `auto` setting for `github_cli`, default to `gh`
|
|
93
|
+
* Point people to Sapling
|
|
94
|
+
* Handle `sclone` of repos in personal orgs
|
|
95
|
+
* Better error when a subcommand isn't specified
|
|
96
|
+
* Various documentation fixes
|
|
97
|
+
|
|
98
|
+
## 0.0.11 (2022-10-06)
|
|
99
|
+
|
|
100
|
+
* Properly handle slashes in branch names (closes #101)
|
|
101
|
+
* Support for running a command to determine checks (linters, units) to run
|
|
102
|
+
* Support for using `gh` CLI instead of `hub` (experimental)
|
|
103
|
+
* Add new `pullsuggestions` command to pull in (accepted) suggestions from a
|
|
104
|
+
GitHub code review.
|
|
105
|
+
* Detect mismatched primary branch names to assist with projects changing from
|
|
106
|
+
`master` to `main`
|
|
107
|
+
|
|
108
|
+
## 0.0.10 (2021-12-06)
|
|
109
|
+
|
|
110
|
+
* Support 'main' as a default/primary branch
|
|
111
|
+
* Fix doc errors
|
|
112
|
+
* Handle rebase failures more gracefully, give users hints (closes #88)
|
|
113
|
+
* Handle SAML errors better (closes #95)
|
|
114
|
+
* Don't parse option args as subcommands (closes #89)
|
|
115
|
+
|
|
116
|
+
## 0.0.9 (2021-02-20)
|
|
117
|
+
|
|
118
|
+
* Fix smartclone not honoring `--github-host`
|
|
119
|
+
* Use SSH protocol by default on short repo names
|
|
120
|
+
* Handle anonymous auth failures gracefully
|
|
121
|
+
* Better support for autocorrecting linters
|
|
122
|
+
|
|
123
|
+
## 0.0.8 (2020-12-16)
|
|
124
|
+
|
|
125
|
+
* Colorize and simplify output
|
|
126
|
+
* New smartlog feature
|
|
127
|
+
* Doc fixes
|
|
128
|
+
|
|
129
|
+
## 0.0.7 (2020-11-23)
|
|
130
|
+
|
|
131
|
+
* Add new command `smartpullrequest` (or `smartpr` or `spr`) for creating
|
|
132
|
+
pull requests (closes #51)
|
|
133
|
+
* Add checks for dirty repos before `smartpush`, `forcepush`, and
|
|
134
|
+
`smartpullrequest`
|
|
135
|
+
* Add `--ignore-dirty` and `--ignore-prerun-failure` options
|
|
136
|
+
* Handle when git prompts for a username (closes #52)
|
|
137
|
+
* Always use SSH for the forked remote (closes #56)
|
|
138
|
+
* Better handling of various forms of repo URLs
|
|
139
|
+
* Fix typo of `version` in help message
|
|
140
|
+
* Fix typos in `README.md`
|
|
141
|
+
|
|
142
|
+
## 0.0.6 (2020-07-05)
|
|
143
|
+
|
|
144
|
+
* Add automatic commit template configuration (closes #38)
|
|
145
|
+
* bcleanall: Return to reasonable branch (fixes #37)
|
|
146
|
+
* Handle case where `hub` has no auth token (fixes #39)
|
|
147
|
+
* Fix crash in `smartclone`
|
|
148
|
+
* Improve logging
|
|
149
|
+
* Fix `sj unit` running lints instead of units
|
|
150
|
+
|
|
151
|
+
## 0.0.5 (2020-06-24)
|
|
152
|
+
|
|
153
|
+
* Fix global config file handling
|
|
154
|
+
* Better logging around lint/unit failuers
|
|
155
|
+
* Handle incorrect tracked branches better
|
|
156
|
+
|
|
157
|
+
## 0.0.4 (2020-06-17)
|
|
158
|
+
|
|
159
|
+
* Fix gemspec to include executables
|
|
160
|
+
* Add support for building omnibus releases
|
|
161
|
+
|
|
162
|
+
## 0.0.3 (2020-06-08)
|
|
163
|
+
|
|
164
|
+
* Stop rescuing NoMethodError (fixing a variety of confusing error cases)
|
|
165
|
+
* Fix crash when no `on_push` entry is in repo config
|
|
166
|
+
* Document contribution process (`CONTRIBUTING.md`)
|
|
167
|
+
* Document code of conduct (`CODE_OF_CONDUCT.md`)
|
|
168
|
+
|
|
169
|
+
## 0.0.2 (2020-06-06)
|
|
170
|
+
|
|
171
|
+
* Fix 'co' not accepting multiple arguments/options
|
|
172
|
+
* Fix README typos (#10, #11)
|
|
173
|
+
* Don't assume the ruby to run under
|
|
174
|
+
* Don't crash when no subcommands are passed in
|
|
175
|
+
* Don't assume paths (e.g. for hub, git)
|
|
176
|
+
* Fix crash for unknown method
|
|
177
|
+
* fix handling of empty config files
|
|
178
|
+
|
|
179
|
+
## 0.0.1 (2020-06-05)
|
|
180
|
+
|
|
181
|
+
* Initial release
|
data/CONTRIBUTING.md
ADDED
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
# Contributing to SugarJar
|
|
2
|
+
|
|
3
|
+
We welcome contributions! Contributions come in a variety of forms: clear bug
|
|
4
|
+
reports, code, or spreading the word about this project.
|
|
5
|
+
|
|
6
|
+
If you'd like to contribute code, here's how.
|
|
7
|
+
|
|
8
|
+
Simply use SugarJar to make a fork and setup your repo:
|
|
9
|
+
|
|
10
|
+
```shell
|
|
11
|
+
sj sclone jaymzh/sugarjar
|
|
12
|
+
```
|
|
13
|
+
|
|
14
|
+
Make a branch for your change:
|
|
15
|
+
|
|
16
|
+
```shell
|
|
17
|
+
sj feature mychange
|
|
18
|
+
```
|
|
19
|
+
|
|
20
|
+
Make whatever changes you want, commit with a clear commit message, and a DCO.
|
|
21
|
+
|
|
22
|
+
We require [Developer Certificate of Origin
|
|
23
|
+
(DCO)](https://developercertificate.org/) via a 'signed-off-by:` line in your
|
|
24
|
+
commit (the `git commit -s` does this for you). The Chef community has a lot of
|
|
25
|
+
great documentation on this which you can find
|
|
26
|
+
[here](https://docs.chef.io/community_contributions/#developer-certification-of-origin-dco).
|
|
27
|
+
|
|
28
|
+
```shell
|
|
29
|
+
git commit -as
|
|
30
|
+
```
|
|
31
|
+
|
|
32
|
+
Make a pull request:
|
|
33
|
+
|
|
34
|
+
```shell
|
|
35
|
+
sj spush
|
|
36
|
+
sj pull-request
|
|
37
|
+
```
|