Skip to content

Commit d2be763

Browse files
committed
Merge branch 'pr-23'
2 parents cd7474b + 0f20ad4 commit d2be763

File tree

12 files changed

+111
-80
lines changed

12 files changed

+111
-80
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
pkg/
2+
doc/
3+
Gemfile.lock
14
.project
25
.idea
6+
.bundle
37
target/
8+
vendor/

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: ruby
22
jdk: oraclejdk9
33
script:
4-
- bundle exec rake rubocop
5-
- bundle exec rake clean test
6-
- bundle exec rake clean integration-test
4+
- rake rubocop
5+
- rake clean test
6+
- rake clean integration-test
7+
- rake install_gem
8+
- pmdtester -h

Gemfile

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1-
source 'https://rubygems.org'
2-
gem 'hoe', '3.17.0'
3-
gem 'minitest', '5.10.1'
4-
gem 'mocha'
5-
gem 'nokogiri', '1.8.2'
6-
gem 'rubocop', '~>0.56.0', require: false
7-
gem 'slop', '4.6.2'
8-
gem 'test-unit', '3.2.3'
1+
# -*- ruby -*-
2+
3+
# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
4+
5+
source "https://rubygems.org/"
6+
7+
gem "nokogiri", "~>1.8.2"
8+
gem "slop", "~>4.6.2"
9+
10+
gem "hoe-bundler", "~>1.2", :group => [:development, :test]
11+
gem "hoe-gemspec", "~>1.0", :group => [:development, :test]
12+
gem "hoe-git", "~>1.6", :group => [:development, :test]
13+
gem "minitest", "~>5.10.1", :group => [:development, :test]
14+
gem "mocha", "~>1.5.0", :group => [:development, :test]
15+
gem "rubocop", "~>0.56.0", :group => [:development, :test]
16+
gem "test-unit", "~>3.2.3", :group => [:development, :test]
17+
gem "rdoc", ">=4.0", "<6", :group => [:development, :test]
18+
gem "hoe", "~>3.17", :group => [:development, :test]
19+
20+
# vim: syntax=ruby

Gemfile.lock

Lines changed: 0 additions & 47 deletions
This file was deleted.

