danger-wcc 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c6061afcb81994d044747055b405da083c2a8f68
-  data.tar.gz: 9113729ee91c5f20f20bcbdc7dc193c8767a4118
+SHA256:
+  metadata.gz: a453b0e7855e187bb2b99a3e8dfae08ebea992ec6b3eb1a889698f2eba91bd1c
+  data.tar.gz: 01634fb5d565a326dc05c16a65e034b35725485a6ffbd154e9d816455e8a610e
 SHA512:
-  metadata.gz: 1912d4617cea797c14e831c2fe0ba7669b85153944169f1345611eca4e4c4b6de6c3963f3735d6b1e1e51a76c29d2756534b59edbef3f15f0c56e2c78288ba3b
-  data.tar.gz: cabc48b95b641fdc38a403e6587788d5268a2c6325ab9542252e203c7fbb4968961e1d2bce2e3210804c5b343732b6575eee311f53194187234aeae88caaaa49
+  metadata.gz: 27e81934539ed28e1cf93e8f8cd47f827d091306b346af3facce7eaf928831cacd93e80460b098a320dc6e4dcd0d78cb07496a6ecf4b5bae0e62e0fc4df4c518
+  data.tar.gz: 7eadba11fe6561c2cb0a263c4f2abee021c73c8bbab49583cd152195d530d51c486ecbd3da5d4b9b79aedf514bb0752cd8a7eafd4cd61c3fcca1d6496431376e

data/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.3.3-node
+      - image: cimg/ruby:2.7.6-node
         environment:
           RAILS_ENV: test
     steps:

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.7.6

data/Gemfile.lock

