dev 2.1.34 → 2.1.35
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/apps/git.rb +3 -3
- data/lib/tasks/pull.rb +3 -1
- data/lib/tasks/push.rb +3 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9c4ef8beefd210471026c888f4c503c4b6b56ff1
|
|
4
|
+
data.tar.gz: c89e44996f64bc77e8884b4c3438ba5ae0e23f5b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f7573e6d195916144c7a557ca0f0741f3193bc959df41a12e07b2d8b1957ba3b5beeb5d89ac8e1bd6dbdb9488120f8a7f31571ea88fb58fe3f7bfc32e34e7a82
|
|
7
|
+
data.tar.gz: be8e7ec5d0fae24052261123bac2126dad6c3f1c9124e7e3da1ff81eb22ee4978c1aede286f669138a5b134c5992859f400166bcc9c05ebd9333b8b957147829
|
data/lib/apps/git.rb
CHANGED
|
@@ -84,9 +84,9 @@ class Git
|
|
|
84
84
|
puts `git tag #{version} -m'#{version}'`
|
|
85
85
|
puts 'committing'
|
|
86
86
|
puts `git commit -m'#{version}'`
|
|
87
|
-
puts 'pushing'
|
|
88
|
-
puts `git push --tags`
|
|
89
|
-
puts `git push`
|
|
87
|
+
#puts 'pushing'
|
|
88
|
+
#puts `git push --tags`
|
|
89
|
+
#puts `git push`
|
|
90
90
|
end
|
|
91
91
|
end
|
|
92
92
|
end
|
data/lib/tasks/pull.rb
CHANGED
|
@@ -3,8 +3,10 @@ task :pull do Tasks.execute_task :pull; end
|
|
|
3
3
|
|
|
4
4
|
class Pull < Array
|
|
5
5
|
def update
|
|
6
|
-
if(
|
|
6
|
+
if(!defined?(NO_PULL))
|
|
7
|
+
if(File.exists?('.git') && `git config --list`.include?('user.name=') )
|
|
7
8
|
add_passive('git pull') if Git.branch == 'master'
|
|
9
|
+
end
|
|
8
10
|
end
|
|
9
11
|
end
|
|
10
12
|
end
|
data/lib/tasks/push.rb
CHANGED
|
@@ -3,11 +3,13 @@ task :push do Tasks.execute_task :push;end
|
|
|
3
3
|
|
|
4
4
|
class Push < Array
|
|
5
5
|
def update
|
|
6
|
-
if(
|
|
6
|
+
if(!defined?(NO_PUSH))
|
|
7
|
+
if(File.exists?('.git') && `git config --list`.include?('user.name='))
|
|
7
8
|
if(`git branch`.include?('* master') || `git branch`.include?('* develop'))
|
|
8
9
|
add_passive 'git push'
|
|
9
10
|
add_passive 'git push --tags'
|
|
10
11
|
end
|
|
12
|
+
end
|
|
11
13
|
end
|
|
12
14
|
end
|
|
13
15
|
end
|