eac_rails_base0 0.57.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f213dfc10aec44404ae01fc154094fa40c97ec416a13031e868108c2bd8233
-  data.tar.gz: acb891c064862f4f8f23056c122c5549ed63e1cca1e58249f2dd901b99f75cc1
+  metadata.gz: f9e8af6cce472c953d6996e62b88a11b60e128634574ba80b18f8f3385d85c96
+  data.tar.gz: 872bc9bcf18bbb4a64a7a8688ed352b2cc2a5ead7781af09d20a171c38d241c9
 SHA512:
-  metadata.gz: 20f971988df3294600fbdf6af5a9338171373f2e756645b0e19f3e9fdcd98106584a1f035860333dd99734d2f62b51b4b51e7b3feba3751a3471c5a063d5525f
-  data.tar.gz: 56bfc744890711f33c22b9b66e7ad41ba644b7f3a35e0406b5a8afa666264deea1babf8d86724079d87a7b574ffffbaf7f858adc71845ccfb1b8756af9723296
+  metadata.gz: 7482260d62ed769c60db4fb4c36a1fa5864c3558136725f995b335341e60a959086c277e18b9fa67f8a964b86268a3fde6e55b5af0d1824e0834961a83d73ebf
+  data.tar.gz: 92e7b6afaf6a6931c6b07f86cf4d7636608a2fdb559466857bf01a2df946b35ec4224b460145ddce98ccc250b5cdd1effe100afc53521f9d456f1c719f14d20f

data/lib/eac_rails_base0/app_generator/templates/Gemfile

@@ -13,7 +13,6 @@ group :production do
 end
 
 # Gems locais
-require_relative 'lib/local_plugins'
-LocalPlugins.plugins.each do |p|
-  gem p.name, path: p.root
+Dir["#{__dir__}/{sub/gems,engines}/*/*.gemspec"].each do |file|
+  gem ::File.basename(::File.dirname(file)), path: ::File.dirname(file)
 end

data/lib/eac_rails_base0/paths.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+module EacRailsBase0
+  module Paths
+    class << self
+      # @return [Pathname]
+      def engines_subpath
+        ::Pathname.new('engines')
+      end
+
+      def sub_gems_subpath
+        ::Pathname.new('sub').join('gems')
+      end
+    end
+  end
+end

data/lib/eac_rails_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsBase0
-  VERSION = '0.57.0'
+  VERSION = '0.58.0'
 end

data/lib/eac_rails_base0/x_engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_rails_base0/paths'
 require 'find'
 require 'delegate'
 
@@ -11,7 +12,7 @@ module EacRailsBase0
       enable_simple_cache
 
       def local_root
-        ::Rails.root.join('engines')
+        ::Rails.root.join(::EacRailsBase0::Paths.engines_subpath)
       end
 
       private

data/lib/eac_rails_base0.rb

@@ -17,7 +17,6 @@ require 'rails-i18n'
 module EacRailsBase0
 end
 
-require_dependency 'eac_rails_base0/gems'
 require_dependency 'eac_rails_base0/app_base/ability_mapping'
 require_dependency 'eac_rails_base0/app_base/ability'
 require_dependency 'eac_rails_base0/patches/url_for_patch'

data/lib/tasks/eac_rails_base0.rake

@@ -9,12 +9,14 @@ namespace :eac_rails_base0 do
   end
 
   ::RSpec::Core::RakeTask.new(:rspec) do |t|
-    t.rspec_opts = "--pattern '**/spec/**/*_spec.rb'"
+    t.rspec_opts =
+      "--pattern '{spec,#{::EacRailsBase0::Paths.engines_subpath}/*/spec}/**/*_spec.rb'"
   end
   Rake::Task['eac_rails_base0:rspec'].enhance ['db:test:prepare']
 
   namespace :minitest do
-    { core: '', engines: 'engines/*/' }.each do |name, pattern_prefix|
+    { core: '', engines: "#{::EacRailsBase0::Paths.engines_subpath}/*/" }
+      .each do |name, pattern_prefix|
       ::Rake::TestTask.new(name => 'test:prepare') do |t|
         t.libs << 'test'
         t.pattern = "#{pattern_prefix}test/**/*_test.rb"
@@ -32,7 +34,7 @@ namespace :eac_rails_base0 do
 end
 
 Rake::Task['default'].clear
-task default: %w[eac_rails_base0:gems:test_all]
+task default: %w[eac_rails_base0:test]
 
 Rake::Task['test'].clear
 task test: %w[eac_rails_base0:minitest]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_base0
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -174,26 +174,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: eac_ruby_gems_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -609,7 +589,6 @@ files:
 - lib/eac_rails_base0/app_generator/templates/app/controllers/welcome_controller.rb
 - lib/eac_rails_base0/app_generator/templates/app/views/welcome/index.html.erb
 - lib/eac_rails_base0/app_generator/templates/bin/bundle