@@ -0,0 +1,235 @@
+PATH
+  remote: .
+  specs:
+    danger-wcc (0.1.4)
+      activesupport (>= 4)
+      danger-plugin-api (~> 1.0)
+      git_diff (~> 0.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.1)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    brakeman (4.9.0)
+    claide (1.1.0)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
+    codeclimate-engine-rb (0.4.1)
+      virtus (~> 1.0)
+    coderay (1.1.3)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.10)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    danger (8.6.1)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (>= 0.9.0, < 2.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.7)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 4.7)
+      terminal-table (>= 1, < 4)
+    danger-plugin-api (1.0.0)
+      danger (> 2.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.4.4)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    ffi (1.13.1)
+    flay (2.12.1)
+      erubis (~> 2.7.0)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
+    formatador (0.2.5)
+    git (1.11.0)
+      rchardet (~> 1.8)
+    git_diff (0.4.3)
+    guard (2.16.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.3.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    hashdiff (1.0.1)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    jaro_winkler (1.5.4)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    kwalify (0.7.2)
+    listen (3.0.7)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
+    lumberjack (1.2.7)
+    method_source (1.0.0)
+    minitest (5.15.0)
+    multipart-post (2.1.1)
+    nap (1.1.0)
+    nenv (0.3.0)
+    no_proxy_fix (0.1.2)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (4.22.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    open4 (1.3.4)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    path_expander (1.1.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (3.1.0)
+    public_suffix (4.0.5)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rchardet (1.8.0)
+    reek (5.6.0)
+      codeclimate-engine-rb (~> 0.4.0)
+      kwalify (~> 0.7.0)
+      parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
+      psych (~> 3.1.0)
+      rainbow (>= 2.0, < 4.0)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rspec_junit_formatter (0.3.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.81.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.5)
+    ruby_parser (3.14.2)
+      sexp_processor (~> 4.9)
+    safe_yaml (1.0.5)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    sexp_processor (4.15.0)
+    shellany (0.0.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+    webmock (3.8.3)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    yard (0.9.25)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  brakeman
+  bundler (~> 1.3)
+  danger-wcc!
+  flay
+  guard (~> 2.14)
+  guard-rspec (~> 4.7)
+  guard-rubocop (~> 1.3.0)
+  listen (= 3.0.7)
+  pry
+  rake (~> 10.0)
+  reek
+  rspec (~> 3.4)
+  rspec_junit_formatter (~> 0.3.0)
+  rubocop (~> 0.81)
+  webmock (~> 3.1)
+  yard
+
+BUNDLED WITH
+   1.17.3

data/danger-wcc.gemspec

@@ -19,12 +19,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '> 5'
-  spec.add_runtime_dependency 'brakeman'
+  spec.add_runtime_dependency 'activesupport', '>= 4'
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
-  spec.add_runtime_dependency 'flay'
   spec.add_runtime_dependency 'git_diff', '~> 0.4'
-  spec.add_runtime_dependency 'reek'
+
+  # Optional dependencies
+  spec.add_development_dependency 'brakeman'
+  spec.add_development_dependency 'flay'
+  spec.add_development_dependency 'reek'
 
   # General ruby development
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DangerWCC
-  VERSION = '0.1.1'
+  VERSION = '0.1.4'
 end

data/lib/wcc/util/yarn_info.rb

@@ -6,9 +6,23 @@ class Danger::DangerWCC::Util
       @yarn_lock ||= File.readlines(@options[:lockfile] || 'yarn.lock')
     end
 
-    def package_json_dependencies
+    def package_json_dependencies # rubocop:disable Metrics/AbcSize
       @package_json_dependencies ||=
-        JSON.parse(File.read('package.json'))['dependencies']&.keys || []
+        begin
+          root = JSON.parse(File.read('package.json'))
+          (root['dependencies']&.keys || []).tap do |deps|
+            workspaces = root['workspaces']
+            next unless workspaces && !workspaces.empty?
+
+            # Add in deps from all workspaces
+            workspaces.each do |ws|
+              Dir.glob(File.join(ws, 'package.json')).each do |package_file|
+                d = JSON.parse(File.read(package_file))['dependencies']&.keys
+                deps.concat(d || [])
+              end
+            end
+          end
+        end
     end
 
     def package_json_changes

data/lib/wcc/yarn_deduplicate.rb

@@ -48,15 +48,14 @@ class Danger::DangerWCC < Danger::Plugin
       warning = line.content.match(DEDUPE_REGEXP)
       return unless warning
 
-      pkg, semver, wanted, got = warning.captures
+      pkg, _semver, wanted, got = warning.captures
 
       idx = yarn_info.find_index_in_lockfile(
         pkg, got
       )
       msg = <<~HEREDOC
         You have an opportunity to deduplicate "#{pkg}".
-        It wants #{semver} and could unify with #{wanted}, but instead #{got}
-        was installed alongside it.
+        It's using #{got} but could use the existing version #{wanted}.
 
         You can fix this by running :
         `npx yarn-deduplicate -s fewer --packages "#{pkg}"`

data/spec/wcc/dependencies_spec.rb

@@ -22,6 +22,7 @@ module Danger
         .and_return(load_fixture('dependencies/yarn.lock').split("\n"))
       allow(File).to receive(:read).with('package.json')
         .and_return(load_fixture('dependencies/package.json'))
+      allow(Dir).to receive(:glob).and_return([])
     end
 
     describe 'yarn dependencies' do

data/spec/wcc/yarn_deduplicate_spec.rb

@@ -40,8 +40,8 @@ module Danger
         expect(warnings[0].message)
           .to include('You have an opportunity to deduplicate "@babel/core".')
         expect(warnings[0].message)
-          .to include('It wants >=7.1.0 and could unify with 7.12.10,'\
-            ' but instead 7.4.0')
+          .to include('It\'s using 7.4.0 but could use the existing version '\
+            '7.12.10.')
         expect(warnings[0].message)
           .to include('npx yarn-deduplicate -s fewer --packages "@babel/core"')
         expect(warnings[0].file).to eq('yarn.lock')

metadata

@@ -1,65 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: danger-wcc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Watermark Dev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: brakeman
+  name: danger-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: danger-plugin-api
+  name: git_diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: flay
+  name: brakeman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git_diff
+  name: flay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -276,6 +276,7 @@ files:
 - ".travis.yml"
 - Dangerfile
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -369,7 +370,7 @@ homepage: https://github.com/watermarkchurch/danger-wcc
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -384,9 +385,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.5.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A Danger plugin for Watermark Church custom rules.
 test_files: