ndr_dev_support 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2e7533f6beb88747b0f1f90d6f0145971967afe89a3abc40f2d758e05731ca
-  data.tar.gz: 12a546e8f88d752ec2148a84c8976ba732c3eae138262bd9318645aa019892b7
+  metadata.gz: '0888d5815e584f9a19a63639faf323ccd24c0918645c623f1648167e8a3e1cba'
+  data.tar.gz: a8cd571529741d2dcebbf6d6f78f754586753a26ca24fa3bd3a9fd007a384635
 SHA512:
-  metadata.gz: 5952f961e82afc9e82bfeeef9d93e2a006f2eac01e2ea5a0e99dbfb521c6214b4c352eaedacd42ed11e6333b45c4e8530e1db9eea1e6bb0fd3a0e83f2f1b843b
-  data.tar.gz: 694ac0dc87603055ec136502b07b02f80a77dbee444ae96a9be6473c35b3bbbdc55913f0195669a6215658b08c549b9a19eeae7fb65518f9cb43804b4bb0d3c0
+  metadata.gz: a38a7122c12eadd4521cbd06e898c80c316605596e06bfc71d70d192bed1a4285c9988dfb5200ebec5b0c1b6ccd0af0e3a1a0e8ec281dba3fb9691b553937864
+  data.tar.gz: 499aa9c741b54ef41af36023a306ec23c0b3caaffd4f1f5eea5e3c4158c298037d22e226ce92e0f4fbd56e99ea67044e84eb3c7147bbdb86ff58dabbe458aac5

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/gemfiles/*.lock
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.3.0 / 2019-05-15
+### Added
+* Offer current checkout name as project name when outputting system version info
+* Added a rake rubocop:summary task to list offence counts by cop (#52)
+
+### Fixed
+* rake rubocop:diff now gracefully reports ruby syntax errors (#54)
+* Support Rails 6 release candidate
+
 ## 5.2.0 / 2019-03-21
 ### Added
 * Added rake task to filter brakeman output to specific fingerprints. (#51)

data/code_safety.yml

@@ -3,7 +3,7 @@ file safety:
   ".gitignore":
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 3e1fbd0a5931f7598a2dd3f929a7cd8366dc0e96
+    safe_revision: f462b71c3359c114eaff872b25f5bb864744dc92
   ".hound.yml":
     comments: 
     reviewed_by: timgentry
@@ -15,11 +15,11 @@ file safety:
   ".travis.yml":
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1cce5269b61341c5ec06e91b819df84ac6140165
+    safe_revision: f462b71c3359c114eaff872b25f5bb864744dc92
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e3afc74e63943e91305df371dfe8ad0e30f8341b
+    safe_revision: 9e77154cbe9ee9da8936b21991b00baa008c0629
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -48,6 +48,14 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
+  gemfiles/Gemfile.rails52:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: f462b71c3359c114eaff872b25f5bb864744dc92
+  gemfiles/Gemfile.rails60:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: f462b71c3359c114eaff872b25f5bb864744dc92
   lib/minitest/rake_ci.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -55,7 +63,7 @@ file safety:
   lib/minitest/rake_ci_plugin.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 9023b4def89e618d3f22333e9fbabd6a816873bf
+    safe_revision: f3a5b9d581f7ef463fc1a3075033c39b3397a46b
   lib/ndr_dev_support.rb:
     comments: 
     reviewed_by: timgentry
@@ -159,7 +167,7 @@ file safety:
   lib/ndr_dev_support/rake_ci/concerns/commit_metadata_persistable.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: d3347202d1efafc419c1d79d2643f3fdfcbfdd65
+    safe_revision: fd9fc5dd275a2285549984688d1d3744a628fd73
   lib/ndr_dev_support/rake_ci/redmine/ticket_resolver.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -171,7 +179,7 @@ file safety:
   lib/ndr_dev_support/rubocop/executor.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 41cf1558f567928faaa1e670a36d941c03c78044
+    safe_revision: e56876f46536ba006a9b68029306f41a188bf9c6
   lib/ndr_dev_support/rubocop/range_augmenter.rb:
     comments: 
     reviewed_by: joshpencheon
@@ -195,7 +203,7 @@ file safety:
   lib/ndr_dev_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e3afc74e63943e91305df371dfe8ad0e30f8341b
+    safe_revision: 9e77154cbe9ee9da8936b21991b00baa008c0629
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
@@ -216,7 +224,7 @@ file safety:
   lib/tasks/ci/dependencies.rake:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 5b079c1360f1ccd8efb1f638cdde6a2826e11e96
+    safe_revision: 2f22aa6cc2f86b84e0bf2247e73bed205930db5a
   lib/tasks/ci/housekeep.rake:
     comments: 
     reviewed_by: timgentry
@@ -264,11 +272,11 @@ file safety:
   lib/tasks/rubocop.rake:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 41cf1558f567928faaa1e670a36d941c03c78044
+    safe_revision: 9f33cc3f6fed0c24cb215befa1beaa4bc03e81ef
   ndr_dev_support.gemspec:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 62d99a8df1244b46709b109a86e3edca17325def
+    safe_revision: d117ccbb85276b2962936a6c50018ff1d6b5a12a
   test/daemon/ci_server_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/gemfiles/Gemfile.rails52

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 5.2.0'
+
+gem 'ndr_support', tag: 'v5.4.0', git: 'https://github.com/PublicHealthEngland/ndr_support'

data/gemfiles/Gemfile.rails60

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'activesupport', '~> 6.0.0rc1'
+

data/lib/minitest/rake_ci_plugin.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/string/inflections'
 require 'minitest'
 require 'rugged'
 require 'ndr_dev_support/rake_ci/concerns/commit_metadata_persistable'
@@ -46,6 +47,34 @@ module Minitest
 
     private
 
+    def error_snippets
+      snippets_for results.reject(&:skipped?).select(&:error?)
+    end
+
+    def failure_snippets
+      snippets_for results.reject(&:skipped?).reject(&:error?)
+    end
+
+    # Adapted from Rails' TestUnit reporter
+    def snippets_for(results, limit = 5)
+      executable = defined?(Rails) ? 'bin/rails test ' : 'bundle exec rake test TEST='
+
+      snippets = results[0, limit].map do |result|
+        location, line =
+          if result.respond_to?(:source_location)
+            result.source_location
+          else
+            result.method(result.name).source_location
+          end
+
+        "#{executable}#{location.sub(%r{^#{Dir.pwd}/?}, '')}:#{line}"
+      end
+
+      snippets << "+ #{results.length - limit} more" if (results.length - limit).positive?
+
+      snippets.any? ? "\n```\n#{snippets.join("\n")}\n```" : ''
+    end
+
     def current_statistics
       @current_statistics ||= {
         total_time: total_time, runs: count, assertions: assertions, failures: failures,
@@ -83,7 +112,7 @@ module Minitest
     def failures_attachment
       {
         color: 'danger',
-        text: ActionController::Base.helpers.pluralize(failures, 'test failure'),
+        text: 'test failure'.pluralize(failures) + failure_snippets,
         footer: 'bundle exec rake ci:minitest'
       }
     end
@@ -91,7 +120,7 @@ module Minitest
     def errors_attachment
       {
         color: 'warning',
-        text: ActionController::Base.helpers.pluralize(errors, 'test error'),
+        text: 'test error'.pluralize(errors) + error_snippets,
         footer: 'bundle exec rake ci:minitest'
       }
     end

data/lib/ndr_dev_support/rake_ci/concerns/commit_metadata_persistable.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'active_support/core_ext/array/wrap'
 require 'active_support/inflector'
 require 'yaml'
 

data/lib/ndr_dev_support/rubocop/executor.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'open3'
 require 'shellwords'
 
 module NdrDevSupport
@@ -15,18 +16,34 @@ module NdrDevSupport
 
       def initialize(filenames)
         @filenames = Executor.target_files & filenames
+
+        check_ruby_syntax
       end
 
       def offenses_by_file
         return [] if @filenames.empty?
 
-        escaped_paths = @filenames.map { |path| Shellwords.escape(path) }
         output = JSON.parse(`rubocop --format json #{escaped_paths.join(' ')}`)
 
         output['files'].each_with_object({}) do |file_output, result|
           result[file_output['path']] = file_output['offenses']
         end
       end
+
+      private
+
+      def escaped_paths
+        @escaped_paths ||= @filenames.map { |path| Shellwords.escape(path) }
+      end
+
+      def check_ruby_syntax
+        escaped_paths.each do |path|
+          stdout_and_err_str, status = Open3.capture2e("ruby -c #{path}")
+          next if status.exitstatus.zero?
+
+          raise stdout_and_err_str
+        end
+      end
     end
   end
 end

data/lib/ndr_dev_support/version.rb

@@ -2,5 +2,5 @@
 # This defines the NdrDevSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks (and our own).
 module NdrDevSupport
-  VERSION = '5.2.0'.freeze
+  VERSION = '5.3.0'.freeze
 end

data/lib/tasks/ci/dependencies.rake

@@ -1,9 +1,11 @@
+require 'active_support/core_ext/object/blank'
+
 namespace :ci do
   namespace :dependencies do
     desc 'setup'
     task :setup do
       require 'highline/import'
-      ENV['PROJECT_NAME'] = gem_name || ask('Project Name: ')
+      ENV['PROJECT_NAME'] = gem_name || ask_for_project_name
     end
 
     desc 'process'
@@ -39,6 +41,13 @@ namespace :ci do
         end
     end
 
+    def ask_for_project_name
+      dir_name = File.basename(Dir.pwd)
+      response = ask("Project Name (leave blank to use '#{dir_name}'): ")
+
+      response.presence || dir_name
+    end
+
     # There is probably a simpler way of getting this information
     def gem_name
       self_dependency = Bundler.environment.current_dependencies.detect do |dep|

data/lib/tasks/rubocop.rake

@@ -71,4 +71,25 @@ namespace :rubocop do
       rubocop_file_ranges(file_ranges)
     end
   end
+
+  desc 'A summary of offense counts by cop'
+  task :summary do
+    # Usage: bin/rake rubocop:summary
+    require 'json'
+
+    output = `bundle exec rubocop --format json .`
+    offenses = JSON.parse(output)['files'].flat_map { |file| file['offenses'] }
+    cop_names = offenses.map { |offense| offense['cop_name'] }
+    summary = cop_names.group_by { |x| x }.
+              map { |cop_name, array| [cop_name, array.count] }.
+              sort_by { |_cop_name, count| count }.
+              reverse
+    cop_name_max_length = cop_names.map(&:length).max
+
+    puts "#{'Cop Name'.ljust(cop_name_max_length)} | Count"
+    puts "#{'-' * cop_name_max_length}-+------"
+    summary.each do |cop_name, count|
+      puts "#{cop_name.ljust(cop_name_max_length)} | #{count}"
+    end
+  end
 end

data/ndr_dev_support.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'selenium-webdriver'
 
   # CI server dependencies:
-  spec.add_dependency 'activesupport', '< 6.0.0'
+  spec.add_dependency 'activesupport', '< 6.1'
   spec.add_dependency 'brakeman', '>= 4.2.0'
   spec.add_dependency 'bundler-audit'
   spec.add_dependency 'github-linguist'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement
@@ -364,6 +364,8 @@ files:
 - bin/console
 - bin/setup
 - code_safety.yml
+- gemfiles/Gemfile.rails52
+- gemfiles/Gemfile.rails60
 - lib/minitest/rake_ci.rb
 - lib/minitest/rake_ci_plugin.rb
 - lib/ndr_dev_support.rb
@@ -438,7 +440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: NDR Developer Support library