-- lib/eac_rails_base0/app_generator/templates/bin/bundle_all
 - lib/eac_rails_base0/app_generator/templates/bin/rails
 - lib/eac_rails_base0/app_generator/templates/bin/rake
 - lib/eac_rails_base0/app_generator/templates/bin/setup
@@ -623,11 +602,10 @@ files:
 - lib/eac_rails_base0/app_generator/templates/config/environments/test.rb
 - lib/eac_rails_base0/app_generator/templates/config/routes.rb
 - lib/eac_rails_base0/app_generator/templates/gitignore
-- lib/eac_rails_base0/app_generator/templates/lib/local_plugins.rb
 - lib/eac_rails_base0/engine.rb
-- lib/eac_rails_base0/gems.rb
 - lib/eac_rails_base0/patches/eac_rails_utils_links_helper_patch.rb
 - lib/eac_rails_base0/patches/url_for_patch.rb
+- lib/eac_rails_base0/paths.rb
 - lib/eac_rails_base0/rspec.rb
 - lib/eac_rails_base0/rspec/setup.rb
 - lib/eac_rails_base0/rspec/shared_contexts/when_user_is_admin.rb
@@ -648,7 +626,6 @@ files:
 - lib/generators/eac_rails_base0/testers/testers_generator.rb
 - lib/generators/eac_rails_base0_generator.rb
 - lib/tasks/eac_rails_base0.rake
-- lib/tasks/eac_rails_base0/gems.rake
 homepage: https://github.com/esquilo-azul/eac_rails_base0
 licenses:
 - MIT

data/lib/eac_rails_base0/app_generator/templates/bin/bundle_all

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require_relative '../lib/local_plugins'
-
-LocalPlugins.app_and_plugins.each do |p|
-  puts '----------------------------------------'
-  puts "Diretório: #{p.root}"
-  p.bundle_execute(ARGV)
-end

data/lib/eac_rails_base0/app_generator/templates/lib/local_plugins.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-class LocalPlugins
-  def self.rails_root
-    File.expand_path('..', __dir__)
-  end
-
-  def self.plugins_roots
-    [File.expand_path('vendor/gems', rails_root), File.expand_path('engines', rails_root)]
-  end
-
-  def self.plugins
-    r = []
-    plugins_roots.each do |root|
-      Dir.glob("#{root}/*/").each do |plugin_dir|
-        next unless File.directory?(plugin_dir)
-        next unless Dir.entries(plugin_dir).any? { |f| f.match(/\.gemspec/) }
-
-        r << LocalPlugin.new(plugin_dir)
-      end
-    end
-    r
-  end
-
-  def self.app
-    LocalPlugin.new(rails_root)
-  end
-
-  def self.app_and_plugins
-    plugins + [app]
-  end
-end
-
-class LocalPlugin
-  attr_reader :root
-
-  def initialize(root)
-    @root = root
-  end
-
-  def bundle
-    bin_bundle = File.expand_path('bin/bundle', root)
-    File.exist?(bin_bundle) ? 'bin/bundle' : 'bundle'
-  end
-
-  def subpath(path)
-    File.expand_path(path, root)
-  end
-
-  def name
-    app? ? 'APP' : File.basename(root)
-  end
-
-  def app?
-    root == LocalPlugins.rails_root
-  end
-
-  def bundle_execute(args)
-    Dir.chdir(root) { system(*([bundle] + args)) }
-  end
-end

data/lib/eac_rails_base0/gems.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_gems_utils/gem'
-
-module EacRailsBase0
-  module Gems
-    class << self
-      enable_simple_cache
-
-      def vendor_gems_root
-        ::Rails.root.join('vendor', 'gems')
-      end
-
-      private
-
-      def app_uncached
-        ::EacRubyGemsUtils::Gem.new(::Rails.root)
-      end
-
-      def all_uncached
-        vendor_gems + [app]
-      end
-
-      def vendor_gems_uncached
-        r = []
-        vendor_gems_root.each_child.each do |child|
-          r << ::EacRubyGemsUtils::Gem.new(child) if child.directory?
-        end
-        r
-      end
-    end
-  end
-end

data/lib/tasks/eac_rails_base0/gems.rake

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-namespace :eac_rails_base0 do
-  namespace :gems do
-    desc <<~DESCRIPTION
-      Minitest and RSpec for application and local gems.
-
-      Use GEMS environment variable to test only selected gems. Example:
-
-        rake eac_rails_base0:gems:test_all GEMS=gem1_name,gem2_name
-    DESCRIPTION
-    task test_all: :environment do
-      require 'eac_ruby_gems_utils/tests/multiple'
-      gems = ::EacRailsBase0::Gems.all
-      ENV['GEMS'].if_present { |v| v.to_s.split(',').map(&:strip) }.if_present do |gem_names|
-        gems = gems.select { |gem| gem_names.include?(gem.to_s) }
-      end
-      tests = ::EacRubyGemsUtils::Tests::Multiple.new(gems)
-      raise 'Some test did not pass' unless tests.ok?
-    end
-  end
-end