git_dj 0.0.5 → 0.0.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/lib/git_dj/version.rb +1 -1
- data/lib/git_dj.rb +16 -5
- metadata +7 -9
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: fdac17b76b21db309841f2008d1bc7c39a00add4
|
4
|
+
data.tar.gz: d50296970fe580efe74393fadcd3366f5f3dcf9f
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: ae22867a3becaa342817a622bfba5372784b9c8f639930f97f614b348d936b3bc51452f2261344648ae62ce2686a6f19f51718372f04c465eac429366eccd995
|
7
|
+
data.tar.gz: bbe2348ce6c1a31f9c6d22ad95dde266b0b0caf2df95e80e4afa8416d226b785bc7f7d81e1531107aa71d3f62e40784afe443ec3e711a7c2da6a175663f3b50b
|
data/lib/git_dj/version.rb
CHANGED
data/lib/git_dj.rb
CHANGED
@@ -13,6 +13,8 @@ class GitDj
|
|
13
13
|
case ARGV[0]
|
14
14
|
when 'integrate'
|
15
15
|
integrate_current_branch
|
16
|
+
when 'integrate2'
|
17
|
+
integrate_current_branch2
|
16
18
|
when 'release'
|
17
19
|
release_current_branch
|
18
20
|
when 'get'
|
@@ -29,18 +31,27 @@ class GitDj
|
|
29
31
|
end
|
30
32
|
|
31
33
|
def integrate_current_branch
|
34
|
+
send_branch_to_integration('')
|
35
|
+
end
|
36
|
+
|
37
|
+
def integrate_current_branch2
|
38
|
+
send_branch_to_integration('2')
|
39
|
+
end
|
40
|
+
|
41
|
+
def send_branch_to_integration(staging_ver = '')
|
32
42
|
drop_commands_cache
|
33
43
|
cur_branch = current_branch_name
|
44
|
+
integration_branch = INTEGRATION_BRANCH + staging_ver
|
34
45
|
if has_uncommited_changes
|
35
46
|
puts red_color("Failed to integrate #{cur_branch}: you have uncommited changes")
|
36
|
-
elsif cur_branch ==
|
37
|
-
puts red_color("Can not integrate #{
|
47
|
+
elsif cur_branch == integration_branch
|
48
|
+
puts red_color("Can not integrate #{integration_branch} into #{integration_branch}")
|
38
49
|
else
|
39
50
|
run_cmds [
|
40
|
-
"git checkout #{
|
51
|
+
"git checkout #{integration_branch}",
|
52
|
+
"git pull origin #{integration_branch}",
|
41
53
|
"git merge #{cur_branch}",
|
42
|
-
"git
|
43
|
-
"git push origin #{INTEGRATION_BRANCH}",
|
54
|
+
"git push origin #{integration_branch}",
|
44
55
|
"git checkout #{cur_branch}"
|
45
56
|
]
|
46
57
|
|
metadata
CHANGED
@@ -1,15 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: git_dj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
5
|
-
prerelease:
|
4
|
+
version: 0.0.6
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- Mikhail Tabunov
|
9
8
|
autorequire:
|
10
9
|
bindir: bin
|
11
10
|
cert_chain: []
|
12
|
-
date:
|
11
|
+
date: 2014-01-30 00:00:00.000000000 Z
|
13
12
|
dependencies: []
|
14
13
|
description: A simple and lightweight alternative to git flow
|
15
14
|
email:
|
@@ -30,26 +29,25 @@ files:
|
|
30
29
|
- lib/git_dj/version.rb
|
31
30
|
homepage: ''
|
32
31
|
licenses: []
|
32
|
+
metadata: {}
|
33
33
|
post_install_message:
|
34
34
|
rdoc_options: []
|
35
35
|
require_paths:
|
36
36
|
- lib
|
37
37
|
required_ruby_version: !ruby/object:Gem::Requirement
|
38
|
-
none: false
|
39
38
|
requirements:
|
40
|
-
- -
|
39
|
+
- - '>='
|
41
40
|
- !ruby/object:Gem::Version
|
42
41
|
version: '0'
|
43
42
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
44
|
-
none: false
|
45
43
|
requirements:
|
46
|
-
- -
|
44
|
+
- - '>='
|
47
45
|
- !ruby/object:Gem::Version
|
48
46
|
version: '0'
|
49
47
|
requirements: []
|
50
48
|
rubyforge_project:
|
51
|
-
rubygems_version:
|
49
|
+
rubygems_version: 2.0.6
|
52
50
|
signing_key:
|
53
|
-
specification_version:
|
51
|
+
specification_version: 4
|
54
52
|
summary: Git dj<D-d>
|
55
53
|
test_files: []
|