netsoft-danger 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1bb297084211ee73b3610e83d81c606dfc91b766b0f27c85039e4a60356d4a
-  data.tar.gz: e04cb0d0da8aee130efd829b14699e578276c1034e1530ccc482065bea14f803
+  metadata.gz: e6d63752b34b78d9c1c5f2527140833504efec1a06f2b1d28addfb24f2e403b6
+  data.tar.gz: 329482a85420c77b166e255ef01e8fe080c40acdfe00d8e86c86b3b1af80aeb0
 SHA512:
-  metadata.gz: dc45dbff4585b2522bed6bfebf6667a717133745913770a4fbe7c6e5ef428e05dde4fc3503cd7da1eab62c2f5c36ab776d6e83da03d3810e1c4a4c4330325a5d
-  data.tar.gz: 8139e5cb47340d0cfe6b3e416ebc9f41758c40360f52fb124bc89fd7048a4bf757a937187af1e135fe7435ec2bac099272107bc9c14e8ee92a25885099bf1508
+  metadata.gz: 1a4ffb45c808ad945619ddae8d5805e02066fbc1006d3bf31ba23581312840819f4868f2fcbb2bf7557c68954005299a6d496e5ddf106329b0c8a3afe51aaa16
+  data.tar.gz: 3908944e5a0f1c246b83caaf40c73db44a1b9672b191cb022d59c34fff7f8b2e913f14c2abaf12942bf75065bb68e78f74cad86c896cce397fe590f6f284808e

data/.github/PULL_REQUEST_TEMPLATE.txt

@@ -0,0 +1,25 @@
+## Change description
+
+> Please include a summary of the change and which issue is fixed. Please also include
+  relevant motivation and context. List any dependencies that are required for this change.
+
+## Related issues
+
+- Source: <Issue link or Spec Link>
+- UAT: <UAT Link>
+- QA: <QA Task Link here>
+- Review app: <Link to Heroku>
+
+## Checklists
+
+### Development
+
+- [ ] The commit message follows our guidelines
+- [ ] I have performed a self-review of my own code
+- [ ] I have thoroughly tested the changes
+- [ ] I have added tests that prove my fix is effective or that my feature works
+
+### Security
+
+- [ ] Security impact of change has been considered
+

data/.rubocop.yml

@@ -1,6 +1,9 @@
 inherit_gem:
   netsoft-rubocop:
-    - default.yml
+    - config/default.yml
+
+AllCops:
+  TargetRubyVersion: 2.4
 
 Style/SignalException:
   Exclude:
@@ -10,6 +13,19 @@ Style/IfUnlessModifier:
   Exclude:
     - Dangerfile
 
+Style/SoleNestedConditional:
+  Exclude:
+    - Dangerfile
+
 Layout/EmptyLineAfterGuardClause:
   Exclude:
-    - Dangerfile
+    - Dangerfile
+
+Layout/LineLength:
+  Exclude:
+    - Dangerfile
+
+Performance/StringInclude:
+  Exclude:
+    - Dangerfile
+

data/CHANGELOG.md

@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 ### Fixed
 
+## [0.4.3]
+### Added
+- add brakeman artifact extraction
+### Changed
+- updated netsoft-rubocop and rubocop config
+- remove old commit message style from checks
+- update PR template
+
+## [0.4.2]
+### Fixed
+- restrict simplecov version
+
 ## [0.4.1]
 ### Changed
 - exclude binary files in the grep calls

data/Dangerfile

@@ -43,16 +43,12 @@ git.commits.each do |c|
   short              = " ( #{c.sha[0..7]} )"
   has_migrations     = c.diff_parent.any? { |f| f.path =~ %r{db/migrate/} }
   has_schema_changes = c.diff_parent.any? { |f| f.path =~ %r{db/schema\.rb} }
-  old_migration_msg  = c.message.start_with?('[migration]')
-  has_migration_msg  = old_migration_msg || c.message.match?(/\Amigration(\([A-Za-z]+\))?:/)
+  has_migration_msg  = c.message.match?(/\Amigration(\([A-Za-z]+\))?:/)
   no_schema_ok       = ENV['DANGER_NO_SCHEMA_OK'] || false
   if has_migrations || has_schema_changes
     unless has_migration_msg
       fail 'migration: Schema migration commits needs to be tagged with (migration). e.g. migration(Module): ' + short
     end
-    if old_migration_msg
-      warn 'migration: Please switch to the new conventional commit format.'
-    end
     if has_migrations && !has_schema_changes && !no_schema_ok
       fail 'migration: Please checkin your schema.rb changes with your migration' + short
     end
@@ -76,15 +72,11 @@ git.commits.each do |c|
   end
 
   has_gemfile_changes = c.diff_parent.any? { |f| f.path =~ /Gemfile|gemspec/ }
