mutant 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88d8955c5d10cb6d884c519e2e9472affa627ab71377f73bd0746f8e27aea1d5
-  data.tar.gz: e4d07470181a24861d61e5f90a107fdcdc6da4f959392bf25c8bf6c8ce1e3628
+  metadata.gz: 5194ccc2d7c83d425c53dc7339242277010dcac6715248380417f936d88f7eda
+  data.tar.gz: ba35d0efea5be46b335947acd7452d72df6917deba2e6ccad96d8e0b60bdb2e4
 SHA512:
-  metadata.gz: 6906c7b02d2979d2f666735266a1c7220d75b6af35457ff54b021b3cf5306c1c4b94688eacfb685c46ee554353f91d6a78f6ac999e7535981f162e4b9d312a65
-  data.tar.gz: '059b7da0f47093ec1a7416fd1c3492f3eb01ccd3741796ff4f97ddbf597d2fd37c102c2bacfd5268204115efb6fc428088225d18785e22febfb49ba0d625710c'
+  metadata.gz: a63b99d244b957e3b3664243ed8a37704b2bdc596be0020de7f5665351958d941ec1be81584af798f7c0b63011d5cd689b4d3b77686469d869670592bffdecf4
+  data.tar.gz: 76c702695a6e04f874a73952fb153065bb0f76ebd098b50b6bb6e7b670568ca842aa78b70c71abb8728248eacf0e28ef123c02eab4c443d4a896fe3939ff453b

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.9.4 2020-01-03
+
+* Bump unparser dependency
+
 # v0.9.3 2020-01-03
 
 * Change to soft dependency on mutant-license.

data/Gemfile.lock

@@ -37,7 +37,7 @@ GIT
 PATH
   remote: .
   specs:
-    mutant (0.9.3)
+    mutant (0.9.4)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       anima (~> 0.3.1)
@@ -47,9 +47,10 @@ PATH
       equalizer (~> 0.0.9)
       ice_nine (~> 0.11.1)
       memoizable (~> 0.4.2)
+      mprelude (~> 0.1.0)
       parser (~> 2.6.5)
       procto (~> 0.0.2)
-      unparser (~> 0.4.5)
+      unparser (~> 0.4.6)
 
 GEM
   remote: https://rubygems.org/
@@ -96,6 +97,13 @@ GEM
     kwalify (0.7.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
+    mprelude (0.1.0)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.1)
+      procto (~> 0.0.2)
     mutant-license (0.1.0)
     parallel (1.19.1)
     parser (2.6.5.0)

data/lib/mutant.rb

@@ -10,6 +10,7 @@ require 'digest/sha1'
 require 'equalizer'
 require 'etc'
 require 'ice_nine'
+require 'mprelude'
 require 'json'
 require 'open3'
 require 'optparse'
@@ -30,13 +31,14 @@ Thread.abort_on_exception = true
 #
 # @api private
 module Mutant
+  Either = MPrelude::Either
+
   EMPTY_STRING   = ''
   EMPTY_ARRAY    = [].freeze
   EMPTY_HASH     = {}.freeze
   SCOPE_OPERATOR = '::'
 end # Mutant
 
-require 'mutant/base'
 require 'mutant/bootstrap'
 require 'mutant/version'
 require 'mutant/env'

data/lib/mutant/cli.rb

@@ -36,10 +36,10 @@ module Mutant
     def self.run(world, default_config, arguments)
       License
         .apply(world)
-        .apply { Config.load_config_file(world, default_config) }
-        .apply { |file_config| apply(world, file_config, arguments) }
-        .apply { |cli_config| Bootstrap.apply(world, cli_config) }
-        .apply(&Runner.method(:apply))
+        .bind { Config.load_config_file(world, default_config) }
+        .bind { |file_config| apply(world, file_config, arguments) }
+        .bind { |cli_config| Bootstrap.apply(world, cli_config) }
+        .bind(&Runner.method(:apply))
         .from_right { |error| world.stderr.puts(error); return false }
         .success?
     end

data/lib/mutant/integration.rb

@@ -28,7 +28,7 @@ module Mutant
     # @return [Either<String, Integration>]
     def self.setup(env)
       attempt_require(env)
-        .apply { attempt_const_get(env) }
+        .bind { attempt_const_get(env) }
         .fmap { |klass| klass.new(env.config).setup }
     end
 

