conflict 0.1.0 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/lib/conflict/core.rb +41 -17
- data/lib/conflict/domain.rb +13 -8
- data/lib/conflict/parsers.rb +58 -14
- data/test/common.rb +132 -132
- data/test/negative_test.rb +10 -9
- data/test/parser_test.rb +14 -14
- data/test/round_trip/expiration_test.rb +56 -56
- data/test/round_trip/happy_path_test.rb +105 -105
- data/test/round_trip/multi_diff_test.rb +67 -67
- data/test/round_trip/multiple_actions_test.rb +82 -82
- data/test/round_trip/negative_test.rb +109 -79
- data/test/round_trip/relative_path_test.rb +63 -63
- metadata +20 -19
metadata
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
|
-
rubygems_version: 0.
|
|
2
|
+
rubygems_version: 0.9.2
|
|
3
3
|
specification_version: 1
|
|
4
4
|
name: conflict
|
|
5
5
|
version: !ruby/object:Gem::Version
|
|
6
|
-
version: 0.
|
|
7
|
-
date: 2007-08-
|
|
6
|
+
version: 0.2.0
|
|
7
|
+
date: 2007-08-17 00:00:00 -05:00
|
|
8
8
|
summary: Notifies a developer of conflicts between his/her work and that of other developers
|
|
9
9
|
require_paths:
|
|
10
10
|
- lib
|
|
@@ -25,51 +25,52 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
|
|
|
25
25
|
platform: ruby
|
|
26
26
|
signing_key:
|
|
27
27
|
cert_chain:
|
|
28
|
+
post_install_message:
|
|
28
29
|
authors:
|
|
29
30
|
- Dennis Byrne
|
|
30
31
|
files:
|
|
31
32
|
- Rakefile
|
|
32
33
|
- README
|
|
33
34
|
- LICENSE
|
|
35
|
+
- lib/conflict
|
|
34
36
|
- lib/conflict.rb
|
|
35
37
|
- lib/run_conflict
|
|
36
|
-
- lib/conflict
|
|
37
|
-
- lib/conflict/domain.rb
|
|
38
38
|
- lib/conflict/core.rb
|
|
39
|
+
- lib/conflict/domain.rb
|
|
39
40
|
- lib/conflict/parsers.rb
|
|
40
41
|
- bin/conflict
|
|
42
|
+
- test/common.rb
|
|
43
|
+
- test/data
|
|
44
|
+
- test/database_test.rb
|
|
41
45
|
- test/equality_test.rb
|
|
42
46
|
- test/event_test.rb
|
|
43
|
-
- test/database_test.rb
|
|
44
|
-
- test/data
|
|
45
47
|
- test/negative_test.rb
|
|
46
48
|
- test/parser_test.rb
|
|
47
|
-
- test/common.rb
|
|
48
49
|
- test/round_trip
|
|
49
|
-
- test/data/
|
|
50
|
-
- test/data/rails.diff.txt
|
|
50
|
+
- test/data/a13g.diff.txt
|
|
51
51
|
- test/data/apache_myfaces.diff.txt
|
|
52
|
+
- test/data/rails.diff.txt
|
|
52
53
|
- test/data/rails.info.txt
|
|
53
|
-
- test/data/
|
|
54
|
+
- test/data/stomp
|
|
54
55
|
- test/data/three
|
|
55
|
-
- test/data/stomp/stomp.2.diff.txt
|
|
56
|
-
- test/data/stomp/stomp.2.info.txt
|
|
57
56
|
- test/data/stomp/stomp.1.diff.txt
|
|
58
57
|
- test/data/stomp/stomp.1.info.txt
|
|
58
|
+
- test/data/stomp/stomp.2.diff.txt
|
|
59
|
+
- test/data/stomp/stomp.2.info.txt
|
|
60
|
+
- test/data/three/added.diff.txt
|
|
59
61
|
- test/data/three/changed.diff.txt
|
|
60
|
-
- test/data/three/deleted.diff.txt
|
|
61
62
|
- test/data/three/conflict.info.txt
|
|
62
|
-
- test/data/three/
|
|
63
|
-
- test/round_trip/multi_diff_test.rb
|
|
64
|
-
- test/round_trip/happy_path_test.rb
|
|
63
|
+
- test/data/three/deleted.diff.txt
|
|
65
64
|
- test/round_trip/expiration_test.rb
|
|
65
|
+
- test/round_trip/happy_path_test.rb
|
|
66
|
+
- test/round_trip/multiple_actions_test.rb
|
|
67
|
+
- test/round_trip/multi_diff_test.rb
|
|
66
68
|
- test/round_trip/negative_test.rb
|
|
67
69
|
- test/round_trip/relative_path_test.rb
|
|
68
|
-
- test/round_trip/multiple_actions_test.rb
|
|
69
70
|
test_files:
|
|
71
|
+
- test/database_test.rb
|
|
70
72
|
- test/equality_test.rb
|
|
71
73
|
- test/event_test.rb
|
|
72
|
-
- test/database_test.rb
|
|
73
74
|
- test/negative_test.rb
|
|
74
75
|
- test/parser_test.rb
|
|
75
76
|
rdoc_options: []
|