mutant 0.11.23 → 0.11.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa07ddf4b4373385631a41ea909149b416a97eaeaa51c0f259d846fbf5488c24
-  data.tar.gz: ef900eed75c28e9ad08e21e2ed026dd4184808125ed5338c36e421659c388ff1
+  metadata.gz: 582339f240c2c234a6130ff32d7c998318b9b82670321483d5b66351524acfb9
+  data.tar.gz: 1f027e4239fc3bb5b518e796249ab4ac9cf2902d938995adfbd276af2fb69951
 SHA512:
-  metadata.gz: e5a6f9a778791413e93f0b9d427d3636e4cbfba89581f1b196a03fa2bd528935550405da4a02e281a72476fac6dbd8a5a11ad101e484989051de36305fea3a63
-  data.tar.gz: 256ba65540c021c9855248dfe4aeff4a230e2cd4119119b4e46ff5f82c1c1eac540d8a4e2f9b1345be9f2b81d171ecfbae5a11ae03d1139643522dd190c0e77c
+  metadata.gz: 823420ff1abcf0b8ac2e8c79012962a355f85324195cefc4d1daf9a60537f5773d2d125ec76881462b6f59d61081a2875c9f5c168ede8cbab190f7cc45a9a665
+  data.tar.gz: 1ebafd946b6b3404835653a3a024e655b9961d418247201ba14080fb772df20cab6295609acaee00d41bd9820f8fdb492b8b0606791435be395f863588cde104

data/lib/mutant/ast/structure.rb

@@ -391,6 +391,16 @@ module Mutant
           fixed:    EMPTY_ARRAY,
           variable: nil
         ),
