lono 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f556c131b651401e05e951dfd499f98bbcfb01e8e3dc912e2b4d3ec128068f93
-  data.tar.gz: fbc95989d2f2b84cdd8be923c91e05cb002a987050990e932f4355b8689eb058
+  metadata.gz: c17c7945bfc25050f4bba832aa84181fa3dbe5936b7091dbb9e229439ee791e7
+  data.tar.gz: 9e70a07cf9b49154af4c35895e9168a8b044aeed73ed9ffab19d648727a2f5aa
 SHA512:
-  metadata.gz: 6f26e2d765057d328e0c92888c7063a5e849770787928910c0e437a342260fd6e06a11e0d83688d37ab32fb4b22c4c04ccfbed452adecd19c7c7a51e77e333db
-  data.tar.gz: 801b6151a8a7635b94db55937bb387d00dabff728f3dd49a681201752b7a18664fae0508fdaf38d9e64ef9b53af89fe6437cf82f4f7a7417dad0728c817210bc
+  metadata.gz: e8d2c8de40d9b10801fad58420696d8bc0ce40d831b84bd2d9a060c25295c8a0eba29084a12071c96c5347366811581ebc8004319b07be2049f6cc8811f12ca0
+  data.tar.gz: '08fcdb268f588cf77f16c4c684940727533665c00e868a1f1c6251325a974987c92feeb68983e105288b21d47ff3db14bdad61e10a9fa84d66793f20b4e1dd07'

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [7.2.1]
+- #51 fix extensions helpers loading and cleanup
+
 ## [7.2.0]
 - #48 fix codebuild and circleci
 - #49 lono extensions

data/lib/lono/extensions/loader.rb

@@ -1,16 +1,17 @@
 class Lono::Extensions
-  class Loader < Lono::AbstractBase
+  module Loader
     include Lono::Template::Context::Loader::LoadFiles
 
-    def run
+    def load_all_extension_helpers
       Lono::Jade::Registry.tracked_extensions.each do |registry|
         load_extension_helpers(registry)
       end
     end
 
     def load_extension_helpers(registry)
-      root = find_root(registry)
+      root = find_extensions_root_path(registry)
       helpers_path = "#{root}/lib/#{registry.name}/helpers"
+
       load_files(helpers_path)
     end
 
@@ -19,14 +20,10 @@ class Lono::Extensions
     #     2. normal gem
     #     3. materialized gem
     #
-    def find_root(registry)
-      jadespec = finder.find(registry.name)
+    def find_extensions_root_path(registry)
+      @finder ||= Lono::Finder::Extension.new
+      jadespec = @finder.find(registry.name)
       jadespec.root
     end
-
-    def finder
-      Lono::Finder::Extension.new
-    end
-    memoize :finder
   end
 end

data/lib/lono/extensions/preparer.rb

@@ -3,14 +3,13 @@ class Lono::Extensions
     def initialize(options={})
       super
       @register = Register.new(options)
-      @loader = Loader.new(options)
     end
 
     def run
       @register.run
       materialize
-      # no need to validate because bundler will fail to install extension earlier and is a form of "validation already"
-      @loader.run
+      # loading happens in Lono::Extensions::Loader load_all_extension_helpers module
+      # so it has the proper self.class include scope
     end
 
     def materialize

data/lib/lono/template/strategy/dsl/builder.rb

@@ -2,6 +2,7 @@ class Lono::Template::Strategy::Dsl
   class Builder
     include Lono::Template::Util
     include Lono::Template::Context::Loader
+    include Lono::Extensions::Loader
 
     include Syntax
     extend Memoist
@@ -27,6 +28,7 @@ class Lono::Template::Strategy::Dsl
     # load_extensions and evaluate extend_with methods earlier than load_context so project helpers can override extensions
     def load_extensions # evaluates extend_with
       Lono::Extensions::Preparer.new(@options).run
+      load_all_extension_helpers # after Extensions::Preparer#run
     end
 
     def finalize

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.2.0"
+  VERSION = "7.2.1"
 end

data/lib/templates/blueprint/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in ecs-asg.gemspec
+# Specify your gem's dependencies in the gemspec file
 gemspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-23 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport