lono 6.1.8 → 6.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b44dae2e1a33765ce3e3d969e0f2ca6ad0230f027b1ff94863b27bb3077b4e26
-  data.tar.gz: 280c9073d25b90b02afe7e44aa22514fb21ad8affd3ed3272c4315edd6f2acd6
+  metadata.gz: 98eb8c664ca1835e37b72418cff2c983ea5863902b5866597b42deeaef912977
+  data.tar.gz: c2f21dfe5e45dcfb28cea9d9a09702cb79f022dc3747a52dad0c8ceeb4077f26
 SHA512:
-  metadata.gz: 7ed15e4146cfb29b71e6399f1f7424ec6533bbe0def6886b931e2bf506a1913bdb8bf518a599e100679638de1a603942a814aa1e3b7268b29d49fb1664a1b614
-  data.tar.gz: 45dfae54e67bdd6b51ac6ad2943b86126c4e1f4d8ac6fe6c1f24d923e9e67d12e514bbcf6f3cc636e08ca0f0a7a352df84dc0c981345bb551dd6e145c70d838f
+  metadata.gz: aa93526540aea34e7166ccfd0d64109333019ebd21b43d58705cc10239ed72a2951de01ec696253e60d8066723187d9288ee5ea10ff2226a44301698c11ded74
+  data.tar.gz: 5c148cb13bf315292b1173f1acea6f4c89d5825e2432a101f5cecec910045c75d3462bce3d7c9f509c98bd2cfa2f9b150302bf7706adf356a2a42d1badcb2c61

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.
 
+## [6.1.9]
+- #30 fix md5 sum calcuation for single file
+- #31 Add app files ERB support docs
+- options `--sure` and `--iam` add `CAPABILITY_AUTO_EXPAND` for serverless transform
+
 ## [6.1.8]
 - #28 add user_data_script helper
 - #29 remove items in Hash structure with nil value at any level

data/lib/lono/app_file/base.rb

@@ -4,6 +4,11 @@ module Lono::AppFile
     include Lono::Blueprint::Root
     extend Memoist
 
+    # What's needed for a Thor::Group or "Sequence". Gives us Thor::Actions commands like create_file
+    # Must be included before `def initialize` as we override the Thor initialize
+    include Thor::Actions
+    include Thor::Base
+
     def initialize(blueprint, options={})
       @blueprint, @options = blueprint, options
       @template = @options[:template] || @blueprint
@@ -15,5 +20,16 @@ module Lono::AppFile
 
     def initialize_variables
     end
+
+  private
+    # Hack Thor to be able to dynamically set the source_paths at runtime instance methods
+    def override_source_paths(*paths)
+      # Using string with instance_eval because block doesnt have access to path at runtime.
+      self.class.instance_eval %{
+        def self.source_paths
+          #{paths.flatten.inspect}
+        end
+      }
+    end
   end
 end

data/lib/lono/app_file/build.rb

@@ -1,3 +1,5 @@
+require "thor"
+
 module Lono::AppFile
   class Build < Base
     def initialize_variables
@@ -6,7 +8,6 @@ module Lono::AppFile
 
     def run
       return unless detect_files?
-
       puts "Building app/files for blueprint #{@blueprint}"
       build_all
     end
@@ -25,6 +26,12 @@ module Lono::AppFile
       end
     end
 
+    def copy_to_output
+      override_source_paths("#{Lono.blueprint_root}/app/files")
+      self.destination_root = @output_files_path
+      directory(".", verbose: false)
+    end
+
     def zip_file(item)
       path = item.path
       zip_file = item.zip_file_name
@@ -58,13 +65,6 @@ module Lono::AppFile
       FileUtils.rm_rf(@output_files_path)
     end
 
-    def copy_to_output
-      src = "#{Lono.blueprint_root}/app/files"
-      dest = @output_files_path
-      FileUtils.mkdir_p(File.dirname(dest))
-      FileUtils.cp_r(src, dest)
-    end
-
     def detect_files?
       app_files = Dir["#{Lono.blueprint_root}/app/files/*"]
       if app_files.empty?

data/lib/lono/cfn/base.rb

@@ -261,7 +261,7 @@ class Lono::Cfn
     def capabilities
       return @options[:capabilities] if @options[:capabilities]
       if @options[:sure] || @options[:iam]
-        ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
+        ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]
       end
     end
 

data/lib/lono/cli.rb

@@ -50,15 +50,22 @@ module Lono
       Lono::Inspector::Graph.new(blueprint, template, options).run
     end
 
-    desc "seed", "Generates starter configs for a blueprint."
+    desc "seed BLUEPRINT", "Generates starter configs for a blueprint."
     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!
+    add_runtime_options! # Thor::Action options like --force
     def seed(blueprint)
       Seed.new(blueprint, options).create
     end
 
+    desc "app_files BLUEPRINT", "Builds app files"
+    long_desc Help.text("app_files")
+    add_runtime_options! # Thor::Action options like --force
+    def app_files(blueprint)
+      Lono::AppFile::Build.new(blueprint, options).run
+    end
+
     desc "clean", "Removes `output` folder."
     def clean
       Clean.new(options).run

data/lib/lono/md5.rb

@@ -15,13 +15,11 @@ module Lono
       # This checksum within the file name is to mainly make sure that Lambda::Function resources "change" and an update is triggered.
       # There's another checksum in the upload code that makes sure we don't upload the code again to speed up things.
       def sum(path)
-        files = Dir["#{path}/**/*"]
-        files = files.reject { |f| File.directory?(f) }
-                     .reject { |f| File.symlink?(f) }
-        files.sort!
-        content = files.map do |f|
-          Digest::MD5.file(f).to_s[0..7]
-        end.join
+        content = if File.directory?(path)
+          sum_directory(path)
+        else
+          Digest::MD5.file(path).to_s[0..7]
+        end
 
         md5 = Digest::MD5.new
         md5.update(content)
@@ -29,6 +27,17 @@ module Lono
       end
       memoize :sum
 
+      def sum_directory(dir)
+        files = Dir["#{dir}/**/*"]
+        files = files.reject { |f| File.directory?(f) }
+                     .reject { |f| File.symlink?(f) }
+        files.sort!
+
+        files.map do |f|
+          Digest::MD5.file(f).to_s[0..7]
+        end.join
+      end
+
       def name(path)
         relative_path = name_without_md5(path)
         relative_path = relative_path.sub(/\.(\w+)$/,'') # strip extension

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "6.1.8"
+  VERSION = "6.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 6.1.8
+  version: 6.1.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport