lono 5.2.4 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5273c020cc1b450ac452c7528f37dcef84d8d390ff9f4cad7c239bc39059fa
-  data.tar.gz: dc05377524507ac767ba84954742d2e99ecf2cec638f642e26adc2b28df73eec
+  metadata.gz: 798d555eb31a539699308dd7ef59af75a3fd2cd99e6d4ce101476e0fe2711a9b
+  data.tar.gz: 6c66d0ee14ce53ee16f2c39ade5fb0dfe0c5b0bc0ae59f6d65b92c0d5662732f
 SHA512:
-  metadata.gz: aaecbe4f433f3c46d01140614f59b1d0d4a2cffc52d7ce012a79add4c7653414ebb41fe7e6c40d79b79328ccd8510084b40df7eaa613c0ce4d64b8ef9ebcdcc8
-  data.tar.gz: bb415b8ed4dc7e1a71a98213f16b7829761f6014b89a0ffcefb5cd6c317e6bb2959da00d39490bc8025f90d1553a6b083a02846ab47baaab6357e4404cd95e7a
+  metadata.gz: 48b6f6152e99479a2460abb1edf02b44e639fa3dc7dce5a8458d4dbcfb75cdd8bc9a032946bc1df15cbbb4034985e92d515ddcfeb62b3a233fb3d1901ed4b36c
+  data.tar.gz: de0ee3979c84a09d89b494cfd0e358b8a24e2275adfd3b1271ef9513c55a9fc213d621d1057b5777ad6e1cc56542d85c9d2e04f05be63cd34772f03b9ac0a8fa

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 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.
 
+## [5.2.5]
+* #6 updates
+* changes so `lono code import` can create full blueprint structure
+* improve `lono seed` to prompt before overwriting
+* improve starter configs params
+* improve started Gemfile
+- lono new --demo option to include starter demo blueprint
+- lono seed: use Thor::Actions to prompt before overwriting
+
 ## [5.2.4]
 - add description to lono managed stack
 

data/lib/lono/blueprint/new.rb

@@ -15,6 +15,7 @@ class Lono::Blueprint
         [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files."],
         [:from_new, type: :boolean, desc: "Called from `lono new` command."],
         [:project_name, default: '', desc: "Only used with from_new internally"],
+        [:import, type: :boolean, desc: "Flag for lono code import"],
         [:type, default: "dsl", desc: "Blueprint type: dsl or erb"],
       ]
     end
@@ -48,6 +49,7 @@ class Lono::Blueprint
     end
 
     def create_app_folder
+      return if @options[:import]
       directory "../blueprint_types/#{@options[:type]}", "#{@cwd}/#{blueprint_name}"
     end
 
@@ -58,6 +60,8 @@ class Lono::Blueprint
     end
 
     def create_starter_configs
+      return if @options[:import]
+
       if options[:from_new] # lono new command
         directory "../blueprint_configs", options[:project_name]
       else # lono blueprint new command
@@ -73,7 +77,8 @@ class Lono::Blueprint
     end
 
     def bundle_install
-      return if options[:from_new]
+      return if options[:from_new] || options[:import]
+
       return unless options[:bundle]
 
       puts "=> Installing dependencies with: bundle install"
@@ -90,7 +95,7 @@ class Lono::Blueprint
 
         Cd into your blueprint and check things out.
 
-          cd #{blueprint_name}
+            cd #{blueprint_name}
 
         More info: https://lono.cloud/docs/core/blueprints
 
@@ -98,7 +103,8 @@ class Lono::Blueprint
     end
 
     def tree
-      return if options[:from_new]
+      return if options[:from_new] || options[:import]
+
       tree_installed = system("type tree > /dev/null")
       return unless tree_installed
 

data/lib/lono/cli.rb

@@ -1,5 +1,6 @@
 module Lono
   class CLI < Command
+    include Thor::Actions # for add_runtime_options
 
     long_desc Help.text(:new)
     New.cli_options.each do |args|
@@ -52,6 +53,7 @@ module Lono
     long_desc Help.text("seed")
     option :param, desc: "override convention and specify the param file to use"
     option :template, desc: "override convention and specify the template file to use"