-  old_gemfile_msg     = c.message.start_with?('[gemfile]')
-  has_gemfile_msg     = old_gemfile_msg || c.message.match?(/\Agemfile(\([A-Za-z]+\))?:/)
+  has_gemfile_msg     = c.message.match?(/\Agemfile(\([A-Za-z]+\))?:/)
   if has_gemfile_changes
     unless has_gemfile_msg
       fail 'gemfile: Gemfile commits needs to be tagged with (gemfile). e.g. gemfile(Module): ' + short
     end
-    if old_migration_msg
-      warn 'gemfile: Please switch to the new conventional commit format.'
-    end
     if c.diff_parent.any? { |f| f.path !~ /Gemfile|gemspec/ }
       fail 'gemfile: Gemfile commit contains non-gemfile changes' + short
     end
@@ -98,15 +90,11 @@ git.commits.each do |c|
   end
 
   has_package_changes = c.diff_parent.any? { |f| f.path =~ /package\.json|yarn\.lock/ }
-  old_package_msg     = c.message.start_with?('[package.json]')
-  has_package_msg     = old_package_msg || c.message.match?(/\Apackage(\([A-Za-z]+\))?:/)
+  has_package_msg     = c.message.match?(/\Apackage(\([A-Za-z]+\))?:/)
   if has_package_changes
     unless has_package_msg
       fail 'package: Package.json commits needs to be tagged with package. e.g package(Module): ' + short
     end
-    if old_package_msg
-      warn 'package: Please switch to the new conventional commit format.'
-    end
     if c.diff_parent.any? { |f| f.path !~ /package\.json|yarn\.lock/ }
       fail 'package: Package.json commit contains non-package changes' + short
     end
@@ -127,6 +115,7 @@ if ENV['CIRCLE_TOKEN']
   coverage    = artifacts.find { |artifact| artifact.end_with?('coverage/index.html') }
   rubocop     = artifacts.find { |artifact| artifact.end_with?('rubocop/report.html') }
   eslint      = artifacts.find { |artifact| artifact.end_with?('eslint/report.html') }
+  brakeman    = artifacts.find { |artifact| artifact.end_with?('brakeman/report.html') }
   rspec_files = artifacts.select { |artifact| artifact =~ /rspec-(.+)\.html$/ }
 
   {}.tap do |hash|
@@ -135,6 +124,7 @@ if ENV['CIRCLE_TOKEN']
     hash['RuboCop inspection report'] = rubocop if rubocop
     hash['ESLint inspection report']  = eslint if eslint
     hash['Jest coverage report']      = jest if jest
+    hash['Brakeman issues report']    = brakeman if brakeman
   end.each do |msg, links|
     links = [*links]
     if links.size == 1

data/bin/netsoft-circle

@@ -34,7 +34,9 @@ class NetsoftCircle < Thor # :nodoc:
   end
 
   desc 'merge', 'Merges several simplecov json result files'
-  option :output, type: :string, aliases: '-o', desc: 'Specify an alternate output directory for the produced coverage data'
+  option :output, type: :string, aliases: '-o',
+         desc:          'Specify an alternate output directory for the produced coverage data'
+
   def merge(*files)
     require 'simplecov'
     return if files.empty?
@@ -81,6 +83,15 @@ class NetsoftCircle < Thor # :nodoc:
     exit(1) unless $CHILD_STATUS.success?
   end
 
+  desc 'brakeman', 'Run brakeman'
+  def brakeman
+    system <<~COMMAND
+      bundle _${BUNDLE_VERSION}_ exec brakeman \
+        -o $CIRCLE_ARTIFACTS/brakeman/report.html
+    COMMAND
+    exit(1) unless $CHILD_STATUS.success?
+  end
+
   def self.exit_on_failure?
     true
   end

data/lib/netsoft-danger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NetsoftDanger
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/netsoft-danger.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ['lib']
 
+  s.required_ruby_version = '>= 2.4'
+
   s.add_runtime_dependency 'danger', '~> 5.0'
   s.add_runtime_dependency 'faraday'
   s.add_runtime_dependency 'simplecov', '~> 0.20.0'
@@ -23,9 +25,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
 
-  s.add_development_dependency 'netsoft-rubocop', '= 1.0.1'
-  s.add_development_dependency 'rubocop', '= 0.74.0'
-  s.add_development_dependency 'rubocop-performance', '= 1.5.2'
-  s.add_development_dependency 'rubocop-rails', '= 2.4.2'
-  s.add_development_dependency 'rubocop-rspec', '= 1.38.1'
+  s.add_development_dependency 'netsoft-rubocop', '= 1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netsoft-danger
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - urkle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -86,70 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.74.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.74.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.38.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.38.1
+        version: 1.1.2
 description: Packages a Dangerfile to be used with Danger.
 email: []
 executables:
@@ -158,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/PULL_REQUEST_TEMPLATE.txt"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -186,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="