ninny 0.1.22.1 → 0.1.23
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/lib/ninny/commands/create_dated_branch.rb +1 -1
- data/lib/ninny/commands/pull_request_merge.rb +2 -2
- data/lib/ninny/git.rb +2 -1
- data/lib/ninny/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5a614b015ac474fd395e35795ac14c7a272c8bb434760f80279e6cdfb7605c5a
|
|
4
|
+
data.tar.gz: 2d06f802a0d90eef99918318b1b83dcdd622fd8f071b232585cad542d89345aa
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 283756965f579f7e23d23e7d0bf2cd86352ccae4423da58cb14ad6cbe42bfab3fc2499dff0bed10ad83f27ddf20947df9175236b6d9c9109e20db54d04d0165e
|
|
7
|
+
data.tar.gz: d0ed10e2d8abf24a94b7e76c92136664fcf83c00ff815f4ccb97a0b1e0b94a7478eaf10de776aea65fba4b656784f45f372c794b9f8905de4ff7a4b5f49277cd
|
|
@@ -38,7 +38,7 @@ module Ninny
|
|
|
38
38
|
def delete_old_branches
|
|
39
39
|
return unless extra_branches.any?
|
|
40
40
|
|
|
41
|
-
should_delete = should_delete_old_branches || prompt.
|
|
41
|
+
should_delete = should_delete_old_branches || prompt.no?(
|
|
42
42
|
"Do you want to delete the old #{branch_type} branch(es)? (#{extra_branches.join(', ')})"
|
|
43
43
|
)
|
|
44
44
|
|
|
@@ -46,8 +46,8 @@ module Ninny
|
|
|
46
46
|
Ninny.git.check_out(branch_to_merge_into, false)
|
|
47
47
|
Ninny.git.track_current_branch
|
|
48
48
|
rescue Ninny::Git::NoBranchOfType
|
|
49
|
-
prompt.say "
|
|
50
|
-
|
|
49
|
+
prompt.say "Could not find a #{branch_type} branch. Please create one or double check it exists. If it " \
|
|
50
|
+
'exists, please do a fresh git pull or git fetch to ensure Ninny can find it.'
|
|
51
51
|
end
|
|
52
52
|
|
|
53
53
|
# Public: Merge the pull request's branch into the checked-out branch
|
data/lib/ninny/git.rb
CHANGED
|
@@ -138,7 +138,8 @@ module Ninny
|
|
|
138
138
|
#
|
|
139
139
|
# Returns an Array of Branches containing the branch name
|
|
140
140
|
def latest_branch_for(prefix)
|
|
141
|
-
|
|
141
|
+
# I don't really see why the first part would break, and the second would work, but you never know
|
|
142
|
+
branches_for(prefix).last || Ninny.git.branches_for(prefix).last || raise(NoBranchOfType, "No #{prefix} branch")
|
|
142
143
|
end
|
|
143
144
|
|
|
144
145
|
# Public: Whether the Git index is clean (has no uncommited changes)
|
data/lib/ninny/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ninny
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.23
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- DispatchIt, Inc. Engineers
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-12-
|
|
11
|
+
date: 2022-12-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: git
|