+    add_runtime_options!
     def seed(blueprint)
       Seed.new(blueprint, options).create
     end

data/lib/lono/help/new.md

@@ -40,21 +40,19 @@ By default, `lono new` generates a skeleton project. Use `TEMPLATE` to generate
 
       cd infra
 
-    To generate the blueprint templates without launching a stack, you can run:
+      To create a new blueprint run:
 
-      lono generate demo
+          lono blueprint new demo
 
-    The generated files are created at `output/demo/templates` and `output/demo/params`.
+      To deploy the blueprint:
 
-    To deploy the CloudFormation stack:
+          lono cfn deploy my-demo --blueprint demo
 
-      lono cfn deploy my-demo --blueprint demo
+      If you name the stack according to conventions, you can simply run:
 
-    If you name the stack according to conventions, you can simply run:
+          lono cfn deploy demo
 
-      lono cfn deploy demo
-
-    To list and create additional blueprints refer to https://lono.cloud/docs/core/blueprints
+      To list and create additional blueprints refer to https://lono.cloud/docs/core/blueprints
 
     More info: http://lono.cloud/
     $

data/lib/lono/new.rb

@@ -11,6 +11,7 @@ module Lono
     def self.cli_options
       [
         [:bundle, type: :boolean, default: true, desc: "Runs bundle install on the project"],
+        [:demo, type: :boolean, default: false, desc: "Also generate demo blueprint"],
         [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files."],
         [:git, type: :boolean, default: true, desc: "Git initialize the project"],
         [:type, default: "dsl", desc: "Blueprint type: dsl or erb"],
@@ -32,6 +33,7 @@ module Lono
     end
 
     def create_starter_blueprint
+      return unless @options[:demo]
       # https://github.com/erikhuda/thor/wiki/Invocations
       Lono::Blueprint::New.start(["demo", "--from-new", "--type", @options[:type], "--project-name", project_name])
     end
@@ -71,21 +73,19 @@ module Lono
         Congrats 🎉 You have successfully created a lono project.  A starter demo blueprint was created
         and is at blueprints/demo.  Check things out by going into the created infra folder.
 
-          cd #{project_name}
+            cd #{project_name}
 
-        To generate the blueprint templates without launching a stack, you can run:
+        To create a new blueprint run:
 
-          lono generate demo
+            lono blueprint new demo
 
-        The generated files are created at `output/demo/templates` and `output/demo/params`.
+        To deploy the blueprint:
 
-        To deploy the CloudFormation stack:
-
-          lono cfn deploy my-demo --blueprint demo
+            lono cfn deploy my-demo --blueprint demo
 
         If you name the stack according to conventions, you can simply run:
 
-          lono cfn deploy demo
+            lono cfn deploy demo
 
         To list and create additional blueprints refer to https://lono.cloud/docs/core/blueprints
 

data/lib/lono/seed/base.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require "memoist"
+require "thor"
 require "yaml"
 
 # Subclasses should implement:
@@ -15,8 +16,15 @@ class Lono::Seed
     include Lono::Blueprint::Root
     include Lono::AwsServices
     include Lono::Conventions
+
+    # What's needed for a Thor::Group or "Sequence"
+    # Gives us Thor::Actions commands like create_file
+    include Thor::Actions
+    include Thor::Base
+
     extend Memoist
 
+    # attr_reader :options
     def initialize(blueprint, options)
       @blueprint, @options = blueprint, options
       @template, @param = template_param_convention(options)
@@ -25,14 +33,15 @@ class Lono::Seed
     def run
       check_dsl_type!
       setup
+      self.destination_root = Dir.pwd # Thor::Actions require destination_root to be set
       create_params
       create_variables
       finish
     end
 
-    # Always create params files
     def create_params
       return unless params
+
       # Only supporting the main blueprint for now
       path = "#{Lono.config.templates_path}/#{@blueprint}.rb"
       if File.exist?(path)
@@ -49,11 +58,37 @@ class Lono::Seed
       true
     end
 
+    def create_param_file(app_template_path)
+      parameters = parameters(app_template_path)
+
+      lines = []
+      required = required(parameters)
+      lines << "# Required parameters:" unless required.empty?
+      required.each do |name, data|
+        example = description_example(data["Description"])
+        lines << "#{name}=#{example}"
+      end
+      optional = optional(parameters)
+      lines << "# Optional parameters:" unless optional.empty?
+      optional.each do |name, data|
+        value = default_value(data)
+        lines << "# #{name}=#{value}"
+      end
+
+      if lines.empty?
+        puts "Template has no parameters."
+        return
+      end
+
+      content = lines.join("\n") + "\n"
+      dest_path = "configs/#{@blueprint}/params/#{Lono.env}.txt" # only support environment level parameters for now
+      create_file(dest_path, content) # Thor::Action
+    end
+
     def create_variables
       return unless variables
       dest_path = "configs/#{@blueprint}/variables/#{Lono.env}.rb"
-      write(dest_path, variables)
-      puts "Starter variables created: #{dest_path}"
+      create_file(dest_path, variables) # Thor::Action
     end
 
     def check_dsl_type!
@@ -83,34 +118,6 @@ class Lono::Seed
       false
     end
 
-    def create_param_file(app_template_path)
-      parameters = parameters(app_template_path)
-
-      lines = []
-      required = required(parameters)
-      lines << "# Required parameters:" unless required.empty?
-      required.each do |name, data|
-        example = description_example(data["Description"])
-        lines << "#{name}=#{example}"
-      end
-      optional = optional(parameters)
-      lines << "# Optional parameters:" unless optional.empty?
-      optional.each do |name, data|
-        value = default_value(data)
-        lines << "# #{name}=#{value}"
-      end
-
-      if lines.empty?
-        puts "Template has no parameters."
-        return
-      end
-
-      content = lines.join("\n") + "\n"
-      dest_path = "configs/#{@blueprint}/params/#{Lono.env}.txt" # only support environment level parameters for now
-      write(dest_path, content)
-      puts "Starter params created:    #{dest_path}"
-    end
-
     def write(path, content)
       FileUtils.mkdir_p(File.dirname(path))
       IO.write(path, content)

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "5.2.4"
+  VERSION = "5.2.5"
 end

data/lib/templates/blueprint/%blueprint_name%.gemspec.tt

@@ -26,8 +26,7 @@ Gem::Specification.new do |spec|
     spec.metadata["changelog_uri"] = "https://github.com/user/repo/blob/master/CHANGELOG.md"  # TODO: Change me
 <% end -%>
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/templates/blueprint_configs/configs/%blueprint_name%/params/development.txt

@@ -0,0 +1,2 @@
+# Starter Example
+# InstanceType=t3.micro

data/lib/templates/blueprint_configs/configs/%blueprint_name%/variables/development.rb

@@ -0,0 +1,2 @@
+# Starter Example
+# @variable = "value"

data/lib/templates/skeleton/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
-# gem "lono-pro" # optional
+gem "lono" # optional
+gem "lono-pro" # optional

data/lono.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.license       = "https://boltops.com/boltops-community-license"
 
   gem.add_dependency "activesupport"
-  gem.add_dependency "awesome_print"
   gem.add_dependency "aws-sdk-cloudformation"
   gem.add_dependency "aws-sdk-ec2" # lono seed
   gem.add_dependency "aws-sdk-iam" # lono seed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.2.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
@@ -562,10 +548,10 @@ files:
 - lib/templates/blueprint/README.md
 - lib/templates/blueprint/Rakefile
 - lib/templates/blueprint/seed/configs.rb
-- lib/templates/blueprint_configs/configs/%blueprint_name%/params/base.txt
 - lib/templates/blueprint_configs/configs/%blueprint_name%/params/development.txt
-- lib/templates/blueprint_configs/configs/%blueprint_name%/variables/base.rb
+- lib/templates/blueprint_configs/configs/%blueprint_name%/params/production.txt
 - lib/templates/blueprint_configs/configs/%blueprint_name%/variables/development.rb
+- lib/templates/blueprint_configs/configs/%blueprint_name%/variables/production.rb
 - lib/templates/blueprint_types/dsl/app/templates/%blueprint_name%.rb
 - lib/templates/blueprint_types/dsl/app/user_data/bootstrap.sh
 - lib/templates/blueprint_types/erb/app/definitions/base.rb.tt