eac_ruby_utils 0.71.0 → 0.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac58b6068bc75fe11061fa1f801f9ad5968349e926091224a60b7f2e3ed035a
-  data.tar.gz: 61d5b30e7d2e3c78c396024793dcc1666b062471793914910c2a787c717fc160
+  metadata.gz: c880b9a4d8c7f5bdeaeb79714b93d4cb06a27b60284351ce0efebc6604314a7f
+  data.tar.gz: 8f6673a2c76689929d05c263130013c5ac3194da3dd79308e5547f26106ff4f4
 SHA512:
-  metadata.gz: eb8f48fff07497fb711ce0bff11268436073d191d94160c3f1c328a8330e55177b4697b4428bc3049ddf41ac9ebc13f8c3ebc4262898b17e7c2ce973d2a1bf30
-  data.tar.gz: 2f12ec4daab1375f8d7165edc804e486dde44783b830dbe9d3d5c432d805658430e6674f9f2c5660ed1a07c5d2e53b4105d5905be3c61cfe902d6d2a434cb254
+  metadata.gz: b18f437b042599390df09581bbd8458598d9e1ed9db610393f5dae710c91414acf4363eab6d60f04fcb4612b9b20ffe340c3d24b050f4ea93512037196cebe18
+  data.tar.gz: 78c592a8a35f720d2cf4a6a7e97c920fb21ab98d1d6e5b6496cdc3ee1c8d97585d2e63125ff81d58a84a582b6e99f5f4adc96d565749c8a40bded6ba046fd7a5

data/lib/eac_ruby_utils/gems_registry.rb

@@ -28,9 +28,8 @@ module EacRubyUtils
 
     # @return [Array<EacRubyUtils::GemsRegistry::Gem>]
     def all_gems
-      ::Gem::Specification.map do |gemspec|
-        ::EacRubyUtils::GemsRegistry::Gem.new(self, gemspec)
-      end
+      ::Gem::Specification.map { |gemspec| ::EacRubyUtils::GemsRegistry::Gem.new(self, gemspec) }
+                          .sort
     end
   end
 end

data/lib/eac_ruby_utils/gems_registry/gem.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/recursive_builder'
+require 'eac_ruby_utils/simple_cache'
 
 module EacRubyUtils
   class GemsRegistry
     class Gem
+      include ::Comparable
+      include ::EacRubyUtils::SimpleCache
+
       attr_reader :registry, :gemspec
 
       def initialize(registry, gemspec)
@@ -12,6 +17,23 @@ module EacRubyUtils
         @gemspec = gemspec
       end
 
+      def depend_on(gem)
+        dependencies.lazy.map(&:name).include?(gem.gemspec.name)
+      end
+
+      def dependencies
+        @dependencies ||= dependencies_uncached # dependencies_uncached
+      end
+
+      def <=>(other)
+        sd = depend_on(other)
+        od = other.depend_on(self)
+        return 1 if sd && !od
+        return -1 if od && !sd
+
+        gemspec.name <=> other.gemspec.name
+      end
+
       def found?
         lib_file_found? && registered_module.is_a?(::Module)
       end
@@ -34,6 +56,20 @@ module EacRubyUtils
       def path_to_require
         gemspec.name.gsub('-', '/') + '/' + registry.module_suffix.underscore
       end
+
+      private
+
+      def dependencies_uncached
+        ::EacRubyUtils::RecursiveBuilder
+          .new(gemspec) { |item| gem_item_dependencies(item) }
+          .result
+      end
+
+      def gem_item_dependencies(item)
+        ::Gem::Specification.find_by_name(item.name).dependencies
+      rescue ::Gem::MissingSpecError
+        []
+      end
     end
   end
 end