History.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@
2727
* [#20](https://github.com/pmd/pmd-regression-tester/pull/20): Change the way of parsing xml file from DOM to SAX - [BBG](https://github.com/djydewang)
2828
* [#21](https://github.com/pmd/pmd-regression-tester/pull/21): Add auto-gen-config option for PmdTester - [BBG](https://github.com/djydewang)
2929
* [#22](https://github.com/pmd/pmd-regression-tester/pull/22): Add 'introduce new errors' table head for html summary report - [BBG](https://github.com/djydewang)
30+
* [#23](https://github.com/pmd/pmd-regression-tester/pull/23): Preparing for the release of PmdTester - [BBG](https://github.com/djydewang)

Manifest.txt

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,35 @@
1+
.rubocop.yml
2+
.rubocop_todo.yml
3+
.travis.yml
4+
Gemfile
15
History.md
26
LICENSE
37
Manifest.txt
4-
README.md
8+
README.rdoc
59
Rakefile
610
bin/pmdtester
11+
config/all-java.xml
12+
config/design.xml
13+
config/project-list.xml
14+
config/project_list.txt
15+
config/projectlist_1_0_0.xsd
16+
lib/pmdtester/builders/diff_builder.rb
17+
lib/pmdtester/builders/diff_report_builder.rb
18+
lib/pmdtester/builders/html_report_builder.rb
19+
lib/pmdtester/builders/pmd_report_builder.rb
20+
lib/pmdtester/builders/rule_set_builder.rb
21+
lib/pmdtester/builders/summary_report_builder.rb
22+
lib/pmdtester/cmd.rb
723
lib/pmdtester/parsers/options.rb
8-
test/test_options.rb
24+
lib/pmdtester/parsers/pmd_report_document.rb
25+
lib/pmdtester/parsers/projects_parser.rb
26+
lib/pmdtester/pmd_branch_detail.rb
27+
lib/pmdtester/pmd_error.rb
28+
lib/pmdtester/pmd_report_detail.rb
29+
lib/pmdtester/pmd_violation.rb
30+
lib/pmdtester/project.rb
31+
lib/pmdtester/report_diff.rb
32+
lib/pmdtester/resource_locator.rb
33+
lib/pmdtester/runner.rb
34+
resources/css/maven-base.css
35+
resources/css/maven-theme.css

README.md renamed to README.rdoc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
# pmdtester
1+
= pmdtester
22

3-
code :: https://github.com/pmd/pmd-regression-tester
4-
bugs :: https://github.com/pmd/pmd-regression-tester/issues
3+
code :: https://github.com/pmd/pmd-regression-tester
4+
bugs :: https://github.com/pmd/pmd-regression-tester/issues
55

6-
## DESCRIPTION:
6+
build-status :: {<img src="https://travis-ci.com/pmd/pmd-regression-tester.svg?branch=master" alt="Build Status" />}[https://travis-ci.com/pmd/pmd-regression-tester]
7+
8+
== DESCRIPTION:
79

810
A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.
911

10-
## FEATURES/PROBLEMS:
12+
== FEATURES/PROBLEMS:
1113

1214
The diff report can be generated according to the base and patch branch of PMD
1315
on a list of standard projects(Spring Framework, Hibernate, Solr, etc.)
1416

15-
## SYNOPSIS:
17+
== SYNOPSIS:
1618

17-
FIX (code sample of usage)
19+
* FIX (code sample of usage)
1820

19-
## REQUIREMENTS:
21+
== REQUIREMENTS:
2022

2123
* FIX (list of requirements)
2224

23-
## INSTALL:
25+
== INSTALL:
2426

2527
* FIX (sudo gem install, anything else)
2628

27-
## DEVELOPERS:
29+
== DEVELOPERS:
2830

2931
You can list all tasks by running `rake -T`.
3032

Rakefile

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
11
# -*- ruby -*-
2-
3-
require 'hoe'
42
require 'rake/testtask'
53
require 'rubocop/rake_task'
6-
require './lib/pmdtester/cmd.rb'
7-
require './lib/pmdtester/parsers/options.rb'
4+
require_relative './lib/pmdtester/parsers/options.rb'
5+
6+
gem 'hoe'
7+
require 'hoe'
8+
Hoe.plugin :bundler
9+
Hoe.plugin :gemspec
10+
Hoe.plugin :git
811

912
Hoe.spec 'pmdtester' do
1013
self.version = PmdTester::Options::VERSION
1114

1215
self.author = 'Binguo Bao'
1316
self.email = '[email protected]'
14-
self.clean_globs = %w[target/reports/**/* target/test**/*]
17+
self.clean_globs = %w[target/reports/**/* target/test/**/*]
18+
self.extra_deps += [['nokogiri', '~> 1.8.2'], ['slop', '~> 4.6.2']]
19+
self.extra_dev_deps += [
20+
['hoe-bundler', '~> 1.2'],
21+
['hoe-gemspec', '~> 1.0'],
22+
['hoe-git', '~> 1.6'],
23+
['minitest', '~> 5.10.1'],
24+
['mocha', '~> 1.5.0'],
25+
['rubocop', '~> 0.56.0'],
26+
['test-unit', '~> 3.2.3']
27+
]
1528

1629
license 'BSD-2-Clause'
1730
end
@@ -29,3 +42,5 @@ Rake::TestTask.new('integration-test') do |task|
2942
task.pattern = 'test/**/integration_test_*.rb'
3043
task.verbose = true
3144
end
45+
46+
# vim: syntax=ruby

lib/pmdtester/builders/html_report_builder.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# frozen_string_literal: true
22

3+
require_relative '../resource_locator'
34
module PmdTester
45
# This class is the parent of all classes which is used to build html report
56
class HtmlReportBuilder
6-
CSS_SRC_DIR = 'resources/css'
7+
CSS_SRC_DIR = ResourceLocator.locate('resources/css')
78

89
def build_html_report(title_name)
910
html_builder = Nokogiri::HTML::Builder.new do |doc|

lib/pmdtester/builders/rule_set_builder.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
require 'nokogiri'
44
require 'set'
55
require_relative '../cmd'
6+
require_relative '../resource_locator'
67
module PmdTester
78
# This class is responsible for generation dynamic configuration
89
# according to the difference between base and patch branch of Pmd.
@@ -13,7 +14,8 @@ class RuleSetBuilder
1314
PATH_TO_PMD_JAVA_BASED_RULES =
1415
'pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule'
1516
PATH_TO_PMD_XPATH_BASED_RULES = 'pmd-java/src/main/resources/category/java'
16-
PATH_TO_ALL_JAVA_RULES = 'config/all-java.xml'
17+
PATH_TO_ALL_JAVA_RULES =
18+
ResourceLocator.locate('config/all-java.xml')
1719
PATH_TO_DYNAMIC_CONFIG = 'target/dynamic-config.xml'
1820
NO_JAVA_RULES_CHANGED_MESSAGE = 'No java rules have been changed!'
1921

0 commit comments

Comments
 (0)