preparing for release of pmdtester-1.0.0.beta3

Author: djydewang

.rubocop.yml

@@ -8,3 +8,11 @@ AllCops:
 
 Metrics/LineLength:
   Max: 100
+
+Metrics/MethodLength:
+  Exclude:
+    - 'lib/pmdtester/parsers/options.rb'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'lib/pmdtester/parsers/options.rb'

Rakefile

@@ -28,6 +28,7 @@ hoe = Hoe.spec 'pmdtester' do
     ['rubocop',       '~> 0.56.0'],
     ['test-unit',     '~> 3.2.3']
   ]
+  self.spec_extras[:required_rubygems_version] = '>= 2.4.1'
 
   license 'BSD-2-Clause'
 end

lib/pmdtester/builders/pmd_report_builder.rb

@@ -97,7 +97,7 @@ def generate_pmd_reports
 
       sum_time = 0
       @projects.each do |project|
-        logger.info "Generating #{project.name}'s PMD report'"
+        logger.info "Generating #{project.name}'s PMD report"
         execution_time, end_time =
           generate_pmd_report(project.local_source_path,
                               project.get_pmd_report_path(@pmd_branch_name))

lib/pmdtester/parsers/options.rb

@@ -14,6 +14,8 @@ class Options
     LOCAL = 'local'
     ONLINE = 'online'
     SINGLE = 'single'
+    DEFAULT_CONFIG_PATH = ResourceLocator.locate('config/all-java.xml')
+    DEFAULT_LIST_PATH = ResourceLocator.locate('config/project-list.xml')
 
     attr_reader :local_git_repo
     attr_reader :base_branch
@@ -68,11 +70,14 @@ def parse(argv)
         o.string '-b', '--base-branch', 'name of the base branch in local PMD repository'
         o.string '-p', '--patch-branch',
                  'name of the patch branch in local PMD repository'
-        o.string '-bc', '--base-config', 'path to the base PMD configuration file'
-        o.string '-pc', '--patch-config', 'path to the patch PMD configuration file'
+        o.string '-bc', '--base-config', 'path to the base PMD configuration file',
+                 default: DEFAULT_CONFIG_PATH
+        o.string '-pc', '--patch-config', 'path to the patch PMD configuration file',
+                 default: DEFAULT_CONFIG_PATH
         o.string '-c', '--config', 'path to the base and patch PMD configuration file'
         o.string '-l', '--list-of-project',
-                 'path to the file which contains the list of standard projects'
+                 'path to the file which contains the list of standard projects',
+                 default: DEFAULT_LIST_PATH
         o.string '-m', '--mode', mode_message, default: 'local'
         o.bool '-f', '--html-flag',
                'whether to not generate the html diff report in single mode'
@@ -111,20 +116,17 @@ def check_options
     def check_local_options
       check_option(LOCAL, 'base branch name', @base_branch)
       check_option(LOCAL, 'base branch config path', @base_config) unless @auto_config_flag
-      check_option(LOCAL, 'patch branch name', @patch_branch)
       check_option(LOCAL, 'patch branch config path', @patch_config) unless @auto_config_flag
       check_option(LOCAL, 'list of projects file path', @project_list)
     end
 
     def check_single_options
-      check_option(SINGLE, 'patch branch name', @patch_branch)
       check_option(SINGLE, 'patch branch config path', @patch_config)
       check_option(SINGLE, 'list of projects file path', @project_list)
     end
 
     def check_online_options
       check_option(ONLINE, 'base branch name', @base_branch)
-      check_option(ONLINE, 'patch branch name', @patch_branch)
     end
 
     def check_common_options

lib/pmdtester/runner.rb

@@ -18,6 +18,7 @@ def run
       when Options::SINGLE
         run_single_mode
       end
+      introduce_new_pmd_error?
     end
 
     def run_local_mode
@@ -116,5 +117,12 @@ def build_diff_html_reports
     def get_projects(file_path)
       @projects = ProjectsParser.new.parse(file_path)
     end
+
+    def introduce_new_pmd_error?
+      @projects.each do |project|
+        return true if project.introduce_new_errors?
+      end
+      false
+    end
   end
 end

test/test_options.rb

@@ -30,6 +30,14 @@ def test_long_option
     assert_equal('config/project_list.txt', opts.project_list)
   end
 
+  def test_default_value
+    command_line = %w[-r /path/to/repo -b pmd_releases/6.2.0 -p master]
+    opts = Options.new(command_line)
+    assert_equal(Options::DEFAULT_CONFIG_PATH, opts.base_config)
+    assert_equal(Options::DEFAULT_CONFIG_PATH, opts.patch_config)
+    assert_equal(Options::DEFAULT_LIST_PATH, opts.project_list)
+  end
+
   def test_single_mode
     command_line =
       %w[-r /path/to/repo -p master -pc config.xml -l list.xml -f -m single]
@@ -62,27 +70,6 @@ def test_local_miss_base_name
     parse_and_assert_error_messages(argv, expect)
   end
 
-  def test_local_miss_base_config
-    argv = %w[-r target/repositories/pmd -b master
-              -p pmd_releases/6.1.0 -pc config/design.xml -l test/resources/project-test.xml]
-    expect = 'base branch config path is required in local mode.'
-    parse_and_assert_error_messages(argv, expect)
-  end
-
-  def test_local_miss_patch_config
-    argv = %w[-r target/repositories/pmd -bc config/design.xml
-              -p pmd_releases/6.1.0 -l test/resources/project-test.xml]
-    expect = 'base branch name is required in local mode.'
-    parse_and_assert_error_messages(argv, expect)
-  end
-
-  def test_single_miss_patch_config
-    argv = %w[-r target/repositories/pmd -m single
-              -p pmd_releases/6.1.0 -l test/resources/project-test.xml]
-    expect = 'patch branch config path is required in single mode.'
-    parse_and_assert_error_messages(argv, expect)
-  end
-
   def test_online_miss_base_name
     argv = %w[-r target/repositories/pmd -p pmd_releases/6.1.0 -m online]
     expect = 'base branch name is required in online mode.'