lono 6.1.4 → 6.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5e716a5067fea74e53aa4431a798004481ac433a50622c8d057f8e61cca3056
-  data.tar.gz: a40280ee2f07061ff6b491003cc56b43f0c7d409a7baafffdd242055d0abe2eb
+  metadata.gz: 451cabbd35459ee59695b80d3838756d978115b76e8439fab63f4e4bf5ad2e15
+  data.tar.gz: b73359e119a5ff577e237aa71a569f60be31291cfa5e65be022245cac34d4f4a
 SHA512:
-  metadata.gz: '0294336987fb917fa74c100db0ae88a8822b9f2e487130f1e7a6e16953b5c0b1e0d373a708ec4f25ed7174c6a0435792a960d945bc41dfa59c2bfc4077286616'
-  data.tar.gz: 769b99a41dffa596d00f29510e6412b4f1741f8068549179f2fba48e1de5782090e48cb0def97597f8c048b4c66517743079a8b152438c6355cfb14655a4d1a6
+  metadata.gz: 91e5c867855bac062ea0d937e709b2cd1c25b659a39e051034731e34cbc85ba37ae66220f924e92183d69f27fb9b40f304837ed66fb203267714aa69f3ebb588
+  data.tar.gz: cf30a279629efc794e20beab973a925b58c6bf7f8b5ed7be8d26e613643ab7e66a0ae7ade72ce3c53a0a0e3cfad7b83f60d6ca4286376c95311f226d33903488

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.
 
+## [6.1.5]
+- #23 improve blueprint starter project and add --no-demo option
+
 ## [6.1.4]
 - #22 tags helper: return nil if @tags not set and using variable mode
 

data/lib/lono/blueprint/new.rb

