lono 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c82050fbf233130f2fda69d2bc32fe20d8887a1d32658875522cc11a8cc3df6
-  data.tar.gz: 0e5a9f4657820d9104410ba5b35c3c2383a2967c5b3145f03ea9927a4413eb12
+  metadata.gz: f556c131b651401e05e951dfd499f98bbcfb01e8e3dc912e2b4d3ec128068f93
+  data.tar.gz: fbc95989d2f2b84cdd8be923c91e05cb002a987050990e932f4355b8689eb058
 SHA512:
-  metadata.gz: 4fa72e2ed20267512962e1b4ff0cab8962186fd8bb0b1be9a07e478577aaeedae7ec4cded6e1bee7c1c77bffe1a93ad126e3a60601ff0fe1381fea30ccb15fb8
-  data.tar.gz: e0388dd38dbbae9483088d07bb630585b779b167f3cdae4f36b861e72cc5c24a8ba39797fabb4296da8550d73b1277459645a1972564f9e4baffee40d08d51b7
+  metadata.gz: 6f26e2d765057d328e0c92888c7063a5e849770787928910c0e437a342260fd6e06a11e0d83688d37ab32fb4b22c4c04ccfbed452adecd19c7c7a51e77e333db
+  data.tar.gz: 801b6151a8a7635b94db55937bb387d00dabff728f3dd49a681201752b7a18664fae0508fdaf38d9e64ef9b53af89fe6437cf82f4f7a7417dad0728c817210bc

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.5.0-node-browsers
+      - image: circleci/ruby:2.6.5-node-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -35,6 +35,8 @@ jobs:
       - run:
           name: install dependencies
           command: |
+            gem install bundler
+            gem update --system
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
       - save_cache:

data/.cody/acceptance.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+gem install bundler # upgrade bundler
+
 set -exu
 
 git config --global user.email "tonguerooo@gmail.com"

data/.cody/buildspec.yml

@@ -1,6 +1,9 @@
 version: 0.2
 
 phases:
+  install:
+    runtime-versions:
+      ruby: 2.6
   build:
     commands:
       - .cody/acceptance.sh

data/.cody/project.rb

@@ -1,5 +1,5 @@
 github_url("https://github.com/tongueroo/lono")
-linux_image("aws/codebuild/ruby:2.5.3-1.7.0")
+linux_image("aws/codebuild/amazonlinux2-x86_64-standard:2.0")
 triggers(
   webhook: true,
   filter_groups: [[{type: "EVENT", pattern: "PUSH"}]]

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.0]
+- #48 fix codebuild and circleci
+- #49 lono extensions
+- #50 lono extensions docs
+
 ## [7.1.0]
 - #42 introduce configset dsl
 - #43 improve layering behavior

data/lib/lono/cli.rb

@@ -23,6 +23,14 @@ module Lono
       Configset::List.new(options.merge(blueprint: blueprint)).run
     end
 
+    desc "extensions [BLUEPRINT]", "Lists extensions"
+    long_desc Help.text(:extensions)
+    opts.source
+    opts.stack
+    def extensions(blueprint=nil)
+      Extension::List.new(options.merge(blueprint: blueprint)).run
+    end
+
     desc "generate BLUEPRINT", "Generate both CloudFormation templates and parameters files."
     long_desc Help.text(:generate)
     option :quiet, type: :boolean, desc: "silence the output"
@@ -124,6 +132,10 @@ module Lono
     long_desc Help.text(:configset)
     subcommand "configset", Configset
 
+    desc "extension SUBCOMMAND", "extension subcommands"
+    long_desc Help.text(:extension)
+    subcommand "extension", Extension
+
     desc "param SUBCOMMAND", "param subcommands"
     long_desc Help.text(:param)
     subcommand "param", Param

data/lib/lono/configset/combiner.rb

@@ -55,7 +55,7 @@ class Lono::Configset
         next unless init
 
         data = {
-          registry: Lono::Configset::Registry.new(["#{logical_id}OriginalConfigset"], resource: logical_id),
+          registry: Lono::Jade::Registry.new(["#{logical_id}OriginalConfigset"], resource: logical_id),
           metdata_configset: attributes["Metadata"]
         }
         configsets << data

data/lib/lono/configset/meta/dsl.rb

