ninny 0.1.6 → 0.1.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +5 -5
- data/lib/ninny/commands/pull_request_merge.rb +2 -1
- data/lib/ninny/git.rb +9 -0
- data/lib/ninny/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3082655bfdf20dd399f2e6c319db64d44714d533b7cc31d5c15a131ed4407189
|
|
4
|
+
data.tar.gz: 3e00456225b143715daa81b246a0f89a6b56fd6bfe76a0700b7a861fb77902e5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b8334b70b6e72842ed4f53a1f1b39b649bddbe2c1506aadf6a867034c4ec1f5cd8935712fa5eaa93f45390f907cee69bda45e21dcffa473d7118b2ad5b3966c7
|
|
7
|
+
data.tar.gz: fc7ebf59fd6b62ba28a94996fca060b31727244fd3764306401cfcfa4a776934aae60299c47357417602e46665b6a36024678e8fe2d0df20b2df471c99d36480
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
ninny (0.1.
|
|
4
|
+
ninny (0.1.8)
|
|
5
5
|
git (~> 1.5.0)
|
|
6
6
|
gitlab (~> 4.11)
|
|
7
7
|
pastel (~> 0.7.2)
|
|
@@ -19,16 +19,16 @@ GEM
|
|
|
19
19
|
diff-lcs (1.3)
|
|
20
20
|
equatable (0.5.0)
|
|
21
21
|
git (1.5.0)
|
|
22
|
-
gitlab (4.
|
|
23
|
-
httparty (~> 0.
|
|
22
|
+
gitlab (4.17.0)
|
|
23
|
+
httparty (~> 0.18)
|
|
24
24
|
terminal-table (~> 1.5, >= 1.5.1)
|
|
25
|
-
httparty (0.18.
|
|
25
|
+
httparty (0.18.1)
|
|
26
26
|
mime-types (~> 3.0)
|
|
27
27
|
multi_xml (>= 0.5.2)
|
|
28
28
|
kramdown (1.16.2)
|
|
29
29
|
mime-types (3.3.1)
|
|
30
30
|
mime-types-data (~> 3.2015)
|
|
31
|
-
mime-types-data (3.2020.
|
|
31
|
+
mime-types-data (3.2020.1104)
|
|
32
32
|
multi_xml (0.6.0)
|
|
33
33
|
necromancer (0.4.0)
|
|
34
34
|
pastel (0.7.2)
|
|
@@ -33,7 +33,8 @@ module Ninny
|
|
|
33
33
|
|
|
34
34
|
# Public: Check out the branch
|
|
35
35
|
def check_out_branch
|
|
36
|
-
Ninny.git.check_out(branch_to_merge_into)
|
|
36
|
+
Ninny.git.check_out(branch_to_merge_into, false)
|
|
37
|
+
Ninny.git.track_current_branch
|
|
37
38
|
rescue Ninny::Git::NoBranchOfType
|
|
38
39
|
prompt.say "No #{branch_type} branch available. Creating one now."
|
|
39
40
|
CreateDatedBranch.new(branch: branch_type).execute
|
data/lib/ninny/git.rb
CHANGED
|
@@ -73,6 +73,15 @@ module Ninny
|
|
|
73
73
|
end
|
|
74
74
|
end
|
|
75
75
|
|
|
76
|
+
# Public: Track remote branch matching current branch
|
|
77
|
+
#
|
|
78
|
+
# do_after_pull - Should a pull be done after tracking?
|
|
79
|
+
def track_current_branch(do_after_pull=true)
|
|
80
|
+
command('branch', ['-u', "origin/#{current_branch_name}"])
|
|
81
|
+
pull if do_after_pull
|
|
82
|
+
end
|
|
83
|
+
|
|
84
|
+
|
|
76
85
|
# Public: Create a new branch from the given source
|
|
77
86
|
#
|
|
78
87
|
# new_branch_name - The name of the branch to create
|
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.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Carl Allen
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-12-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: tty-box
|
|
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
256
256
|
- !ruby/object:Gem::Version
|
|
257
257
|
version: '0'
|
|
258
258
|
requirements: []
|
|
259
|
-
rubygems_version: 3.0.
|
|
259
|
+
rubygems_version: 3.0.8
|
|
260
260
|
signing_key:
|
|
261
261
|
specification_version: 4
|
|
262
262
|
summary: 'ninny (n): an foolish person, see: git'
|