@@ -12,10 +12,11 @@ class Lono::Blueprint
     def self.cli_options
       [
         [:bundle, type: :boolean, default: true, desc: "Runs bundle install on the project"],
+        [:demo, type: :boolean, default: true, desc: "Include demo template"],
         [: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"],
+        [:project_name, default: '', desc: "Only used with from_new internally"],
         [:type, default: "dsl", desc: "Blueprint type: dsl or erb"],
       ]
     end
@@ -43,6 +44,11 @@ class Lono::Blueprint
       end
     end
 
+    def set_variables
+      @demo = @options[:demo]
+      @demo = false if ENV["LONO_ORG"] # overrides --demo CLI option
+    end
+
     def create_project
       puts "=> Creating new blueprint called #{blueprint_name}."
       directory ".", "#{@cwd}/#{blueprint_name}"
@@ -50,7 +56,13 @@ class Lono::Blueprint
 
     def create_app_folder
       return if @options[:import]
-      directory "../blueprint_types/#{@options[:type]}", "#{@cwd}/#{blueprint_name}"
+
+      if @demo
+        directory "../blueprint_types/#{@options[:type]}", "#{@cwd}/#{blueprint_name}"
+      else
+        empty_directory "#{@cwd}/#{blueprint_name}/app/templates"
+        create_file "#{@cwd}/#{blueprint_name}/app/templates/#{blueprint_name}.rb"
+      end
     end
 
     def create_empty_directories
@@ -60,6 +72,7 @@ class Lono::Blueprint
     end
 
     def create_starter_configs
+      return unless @demo
       return if @options[:import]
 
       if options[:from_new] # lono new command

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "6.1.4"
+  VERSION = "6.1.5"
 end

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

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Write a short summary because it's required."  # TODO: Change me
   spec.description   = "Write a longer description or delete this line."  # TODO: Change me
-  spec.homepage      = "https://github.com/USER/<%= blueprint_name %>"  # TODO: Change me
+  spec.homepage      = "<%= ENV['LONO_ORG'] || "https://github.com/USER" %>/<%= blueprint_name %>"
   spec.license       = "<%= ENV['LONO_LICENSE'] || 'MIT' %>"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
     spec.metadata["allowed_push_host"] = "<%= ENV['LONO_ALLOWED_PUSH_HOST'] || "TODO: Set to 'http://mygemserver.com'"%>"
 
     spec.metadata["homepage_uri"] = spec.homepage
-<% if ENV['LONO_SOURCE_CODE_ORG'] -%>
-    spec.metadata["source_code_uri"] = "<%= ENV['LONO_SOURCE_CODE_ORG'] %>/<%= blueprint_name %>"
-    spec.metadata["changelog_uri"] = "<%= ENV['LONO_SOURCE_CODE_ORG'] %>/<%= blueprint_name %>/blob/master/CHANGELOG.md"
+<% if ENV['LONO_ORG'] -%>
+    spec.metadata["source_code_uri"] = "<%= ENV['LONO_ORG'] %>/<%= blueprint_name %>"
+    spec.metadata["changelog_uri"] = "<%= ENV['LONO_ORG'] %>/<%= blueprint_name %>/blob/master/CHANGELOG.md"
 <% else -%>
     spec.metadata["source_code_uri"] = "https://github.com/user/repo" # TODO: Change me
     spec.metadata["changelog_uri"] = "https://github.com/user/repo/blob/master/CHANGELOG.md"  # TODO: Change me

data/lib/templates/blueprint/README.md.tt

@@ -0,0 +1,33 @@
+# Blueprint: <%= blueprint_name %>
+
+## Usage
+
+1. Configure: configs/<%= blueprint_name %> values
+2. Deploy
+
+## Configure
+
+First you want to configure the `configs/<%= blueprint_name %>` [config files](https://lono.cloud/docs/core/configs/).  You can use [lono seed](https://lono.cloud/reference/lono-seed/) to configure starter values quickly.
+
+    LONO_ENV=development lono seed <%= blueprint_name %>
+
+For additional environments:
+
+    LONO_ENV=production  lono seed <%= blueprint_name %>
+
+The generated files in `config/<%= blueprint_name %>` folder look something like this:
+
+    configs/<%= blueprint_name %>/
+    ├── params
+    │   ├── development.txt
+    │   └── production.txt
+    └── variables
+        ├── development.rb
+        └── production.rb
+
+## Deploy
+
+Use the [lono cfn deploy](http://lono.cloud/reference/lono-cfn-deploy/) command to deploy. Example:
+
+    LONO_ENV=development lono cfn deploy <%= blueprint_name %>-development --blueprint <%= blueprint_name %> --sure
+    LONO_ENV=production  lono cfn deploy <%= blueprint_name %>-production  --blueprint <%= blueprint_name %> --sure

data/lib/templates/blueprint/{Rakefile → Rakefile.tt}

@@ -1,3 +1,6 @@
+<% if ENV['LONO_ORG'] -%>
+ENV['gem_push']='no'
+<% end -%>
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 6.1.4
+  version: 6.1.5
 platform: ruby
 authors:
 - Tung Nguyen
@@ -585,8 +585,8 @@ files:
 - lib/templates/blueprint/.meta/config.yml.tt
 - lib/templates/blueprint/CHANGELOG.md
 - lib/templates/blueprint/Gemfile
-- lib/templates/blueprint/README.md
-- lib/templates/blueprint/Rakefile
+- lib/templates/blueprint/README.md.tt
+- lib/templates/blueprint/Rakefile.tt
 - lib/templates/blueprint/seed/configs.rb
 - lib/templates/blueprint_configs/configs/%blueprint_name%/params/development.txt
 - lib/templates/blueprint_configs/configs/%blueprint_name%/params/production.txt

data/lib/templates/blueprint/README.md

@@ -1,37 +0,0 @@
-# Blueprint Starter README
-
-## Usage
-
-1. Configure: configs/BLUEPRINT values
-2. Deploy blueprint
-
-## Configure
-
-First you want to configure the `configs/BLUEPRINT/params` and `configs/BLUEPRINT/variables` files.
-
-If the blueprint has implemented it, you can use `lono seed` to quickly configure starter values for these `config/BLUEPRINT` files.
-
-    LONO_ENV=development lono seed BLUEPRINT --args key1:value1 key2:value2
-
-To additional environments:
-
-    LONO_ENV=production  lono seed BLUEPRINT --args key1:value1 key2:value2
-
-The generated files in `config/BLUEPRINT` folder look something like this:
-
-    configs/BLUEPRINT/
-    ├── params
-    │   ├── development.txt
-    │   └── production.txt
-    └── variables
-        ├── development.rb
-        └── production.rb
-
-The PARAM depends on how the blueprint was authored.  The PARAM conventionally defaults to BLUEPRINT.
-
-## Deploy
-
-Use the [lono cfn deploy](http://lono.cloud/reference/lono-cfn-deploy/) command to deploy. Example:
-
-    LONO_ENV=development lono cfn deploy BLUEPRINT-development --blueprint BLUEPRINT --iam
-    LONO_ENV=production  lono cfn deploy BLUEPRINT-production  --blueprint BLUEPRINT --iam