data/lib/mutant/license.rb

@@ -23,7 +23,7 @@ module Mutant
       load_mutant_license(world)
         .fmap { license_path(world) }
         .fmap { |path| Subscription.from_json(world.json.load(path)) }
-        .apply { |sub| sub.apply(world) }
+        .bind { |sub| sub.apply(world) }
     end
     private_class_method :license_result
 

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

@@ -53,7 +53,7 @@ module Mutant
           world
             .capture_stdout(%w[git remote --verbose])
             .fmap(&method(:parse_remotes))
-            .apply(&method(:check_subscription))
+            .bind(&method(:check_subscription))
         end
 
       private

data/lib/mutant/transform.rb

@@ -263,7 +263,7 @@ module Mutant
         PRIMITIVE
           .apply(input)
           .lmap(&method(:lift_error))
-          .apply(&method(:run))
+          .bind(&method(:run))
       end
 
     private
@@ -351,8 +351,8 @@ module Mutant
         PRIMITIVE
           .apply(input)
           .lmap(&method(:lift_error))
-          .apply(&method(:reject_keys))
-          .apply(&method(:transform))
+          .bind(&method(:reject_keys))
+          .bind(&method(:transform))
       end
 
     private
@@ -363,7 +363,7 @@ module Mutant
       #
       # @return [Either<Error, Hash>]
       def transform(input)
-        transform_required(input).apply do |required|
+        transform_required(input).bind do |required|
           transform_optional(input).fmap(&required.method(:merge))
         end
       end
@@ -503,7 +503,8 @@ module Mutant
       #
       # @return [Either<Error, Object>]
       def apply(input)
-        Either.wrap_error(error_class) { block.call(input) }
+        Either
+          .wrap_error(error_class) { block.call(input) }
           .lmap { |exception| error(input: input, message: exception.to_s) }
       end
     end # Exception

data/lib/mutant/version.rb

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

data/mutant.gemspec

@@ -21,18 +21,19 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = %w[LICENSE]
   gem.executables      = %w[mutant]
 
-  gem.add_runtime_dependency('abstract_type',  '~> 0.0.7')
-  gem.add_runtime_dependency('adamantium',     '~> 0.2.0')
-  gem.add_runtime_dependency('anima',          '~> 0.3.1')
-  gem.add_runtime_dependency('ast',            '~> 2.2')
-  gem.add_runtime_dependency('concord',        '~> 0.1.5')
-  gem.add_runtime_dependency('diff-lcs',       '~> 1.3')
-  gem.add_runtime_dependency('equalizer',      '~> 0.0.9')
-  gem.add_runtime_dependency('ice_nine',       '~> 0.11.1')
-  gem.add_runtime_dependency('memoizable',     '~> 0.4.2')
-  gem.add_runtime_dependency('parser',         '~> 2.6.5')
-  gem.add_runtime_dependency('procto',         '~> 0.0.2')
-  gem.add_runtime_dependency('unparser',       '~> 0.4.5')
+  gem.add_runtime_dependency('abstract_type', '~> 0.0.7')
+  gem.add_runtime_dependency('adamantium',    '~> 0.2.0')
+  gem.add_runtime_dependency('anima',         '~> 0.3.1')
+  gem.add_runtime_dependency('ast',           '~> 2.2')
+  gem.add_runtime_dependency('concord',       '~> 0.1.5')
+  gem.add_runtime_dependency('diff-lcs',      '~> 1.3')
+  gem.add_runtime_dependency('equalizer',     '~> 0.0.9')
+  gem.add_runtime_dependency('ice_nine',      '~> 0.11.1')
+  gem.add_runtime_dependency('memoizable',    '~> 0.4.2')
+  gem.add_runtime_dependency('mprelude',      '~> 0.1.0')
+  gem.add_runtime_dependency('parser',        '~> 2.6.5')
+  gem.add_runtime_dependency('procto',        '~> 0.0.2')
+  gem.add_runtime_dependency('unparser',      '~> 0.4.6')
 
   gem.add_development_dependency('devtools', '~> 0.1.23')
   gem.add_development_dependency('parallel', '~> 1.3')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Markus Schirp
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: mprelude
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: devtools
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +266,6 @@ files:
 - lib/mutant/ast/nodes.rb
 - lib/mutant/ast/sexp.rb
 - lib/mutant/ast/types.rb
