p4tools 0.2.0.0 → 0.2.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/p4tools/spec.rb +1 -1
- data/lib/p4tools/utils/validators/shelve_validator.rb +17 -13
- metadata +2 -2
data/lib/p4tools/spec.rb
CHANGED
@@ -17,14 +17,9 @@ module P4Tools
|
|
17
17
|
end
|
18
18
|
|
19
19
|
unshelved_files = find_not_shelved_files
|
20
|
-
|
21
|
-
return unshelved_files
|
22
|
-
end
|
23
|
-
|
24
|
-
find_diff_files
|
20
|
+
unshelved_files + find_diff_files
|
25
21
|
end
|
26
22
|
|
27
|
-
# @return [Boolean]
|
28
23
|
def find_not_shelved_files
|
29
24
|
@opened_files - @shelved_files
|
30
25
|
end
|
@@ -33,18 +28,27 @@ module P4Tools
|
|
33
28
|
def find_diff_files
|
34
29
|
return [] unless @check_diff
|
35
30
|
|
31
|
+
diff_files = []
|
36
32
|
shelve_revisions = []
|
37
|
-
@
|
38
|
-
|
39
|
-
|
33
|
+
files_to_check = @opened_files & @shelved_files
|
34
|
+
|
35
|
+
unless files_to_check.empty?
|
36
|
+
@p4.run_opened(*files_to_check).each { |file|
|
37
|
+
if edited?(file)
|
38
|
+
shelve_revisions.push("#{file['depotFile']}@=#{@cl}")
|
39
|
+
end
|
40
|
+
}
|
41
|
+
|
42
|
+
unless shelve_revisions.empty?
|
43
|
+
diff_files = @p4.run_diff('-f', '-se', *shelve_revisions).collect { |d| d['depotFile'] }
|
40
44
|
end
|
41
|
-
|
45
|
+
end
|
42
46
|
|
43
|
-
|
47
|
+
diff_files
|
44
48
|
end
|
45
49
|
|
46
|
-
def
|
47
|
-
file['action'].include?('
|
50
|
+
def edited?(file)
|
51
|
+
file['action'].include?('edit')
|
48
52
|
end
|
49
53
|
|
50
54
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: p4tools
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.1.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2015-03-18 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: P4Ruby-mingwx86
|