netsoft-danger 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1bb297084211ee73b3610e83d81c606dfc91b766b0f27c85039e4a60356d4a
-  data.tar.gz: e04cb0d0da8aee130efd829b14699e578276c1034e1530ccc482065bea14f803
+  metadata.gz: 9e08eb241362988d887b622fb6a446e8e76fd5dd93384ef105ea91e073d86737
+  data.tar.gz: 3e5c368c2e1b2048abd67b3d781f112ef117b3e1bde28ce58a8dc29a9e8f0f54
 SHA512:
-  metadata.gz: dc45dbff4585b2522bed6bfebf6667a717133745913770a4fbe7c6e5ef428e05dde4fc3503cd7da1eab62c2f5c36ab776d6e83da03d3810e1c4a4c4330325a5d
-  data.tar.gz: 8139e5cb47340d0cfe6b3e416ebc9f41758c40360f52fb124bc89fd7048a4bf757a937187af1e135fe7435ec2bac099272107bc9c14e8ee92a25885099bf1508
+  metadata.gz: ce2b4c4f42b58878171a7a990d00155881af9a62d641c992c9edf376df41f6e68a0d95755f6e477ca73ce97d5c2707218697ea46fdd96f5f97cc3d2529ede9fe
+  data.tar.gz: b5591601776b74461a67cd573b4ac08ec7e9eb66082e22ee0805195b3a9037ce1a56612da6b5f435686f2ef2a7cc32bda7edc299e6d42380c2bfee0a66f9349b

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,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 ### Fixed
 
+## [0.5.0]
+### Changed
+- updated danger to 8.x
+
+## [0.4.5]
+### Changed
+- remove the "fit left in tests" check
+
+## [0.4.4]
+### Changed
+- stop pushing to private gem server
+
+## [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
@@ -44,4 +68,3 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - package.json checks
 ### Fixed
 - requie older version of faraday until octokit is fixed (https://github.com/octokit/octokit.rb/pull/1154)
-

data/Dangerfile

@@ -16,7 +16,6 @@ end
 if Dir.exist?('spec')
   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
@@ -43,16 +42,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 +71,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 +89,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 +114,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 +123,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.5.0'
 end

data/netsoft-danger.gemspec

@@ -13,19 +13,19 @@ Gem::Specification.new do |s|
   s.description = 'Packages a Dangerfile to be used with Danger.'
   s.executables << 'netsoft-circle'
 
-  s.files         = `git ls-files`.split("\n")
+  s.files = `git ls-files`.split("\n").reject { |f|
+    f.match?(%r{^\.github/}i)
+  }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'danger', '~> 5.0'
+  s.required_ruby_version = '>= 2.4'
+
+  s.add_runtime_dependency 'danger', '~> 8.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.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - urkle
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -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:
@@ -157,7 +101,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -178,7 +121,7 @@ files:
 homepage: https://github.com/NetsoftHoldings/danger
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,15 +129,15 @@ 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: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Danger.systems conventions for Netsoft projects.
 test_files: []

data/.circleci/config.yml

@@ -1,136 +0,0 @@
-version: 2
-
-defaults: &defaults
-  docker: &ruby_image
-    - &ruby_image
-      image: circleci/ruby:2.5.5-stretch
-      environment:
-        RUBYOPT: '-KU -E utf-8:utf-8'
-        BUNDLE_PATH: vendor/bundle
-        BUNDLE_VERSION: 1.17.3
-        BUNDLE_JOBS: 4
-        BUNDLE_RETRY: 3
-
-filters:
-  test: &filter_test
-    filters:
-      tags:
-        ignore: /^v.*/
-  beta: &filter_beta
-    filters:
-      branches:
-        ignore: /.*/
-      tags:
-        only: /^v[0-9]+(\.[0-9]+)+(\.[a-z].+).*/
-  release: &filter_release
-    filters:
-      branches:
-        ignore: /.*/
-      tags:
-        only: /^v[0-9]+(\.[0-9]+)+/
-
-workflows:
-  version: 2
-  build_test:
-    jobs:
-      - "Checkout":
-          <<: *filter_test
-          context: org-global
-      - "Build":
-          <<: *filter_test
-          context: org-global
-          requires:
-            - "Checkout"
-  build_test_beta:
-    jobs:
-      - "Checkout":
-          <<: *filter_beta
-          context: org-global
-      - "Build":
-          <<: *filter_beta
-          context: org-global
-          requires:
-            - "Checkout"
-      - "Publish":
-          <<: *filter_beta
-          context: org-global
-          requires:
-            - "Build"
-  build_test_release:
-    jobs:
-      - "Checkout":
-          <<: *filter_release
-          context: org-global
-      - "Build":
-          <<: *filter_release
-          context: org-global
-          requires:
-            - "Checkout"
-      - "Publish":
-          <<: *filter_release
-          context: org-global
-          requires:
-            - "Build"
-
-jobs:
-  "Checkout":
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: .
-      - checkout
-
-      - restore_cache:
-          keys:
-            - netsoft-danger-bundle-v3-{{ checksum "Gemfile" }}-{{ checksum "netsoft-danger.gemspec" }}
-      - run:
-          name: Install bundler
-          command: gem install bundler --version=$BUNDLE_VERSION
-      - run:
-          name: Bundle Install
-          command: |-
-            bundle _${BUNDLE_VERSION}_ check || bundle _${BUNDLE_VERSION}_ install --retry=$BUNDLE_RETRY
-      - save_cache:
-          key: netsoft-danger-bundle-v3-{{ checksum "Gemfile" }}-{{ checksum "netsoft-danger.gemspec" }}
-          paths:
-            - vendor/bundle
-            - Gemfile.lock
-
-      - persist_to_workspace:
-          root: .
-          paths: .
-  "Build":
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: .
-      - run:
-          name: Install bundler
-          command: gem install bundler --version=$BUNDLE_VERSION
-      - run:
-          name: Build gem
-          command: |-
-            gem build *.gemspec
-      - run:
-          name: Run rubocop
-          command: |-
-            bundle exec rubocop
-      - run:
-          name: Run Danger
-          command: |-
-            bundle exec danger
-  "Publish":
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: .
-      - run:
-          name: Deploy to gem server
-          command: |-
-            ./bin/tag_check.sh
-            ./bin/setup-rubygems.sh
-            rm -rf pkg
-            gem install geminabox
-            rake build
-            gem inabox -g ${HUBSTAFF_GEM_SERVER} pkg/*
-            gem push pkg/*.gem