Skip to content

Commit 7a0ffd0

Browse files
authored
Version bump (#160)
* changelog * bundle update * new rubocop * new version Signed-off-by: Phil Dibowitz <phil@ipom.com>
1 parent 13cd7d4 commit 7a0ffd0

File tree

4 files changed

+28
-13
lines changed

4 files changed

+28
-13
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# SugarJar Changelog
22

3+
## 1.1.2 (2024-04-25)
4+
5+
* Add support for 'subfeatures'
6+
* Add support for building stacked PRs based on 'subfeatures'
7+
* smartpullrequest: only autofill in the PR when a single commit exists between
8+
the base and us
9+
* smartpullrequest: Add `--fill` option to let people opt-out of autofilling the
10+
PR
11+
* smartpullrequest: State that we're autofilling the PR when we do
12+
* feature: Fix some corner cases where feature-prefixing didn't work
13+
* pullsuggestions: Print the diff in the correct order
14+
* feature/subfeature: set tracked branch for the user
15+
* subfeature: automatically update tracked branch when previous tracked branch
16+
disappears
17+
318
## 1.1.1 (2024-02-12)
419

520
* Relax ruby requirements to allow for easier packaging

Gemfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
sugarjar (1.1.1)
4+
sugarjar (1.1.2)
55
deep_merge
66
mixlib-log
77
mixlib-shellout
@@ -11,12 +11,12 @@ GEM
1111
remote: https://rubygems.org/
1212
specs:
1313
ast (2.4.2)
14-
chef-utils (18.4.2)
14+
chef-utils (18.4.12)
1515
concurrent-ruby
1616
concurrent-ruby (1.2.3)
1717
deep_merge (1.2.2)
1818
diff-lcs (1.5.1)
19-
json (2.7.1)
19+
json (2.7.2)
2020
kramdown (2.4.0)
2121
rexml
2222
kramdown-parser-gfm (1.1.0)
@@ -56,20 +56,20 @@ GEM
5656
rspec-mocks (3.13.0)
5757
diff-lcs (>= 1.2.0, < 2.0)
5858
rspec-support (~> 3.13.0)
59-
rspec-support (3.13.0)
60-
rubocop (1.60.2)
59+
rspec-support (3.13.1)
60+
rubocop (1.63.3)
6161
json (~> 2.3)
6262
language_server-protocol (>= 3.17.0)
6363
parallel (~> 1.10)
6464
parser (>= 3.3.0.2)
6565
rainbow (>= 2.2.2, < 4.0)
6666
regexp_parser (>= 1.8, < 3.0)
6767
rexml (>= 3.2.5, < 4.0)
68-
rubocop-ast (>= 1.30.0, < 2.0)
68+
rubocop-ast (>= 1.31.1, < 2.0)
6969
ruby-progressbar (~> 1.7)
7070
unicode-display_width (>= 2.4.0, < 3.0)
71-
rubocop-ast (1.30.0)
72-
parser (>= 3.2.1.0)
71+
rubocop-ast (1.31.2)
72+
parser (>= 3.3.0.4)
7373
ruby-progressbar (1.13.0)
7474
tomlrb (2.0.3)
7575
tty-color (0.6.0)

lib/sugarjar/commands.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -764,11 +764,11 @@ def all_remote_branches(remote = 'origin')
764764
end
765765

766766
def all_local_branches
767-
branches = []
768-
git('branch', '--format', '%(refname)').stdout.lines.each do |line|
769-
branches << branch_from_ref(line.strip)
767+
git(
768+
'branch', '--format', '%(refname)'
769+
).stdout.lines.map do |line|
770+
branch_from_ref(line.strip)
770771
end
771-
branches
772772
end
773773

774774
def all_remotes

lib/sugarjar/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
class SugarJar
2-
VERSION = '1.1.1'.freeze
2+
VERSION = '1.1.2'.freeze
33
end

0 commit comments

Comments
 (0)