diggit 2.1.0 → 2.1.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.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/README.md +16 -5
  4. data/bin/dgit +30 -7
  5. data/lib/dgit/core.rb +46 -42
  6. data/lib/dgit/entries.rb +7 -18
  7. data/lib/dgit/version.rb +2 -1
  8. data/plugins/addon/db.rb +3 -2
  9. data/plugins/addon/out.rb +25 -3
  10. data/plugins/addon/src_opt.rb +2 -1
  11. data/plugins/analysis/conflict_merge.rb +118 -0
  12. data/plugins/analysis/javadoc.rb +152 -10
  13. data/plugins/analysis/tex.rb +1 -1
  14. data/spec/cli_spec.rb +114 -0
  15. data/spec/core_spec.rb +47 -17
  16. data/spec/dgit/plugins/analysis/test_analysis_with_clean_error.rb +1 -1
  17. data/spec/dgit/plugins/analysis/test_analysis_with_error.rb +1 -1
  18. data/spec/dgit/plugins/join/test_join_with_clean_error.rb +1 -1
  19. data/spec/dgit/plugins/join/test_join_with_error.rb +1 -1
  20. data/spec/spec_helper.rb +13 -3
  21. metadata +24 -23
data/spec/dgit/plugins/analysis/test_analysis_with_clean_error.rb CHANGED
@@ -22,6 +22,6 @@ class TestAnalysisWithCleanError < Diggit::Analysis
22
22
  end
23
23
 
24
24
  def clean
25
- fail "Error!"
25
+ raise "Error!"
26
26
  end
27
27
  end
data/spec/dgit/plugins/analysis/test_analysis_with_error.rb CHANGED
@@ -19,7 +19,7 @@
19
19
 
20
20
  class TestAnalysisWithError < Diggit::Analysis
21
21
  def run
22
- fail "Error!"
22
+ raise "Error!"
23
23
  end
24
24
 
25
25
  def clean
data/spec/dgit/plugins/join/test_join_with_clean_error.rb CHANGED
@@ -24,6 +24,6 @@ class TestJoinWithCleanError < Diggit::Join
24
24
  end
25
25
 
26
26
  def clean
27
- fail "Error!"
27
+ raise "Error!"
28
28
  end
29
29
  end
data/spec/dgit/plugins/join/test_join_with_error.rb CHANGED
@@ -21,7 +21,7 @@ class TestJoinWithError < Diggit::Join
21
21
  require_analyses 'test_analysis'
22
22
 
23
23
  def run
24
- fail "Error!"
24
+ raise "Error!"
25
25
  end
26
26
 
27
27
  def clean
data/spec/spec_helper.rb CHANGED
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  # encoding: utf-8
2
3
  #
3
4
  # This file is part of Diggit.
@@ -9,11 +10,11 @@
9
10
  #
10
11
  # Diggit is distributed in the hope that it will be useful,
11
12
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
12
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
14
  # GNU Lesser General Public License for more details.
14
15
  #
15
16
  # You should have received a copy of the GNU Lesser General Public License
16
- # along with Diggit. If not, see <http://www.gnu.org/licenses/>.
17
+ # along with Diggit. If not, see <http://www.gnu.org/licenses/>.
17
18
  #
18
19
  # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
19
20
 
@@ -22,4 +23,13 @@ Coveralls.wear!
22
23
 
23
24
  require_relative('../lib/dgit')
24
25
 
25
- TEST_URL = 'https://github.com/jrfaller/test-git.git'
26
+ TEST_URL = 'https://github.com/jrfaller/test-git.git|0a8267929977bf800ababb6ae1bf3b0ed08827a4'.freeze
27
+ TEST_URL_INFO1 = 'https://github.com/jrfaller/test-git.git'.freeze
28
+ TEST_URL_INFO2 = '0a8267929977bf800ababb6ae1bf3b0ed08827a4'.freeze
29
+
30
+ RSpec.configure do |config|
31
+ config.before(:all) do
32
+ FileUtils.rm_rf('spec/dgit/.dgit')
33
+ FileUtils.rm_rf('spec/dgit/sources')
34
+ end
35
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: diggit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0
4
+ version: 2.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jean-Rémy Falleri
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-11-12 00:00:00.000000000 Z
12
+ date: 2016-10-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rugged
@@ -17,112 +17,112 @@ dependencies:
17
17
  requirements:
