netsoft-danger 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d0604e13a2bbd095af7c03da769e5687fb97401441c45bb54d3a6e682bad16
-  data.tar.gz: 1a37871ed405e809abf23acf518b99042e3e49bc2f1684d6941bf37b7e801e85
+  metadata.gz: 249c46e51ad363cf9770f85e9484d545050b10725ce69929752ade88c85a2e13
+  data.tar.gz: 0f8e84701944f0c155d57fb0bb9ed42bf95d9df5a58037877b22a680f5a48f7e
 SHA512:
-  metadata.gz: 9defe1928aaaa112b151d44f2bdacee0ac8b4821cf9b1e6b2ffd7d91b10dc889a9e1339705dad2d5c19bcafbc7ff5da30f07699e88c3f3d7a290a2d15acad9d5
-  data.tar.gz: 85d7f668e2d38d708b11c2dde99c9b0608fcc1198506edb3065eed199d88fe0ad056667c3ffd30869e92db057631d05bd03d71e68b5dfcb345d8a7c5ded765b8
+  metadata.gz: e36882413a1186a6595044e3702b5bad2e6b700de4b3c38566b15b099cc5fe68de4a62106a4cbe2a99185a76391dc8ba90be5cea55a0a62d80a9a8a4a8c82227
+  data.tar.gz: fdc96629d3928b82f4772d58005e90f5f5c1aad47121b3c570a9437d3c223210039862a79d9f2ecd5308e29f3f9bce42182067d65d26fc06d6ca3854fc1e11f0

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
     - config/default.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Style/SignalException:
   Exclude:

data/CHANGELOG.md

@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 ### Fixed
 
+## [0.8.0]
+### Added
+- added check for bundler version in Gemfile.lock
+### Changed
+- updated to bundler 2.3.9 for CI runs
+### Fixed
+- silence intermittent error when removing a label
+
+## [0.7.0]
+### Changed
+- remove checks for migration and gemfile prefixes in commit messages
+
 ## [0.6.0]
 - remove the focus and print checks from the ruby danger (now handled by rubocop)
 

data/Dangerfile

@@ -10,6 +10,8 @@ def toggle_label(github, label, should_set)
   elsif !should_set && has_label
     github.api.remove_label(repo_name, pr_number, label)
   end
+rescue
+  # noop
 end
 
 if File.exist?('Gemfile')
@@ -24,114 +26,20 @@ if File.exist?('Gemfile')
   end
 end
 
+if File.exist?('Gemfile.lock')
+  if `grep -e "^BUNDLED WITH$" -A 1 Gemfile.lock | grep '    ' | grep -v "\(2\.3\.9\)"`.length > 1
+    fail('gemfile.lock: Gemfile was not bundled with approved bundler version. Please use 2.3.9')
+  end
+end
+
 if github.branch_for_head.start_with?('security')
   toggle_label(github, 'security', true)
 end
 
-should_have_migration_label = false
-
 git.commits.each do |c|
-  short              = " ( #{c.sha[0..7]} )"
-  has_migrations     = c.diff_parent.any? { |f| f.path =~ %r{db/migrate/} }
+  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} }
-  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 has_migrations && !has_schema_changes && !no_schema_ok
-      fail 'migration: Please checkin your schema.rb changes with your migration' + short
-    end
-    if !has_migrations && has_schema_changes
-      warn 'migration: Please checkin your migrations with your schema.rb changes' + short
-    end
-    if c.diff_parent.any? { |f| f.path !~ %r{db/migrate/|db/schema\.rb} }
-      fail 'migration: Migration commit contains non-migration changes' + short
-    end
-
-    should_have_migration_label = true
-  elsif has_migration_msg
-    fail '[migration] Migration commit with no migrations!' + short
-  end
-
-  has_hubstaff_icon_changes = c.diff_parent.any? { |f| f.path =~ /hubstaff(icons|font)|fontcustom-manifest/ }
-  if has_hubstaff_icon_changes
-    if c.diff_parent.any? { |f| !(f.path =~ /hubstaff-(icons|font)/ || f.path =~ /fontcustom-manifest/) }
-      fail 'hubstaff-icons: Put hubstaff-icon changes into their own commit' + short
-    end
-  end
-
-  has_gemfile_changes = c.diff_parent.any? { |f| f.path =~ /Gemfile|gemspec/ }
-  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 c.diff_parent.any? { |f| f.path !~ /Gemfile|gemspec/ }
-      fail 'gemfile: Gemfile commit contains non-gemfile changes' + short
-    end
-    if c.diff_parent.any? { |f| f.path == 'Gemfile.lock' }
-      unless `grep -E -- '^BUNDLED WITH\s*\n\s+(1\\.15\\.2|1\\.17\\.3)$' Gemfile.lock`.length > 1
-        fail('gemfile: Gemfile not bundled with bundler 1.15.2 or 1.17.3')
-      end
-    end
-  elsif has_gemfile_msg
-    fail 'gemfile: Gemfile commit has no gemfile changes!' + short
-  end
 
-  has_package_changes = c.diff_parent.any? { |f| f.path =~ /package\.json|yarn\.lock/ }
-  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 c.diff_parent.any? { |f| f.path !~ /package\.json|yarn\.lock/ }
-      fail 'package: Package.json commit contains non-package changes' + short
-    end
-  elsif has_package_msg
-    fail 'package: Pacakge.json commit has no package changes!' + short
-  end
-end
-
-toggle_label(github, 'run migration', should_have_migration_label)
-
-if ENV['CIRCLE_TOKEN']
-  require 'open-uri'
-
-  artifact_url = "https://circleci.com/api/v1.1/project/github/#{ENV['CIRCLE_PROJECT_USERNAME']}/#{ENV['CIRCLE_PROJECT_REPONAME']}/#{ENV['CIRCLE_BUILD_NUM']}/artifacts?circle-token=#{ENV['CIRCLE_TOKEN']}"
-  artifacts    = JSON.parse(URI.parse(artifact_url).read).map { |a| a['url'] }
-
-  jest        = artifacts.find { |artifact| artifact.end_with?('jest/index.html') }
-  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|
-    hash['Ruby coverage report']      = coverage if coverage
-    hash['RSpec test report']         = rspec_files unless rspec_files.empty?
-    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
-      message("[#{msg}](#{links[0]})")
-    else
-      r         = /rspec-(.+)\.html$/
-      the_links = links.map { |l|
-        m = r.match(l)
-        if m
-          "[#{m[1]}](#{l})"
-        else
-          "[link](#{l})"
-        end
-      }.join(', ')
-
-      message("#{msg} - #{the_links}")
-    end
-  end
+  should_have_migration_label = true if has_migrations || has_schema_changes
+  toggle_label(github, 'run migration', should_have_migration_label)
 end

data/lib/netsoft-danger/version.rb

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

data/netsoft-danger.gemspec

@@ -13,12 +13,10 @@ 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").reject { |f|
-    f.match?(%r{^\.github/}i)
-  }
+  s.files = `git ls-files`.split("\n").grep_v(%r{^\.github/}i)
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.5'
 
   s.add_runtime_dependency 'danger', '~> 8.0'
   s.add_runtime_dependency 'faraday'
@@ -27,5 +25,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
 
-  s.add_development_dependency 'netsoft-rubocop', '= 1.1.2'
+  s.add_development_dependency 'netsoft-rubocop', '= 1.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netsoft-danger
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - urkle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.5
 description: Packages a Dangerfile to be used with Danger.
 email: []
 executables:
@@ -129,14 +129,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Danger.systems conventions for Netsoft projects.