-- lib/mutant/base.rb
 - lib/mutant/bootstrap.rb
 - lib/mutant/cli.rb
 - lib/mutant/color.rb
@@ -499,7 +512,6 @@ files:
 - spec/unit/mutant/config_spec.rb
 - spec/unit/mutant/context_spec.rb
 - spec/unit/mutant/diff_spec.rb
-- spec/unit/mutant/either_spec.rb
 - spec/unit/mutant/env_spec.rb
 - spec/unit/mutant/expression/method_spec.rb
 - spec/unit/mutant/expression/methods_spec.rb
@@ -527,7 +539,6 @@ files:
 - spec/unit/mutant/matcher/scope_spec.rb
 - spec/unit/mutant/matcher/static_spec.rb
 - spec/unit/mutant/matcher_spec.rb
-- spec/unit/mutant/maybe_spec.rb
 - spec/unit/mutant/meta/example/dsl_spec.rb
 - spec/unit/mutant/meta/example/verification_spec.rb
 - spec/unit/mutant/meta/example_spec.rb
@@ -613,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ''
@@ -637,7 +648,6 @@ test_files:
 - spec/unit/mutant/config_spec.rb
 - spec/unit/mutant/context_spec.rb
 - spec/unit/mutant/diff_spec.rb
-- spec/unit/mutant/either_spec.rb
 - spec/unit/mutant/env_spec.rb
 - spec/unit/mutant/expression/method_spec.rb
 - spec/unit/mutant/expression/methods_spec.rb
@@ -665,7 +675,6 @@ test_files:
 - spec/unit/mutant/matcher/scope_spec.rb
 - spec/unit/mutant/matcher/static_spec.rb
 - spec/unit/mutant/matcher_spec.rb
-- spec/unit/mutant/maybe_spec.rb
 - spec/unit/mutant/meta/example/dsl_spec.rb
 - spec/unit/mutant/meta/example/verification_spec.rb
 - spec/unit/mutant/meta/example_spec.rb

data/lib/mutant/base.rb

@@ -1,192 +0,0 @@
-# frozen_string_literal: true
-
-module Mutant
-  module Functor
-    include AbstractType
-
-    abstract_method :fmap
-
-  private
-
-    # Raise error unless block is provided
-    #
-    # @raise [MissingBlockError]
-    #   if no block is given
-    #
-    # @return [self]
-    def require_block
-      fail LocalJumpError unless block_given?
-      self
-    end
-  end # Functor
-
-  class Maybe
-    include(
-      AbstractType,
-      Adamantium::Flat,
-      Functor
-    )
-
-    class Nothing < self
-      instance = new
-
-      define_method(:new) { instance }
-
-      # Evaluate functor block
-      #
-      # @return [Maybe::Nothing]
-      def fmap(&block)
-        require_block(&block)
-      end
-
-      # Evaluate applicative block
-      #
-      # @return [Maybe::Nothing]
-      def apply(&block)
-        require_block(&block)
-      end
-    end # Nothing
-
-    class Just < self
-      include Concord.new(:value)
-
-      # Evalute functor block
-      #
-      # @return [Maybe::Just<Object>]
-      def fmap
-        Just.new(yield(value))
-      end
-
-      # Evalute applicative block
-      #
-      # @return [Maybe]
-      def apply
-        yield(value)
-      end
-    end # Just
-  end # Maybe
-
-  class Either
-    include(
-      AbstractType,
-      Adamantium::Flat,
-      Concord.new(:value),
-      Functor
-    )
-
-    # Execute block and wrap error in left
-    #
-    # @param [Class:Exception] error
-    #
-    # @return [Either<Exception, Object>]
-    def self.wrap_error(error)
-      Right.new(yield)
-    rescue error => exception
-      Left.new(exception)
-    end
-
-    class Left < self
-      # Evaluate functor block
-      #
-      # @return [Either::Left<Object>]
-      def fmap(&block)
-        require_block(&block)
-      end
-
-      # Evaluate applicative block
-      #
-      # @return [Either::Left<Object>]
-      def apply(&block)
-        require_block(&block)
-      end
-
-      # Unwrap value from left
-      #
-      # @return [Object]
-      def from_left
-        value
-      end
-
-      # Unwrap value from right
-      #
-      # @return [Object]
-      #
-      # rubocop:disable Style/GuardClause
-      def from_right
-        if block_given?
-          yield(value)
-        else
-          fail "Expected right value, got #{inspect}"
-        end
-      end
-      # rubocop:enable Style/GuardClause
-
-      # Map over left value
-      #
-      # @return [Either::Right<Object>]
-      def lmap
-        Left.new(yield(value))
-      end
-
-      # Evaluate left side of branch
-      #
-      # @param [#call] left
-      # @param [#call] _right
-      def either(left, _right)
-        left.call(value)
-      end
-    end # Left
-
-    class Right < self
-      # Evaluate functor block
-      #
-      # @return [Either::Right<Object>]
-      def fmap
-        Right.new(yield(value))
-      end
-
-      # Evaluate applicative block
-      #
-      # @return [Either<Object>]
-      def apply
-        yield(value)
-      end
-
-      # Unwrap value from left
-      #
-      # @return [Object]
-      #
-      # rubocop:disable Style/GuardClause
-      def from_left
-        if block_given?
-          yield(value)
-        else
-          fail "Expected left value, got #{inspect}"
-        end
-      end
-      # rubocop:enable Style/GuardClause
-
-      # Unwrap value from right
-      #
-      # @return [Object]
-      def from_right
-        value
-      end
-
-      # Map over left value
-      #
-      # @return [Either::Right<Object>]
-      def lmap(&block)
-        require_block(&block)
-      end
-
-      # Evaluate right side of branch
-      #
-      # @param [#call] _left
-      # @param [#call] right
-      def either(_left, right)
-        right.call(value)
-      end
-    end # Right
-  end # Either
-end # Mutant