@@ -2,7 +2,7 @@ class Lono::Configset::Meta
   module Dsl
     def depends_on(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
-      registry = Lono::Configset::Registry.new(args, options)
+      registry = Lono::Jade::Registry.new(args, options)
       registry.depends_on = args.first
       registry.parent = @jade
       already_has = @jade.depends_ons.detect { |d| d.name == registry.name && d.args == registry.args }

data/lib/lono/configset/preparer.rb

@@ -10,7 +10,7 @@ class Lono::Configset
 
     def run
       register
-      resolve_dependencies
+      resolve_dependencies # also calls jade.materialize
       register_dependencies
       materialize
       validate_all! # run after final materializer
@@ -23,8 +23,8 @@ class Lono::Configset
     end
 
     def resolve_dependencies
-      jades = Lono::Jade.tracked  # at this point only top-level
-      @resolver.resolve(jades)
+      jades = Lono::Jade::Registry.tracked_configsets  # at this point only top-level
+      @resolver.resolve(jades) # also calls jade.materialize
     end
 
     def register_dependencies
@@ -32,8 +32,8 @@ class Lono::Configset
     end
 
     def materialize
-      jades = Lono::Jade.downloaded
-      Materializer::Final.new.build(jades)
+      jades = Lono::Jade::Registry.downloaded_configsets
+      Lono::Jade::Materializer::Final.new.build(jades)
     end
 
     def validate_all!

data/lib/lono/configset/register/base.rb

@@ -18,7 +18,8 @@ module Lono::Configset::Register
 
     def jadify
       self.class.configsets.each do |registry|
-        Lono::Jade.new(registry.name, jade_type, registry)
+        jade = Lono::Jade.new(registry.name, jade_type, registry)
+        Lono::Jade::Registry.tracked_configsets << jade
       end
     end
 

data/lib/lono/configset/register/dsl.rb

@@ -1,8 +1,7 @@
 module Lono::Configset::Register
   module Dsl
-    def configset(*args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      registry = Lono::Configset::Registry.new(args, options)
+    def configset(*args, **options)
+      registry = Lono::Jade::Registry.register_configset(args, options)
       self.class.append(registry)
       store_for_validation(registry)
     end

data/lib/lono/configset/resolver.rb

@@ -7,6 +7,7 @@ class Lono::Configset
     @@resolving_message_shown = false
     def resolve(*unresolved)
       unresolved.flatten! # initially only top-level
+      unresolved.uniq! { |jade| jade.name }
       puts "Resolving dependencies..." if !@@resolving_message_shown && !unresolved.empty?
       puts "Resolving #{unresolved.map(&:name)}" if ENV['LONO_DEBUG_CONFIGSET']
 

data/lib/lono/extension.rb

@@ -0,0 +1,9 @@
+module Lono
+  class Extension < Command
+    long_desc Help.text("extension/new")
+    New.cli_options.each do |args|
+      option(*args)
+    end
+    register(New, "new", "new NAME", "Generates new lono extension.")
+  end
+end

data/lib/lono/extension/helper.rb

@@ -0,0 +1,13 @@
+class Lono::Extension
+  module Helper
+    extend Memoist
+
+    def extension_class_name
+      extension_underscore_name.camelize
+    end
+
+    def extension_underscore_name
+      extension_name.underscore
+    end
+  end
+end

data/lib/lono/extension/list.rb

@@ -0,0 +1,39 @@
+require 'cli-format'
+
+class Lono::Extension
+  class List
+    def initialize(options={})
+      @options = options
+      @stack, @blueprint, @template, @param = Lono::Conventions.new(options).values
+    end
+
+    def run
+      if @blueprint
+        blueprint_configsets
+      else
+        project_configsets
+      end
+    end
+
+    def blueprint_configsets
+      Lono::Extensions::Preparer.new(@options).run # register and materialize gems
+      tracked_extension_names = Lono::Jade::Registry.tracked_extensions.map(&:name)
+
+      finder = Lono::Finder::Extension.new
+      jadespecs = finder.find_all
+
+      presenter = CliFormat::Presenter.new(@options)
+      presenter.header = %w[Name Path Type]
+      jadespecs.each do |j|
+        if tracked_extension_names.include?(j.name)
+          presenter.rows << [j.name, j.root, j.source_type]
+        end
+      end
+      presenter.show
+    end
+
+    def project_configsets
+      Lono::Finder::Extension.list(filter_materialized: true, message: "Project extensions:")
+    end
+  end
+end

data/lib/lono/extension/new.rb

@@ -0,0 +1,72 @@
+class Lono::Extension
+  class New < Lono::Sequence
+    include Lono::Blueprint::Helper # for user_info
+    include Lono::Extension::Helper
+
+    argument :extension_name
+
+    def self.source_root
+      templates = File.expand_path("../../templates", File.dirname(__FILE__))
+      "#{templates}/extension"
+    end
+
+    def self.cli_options
+      [
+        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files."],
+      ]
+    end
+
+    cli_options.each do |args|
+      class_option(*args)
+    end
+
+    # for specs
+    def set_cwd
+      @cwd = ENV['LONO_TEST'] ? File.dirname(Lono.root) : "#{Dir.pwd}/app/extensions"
+    end
+
+    def create_project
+      puts "=> Creating new extension called #{extension_name}."
+      directory ".", "#{@cwd}/#{extension_name}", options
+    end
+
+    def create_license
+      return unless ENV['LONO_LICENSE_FILE']
+      copy_file ENV['LONO_LICENSE_FILE'], "#{@cwd}/#{extension_name}/LICENSE.txt"
+    end
+
+    # After this commands are executed with the newly created project
+    def set_destination_root
+      destination_root = "#{@cwd}/#{extension_name}"
+      self.destination_root = destination_root
+      @old_dir = Dir.pwd # for reset_current_dir
+      FileUtils.cd(self.destination_root)
+    end
+
+    def welcome_message
+      puts <<~EOL
+        #{"="*64}
+        Congrats 🎉 You have successfully created a lono extension.
+
+        Cd into your extension and check things out.
+
+            cd #{extension_name}
+
+        More info: https://lono.cloud/docs/extensions
+
+      EOL
+    end
+
+    def tree
+      tree_installed = system("type tree > /dev/null")
+      return unless tree_installed
+
+      structure = `tree .`
+      puts <<~EOL
+        Here is the structure of your extension:
+
+        #{structure}
+      EOL
+    end
+  end
+end

data/lib/lono/extensions.rb

@@ -0,0 +1,18 @@
+module Lono
+  class Extensions
+    include Dsl
+    include Lono::Template::Evaluate
+
+    def initialize(template_path)
+      @template_path = template_path
+    end
+
+    def evaluate
+      evaluate_template_path(@template_path) # handle extend_with
+    end
+
+    # The extend_with methods are used in file as the normal DSL evaluation.
+    # We use method_missing so we dont have to redefine all the normal methods of the DSL.
+    def method_missing(name, *args, &block); end
+  end
+end

data/lib/lono/extensions/dsl.rb

@@ -0,0 +1,11 @@
+class Lono::Extensions
+  module Dsl
+    def extend_with(*args, **options)
+      register_extension_helper(args, options)
+    end
+
+    def register_extension_helper(args, options={})
+      Lono::Jade::Registry.register_extension(args, options)
+    end
+  end
+end

data/lib/lono/extensions/loader.rb

@@ -0,0 +1,32 @@
+class Lono::Extensions
+  class Loader < Lono::AbstractBase
+    include Lono::Template::Context::Loader::LoadFiles
+
+    def run
+      Lono::Jade::Registry.tracked_extensions.each do |registry|
+        load_extension_helpers(registry)
+      end
+    end
+
+    def load_extension_helpers(registry)
+      root = find_root(registry)
+      helpers_path = "#{root}/lib/#{registry.name}/helpers"
+      load_files(helpers_path)
+    end
+
+    #
+    #     1. vendor/extensions
+    #     2. normal gem
+    #     3. materialized gem
+    #
+    def find_root(registry)
+      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

@@ -0,0 +1,23 @@
+class Lono::Extensions
+  class Preparer < Lono::AbstractBase
+    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
+    end
+
+    def materialize
+      Lono::Jade::Registry.tracked_extensions.each do |registry|
+        jade = Lono::Jade.new(registry.name, "extension", registry)
+        jade.materialize
+      end
+    end
+  end
+end

data/lib/lono/extensions/register.rb

@@ -0,0 +1,15 @@
+class Lono::Extensions
+  class Register < Lono::AbstractBase
+    include Lono::Configset::EvaluateFile
+
+    def run
+      register_extensions # evaluates extend_with
+    end
+
+    # register_extensions and evaluate extend_with methods earlier than load_context so project helpers can override extensions
+    def register_extensions
+      template_path = "#{Lono.config.templates_path}/#{@template}.rb"
+      Lono::Extensions.new(template_path).evaluate # registers extensions
+    end
+  end
+end

data/lib/lono/finder/base.rb

@@ -24,7 +24,6 @@ module Lono::Finder
       end
     end
 
-    # overridden in finder/blueprint/configset.rb
     def local
       project + vendor + gems
     end
@@ -43,7 +42,7 @@ module Lono::Finder
       components(gem_roots, "gem")
     end
 
-    # Folders that each materialized gems to tmp/configsets
+    # Folders that each materialized gems to tmp/jades
     def materialized
       components(materialized_gem_roots, "materialized")
     end
@@ -114,8 +113,9 @@ module Lono::Finder
     memoize :gem_roots
 
     def materialized_gem_roots
-      gemfile_lock = "#{Lono.root}/tmp/configsets/Gemfile.lock"
+      gemfile_lock = "#{Lono.root}/tmp/jades/Gemfile.lock"
       return [] unless File.exist?(gemfile_lock)
+
       parser = Bundler::LockfileParser.new(Bundler.read_file(gemfile_lock))
       specs = parser.specs
       # __materialize__ only exists in Gem::LazySpecification and not in Gem::Specification