dev 2.0.289 → 2.0.290
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/apps/git.rb +8 -1
- data/lib/tasks/commit.rb +3 -2
- data/lib/tasks/push.rb +5 -3
- 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: 5384a3b0921ae08670ed7c1ebadef5808f6f0d73
|
4
|
+
data.tar.gz: f2a9c0d248e843f43b1b8873111f785f902f7727
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: aa9fd06c291ebac01df2e55f3f6c621cbcd1e23a6d0f96f9b26c6c3aa61f2380fe4f86df3404b8c99253de5c07ff3619ad6d8f8b19030fdc824cbaaf0fe1d3e4
|
7
|
+
data.tar.gz: 4ba85242996d29f825b941f2435e3d1ae329b2003ec44653f81c4ba92f8f56387e19d1b171aaec43136e7de8c5febd0a33e3b3c86c126240ef2eb94751b3f31a
|
data/lib/apps/git.rb
CHANGED
@@ -152,12 +152,19 @@ class Git
|
|
152
152
|
puts "git clone #{src_url} #{src_directory}"
|
153
153
|
puts `git clone #{src_url} #{src_directory}`
|
154
154
|
else
|
155
|
+
puts "chdir #{src_directory}"
|
155
156
|
Dir.chdir(src_directory) do
|
156
157
|
puts "git pull"
|
157
|
-
|
158
|
+
git_pull=Command.new('git pull')
|
159
|
+
git_pull[:directory]=src_directory
|
160
|
+
git_pull[:timeout] = 30
|
161
|
+
git_pull[:ignore_failure] =true
|
162
|
+
git_pull.execute
|
163
|
+
|
158
164
|
end
|
159
165
|
end
|
160
166
|
|
167
|
+
puts "chdir #{src_directory}"
|
161
168
|
Dir.chdir(src_directory) do
|
162
169
|
puts "git checkout #{branch}"
|
163
170
|
puts `git checkout #{branch}`
|
data/lib/tasks/commit.rb
CHANGED
@@ -14,13 +14,14 @@ class Commit < Array
|
|
14
14
|
|
15
15
|
if(File.exists?('.git') && `git config --list`.include?('user.name=') && Git.user_email.length > 0)
|
16
16
|
if(!`git status`.include?('nothing to commit') &&
|
17
|
-
!`git status`.include?('untracked files present')
|
17
|
+
!`git status`.include?('untracked files present') &&
|
18
|
+
!`git status`.include?('no changes add to commit'))
|
18
19
|
if(message.length==0)
|
19
20
|
if(defined?(REQUIRE_COMMIT_MESSAGE))
|
20
21
|
Commit.reset_commit_message
|
21
22
|
raise "commit.message required to perform commit"
|
22
23
|
else
|
23
|
-
|
24
|
+
add_passive "git commit -m'all'"
|
24
25
|
end
|
25
26
|
else
|
26
27
|
add_quiet "git commit -a -v --file commit.message"
|
data/lib/tasks/push.rb
CHANGED
@@ -3,9 +3,11 @@ task :push do Tasks.execute_task :push;end
|
|
3
3
|
|
4
4
|
class Push < Array
|
5
5
|
def update
|
6
|
-
if(File.exists?('.git') && `git config --list`.include?('user.name=')
|
7
|
-
|
8
|
-
|
6
|
+
if(File.exists?('.git') && `git config --list`.include?('user.name='))
|
7
|
+
if(`git branch`.include?('* master') || `git branch`.include?('* develop'))
|
8
|
+
add_quiet 'git push'
|
9
|
+
add_quiet 'git push --tags'
|
10
|
+
end
|
9
11
|
end
|
10
12
|
end
|
11
13
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dev
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.290
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Lou Parslow
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-11-
|
11
|
+
date: 2015-11-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|