bootinq 1.4.2 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bbde8bd5a9047488c41a60788b57c99ffba1de61217a0e5ac6613a856e5fc66
-  data.tar.gz: 6932d67aa5b2f484726331b5f1483352bc1f6bd535ea187dabe13d7e909630ae
+  metadata.gz: ab4d92e0581dec34e3b8c35ab842953fc6c488a7ff7a79aab4e155e0ec04b598
+  data.tar.gz: 8d1b03413cb95941d3c34fa33e5167ae717a1152fb824f9fc4ca4c95232e3374
 SHA512:
-  metadata.gz: 48c42edfe5b1a4475ad65b5cec66e6a5a124073b6aea9b6fceeea94cc76ce3ddac1786c30f4c0290cbe677e40a677e4ce4350e080867d3a8032fd36a0552d12e
-  data.tar.gz: 95db837f38266267c0fe733edcd91ad51694ff8c5a90c849e1f28335637a385cda2de1ea1c285e5a6e8f8bb5f00be2e121b5ef27bbfe9213a3ecf17e97454c22
+  metadata.gz: 957af1a041fb5230543b149ae7bb3fa14b455e0070232c60afe617c6dfce34712d3d9ea118aad38d2fd824ef253cb6af38a1e4a115d9f5862a2680ce4d2a48e2
+  data.tar.gz: 3dcecd28f93e44b34e7401fb6c4702754f57cac19706996a74fdbc306a9251d0fd7f8360afcd07470d37627461af4ecf1ea45e03f626b52543123d1991453d72

data/Gemfile

@@ -32,6 +32,14 @@ group :shared_boot do
   gem 'shared', path: 'spec/dummy/engines/shared'
 end
 
+group :api_part_boot do
+  gem 'api_part', path: 'spec/dummy/engines/api_part'
+end
+
 group :api_boot do
   gem 'api', path: 'spec/dummy/engines/api'
+end
+
+group :api2_boot do
+  gem 'api2', path: 'spec/dummy/engines/api2'
 end

data/README.md

@@ -148,7 +148,7 @@ require 'bootinq'
 
 # Bundler.require :default, ENV['RACK_ENV']
 Bootinq.require :default, ENV['RACK_ENV'], verbose: true