data/lib/eac_ruby_utils/recursive_builder.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/simple_cache'
+
+module EacRubyUtils
+  class RecursiveBuilder
+    include ::EacRubyUtils::SimpleCache
+
+    attr_reader :root, :neighbors_block
+
+    def initialize(root, &neighbors_block)
+      @root = root
+      @neighbors_block = neighbors_block
+    end
+
+    private
+
+    attr_reader :added, :to_check
+
+    def result_uncached
+      @added = []
+      @to_check = []
+      item_try_add_to_check(root)
+      while check_next_item
+        # Do nothing
+      end
+      added
+    end
+
+    def item_try_add_to_check(item)
+      to_check << item unless item_added?(item)
+    end
+
+    def item_added?(item)
+      added.include?(item) || to_check.include?(item)
+    end
+
+    def check_next_item
+      return false unless to_check.any?
+
+      item = to_check.shift
+      added << item
+      item_neighborhs(item).each { |sub_item| item_try_add_to_check(sub_item) }
+      true
+    end
+
+    def item_neighborhs(item)
+      neighbors_block.call(item)
+    end
+  end
+end

data/lib/eac_ruby_utils/rspec/default_setup.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/rspec/setup'
+require 'eac_ruby_utils/rspec/setup_manager'
 
 module EacRubyUtils
   module Rspec
     class << self
+      # @return [EacRubyUtils::Rspec::SetupManager]
       def default_setup
         @default_setup ||
           raise("Default instance was not set. Use #{self.class.name}.default_setup_create")
       end
 
+      # @return [EacRubyUtils::Rspec::SetupManager]
       def default_setup_create(app_root_path, rspec_config = nil)
-        @default_setup = ::EacRubyUtils::Rspec::Setup.create(app_root_path, rspec_config)
+        @default_setup = ::EacRubyUtils::Rspec::SetupManager.create(app_root_path, rspec_config)
       end
     end
   end

data/lib/eac_ruby_utils/rspec/setup.rb

@@ -1,45 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/gems_registry'
-require 'eac_ruby_utils/patches/object/if_respond'
-require 'eac_ruby_utils/patches/object/to_pathname'
+require 'eac_ruby_utils/core_ext'
 
 module EacRubyUtils
   module Rspec
-    class Setup
-      GEMS_REGISTRY_SUFFIX = 'Rspec::SetupInclude'
-
-      class << self
-        def create(app_root_path, rspec_config = nil)
-          if rspec_config
-            new(app_root_path, rspec_config)
-          else
-            ::RSpec.configure { |new_rspec_config| new(app_root_path, new_rspec_config) }
-          end
-        end
-      end
-
-      attr_reader :app_root_path, :rspec_config
-
-      def initialize(app_root_path, rspec_config)
-        @app_root_path = app_root_path.to_pathname
-        @rspec_config = rspec_config
-        include_registry
-      end
-
-      # @return [EacRubyUtils::GemsRegistry]
-      def gems_registry
-        @gems_registry ||= ::EacRubyUtils::GemsRegistry.new(GEMS_REGISTRY_SUFFIX)
-      end
-
-      protected
-
-      def include_registry
-        gems_registry.registered.each do |gem|
-          singleton_class.include(gem.registered_module)
-          gem.registered_module.setup(self) if gem.registered_module.respond_to?(:setup)
-        end
-      end
+    module Setup
+      extend ::ActiveSupport::Concern
+      require_sub __FILE__, include_modules: true
     end
   end
 end

