lambda-layer-cake 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0929fa88af212b2adbd2434aa1f75518fa50990c7b0ec5e1145153d76fde16b8'
-  data.tar.gz: 2322e1e5922ddf716815de7cb850efa1295947430938de80e167def203b006aa
+  metadata.gz: 862e89024d175ec0fac695fb60af13fd28b26f6b292b1f68651d12527e476e45
+  data.tar.gz: 4dc8138d2c550df0db3af32be86d55a491e7b7a85b8c59ec84ed476d8facb9be
 SHA512:
-  metadata.gz: e823aee747d165029b115ff61455a0354d4cd33e9c73084e65b62a0199bd14ca75520ff026884e9ac59ac5c9dd5370d09b90311fb7ddb049cfa4f0750a95783b
-  data.tar.gz: fd1b85928ef49acd74b93408994bfb5513c51d06d8166d14d3e96ce38d102cbed9faeb090f94d81dbce6b63a66183a6c62e34d72729ff31544808856bc087e29
+  metadata.gz: 3e7dc86198a59c89de3d35647086019402fb1aa94e98a122e9d4dc96bd0e5a9d3f0947ac4f8bbfb3ebfde0b27d5c2341080266cf4e133127e91e9c1906414e39
+  data.tar.gz: 1f5dbdecebe976d3f7629374b835b5116847eed7e28d2d4546d3d589d2be64eb190140aa5202088a5737a5aff3ac0f2d036abd0cb479027df1f9d4719b822138

data/build_env/build_ruby.rb

@@ -18,6 +18,7 @@ def main
   if(File.exist?('system-packages.txt'))
     STDERR.puts("Installing System Packages")
     build_deps = File.read("system-packages.txt").split
+    STDERR.puts("Packages: #{build_deps.join(',')}")
     unless(system("yum", "install", "-y", *(build_deps)))
       STDERR.puts("Could not install build dependency pacakges")
       exit 2
@@ -26,7 +27,7 @@ def main
 
   STDERR.puts("Building Gems")
   FileUtils.mkdir_p("/tmp/build/bundle")
-  unless(system("bundle","install","--deployment","--path=/tmp/build/bundle"))
+  unless(system("bundle","install","--deployment","--path=/tmp/build/bundle","--without","test","development"))
     STDERR.puts("Couldn't build gems")
     exit 3
   end
@@ -66,11 +67,13 @@ def main
   FileUtils.mkdir_p('/tmp/outputs/lib')
   FileUtils.cp(libs.to_a, '/tmp/outputs/lib')
 
+  #This directory is not needed at runtime
+  STDERR.puts("Removing extra files")
+  FileUtils.rm_rf(Dir["/tmp/build/bundle/ruby/*/cache"])
+  FileUtils.rm_rf(Dir["/tmp/build/bundle/ruby/*/gems/*/test"])
+
   STDERR.puts("Moving Bundle into place")
   FileUtils.cp_r("/tmp/build/bundle", "/tmp/outputs")
-  #This directory is not needed at runtime
-  #STDERR.puts("Removing extra files")
-  #FileUtils.rm_rf("/tmp/outputs/bundle/ruby/2.5.0/cache")
 
   STDERR.puts("All Done!")
 end

data/lib/lambda_layer_cake/rake_helper.rb

@@ -26,7 +26,7 @@ module LambdaLayerCake
         -v #{inputs_dir}:/tmp/inputs 
         -v #{outputs_dir}:/tmp/outputs 
         -v #{File.expand_path(__dir__ + "/../../build_env")}:/var/task 
-        lambci/lambda:build-ruby2.5 ruby build_ruby.rb}
+        lambci/lambda:#{docker_tag} ruby build_ruby.rb}
       STDERR.puts("Excuting cmd: #{cmd.join(' ')}")
       system(*cmd) or raise    
     end
@@ -55,7 +55,7 @@ module LambdaLayerCake
       desc "Build the current layer version and symlink it to the versioned zip"
       file ".layer_cake/layer.zip": ".layer_cake/layer-#{input_hash}.zip" do
         FileUtils.ln_s("layer-#{input_hash}.zip",".layer_cake/layer.zip", force: true)
-      end    
+      end
     end
 
     def app_task_definitions!
@@ -67,6 +67,7 @@ module LambdaLayerCake
         system(*cmd) or raise
         
         #Insert a symlink into the app.zip
+        FileUtils.rm_r(working_dir("app/")) if(File.exists?(working_dir("app")))
         FileUtils.mkdir_p(working_dir("app/vendor"))
         FileUtils.ln_s("/tmp", working_dir("app/tmp"))
         FileUtils.ln_s("/opt/bundle", working_dir("app/vendor/bundle"), force: true)
@@ -80,7 +81,13 @@ module LambdaLayerCake
       desc "Output the version hash for the current input files (Gemfile, Gemfile.lock, system-packages.txt)"
       task :version do
         $stdout.write input_hash
-      end    
+      end
+
+      desc "Reports the ruby version of the lambda environment"
+      task :ruby_version do
+        $stdout.write ruby_version
+      end
+
     end
 
     def clean_task_definitions!
@@ -117,5 +124,19 @@ module LambdaLayerCake
         )
       )
     end
+
+    def docker_tag
+      "build-ruby#{/^\d+\.\d+/.match(RUBY_VERSION)[0]}"
+    end
+
+    def ruby_version
+      cmd = %W{docker run --rm
+        -v #{inputs_dir}:/tmp/inputs 
+        -v #{outputs_dir}:/tmp/outputs 
+        -v #{File.expand_path(__dir__ + "/../../build_env")}:/var/task 
+        lambci/lambda:#{docker_tag} ruby -e }.push '$stdout.write RUBY_VERSION'
+      STDERR.puts("Excuting cmd: #{cmd.join(' ')}")
+      system(*cmd) or raise
+    end
   end
 end

data/lib/lambda_layer_cake/version.rb

@@ -1,3 +1,3 @@
 module LambdaLayerCake
-  VERSION = '0.1.1'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lambda-layer-cake
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Logan Bowers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -73,7 +73,7 @@ homepage: http://github.com/loganb/lambda-layer-cake
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,9 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A set of Rake tasks to bundle Rails apps for use on AWS Lambda
 test_files: []