data/spec/unit/mutant/either_spec.rb

@@ -1,247 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Mutant::Either do
-  describe '.wrap_error' do
-    def apply
-      described_class.wrap_error(error, &block)
-    end
-
-    let(:error) { TestError }
-
-    class TestError < RuntimeError; end
-
-    context 'when block returns' do
-      let(:value) { instance_double(Object, 'value') }
-      let(:block) { -> { value }                     }
-
-      it 'returns right wrapping block value' do
-        expect(apply).to eql(described_class::Right.new(value))
-      end
-    end
-
-    context 'when block raises' do
-      let(:exception) { error.new             }
-      let(:block)     { -> { fail exception } }
-
-      context 'with covered exception' do
-        it 'returns left wrapping exception' do
-          expect(apply).to eql(described_class::Left.new(exception))
-        end
-      end
-
-      context 'with uncovered exception' do
-        let(:exception) { StandardError.new }
-
-        it 'returns raises error' do
-          expect { apply }.to raise_error(StandardError)
-        end
-      end
-    end
-  end
-end
-
-RSpec.describe Mutant::Either::Left do
-  subject { described_class.new(value) }
-
-  let(:block_result) { instance_double(Object, 'block result') }
-  let(:value)        { instance_double(Object, 'value')        }
-  let(:yields)       { []                                      }
-
-  let(:block) do
-    lambda do |value|
-      yields << value
-      block_result
-    end
-  end
-
-  class TestError < RuntimeError; end
-
-  describe '#fmap' do
-    def apply
-      subject.fmap(&block)
-    end
-
-    include_examples 'no block evaluation'
-    include_examples 'requires block'
-    include_examples 'returns self'
-  end
-
-  describe '#apply' do
-    def apply
-      subject.apply(&block)
-    end
-
-    include_examples 'no block evaluation'
-    include_examples 'requires block'
-    include_examples 'returns self'
-  end
-
-  describe '#from_left' do
-    def apply
-      subject.from_left(&block)
-    end
-
-    it 'returns left value' do
-      expect(apply).to be(value)
-    end
-
-    include_examples 'no block evaluation'
-  end
-
-  describe '#from_right' do
-    def apply
-      subject.from_right(&block)
-    end
-
-    context 'without block' do
-      let(:block) { nil }
-
-      it 'raises RuntimeError error' do
-        expect { apply }.to raise_error(
-          RuntimeError,
-          "Expected right value, got #{subject.inspect}"
-        )
-      end
-    end
-
-    context 'with block' do
-      let(:yields)       { []                                      }
-      let(:block_return) { instance_double(Object, 'block-return') }
-
-      let(:block) do
-        lambda do |value|
-          yields << value
-          block_return
-        end
-      end
-
-      it 'calls block with left value' do
-        expect { apply }.to change(yields, :to_a).from([]).to([value])
-      end
-
-      it 'returns block value' do
-        expect(apply).to be(block_return)
-      end
-    end
-  end
-
-  describe '#lmap' do
-    def apply
-      subject.lmap(&block)
-    end
-
-    include_examples 'requires block'
-    include_examples 'Functor#fmap block evaluation'
-  end
-
-  describe '#either' do
-    def apply
-      subject.either(block, -> { fail })
-    end
-
-    include_examples '#apply block evaluation'
-  end
-end
-
-RSpec.describe Mutant::Either::Right do
-  subject { described_class.new(value) }
-
-  let(:block_result) { instance_double(Object, 'block result') }
-  let(:value)        { instance_double(Object, 'value')        }
-  let(:yields)       { []                                      }
-
-  let(:block) do
-    lambda do |value|
-      yields << value
-      block_result
-    end
-  end
-
-  describe '#fmap' do
-    def apply
-      subject.fmap(&block)
-    end
-
-    include_examples 'requires block'
-    include_examples 'Functor#fmap block evaluation'
-  end
-
-  describe '#apply' do
-    def apply
-      subject.apply(&block)
-    end
-
-    include_examples 'requires block'
-    include_examples '#apply block evaluation'
-  end
-
-  describe '#from_left' do
-    def apply
-      subject.from_left(&block)
-    end
-
-    context 'without block' do
-      let(:block) { nil }
-
-      it 'raises RuntimeError error' do
-        expect { apply }.to raise_error(
-          RuntimeError,
-          "Expected left value, got #{subject.inspect}"
-        )
-      end
-    end
-
-    context 'with block' do
-      let(:yields)       { []                                      }
-      let(:block_return) { instance_double(Object, 'block-return') }
-
-      let(:block) do
-        lambda do |value|
-          yields << value
-          block_return
-        end
-      end
-
-      it 'calls block with right value' do
-        expect { apply }.to change(yields, :to_a).from([]).to([value])
-      end
-
-      it 'returns block value' do
-        expect(apply).to be(block_return)
-      end
-    end
-  end
-
-  describe '#from_right' do
-    def apply
-      subject.from_right(&block)
-    end
-
-    it 'returns right value' do
-      expect(apply).to be(value)
-    end
-
-    include_examples 'no block evaluation'
-  end
-
-  describe '#lmap' do
-    def apply
-      subject.lmap(&block)
-    end
-
-    include_examples 'requires block'
-    include_examples 'no block evaluation'
-
-    it 'returns self' do
-      expect(apply).to be(subject)
-    end
-  end
-
-  describe '#either' do
-    def apply
-      subject.either(-> { fail }, block)
-    end
-
-    include_examples '#apply block evaluation'
-  end
-end

