netsoft-danger 0.3.9 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca4dcd0963df60b652e45e3bba8ef8262b350e52c0f659b5ec6660cf6f107ffa
-  data.tar.gz: 351f00d2d1f090c7a97e4385adc5c40af0284055b9d5a7676bdb1aec2bc99588
+  metadata.gz: e6d63752b34b78d9c1c5f2527140833504efec1a06f2b1d28addfb24f2e403b6
+  data.tar.gz: 329482a85420c77b166e255ef01e8fe080c40acdfe00d8e86c86b3b1af80aeb0
 SHA512:
-  metadata.gz: 6a29a7f5ffc53604bbbde1214b6ff006b7ead9d38cfee18fc843b2f5d8df467e1c77ed8e914895bc0e0a7e0eebb85808f5d5b5f1a23500c850c9738723ec5b4c
-  data.tar.gz: c7ceb9f06a2815b36ae58e540197aaa7866daa3168c741dcc4ea862eb52b3496612593e9c5ff3e7ea1791be89dc99cac995d66f1f401c4243bdcf30f27e48300
+  metadata.gz: 1a4ffb45c808ad945619ddae8d5805e02066fbc1006d3bf31ba23581312840819f4868f2fcbb2bf7557c68954005299a6d496e5ddf106329b0c8a3afe51aaa16
+  data.tar.gz: 3908944e5a0f1c246b83caaf40c73db44a1b9672b191cb022d59c34fff7f8b2e913f14c2abaf12942bf75065bb68e78f74cad86c896cce397fe590f6f284808e

data/.circleci/config.yml

@@ -3,11 +3,11 @@ version: 2
 defaults: &defaults
   docker: &ruby_image
     - &ruby_image
-      image: circleci/ruby:2.4.4-stretch
+      image: circleci/ruby:2.5.5-stretch
       environment:
         RUBYOPT: '-KU -E utf-8:utf-8'
         BUNDLE_PATH: vendor/bundle
-        BUNDLE_VERSION: 1.15.2
+        BUNDLE_VERSION: 1.17.3
         BUNDLE_JOBS: 4
         BUNDLE_RETRY: 3
 
@@ -82,7 +82,7 @@ jobs:
 
       - restore_cache:
           keys:
-            - netsoft-danger-bundle-v2-{{ checksum "Gemfile" }}-{{ checksum "netsoft-danger.gemspec" }}
+            - netsoft-danger-bundle-v3-{{ checksum "Gemfile" }}-{{ checksum "netsoft-danger.gemspec" }}
       - run:
           name: Install bundler
           command: gem install bundler --version=$BUNDLE_VERSION
@@ -91,7 +91,7 @@ jobs:
           command: |-
             bundle _${BUNDLE_VERSION}_ check || bundle _${BUNDLE_VERSION}_ install --retry=$BUNDLE_RETRY
       - save_cache:
-          key: netsoft-danger-bundle-v2-{{ checksum "Gemfile" }}-{{ checksum "netsoft-danger.gemspec" }}
+          key: netsoft-danger-bundle-v3-{{ checksum "Gemfile" }}-{{ checksum "netsoft-danger.gemspec" }}
           paths:
             - vendor/bundle
             - Gemfile.lock

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,27 @@ 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
+- make PR base ~= master a hard error
+
+## [0.4.0]
+### Fixed
+- correct simplecov merge on newer simplecov release
+
 ## [0.3.9]
 ### Fixed
 - correct API call to github for adding labels and fix logic in determining if we should or should not add the label

data/Dangerfile

@@ -4,7 +4,7 @@ def toggle_label(github, label, should_set)
   repo_name = github.pr_json['head']['repo']['full_name']
   pr_number = github.pr_json['number']
   has_label = github.pr_labels.include?(label)
-  puts repo_name: repo_name, pr_number: pr_number, labels: github.pr_labels, has_label: has_label, label: label, should_set: should_set
+
   if should_set && !has_label
     github.api.add_labels_to_an_issue(repo_name, pr_number, [label])
   elsif !should_set && has_label
@@ -14,11 +14,11 @@ end
 
 # Don't let testing shortcuts get into master by accident
 if Dir.exist?('spec')
-  fail('fdescribe left in tests') if `grep -r -e '\\bfdescribe\\b' spec/ |grep -v 'danger ok' `.length > 1
-  fail('fcontext left in tests') if `grep -r -e '\\bfcontext\\b' spec/ |grep -v 'danger ok' `.length > 1
-  fail('fit left in tests') if `grep -r -e '\\bfit\\b' spec/ | grep -v 'danger ok' `.length > 1
-  fail('ap left in tests') if `grep -r -e '\\bap\\b' spec/ | grep -v 'danger ok' `.length > 1
-  fail('puts left in tests') if `grep -r -e '\\bputs\\b' spec/ | grep -v 'danger ok' `.length > 1
+  fail('fdescribe left in tests') if `grep -r -I -e '\\bfdescribe\\b' spec/ |grep -v 'danger ok' `.length > 1
+  fail('fcontext left in tests') if `grep -r -I -e '\\bfcontext\\b' spec/ |grep -v 'danger ok' `.length > 1
+  fail('fit left in tests') if `grep -r -I -e '\\bfit\\b' spec/ | grep -v 'danger ok' `.length > 1
+  fail('ap left in tests') if `grep -r -I -e '\\bap\\b' spec/ | grep -v 'danger ok' `.length > 1
+  fail('puts left in tests') if `grep -r -I -e '\\bputs\\b' spec/ | grep -v 'danger ok' `.length > 1
 end
 
 if File.exist?('Gemfile')
@@ -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?
@@ -45,7 +47,7 @@ class NetsoftCircle < Thor # :nodoc:
       json = JSON.parse(File.read(file))
       json.each do |command_name, data|
         result = SimpleCov::Result.from_hash(command_name => data)
-        results << result
+        results.concat [*result]
       end
     end
 
@@ -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/dangerfiles/pr.js

@@ -28,7 +28,7 @@ if (!labels.includes('QA passed')) {
 }
 
 if (!danger.github.pr.base.ref.includes('master')) {
-  warn("PR base is not set to master!");
+  fail("PR base is not set to master!");
 }
 
 // Warn when there is a big PR

data/lib/netsoft-danger/version.rb

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

data/netsoft-danger.gemspec

@@ -16,15 +16,14 @@ 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'
   s.add_runtime_dependency 'thor'
 
   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.3.9
+  version: 0.4.3
 platform: ruby
 authors:
 - urkle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -39,27 +39,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,75 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: netsoft-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  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
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: netsoft-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.38.1
+        version: 1.1.2
   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:
@@ -144,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/PULL_REQUEST_TEMPLATE.txt"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -172,15 +131,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Danger.systems conventions for Netsoft projects.