eac_ruby_utils 0.70.0 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d2cf379e2415d60c830cd336cd7e7f10defe243a844de933dfd260aea4c6170
-  data.tar.gz: de772d11fa31b9506914471b46a2fcba0c92f1c8c3d4fb5f0bd1f3127273e2af
+  metadata.gz: 9dd426f30a3da5d190205148f10b7a061a2d0315367747689b01146793dbe858
+  data.tar.gz: '0961ecbdbd58b1652b0d9ec3e863128376837917989610a06a0df396cb8020b0'
 SHA512:
-  metadata.gz: 87b220b118861f20ab93b700bbda9e0fef1992021f2ea9a1f33774650522947e925173302a959b612f1f0a4ab877347605c491638dea2f55634ad093f936670b
-  data.tar.gz: 49a65d53ee272fe9089c4944b7b115177ceac7a282bdc66fc13ecc689a1925cadc04d6cb62457b13193ed995405640617e9c65ed06f83d2368cd0494b30de4b0
+  metadata.gz: 6703ac081a004a151fc22ee490432dad4763ec97c0e3a9c20f6920208d77cd5857cb04351b37e360fa3ba3ae9c34d60bc50872eb3e0b4e05dde269489cbfdf69
+  data.tar.gz: 16fc01e522829482ea82f5e7765c832f7ad861573a0c9df8ddcd6f3452237b91d1019d440a47d69e500bc7c7cdf55727dee0cb935525f91f08862e7070ba65b6

data/lib/eac_ruby_utils/envs/executable.rb

@@ -22,7 +22,7 @@ module EacRubyUtils
       def validate
         return nil if exist?
 
-        "Program \"#{name}\" not found in environment #{env}"
+        "Program \"#{::Shellwords.join(executable_args)}\" not found in environment #{env}"
       end
 
       def validate!
@@ -33,13 +33,25 @@ module EacRubyUtils
 
       def command(*command_args)
         validate!
-        env.command(name, *command_args)
+        env.command(*executable_args, *command_args)
+      end
+
+      def executable_args
+        executable_args_from_envvar || [name]
+      end
+
+      def executable_args_envvar
+        "#{name}_command".variableize.upcase
+      end
+
+      def executable_args_from_envvar
+        ENV[executable_args_envvar].if_present { |v| ::Shellwords.split(v) }
       end
 
       private
 
       def exist_uncached
-        env.command(name, *check_args).execute!
+        env.command(*executable_args, *check_args).execute!
         true
       rescue Errno::ENOENT
         false

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,52 @@
+# 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'
+      REGISTERED_MODULE_PERFORM_METHOD = :perform
+
+      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)
+        registered_module.send(REGISTERED_MODULE_PERFORM_METHOD, self) if
+          registered_module.respond_to?(REGISTERED_MODULE_PERFORM_METHOD)
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 0.73.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-08-14 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