data/lib/eac_ruby_utils/rspec/setup/conditionals.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Rspec
+    module Setup
+      module Conditionals
+        def conditional(tag, &condition)
+          message = condition.call
+          return if message.blank?
+
+          puts("[WARN] Excluded tag: #{tag}: #{message}")
+          rspec_config.filter_run_excluding tag
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/rspec/setup_manager.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/gems_registry'
+require 'eac_ruby_utils/patches/object/if_respond'
+require 'eac_ruby_utils/patches/object/to_pathname'
+
+module EacRubyUtils
+  module Rspec
+    class SetupManager
+      GEMS_REGISTRY_SUFFIX = 'Rspec::Setup'
+
+      class << self
+        def create(app_root_path, rspec_config = nil)
+          if rspec_config
+            new(app_root_path, rspec_config)
+          else
+            ::RSpec.configure { |new_rspec_config| new(app_root_path, new_rspec_config) }
+          end
+        end
+      end
+
+      attr_reader :app_root_path, :rspec_config
+
+      def initialize(app_root_path, rspec_config)
+        @app_root_path = app_root_path.to_pathname
+        @rspec_config = rspec_config
+        include_registry
+      end
+
+      # @return [EacRubyUtils::GemsRegistry]
+      def gems_registry
+        @gems_registry ||= ::EacRubyUtils::GemsRegistry.new(GEMS_REGISTRY_SUFFIX)
+      end
+
+      protected
+
+      def include_registry
+        gems_registry.registered.each do |gem|
+          include_gem_registered(gem.registered_module)
+        end
+      end
+
+      # @param gem [EacRubyUtils::GemsRegistry::Gem]
+      def include_gem_registered(registered_module)
+        extend(registered_module)
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.71.0'
+  VERSION = '0.74.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.71.0
+  version: 0.74.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -73,6 +73,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 description: 
 email: 
 executables: []
@@ -196,13 +202,14 @@ files:
 - lib/eac_ruby_utils/patches/string/inflector.rb
 - lib/eac_ruby_utils/patches/time.rb
 - lib/eac_ruby_utils/patches/time/required_zone.rb
+- lib/eac_ruby_utils/recursive_builder.rb
 - lib/eac_ruby_utils/regexp_parser.rb
 - lib/eac_ruby_utils/require_sub.rb
 - lib/eac_ruby_utils/rspec.rb
-- lib/eac_ruby_utils/rspec/conditional.rb
 - lib/eac_ruby_utils/rspec/default_setup.rb
 - lib/eac_ruby_utils/rspec/setup.rb
-- lib/eac_ruby_utils/rspec/stubbed_ssh.rb
+- lib/eac_ruby_utils/rspec/setup/conditionals.rb
+- lib/eac_ruby_utils/rspec/setup_manager.rb
 - lib/eac_ruby_utils/ruby.rb
 - lib/eac_ruby_utils/ruby/command.rb
 - lib/eac_ruby_utils/ruby/on_clean_environment.rb

data/lib/eac_ruby_utils/rspec/conditional.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/object/blank'
-
-module EacRubyUtils
-  module Rspec
-    class Conditional
-      def self.default
-        @default ||= new
-      end
-
-      def initialize
-        @tags = {}
-      end
-
-      def add(tag, &condition)
-        tags[tag] = condition
-      end
-
-      def configure(rspec_config)
-        tags.each do |tag, condition|
-          message = condition.call
-          if message.present?
-            puts("[WARN] Excluded tag: #{tag}: #{message}")
-            rspec_config.filter_run_excluding tag
-          end
-        end
-      end
-
-      private
-
-      attr_reader :tags
-    end
-  end
-end

data/lib/eac_ruby_utils/rspec/stubbed_ssh.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/object/blank'
-require 'eac_ruby_utils/envs/ssh_env'
-require 'eac_ruby_utils/patches/object/if_present'
-
-module EacRubyUtils
-  module Rspec
-    class StubbedSsh
-      DEFAULT_ENVVAR_NAME = 'STUBBED_SSH_URL'
-
-      class << self
-        def default
-          @default ||= new(DEFAULT_ENVVAR_NAME)
-        end
-      end
-
-      attr_reader :envvar_name
-
-      def initialize(envvar_name)
-        @envvar_name = envvar_name
-      end
-
-      def validate
-        return nil if provided_url.present?
-
-        "Environment variable \"#{envvar_name}\" unprovided or blank"
-      end
-
-      def validate!
-        validate.if_present { |v| raise v }
-      end
-
-      def provided_url
-        ENV[envvar_name]
-      end
-
-      def build_env
-        validate!
-        ::EacRubyUtils::Envs::SshEnv.new(provided_url)
-      end
-    end
-  end
-end