rake_commit 1.0.0 → 1.0.1
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/rake_commit/git.rb +6 -2
- metadata +9 -9
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0ddb2402f70ae866708f5eed4cc19beb7a6a7e98
|
|
4
|
+
data.tar.gz: b83a0373ca89ac622e59e8411baa87d935e0ebba
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 932d087a1e0fb3539ff32f9e128fedd62449498efe1335015a92de350c7ca1d0d54f1e7c9a688dc1a81c30bddf63475913891e43c8045c73be2db83a6e0a73e3
|
|
7
|
+
data.tar.gz: a3fbfbadffbd1d67a80be4dcdf1c7a28ea344cbac85d1ca4c3d773fbb6549a30c4023b2bf175561cf2a24699f53ad7963e62f6df78cda1c8072ceb7274f61048
|
data/lib/rake_commit/git.rb
CHANGED
|
@@ -17,7 +17,10 @@ module RakeCommit
|
|
|
17
17
|
rebase_continue
|
|
18
18
|
RakeCommit::Shell.system("rake")
|
|
19
19
|
push
|
|
20
|
-
|
|
20
|
+
else
|
|
21
|
+
if collapse_git_commits?
|
|
22
|
+
return unless collapse_git_commits
|
|
23
|
+
end
|
|
21
24
|
RakeCommit::Shell.system("rake")
|
|
22
25
|
push
|
|
23
26
|
end
|
|
@@ -28,6 +31,7 @@ module RakeCommit
|
|
|
28
31
|
end
|
|
29
32
|
|
|
30
33
|
def collapse_git_commits?
|
|
34
|
+
return false unless @collapse_commits
|
|
31
35
|
return true unless merge_commits?
|
|
32
36
|
status
|
|
33
37
|
input = Readline.readline("Do you want to collapse merge commits? (y/n): ").chomp
|
|
@@ -73,7 +77,7 @@ module RakeCommit
|
|
|
73
77
|
end
|
|
74
78
|
|
|
75
79
|
def pull_rebase
|
|
76
|
-
RakeCommit::Shell.system "git pull --rebase"
|
|
80
|
+
RakeCommit::Shell.system "git pull --rebase --stat"
|
|
77
81
|
end
|
|
78
82
|
|
|
79
83
|
def push
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rake_commit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Paul Gross
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-03-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: See http://github.com/pgr0ss/rake_commit
|
|
14
14
|
email: pgross@gmail.com
|
|
@@ -19,16 +19,16 @@ extra_rdoc_files: []
|
|
|
19
19
|
files:
|
|
20
20
|
- README.md
|
|
21
21
|
- Rakefile
|
|
22
|
+
- bin/rake_commit
|
|
22
23
|
- lib/rake_commit.rb
|
|
23
|
-
- lib/rake_commit/git_svn.rb
|
|
24
|
-
- lib/rake_commit/shell.rb
|
|
25
|
-
- lib/rake_commit/prompt_line.rb
|
|
26
|
-
- lib/rake_commit/cruise_status.rb
|
|
27
|
-
- lib/rake_commit/commit_message.rb
|
|
28
24
|
- lib/rake_commit/commit.rb
|
|
25
|
+
- lib/rake_commit/commit_message.rb
|
|
26
|
+
- lib/rake_commit/cruise_status.rb
|
|
29
27
|
- lib/rake_commit/git.rb
|
|
28
|
+
- lib/rake_commit/git_svn.rb
|
|
29
|
+
- lib/rake_commit/prompt_line.rb
|
|
30
|
+
- lib/rake_commit/shell.rb
|
|
30
31
|
- lib/rake_commit/svn.rb
|
|
31
|
-
- bin/rake_commit
|
|
32
32
|
homepage: http://github.com/pgr0ss/rake_commit
|
|
33
33
|
licenses:
|
|
34
34
|
- MIT
|
|
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
49
49
|
version: '0'
|
|
50
50
|
requirements: []
|
|
51
51
|
rubyforge_project: rake_commit
|
|
52
|
-
rubygems_version: 2.1
|
|
52
|
+
rubygems_version: 2.2.1
|
|
53
53
|
signing_key:
|
|
54
54
|
specification_version: 4
|
|
55
55
|
summary: A gem which helps with checking in code
|