-
+```
 
 ## Development
 

data/lib/bootinq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Bootinq
-  VERSION = "1.4.2"
+  VERSION = "1.7"
 end

data/lib/bootinq.rb

@@ -37,7 +37,7 @@ require "bootinq/switch"
 # == Example <tt>config/bootinq.yml</tt>:
 #
 #     env_key: BOOTINQ
-#     default: "-f"
+#     default: a
 #
 #     parts:
 #       s: :shared
@@ -45,6 +45,11 @@ require "bootinq/switch"
 #     mount:
 #       a: :api
 #       f: :engine
+#
+#     deps:
+#       shared:
+#         in: af
+#
 class Bootinq
   include Singleton
 
@@ -52,18 +57,24 @@ class Bootinq
     "env_key" => 'BOOTINQ',
     "default" => '',
     "parts"   => {},
-    "mount"   => {}
+    "mount"   => {},
+    "deps"    => {}
   }.freeze
 
-  class << self
-    protected def delegated(sym) # :no-doc:
-      location = caller_locations(1, 1).first
-      file, line = location.path, location.lineno
-      definiton = %(def self.#{sym}(*args, &block); instance.#{sym}(*args, &block); end)
-      class_eval definiton, file, line
+  ALL = %i[* all].freeze
+
+  FilterNegValue = -> (value, config) do
+    if value.start_with?(?-, ?^)
+      value = value.tr('\\-', '\\^')
+      flags = (config['parts'].keys + config['mount'].keys).join
+      [true, flags.delete(flags.delete(value))]
+    else
+      [false, value.dup]
     end
   end
 
+  private_constant :FilterNegValue
+
   # :call-seq:
   #   Bootinq.require(*groups, verbose: false, &block)
   #
@@ -99,27 +110,32 @@ class Bootinq
     instance.ready!
   end
 
+  # Reads config from the given or default path, deserializes it and returns as a hash.
+  def self.deserialized_config(path: nil)
+    bootinq_yaml = File.read(path || ENV.fetch('BOOTINQ_PATH'))
+    YAML.safe_load(bootinq_yaml, [Symbol])
+  end
+
   attr_reader :flags
   attr_reader :components
 
-  delegated :flags
-  delegated :components
-
   def initialize # :no-doc:
-    config_path = ENV.fetch('BOOTINQ_PATH')
-    config = YAML.safe_load(File.read(config_path), [Symbol])
+    config = self.class.deserialized_config
     config.merge!(DEFAULT) { |_, l, r| l.nil? ? r : l }
 
-    @_value     = ENV.fetch(config['env_key']) { config['default'] }
-    @_neg       = @_value.start_with?(?-, ?^)
+    @_orig_value = ENV.fetch(config['env_key']) { config['default'] }
+    @_neg, @_value = FilterNegValue[@_orig_value, config]
+
+    @_deps = config['deps']
+
     @flags      = []
     @components = []
 
-    config['parts'].each { |flag, name| enable_component(name, flag: flag) }
-    config['mount'].each { |flag, name| enable_component(name, flag: flag, as: Mountable) }
+    config['parts'].each { |flag, name| enable_component(name, flag: flag.to_s) }
+    config['mount'].each { |flag, name| enable_component(name, flag: flag.to_s, as: Mountable) }
   end
 
-  delegated def ready? # :no-doc:
+  def ready? # :no-doc:
     !!@ready
   end
 
@@ -128,7 +144,7 @@ class Bootinq
   #
   # At the first call marks Bootinq as ready and returns the instance,
   # otherwise returns nil.
-  delegated def ready!
+  def ready!
     return if ready?
     @ready = true
     if defined?(@_on_ready)
@@ -141,8 +157,8 @@ class Bootinq
   # :call-seq:
   #   Bootinq.enable_component(name, flag: [, as: Component])
   #
-  delegated def enable_component(name, flag:, as: Component)
-    if @_neg ^ @_value.include?(flag)
+  def enable_component(name, flag:, as: Component)
+    if is_dependency?(name) || @_value.include?(flag)
       @flags      << flag
       @components << as.new(name)
     end
@@ -153,8 +169,8 @@ class Bootinq
   #
   # Checks if a component with the given name (i.e. the same gem group)
   # is enabled
-  delegated def enabled?(name)
-    components.include?(name)
+  def enabled?(name)
+    ALL.include?(name) || components.include?(name)
   end
 
   # :call-seq:
@@ -162,12 +178,11 @@ class Bootinq
   #   Bootinq[name] -> Bootinq::Component
   #
   # Returns a <tt>Bootinq::Component</tt> object by its name
-  delegated def component(name)
+  def component(name)
     components[components.index(name)]
   end
 
   alias :[] :component
-  delegated :[]
 
   # :call-seq:
   #   Bootinq.each_mountable { |part| block } -> Array
@@ -177,7 +192,7 @@ class Bootinq
   # passing that part as a parameter. Returns the array of all mountable components.
   #
   # If no block is given, an Enumerator is returned.
-  delegated def each_mountable(&block) # :yields: part
+  def each_mountable(&block) # :yields: part
     components.select(&:mountable?).each(&block)
   end
 
@@ -187,7 +202,7 @@ class Bootinq
   # Merges enabled Bootinq's groups with the given groups and, if loaded with Rails,
   # passes them to <tt>Rails.groups</tt> method, otherwise just returns the merged list
   # to use with <tt>Bundler.require</tt>.
-  delegated def groups(*groups)
+  def groups(*groups)
     groups.unshift(*components.map(&:group))
     if defined?(Rails)
       Rails.groups(*groups)
@@ -219,7 +234,12 @@ class Bootinq
   #   Bootinq.on all: %i(frontend backend) do
   #     # do something when frontend and backend are enabled
   #   end
-  delegated def on(name = nil, any: nil, all: nil) # :yields:
+  def on(name = nil, any: nil, all: nil) # :yields:
+    if ALL.include?(name)
+      yield
+      return true
+    end
+
     if name.nil? && any.nil? && all.nil?
       raise ArgumentError, "wrong arguments (given 0, expected 1)"
     elsif (any && all) || (name && (any || all))
@@ -239,8 +259,8 @@ class Bootinq
   #
   # Takes a list of component names and yields a given block (optionally)
   # if all of them are enabled. Returns boolean matching status.
-  delegated def on_all(*parts) # :yields:
-    is_matched = parts.all? { |p| enabled?(p) }
+  def on_all(*parts) # :yields:
+    is_matched = parts.all? { |part| enabled?(part) }
     yield if is_matched && block_given?
     is_matched
   end
@@ -250,14 +270,14 @@ class Bootinq
   #
   # Takes a list of component names and yields a given block  (optionally)
   # if any of them are enabled. Returns boolean matching status.
-  delegated def on_any(*parts) # :yields:
-    is_matched = parts.any? { |p| enabled?(p) }
+  def on_any(*parts) # :yields:
+    is_matched = parts.any? { |part| enabled?(part) }
     yield if is_matched && block_given?
     is_matched
   end
 
   # :call-seq:
-  #   Bottinq.switch(*parts) { block } -> nil
+  #   Bootinq.switch(*parts) { block } -> nil
   #
   # Collector method.
   #
@@ -267,17 +287,44 @@ class Bootinq
   #     part.frontend { … }
   #     part.backend { … }
   #   end
-  delegated def switch # :yields: Bootinq::Switch.new
+  def switch # :yields: Bootinq::Switch.new
     yield(Switch.new)
     nil
   end
 
+  # :call-seq:
+  #   is_dependency?(part_name) -> true or false
+  #
+  # Checks if the named component is a dependency of the enabled one.
+  def is_dependency?(name)
+    @_deps.key?(name) && @_value.count(@_deps[name]['in'].to_s) > 0
+  end
+
   # Freezes every instance variables and the instance itself.
   def freeze
     @_value.freeze
-    @_neg.freeze
+    @_neg
     @flags.freeze
     @components.freeze
     super
   end
+
+  extend SingleForwardable
+
+  delegate %I[
+    component
+    components
+    each_mountable
+    enabled?
+    enable_component
+    flags
+    groups
+    on
+    on_all
+    on_any
+    ready!
+    ready?
+    switch
+    []
+  ] => :instance
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootinq
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: '1.7'
 platform: ruby
 authors:
 - Anton
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2022-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,7 @@ homepage: https://github.com/estum/bootinq
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Rails Boot Inquirer
 test_files: []