data/spec/unit/mutant/maybe_spec.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Mutant::Maybe::Nothing do
-  subject { described_class.new }
-
-  let(:block) { -> {} }
-
-  describe '#fmap' do
-    def apply
-      subject.fmap(&block)
-    end
-
-    include_examples 'no block evaluation'
-    include_examples 'requires block'
-    include_examples 'returns self'
-  end
-
-  describe '#apply' do
-    def apply
-      subject.apply(&block)
-    end
-
-    include_examples 'no block evaluation'
-    include_examples 'requires block'
-    include_examples 'returns self'
-  end
-end
-
-RSpec.describe Mutant::Maybe::Just do
-  subject { described_class.new(value) }
-
-  let(:block_result) { instance_double(Object, 'block result') }
-  let(:value)        { instance_double(Object, 'value')        }
-  let(:yields)       { []                                      }
-
-  let(:block) do
-    lambda do |value|
-      yields << value
-      block_result
-    end
-  end
-
-  describe '#fmap' do
-    def apply
-      subject.fmap(&block)
-    end
-
-    include_examples 'requires block'
-    include_examples 'Functor#fmap block evaluation'
-  end
-
-  describe '#apply' do
-    def apply
-      subject.apply(&block)
-    end
-
-    include_examples 'requires block'
-    include_examples '#apply block evaluation'
-  end
-end