18
18
  - - "~>"
19
19
  - !ruby/object:Gem::Version
20
- version: '0.21'
20
+ version: '0'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - "~>"
26
26
  - !ruby/object:Gem::Version
27
- version: '0.21'
27
+ version: '0'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: oj
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '2.10'
34
+ version: '2'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '2.10'
41
+ version: '2'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: gli
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - "~>"
47
47
  - !ruby/object:Gem::Version
48
- version: '2.13'
48
+ version: '2'
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - "~>"
54
54
  - !ruby/object:Gem::Version
55
- version: '2.13'
55
+ version: '2'
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: formatador
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
60
  - - "~>"
61
61
  - !ruby/object:Gem::Version
62
- version: '0.2'
62
+ version: '0'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - "~>"
68
68
  - !ruby/object:Gem::Version
69
- version: '0.2'
69
+ version: '0'
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: rspec
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
74
  - - "~>"
75
75
  - !ruby/object:Gem::Version
76
- version: '3.1'
76
+ version: '3'
77
77
  type: :development
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
81
  - - "~>"
82
82
  - !ruby/object:Gem::Version
83
- version: '3.1'
83
+ version: '3'
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: yard
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
88
  - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: '0.8'
90
+ version: '0'
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - "~>"
96
96
  - !ruby/object:Gem::Version
97
- version: '0.8'
97
+ version: '0'
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: rake
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
102
  - - "~>"
103
103
  - !ruby/object:Gem::Version
104
- version: '10.4'
104
+ version: '11'
105
105
  type: :development
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - "~>"
110
110
  - !ruby/object:Gem::Version
111
- version: '10.4'
111
+ version: '11'
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: coveralls
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - "~>"
117
117
  - !ruby/object:Gem::Version
118
- version: '0.8'
118
+ version: '0'
119
119
  type: :development
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
123
  - - "~>"
124
124
  - !ruby/object:Gem::Version
125
- version: '0.8'
125
+ version: '0'
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: rubocop
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -143,14 +143,14 @@ dependencies:
143
143
  requirements:
144
144
  - - "~>"
145
145
  - !ruby/object:Gem::Version
146
- version: '0.10'
146
+ version: '0'
147
147
  type: :development
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
151
  - - "~>"
152
152
  - !ruby/object:Gem::Version
153
- version: '0.10'
153
+ version: '0'
154
154
  description: 'The Diggit repository analysis tool is a neat swiss knife to enable
155
155
  the analysis of many Git repositories.
156
156
 
@@ -177,8 +177,10 @@ files:
177
177
  - plugins/addon/src_opt.rb
178
178
  - plugins/analysis/cloc.rb
179
179
  - plugins/analysis/cloc_per_file.rb
180
+ - plugins/analysis/conflict_merge.rb
180
181
  - plugins/analysis/javadoc.rb
181
182
  - plugins/analysis/tex.rb
183
+ - spec/cli_spec.rb
182
184
  - spec/core_spec.rb
183
185
  - spec/dgit/plugins/addon/test_addon.rb
184
186
  - spec/dgit/plugins/analysis/duplicate_analysis.rb
@@ -196,7 +198,7 @@ files:
196
198
  - spec/spec_helper.rb
197
199
  homepage: https://github.com/jrfaller/diggit
198
200
  licenses:
199
- - LGPL
201
+ - LGPL-3.0
200
202
  metadata: {}
201
203
  post_install_message:
202
204
  rdoc_options: []
@@ -214,9 +216,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
214
216
  version: '0'
215
217
  requirements: []
216
218
  rubyforge_project:
217
- rubygems_version: 2.4.5.1
219
+ rubygems_version: 2.6.7
218
220
  signing_key:
219
221
  specification_version: 4
220
222
  summary: A Git repository analysis tool.
221
223
  test_files: []
222
- has_rdoc: