lono 7.0.4 → 7.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a04aa19c67011e6f32ba9e032f439d281820a97e2ad41c6187aa4aa55971be
-  data.tar.gz: ad2e51a8917fb855e6e7e5cbf230b3445f3d0a1bd9bae478c78189a4ac6b14fe
+  metadata.gz: 978e40e7263ef0cc011601eec42c5581e580c4bc7c74feea55658776d2f60f61
+  data.tar.gz: b8ef03d604d0145577c58a9b2aef532d7e0ac033145bba7b56e5182314f2fef6
 SHA512:
-  metadata.gz: 01caf3e4f07a635acffb67a8a437b6714af1bace864f5ddf016b49aecef0e90b2c5fe387e693adc5e5f91fcea34b7ee8428c9bd2f39ea27779a578ea812c51b8
-  data.tar.gz: 539801feb80ed5fc8e8fe8cb97b012ef9e5fbd7bb172497380a7808abcbb99def14b0ff221c6470ca3fcf9713f41ec3829e9df26fd74ea126b98baa95edc8490
+  metadata.gz: 6df32378a05c9d8279cafb2f6e379b39bfdc3aba799371c1fafd7318fcd1d68aed09f75a01817723b3de2852917d3e7ac9b1c5cec86a2617aa19d56a814a82ab
+  data.tar.gz: 02c7f8fc999daecb2a87889123ce49ced93cc72bdbf0ff2e6b9d1880ea40fa2e8d5d565229d941dee0c746d829f5dd841fc084f41aa42f04392386214d35a722

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.0.5]
+- #41 sort parameter with required at top
+
 ## [7.0.4]
 - #40 fix lono summary total
 

data/lib/lono/output/template.rb

@@ -15,7 +15,12 @@ module Lono::Output
     end
 
     def parameters
-      data["Parameters"] || []
+      list = data["Parameters"] || []
+      # Not using sort_parameter_group because structure is different
+      list.sort_by do |name, data|
+        optional = !data["Default"].nil?
+        [optional, name].join('-')
+      end.to_h
     end
 
     def parameter_groups
@@ -23,9 +28,9 @@ module Lono::Output
       return unless interface
       pgs = interface["ParameterGroups"]
       pgs.inject({}) do |result, pg|
-        k = pg["Label"]["default"]
-        v = pg["Parameters"]
-        result.merge(k => v)
+        label = pg["Label"]["default"]
+        parameters = sort_parameter_group(pg["Parameters"])
+        result.merge(label => parameters)
       end
     end
 
@@ -37,6 +42,15 @@ module Lono::Output
     memoize :data
 
   private
+    def sort_parameter_group(list)
+      list.sort_by do |name|
+        raw_parameters = data["Parameters"] || []
+        param = raw_parameters[name]
+        optional = !param["Default"].nil?
+        [optional, name].join('-')
+      end
+    end
+
     # Check if the template exists and print friendly error message.  Exits if it
     # does not exist.
     def check_template_exists!(template_path)

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.0.4"
+  VERSION = "7.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.0.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -717,8 +717,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The CloudFormation Framework