+        Node.new(
+          type:     :forwarded_kwrestarg,
+          fixed:    EMPTY_ARRAY,
+          variable: nil
+        ),
+        Node.new(
+          type:     :forwarded_restarg,
+          fixed:    EMPTY_ARRAY,
+          variable: nil
+        ),
         Node.new(
           type:     :for,
           fixed:    Node.fixed(

data/lib/mutant/license/subscription/commercial.rb

@@ -4,50 +4,84 @@ module Mutant
   module License
     class Subscription
       class Commercial < self
-        class Author
-          include Anima.new(:email)
-
-          alias_method :to_s, :email
-          public :to_s
-        end
+        include AbstractType
 
         def self.from_json(value)
-          new(licensed: value.fetch('authors').to_set { |email| Author.new(email: email) })
+          {
+            'individual'   => Individual,
+            'organization' => Organization
+          }.fetch(value.fetch('type', 'individual')).from_json(value)
         end
 
-        def call(world)
-          candidates = candidates(world)
+        class Organization < self
+          SUBSCRIPTION_NAME = 'commercial organization'
 
-          if (licensed & candidates).any?
-            success
-          else
-            failure(licensed, candidates)
+          def self.from_json(value)
+            new(licensed: value.fetch('repositories').map(&Repository.public_method(:parse)).to_set)
           end
-        end
 
-      private
+          def call(world)
+            Repository.load_from_git(world).bind(&method(:check_subscription))
+          end
 
-        def candidates(world)
-          git_author(world).merge(commit_author(world))
-        end
+        private
 
-        def git_author(world)
-          capture(world, %w[git config --get user.email])
+          def check_subscription(actual)
+            if licensed.any? { |repository| actual.any? { |other| repository.allow?(other) } }
+              success
+            else
+              failure(licensed, actual)
+            end
+          end
         end
 
-        def commit_author(world)
-          capture(world, %w[git show --quiet --pretty=format:%ae])
-        end
+        class Individual < self
+          SUBSCRIPTION_NAME = 'commercial individual'
 
-        def capture(world, command)
-          world
-            .capture_stdout(command)
-            .fmap(&:chomp)
-            .fmap { |email| Author.new(email: email) }
-            .fmap { |value| Set.new([value]) }
-            .from_right { Set.new }
-        end
+          class Author
+            include Anima.new(:email)
+
+            alias_method :to_s, :email
+            public :to_s
+          end
+
+          def self.from_json(value)
+            new(licensed: value.fetch('authors').to_set { |email| Author.new(email: email) })
+          end
 
+          def call(world)
+            candidates = candidates(world)
+
+            if (licensed & candidates).any?
+              success
+            else
+              failure(licensed, candidates)
+            end
+          end
+
+        private
+
+          def candidates(world)
+            git_author(world).merge(commit_author(world))
+          end
+
+          def git_author(world)
+            capture(world, %w[git config --get user.email])
+          end
+
+          def commit_author(world)
+            capture(world, %w[git show --quiet --pretty=format:%ae])
+          end
+
+          def capture(world, command)
+            world
+              .capture_stdout(command)
+              .fmap(&:chomp)
+              .fmap { |email| Author.new(email: email) }
+              .fmap { |value| Set.new([value]) }
+              .from_right { Set.new }
+          end
+        end # Individual
       end # Commercial
     end # Subscription
   end # License

data/lib/mutant/license/subscription/opensource.rb

@@ -4,63 +4,14 @@ module Mutant
   module License
     class Subscription
       class Opensource < self
-        class Repository
-          include Anima.new(:host, :path)
-
-          REMOTE_REGEXP    = /\A[^\t]+\t(?<url>[^ ]+) \((?:fetch|push)\)\n\z/.freeze
-          GIT_SSH_REGEXP   = %r{\A[^@]+@(?<host>[^:/]+)[:/](?<path>.+?)(?:\.git)?\z}.freeze
-          GIT_HTTPS_REGEXP = %r{\Ahttps://(?<host>[^/]+)/(?<path>.+?)(?:\.git)?\z}.freeze
-
-          private_constant(*constants(false))
-
-          def to_s
-            [host, path].join('/')
-          end
-
-          def self.parse(input)
-            host, path = *input.split('/', 2).map(&:downcase)
-            new(host: host, path: path)
-          end
-
-          def self.parse_remote(input)
-            match = REMOTE_REGEXP.match(input) or
-              fail "Unmatched remote line: #{input.inspect}"
-
-            parse_url(match[:url])
-          end
-          private_class_method :parse_remote
-
-          def self.parse_url(input)
-            match = GIT_SSH_REGEXP.match(input) || GIT_HTTPS_REGEXP.match(input)
-
-            unless match
-              fail "Unmatched git remote URL: #{input.inspect}"
-            end
-
-            new(host: match[:host], path: match[:path].downcase)
-          end
-          private_class_method :parse_url
-
-          def allow?(other)
-            other.host.eql?(host) && path_match?(other.path)
-          end
-
-        private
-
-          def path_match?(other_path)
-            path.eql?(other_path) || (path.end_with?('/*') && other_path.start_with?(path[..-2]))
-          end
-        end # Opensource
+        SUBSCRIPTION_NAME = 'opensource repository'
 
         def self.from_json(value)
           new(licensed: value.fetch('repositories').map(&Repository.public_method(:parse)).to_set)
         end
 
         def call(world)
-          world
-            .capture_stdout(%w[git remote --verbose])
-            .fmap(&method(:parse_remotes))
-            .bind(&method(:check_subscription))
+          Repository.load_from_git(world).bind(&method(:check_subscription))
         end
 
       private
@@ -73,10 +24,6 @@ module Mutant
           end
         end
 
-        def parse_remotes(input)
-          input.lines.map(&Repository.method(:parse_remote)).to_set
-        end
-
       end # Opensource
     end # Subscription
   end # License

data/lib/mutant/license/subscription/repository.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Mutant
+  module License
+    class Subscription
+      class Repository
+        include Anima.new(:host, :path)
+
+        REMOTE_REGEXP    = /\A[^\t]+\t(?<url>[^ ]+) \((?:fetch|push)\)\n\z/.freeze
+        GIT_SSH_REGEXP   = %r{\A[^@]+@(?<host>[^:/]+)[:/](?<path>.+?)(?:\.git)?\z}.freeze
+        GIT_HTTPS_REGEXP = %r{\Ahttps://(?<host>[^/]+)/(?<path>.+?)(?:\.git)?\z}.freeze
+        WILDCARD         = '/*'
+        WILDCARD_RANGE   = (..-WILDCARD.length).freeze
+
+        private_constant(*constants(false))
+
+        def to_s
+          [host, path].join('/')
+        end
+
+        def self.load_from_git(world)
+          world
+            .capture_stdout(%w[git remote --verbose])
+            .fmap(&method(:parse_remotes))
+        end
+
+        def self.parse_remotes(input)
+          input.lines.map(&method(:parse_remote)).to_set
+        end
+        private_class_method :parse_remotes
+
+        def self.parse(input)
+          host, path = *input.split('/', 2).map(&:downcase)
+          new(host: host, path: path)
+        end
+
+        def self.parse_remote(input)
+          match = REMOTE_REGEXP.match(input) or
+            fail "Unmatched remote line: #{input.inspect}"
+
+          parse_url(match[:url])
+        end
+        private_class_method :parse_remote
+
+        def self.parse_url(input)
+          match = GIT_SSH_REGEXP.match(input) || GIT_HTTPS_REGEXP.match(input)
+
+          unless match
+            fail "Unmatched git remote URL: #{input.inspect}"
+          end
+
+          new(host: match[:host], path: match[:path].downcase)
+        end
+        private_class_method :parse_url
+
+        def allow?(other)
+          other.host.eql?(host) && path_match?(other.path)
+        end
+
+      private
+
+        def path_match?(other_path)
+          path.eql?(other_path) || wildcard_match?(path, other_path) || wildcard_match?(other_path, path)
+        end
+
+        def wildcard_match?(left, right)
+          left.end_with?(WILDCARD) && right.start_with?(left[WILDCARD_RANGE])
+        end
+      end # Repository
+    end # Subscription
+  end # License
+end # Mutant

data/lib/mutant/license/subscription.rb

@@ -54,7 +54,7 @@ module Mutant
       end
 
       def subscription_name
-        self.class.name.split('::').last.downcase
+        self.class::SUBSCRIPTION_NAME
       end
 
       def failure_message(expected, actual)

data/lib/mutant/mutator/regexp.rb

@@ -103,7 +103,7 @@ module Mutant
         end
 
         def emit_replacement
-          new_text = MAP[input.quantifier.text]
+          new_text = MAP[input.quantifier.text] or return
 
           emit(mk_dup.tap { |new| new.quantifier.text = new_text })
         end

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # Current mutant version
-  VERSION = '0.11.23'
+  VERSION = '0.11.25'
 end # Mutant

data/lib/mutant.rb

@@ -251,8 +251,9 @@ module Mutant
     require 'mutant/range'
     require 'mutant/license'
     require 'mutant/license/subscription'
-    require 'mutant/license/subscription/opensource'
     require 'mutant/license/subscription/commercial'
+    require 'mutant/license/subscription/opensource'
+    require 'mutant/license/subscription/repository'
     require 'mutant/segment'
     require 'mutant/segment/recorder'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.11.23
+  version: 0.11.25
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2023-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,7 @@ files:
 - lib/mutant/license/subscription.rb
 - lib/mutant/license/subscription/commercial.rb
 - lib/mutant/license/subscription/opensource.rb
+- lib/mutant/license/subscription/repository.rb
 - lib/mutant/loader.rb
 - lib/mutant/matcher.rb
 - lib/mutant/matcher/chain.rb