lono 7.3.0 → 7.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50634682d0b2bd1142fa36acb73b537e1fcceabde68d7ea88da24621c17b2267
-  data.tar.gz: 53a2e8a25610f8f039cdee8c6cb71ab15b24732642d0453a61ace628fb925ca4
+  metadata.gz: c5a28e2180e7a054b7e98282463ff7dff16c5deac888a2e7e24276a1b5121373
+  data.tar.gz: bdba8d533c3e7a984429895e514a4ad59610709c6df98efa688394976637dc1a
 SHA512:
-  metadata.gz: a700f987afc86bdf10ffc561e0f9027d7ce7aa661b852395a6ff734d272f06a655f24ff4f44aff316b3cb0c225ce64affccab258bde7ac58c0393ce47eff09b5
-  data.tar.gz: 1ad6215fc323bd75bd88c085761fe96131d9e71e531cf40ee0d2940cf8f10483c97cb86984c382cf1c3b6ee1522edc60782275a514713b4fc05c5d6627bf184c
+  metadata.gz: 7417b4b562eda86bff02b2f9c9eba2530a9929317ce240f22a36b010bf8eb95af4cbcc5deaabf4f2bdb3d83e8211711c7fcdccfadcdf04d5858532de1424a3b1
+  data.tar.gz: b7f30f13206e2f7264d076c7e3fc3eb2fda318a6a827ad3306581d6b379682637266d6fc20cdd2b937139b26c89c910dd48f26061517ced9e29e673924a3baeb

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.3.1]
+- #55 lambda layer fixes: allow Gemfile path option to vendor gems
+
 ## [7.3.0]
 - #54 introduce lambda layer concept
 

data/lib/lono/app_file/build/lambda_layer/ruby_packager.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 class Lono::AppFile::Build::LambdaLayer
   # Based on jets
   class RubyPackager
@@ -36,8 +38,7 @@ class Lono::AppFile::Build::LambdaLayer
 
     def rsync_and_link(src, dest)
       FileUtils.mkdir_p(dest)
-      # Trailing slashes are required
-      sh "rsync -a --links #{src}/ #{dest}/"
+      rsync(src, dest)
 
       # create symlink in output path not the cache path
       symlink_dest = "#{output_area}/vendor/gems/ruby/#{ruby_folder}"
@@ -69,12 +70,12 @@ class Lono::AppFile::Build::LambdaLayer
     def bundle_install
       puts "Bundling: running bundle install in cache area: #{cache_area}."
 
-      copy_gemfiles(@app_root)
+      rsync(output_area, cache_area)
 
       # Uncomment out to always remove the cache/vendor/gems to debug
       # FileUtils.rm_rf("#{cache_area}/vendor/gems")
 
-      # Remove .bundle folder so .bundle/config doesnt affect how Jets packages gems.
+      # Remove .bundle folder so .bundle/config doesnt affect how gems are packages
       # Not using BUNDLE_IGNORE_CONFIG=1 to allow home ~/.bundle/config to affect bundling though.
       # This is useful if you have private gems sources that require authentication. Example:
       #
@@ -125,18 +126,6 @@ class Lono::AppFile::Build::LambdaLayer
       FileUtils.cp(src, dest)
     end
 
-    # Clean up extra unneeded files to reduce package size
-    def copy_gemfiles(app_root)
-      FileUtils.mkdir_p(cache_area)
-      FileUtils.cp("#{app_root}/Gemfile", "#{cache_area}/Gemfile")
-
-      gemfile_lock = "#{app_root}/Gemfile.lock"
-      dest = "#{cache_area}/Gemfile.lock"
-      return unless File.exist?(gemfile_lock)
-
-      FileUtils.cp(gemfile_lock, dest)
-    end
-
     def setup_bundle_config(dir)
       text =<<-EOL
 ---
@@ -174,7 +163,31 @@ EOL
       puts "=> #{command}"
       out = `#{command}`
       puts out if ENV['LONO_DEBUG_LAMBDA_LAYER']
-      $?.success?
+      success = $?.success?
+      raise("ERROR: running command #{command}").color(:red) unless success
+      success
+    end
+
+    def rsync(src, dest)
+      # Using FileUtils.cp_r doesnt work if there are special files like socket files in the src dir.
+      # Instead of using this hack https://bugs.ruby-lang.org/issues/10104
+      # Using rsync to perform the copy.
+      src.chop! if src.ends_with?('/')
+      dest.chop! if dest.ends_with?('/')
+      check_rsync_installed!
+      # Ensures required trailing slashes
+      FileUtils.mkdir_p(File.dirname(dest))
+      sh "rsync -a --links --no-specials --no-devices #{Shellwords.escape(src)}/ #{Shellwords.escape(dest)}/"
+    end
+
+    @@rsync_installed = false
+    def check_rsync_installed!
+      return if @@rsync_installed # only check once
+      if system "type rsync > /dev/null 2>&1"
+        @@rsync_installed = true
+      else
+        raise "ERROR: Rsync is required. Rsync does not seem to be installed.".color(:red)
+      end
     end
   end
 end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.3.0"
+  VERSION = "7.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.3.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport