bootinq 1.3.0 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02d532d3f79f581c02a9cf22de365c865a5fc455460ff5559d9f32893fc72daa
-  data.tar.gz: 274bbc9139607038551bd75d73104301a6d14a561dfe8a736d33c50fc91f473b
+  metadata.gz: f1e1d6c92b8790ff798d3ac3af73aa4d1ba51d65e5d30a710e71b109dff4a1d2
+  data.tar.gz: ff41e0be38f693a836592446d3a8600613497595228075a325bfa3cd06a36585
 SHA512:
-  metadata.gz: 424dd6941e25ad8b8b5a5497bf5ff5853bf66255774677e2831ca4972756b87956eb93ed55d3fcb87285ad2fc51c24279073c579fcea93a2ce36fa3689105d3d
-  data.tar.gz: 8b807c29dffd4a66ee89ce6b3790560fe0cf3aa69ee1ef1544ed87a5e32f3204077b981df613d05c22530952506a35fa275b86669965610760c025c13484785d
+  metadata.gz: f6d003846a5991fef4e37aaf9ab72c03878eaaecb98b0b347b8ac537f4d583a880b578bda284ec1d1539396b3a822a0d72511cf349d54cb6638892052768a563
+  data.tar.gz: 28a35e3389f226c94126dc11adcecbdde73cb6b8b9b02876ffb987cddaec8f0d32274e3831d61ba163c64bde0eebe00c505bb0b24c7aa3032e445e840fb350dd

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/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,9 +57,22 @@ class Bootinq
     "env_key" => 'BOOTINQ',
     "default" => '',
     "parts"   => {},
-    "mount"   => {}
+    "mount"   => {},
+    "deps"    => {}
   }.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
+
   class << self
     protected def delegated(sym) # :no-doc:
       location = caller_locations(1, 1).first
@@ -67,28 +85,36 @@ class Bootinq
   # :call-seq:
   #   Bootinq.require(*groups, verbose: false, &block)
   #
-  # The helper method to bootstrap the Bootinq.
-  # Sets the BOOTINQ_PATH enviroment variable if it is missing,
-  # invokes the <tt>Bootinq.setup</tt> method with the given verbose key argument & block,
-  # and, finally, gets Bundler to require the given groups.
+  # Invokes the <tt>Bootinq.init</tt> method with the given verbose key argument & block,
+  # and, finally, makes Bundler to require the given groups.
   def self.require(*groups, verbose: false, &block) # :yields: Bootinq.instance
-    ENV['BOOTINQ_PATH'] ||= File.expand_path('../bootinq.yml', caller_locations(1..1)[0].path)
-
-    setup(verbose: verbose, &block)
-
+    init(verbose: verbose, &block)
     Bundler.require(*instance.groups(*groups))
   end
 
   # :call-seq:
-  #   Bootinq.setup(verbose: false, &block) -> true or false
+  #   Bootinq.setup(*groups, verbose: false, &block)
+  #
+  # Invokes the <tt>Bootinq.init</tt> method with the given verbose key argument & block,
+  # and, finally, makes Bundler to setup the given groups.
+  def self.setup(*groups, verbose: false, &block) # :yields: Bootinq.instance
+    init(verbose: verbose, &block)
+    Bundler.setup(*instance.groups(*groups))
+  end
+
+  # :call-seq:
+  #   Bootinq.init(verbose: false, &block) -> true or false
   #
-  # Initializes itself. To track inquired components use <tt>verbose: true</tt> key argument.
+  # Initializes itself. Sets the BOOTINQ_PATH enviroment variable if it is missing.
+  # To track inquired components use <tt>verbose: true</tt> key argument.
   # Optionally yields block within the own instance's binding.
-  def self.setup(verbose: false, &block) # :yields: Bootinq.instance
+  def self.init(verbose: false, &block) # :yields: Bootinq.instance
+    ENV['BOOTINQ_PATH'] ||= File.expand_path('../bootinq.yml', caller_locations(2, 1)[0].path)
+
     instance
+    instance.instance_variable_set(:@_on_ready, block.to_proc) if block_given?
     puts "Bootinq: loading components #{instance.components.join(', ')}" if verbose
-    instance.instance_exec(&block) if block_given?
-    instance
+    instance.ready!
   end
 
   attr_reader :flags
@@ -102,21 +128,42 @@ class Bootinq
     config = YAML.safe_load(File.read(config_path), [Symbol])
     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 = []
-    @switch     = Switch.new(*@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:
+    !!@ready
+  end
+
+  # :call-seq:
+  #   Bootinq.ready! -> nil or self
+  #
+  # At the first call marks Bootinq as ready and returns the instance,
+  # otherwise returns nil.
+  delegated def ready!
+    return if ready?
+    @ready = true
+    if defined?(@_on_ready)
+      instance_exec(&@_on_ready)
+      remove_instance_variable :@_on_ready
+    end
+    freeze
   end
 
   # :call-seq:
   #   Bootinq.enable_component(name, flag: [, as: Component])
   #
   delegated def enable_component(name, flag:, as: Component)
-    if @_neg ^ @_value.include?(flag)
+    if is_dependency?(name) || @_value.include?(flag)
       @flags      << flag
       @components << as.new(name)
     end
@@ -231,7 +278,7 @@ class Bootinq
   end
 
   # :call-seq:
-  #   Bottinq.switch(*parts) { block } -> nil
+  #   Bootinq.switch(*parts) { block } -> nil
   #
   # Collector method.
   #
@@ -242,22 +289,24 @@ class Bootinq
   #     part.backend { … }
   #   end
   delegated def switch # :yields: Bootinq::Switch.new
-    yield(@switch)
+    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
-
-  def self.new
-    super.freeze
-  end
-
-  private_class_method :new
 end

data/lib/bootinq/switch.rb

@@ -5,32 +5,16 @@ class Bootinq
     undef_method :==
     undef_method :equal?
 
-    module YieldMixin
-      def yield_block
-        yield
-      end
-    end
-
-    private_constant :YieldMixin
-
-    def self.new(*names)
-      switch = super()
-      mixin = ::Module.new
-      mixin.include(YieldMixin)
-      names.each { |name| mixin.alias_method name, :yield_block }
-      mixin.send(:private, :yield_block)
-      mixin.send(:extend_object, switch)
-      switch
-    ensure
-      mixin = nil
-    end
-
     def raise(*args) # :no-doc:
       ::Object.send(:raise, *args)
     end
 
-    def method_missing(*)
-      nil
+    def method_missing(name, *)
+      if ::Bootinq.enabled?(name)
+        yield()
+      else
+        nil
+      end
     end
   end
 end

data/lib/bootinq/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootinq
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: '1.5'
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler