ding 1.0.1 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ding/cli.rb +5 -0
- data/lib/ding/models/git.rb +10 -0
- data/lib/ding/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: df0176335d68e86af6ccf4969523bb0ac5da0bd8
|
4
|
+
data.tar.gz: 23dc3b2259afcb665653fdf36b376731d7837612
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 019b33111a0df3822be106570f9c8242633b017b0b7836ccb3c29aaadd5bec1d43bc1fe878caa0369cd706c46673d7572f0a8fa94f78e70cd9e21e7c00735738
|
7
|
+
data.tar.gz: c10de9c6c22f53863a2b7f2785dfde6165d748b356667a569af0c04209458ce3f84bad20275b0e04210df4ccf6328075649dfdd348a13f33c6d0c14a200f1417
|
data/lib/ding/cli.rb
CHANGED
@@ -18,6 +18,11 @@ module Ding
|
|
18
18
|
say "\nDing ding ding: let's merge one or more feature branches to #{testing_branch}:\n\n", :green
|
19
19
|
|
20
20
|
repo = Ding::Git.new(options).tap do |r|
|
21
|
+
if r.is_dirty?
|
22
|
+
say "> Local repo is dirty, resetting state", :yellow
|
23
|
+
r.reset_local_state
|
24
|
+
end
|
25
|
+
|
21
26
|
r.checkout develop_branch
|
22
27
|
|
23
28
|
say "> Deleting #{testing_branch}", :green
|
data/lib/ding/models/git.rb
CHANGED
@@ -65,6 +65,16 @@ module Ding
|
|
65
65
|
raise "Error synchronising with the remote" unless run_cmd "git up"
|
66
66
|
end
|
67
67
|
|
68
|
+
def reset_local_state
|
69
|
+
run_cmd 'git rebase --abort'
|
70
|
+
run_cmd 'git merge --abort'
|
71
|
+
run_cmd 'git reset --hard'
|
72
|
+
end
|
73
|
+
|
74
|
+
def is_dirty?
|
75
|
+
! %x(git status -s).empty?
|
76
|
+
end
|
77
|
+
|
68
78
|
private
|
69
79
|
|
70
80
|
def git_repo?
|
data/lib/ding/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ding
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0
|
4
|
+
version: 1.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Warren Bain
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-10
|
11
|
+
date: 2015-12-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|