git_dj 0.0.7 → 0.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/git_dj/version.rb +1 -1
- data/lib/git_dj.rb +11 -4
- metadata +7 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7e8b0fa64bbf5cec1347bd5c31c3718765389cd8
|
|
4
|
+
data.tar.gz: d8379684c1581207a7bba6b1069d8cf087e198ba
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fc37c37829a613e8555e008f8842d5927bd318bfe78e43ad6ce6a017d003bd6a5096555b5da041e63acf1e2df73c72f5505fb8332592cafef03624bdf55059dc
|
|
7
|
+
data.tar.gz: 6496d243cec2c3cc4e1bcd9366473b14aa64e83acbeeb14e79610b2bb4363c931da9cd5da543a63c5353ee91fb13eab972fdfcaadad30c34d4c4fa44219ad9a5
|
data/lib/git_dj/version.rb
CHANGED
data/lib/git_dj.rb
CHANGED
|
@@ -23,6 +23,8 @@ class GitDj
|
|
|
23
23
|
push_updates_to_origin
|
|
24
24
|
when 'continue'
|
|
25
25
|
continue_prev_commands
|
|
26
|
+
when "i"
|
|
27
|
+
integrate_current_branch_to_another
|
|
26
28
|
when 'help'
|
|
27
29
|
print_help
|
|
28
30
|
else
|
|
@@ -31,17 +33,22 @@ class GitDj
|
|
|
31
33
|
end
|
|
32
34
|
|
|
33
35
|
def integrate_current_branch
|
|
34
|
-
send_branch_to_integration('')
|
|
36
|
+
send_branch_to_integration('staging')
|
|
35
37
|
end
|
|
36
38
|
|
|
37
39
|
def integrate_current_branch2
|
|
38
|
-
send_branch_to_integration('
|
|
40
|
+
send_branch_to_integration('staging2')
|
|
39
41
|
end
|
|
40
42
|
|
|
41
|
-
def
|
|
43
|
+
def integrate_current_branch_to_another
|
|
44
|
+
send_branch_to_integration(ARGV[1])
|
|
45
|
+
end
|
|
46
|
+
|
|
47
|
+
def send_branch_to_integration(integration_branch_name)
|
|
42
48
|
drop_commands_cache
|
|
43
49
|
cur_branch = current_branch_name
|
|
44
|
-
integration_branch =
|
|
50
|
+
integration_branch = integration_branch_name
|
|
51
|
+
|
|
45
52
|
if has_uncommited_changes
|
|
46
53
|
puts red_color("Failed to integrate #{cur_branch}: you have uncommited changes")
|
|
47
54
|
elsif cur_branch == integration_branch
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git_dj
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mikhail Tabunov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2016-10-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: A simple and lightweight alternative to git flow
|
|
14
14
|
email:
|
|
@@ -18,7 +18,7 @@ executables:
|
|
|
18
18
|
extensions: []
|
|
19
19
|
extra_rdoc_files: []
|
|
20
20
|
files:
|
|
21
|
-
- .gitignore
|
|
21
|
+
- ".gitignore"
|
|
22
22
|
- Gemfile
|
|
23
23
|
- LICENSE
|
|
24
24
|
- README.md
|
|
@@ -36,18 +36,19 @@ require_paths:
|
|
|
36
36
|
- lib
|
|
37
37
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
38
38
|
requirements:
|
|
39
|
-
- -
|
|
39
|
+
- - ">="
|
|
40
40
|
- !ruby/object:Gem::Version
|
|
41
41
|
version: '0'
|
|
42
42
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
43
43
|
requirements:
|
|
44
|
-
- -
|
|
44
|
+
- - ">="
|
|
45
45
|
- !ruby/object:Gem::Version
|
|
46
46
|
version: '0'
|
|
47
47
|
requirements: []
|
|
48
48
|
rubyforge_project:
|
|
49
|
-
rubygems_version: 2.
|
|
49
|
+
rubygems_version: 2.2.2
|
|
50
50
|
signing_key:
|
|
51
51
|
specification_version: 4
|
|
52
52
|
summary: Git dj<D-d>
|
|
53
53
|
test_files: []
|
|
54
|
+
has_rdoc:
|