lambda-layer-cake 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e83a6e8260e73527a3adb0d302da0ff59bfe734f165b8c3a5ae2b02c874225
-  data.tar.gz: f3702b522dfae36a3cfab37f5642d9d8618de5c2c82b44cbe7e5c5106c8f6269
+  metadata.gz: ad779537dd417dd3ddb16ca96ece7692dbf38aedff64ee95ae37a712b0fd5d33
+  data.tar.gz: 3330511939df7a90a960711dc55bddd7e3f13ee187d0020febcba01ca7293f98
 SHA512:
-  metadata.gz: 29f5718a159d316a2de9a5785d173dfa1c78332d318531b358970aa67baa4ffc2c42416518056a35a7df3b74585e49237c6386d74ebdce07f65a1b7583f5e9d5
-  data.tar.gz: a8590370365b683367f81829d1992a0ec32e049368b9c92a7002c7e819c001ae2e6c896e6ecbebfc80ab29d04ab6b11ee94f271e38c6a6b7bbe883e54a0a4b7d
+  metadata.gz: a38a3e6ea2694cb6de54d490d940529c498bfb2f6b3f5974f6c3f89487aedec0e7e2d8855a1cf16b19ae4f9f9fb5e53d45027a833c8d4b2930a96b4895922523
+  data.tar.gz: 99b148c4bc9f65e3c911a42a1b4be725bd3aa5fb2c2abe18918a9c5413ac6a431012899f4084c5b70a9b53ba9d9c873328da6426f923b8dbd541710013c4098d

data/README.md

@@ -9,10 +9,31 @@ This gem does just the packaging of the app and leaves deployment as an exercise
 ## Usage
 
 1. Include Lamby and this gem in your Rails app's Gemfile.
-1. Create an `app.rb` in the root of your project per Lamby instructions to implement a Lambda handler. 
+
+  gem 'lambda-layer-cake'
+  gem 'lamby'
+
+1. Create an `app.rb` in the root of your project that contains (stock Lamby app.rb with an extra line for Bundler config): 
+
+```ruby
+# This line tells Bundler where the Layer Cake gems are located
+ENV['BUNDLE_PATH'] = 'vendor/bundle/ruby/2.5.0'
+
+require_relative 'config/boot'
+require 'lamby'
+require_relative 'config/application'
+require_relative 'config/environment'
+
+$app = Rack::Builder.new { run Rails.application }.to_app
+
+def handler(event:, context:)
+  Lamby.handler $app, event, context, rack: :api
+end
+```
+
 1. If you need extra system packages (such as `postgresql-libs` for the `pg` gem), create a file called `system-packages.txt` in the root of your Rails project and include package names, one per line. 
 1. When you are ready to deploy your app, use `rake .layer_cake/layer.zip` and `rake .layer_cake/app.zip` to build files suitable for deployment to Lambda. 
-1. Use the the demployment tools of your choice to deploy the app. 
+1. Use the the demployment tools of your choice to define a Lambda function. The `layer.zip`  
 
 
 ## How It Works
@@ -30,7 +51,9 @@ This is my first attempt at publishing a complete gem and Rails plugin. I took i
 Contributions on the following items is particularly appreciated: 
 
 * Modifying the Docker build environment to probe the host system's cache of gemfiles to more gracefully handle private and unreleased gems
-* A `clean` Rake task
+* Give proper names to the rake tasks
+* A better `clean` Rake task
+* Under some circumstances, `app.zip` does rebuild due to not detecting dependencies
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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
@@ -25,8 +26,8 @@ def main
   end
 
   STDERR.puts("Building Gems")
-  FileUtils.mkdir_p("/tmp/build")
-  unless(system("bundle","install","--deployment","--path=/tmp/build"))
+  FileUtils.mkdir_p("/tmp/build/bundle")
+  unless(system("bundle","install","--deployment","--path=/tmp/build/bundle"))
     STDERR.puts("Couldn't build gems")
     exit 3
   end
@@ -66,10 +67,12 @@ def main
   FileUtils.mkdir_p('/tmp/outputs/lib')
   FileUtils.cp(libs.to_a, '/tmp/outputs/lib')
 
-  STDERR.puts("Moving gems into place")
-  FileUtils.mkdir_p('/tmp/outputs/ruby/gems/2.5.0')
-  #Skip the cache directory since it's not needed at runtime
-  FileUtils.cp_r(Dir["/tmp/build/ruby/2.5.0/*"] - ["/tmp/build/ruby/2.5.0/cache"], "/tmp/outputs/ruby/gems/2.5.0/")
+  #This directory is not needed at runtime
+  STDERR.puts("Removing extra files (skipping)")
+  FileUtils.rm_rf("/tmp/build/bundle/ruby/2.5.0/cache")
+
+  STDERR.puts("Moving Bundle into place")
+  FileUtils.cp_r("/tmp/build/bundle", "/tmp/outputs")
 
   STDERR.puts("All Done!")
 end

data/lib/lambda-layer-cake.rb

@@ -1,70 +1,3 @@
 module LambdaLayerCake
   require 'lambda_layer_cake/railtie' if defined?(Rails)
-
-  class Builder
-    attr :version
-
-    def initialize(version)
-      @version = version
-    end
-
-    def clean!
-      FileUtils.rm_r(outputs_dir!)
-    end
-
-    def build_layer!
-      FileUtils.cp(%w{Gemfile Gemfile.lock system-packages.txt}.select {|f| File.exist?(f) }, inputs_dir!)
-
-      cmd = %W{docker run --rm
-        -v #{inputs_dir!}:/tmp/inputs 
-        -v #{outputs_dir!}:/tmp/outputs 
-        -v #{tools_dir}:/var/task 
-        lambci/lambda:build-ruby2.5 ruby build_ruby.rb}
-      STDERR.puts("Excuting cmd: #{cmd.join(' ')}")
-      system(*cmd) or raise
-    end
-
-    def zip_layer! 
-      pwd = Dir.pwd
-      begin
-        Dir.chdir(outputs_dir!)
-        cmd = *%W{zip -r #{File.join(build_dir!, "layer-#{version}.zip")} lib ruby}
-        system(*cmd) or raise
-      ensure
-        Dir.chdir(pwd)
-      end
-    end
-
-    def build_rails!
-
-    end
-
-    private
-
-    def inputs_dir!
-      working_dir!("layer_inputs")
-    end
-
-    def outputs_dir!
-      working_dir!("layer-#{version}")
-    end
-
-    def working_dir!(path_suffix = "")
-      File.expand_path(
-        File.join(
-          Rails.root,
-          '.layer_cake/',
-          path_suffix
-        )
-      ).tap { |d| FileUtils.mkdir_p(d) }
-    end
-
-    def tools_dir
-      File.expand_path(__dir__ + "/../build_env") # Never needs to be created
-    end
-
-    def build_dir!
-      working_dir!
-    end
-  end
 end

data/lib/lambda_layer_cake/rake_helper.rb

@@ -0,0 +1,142 @@
+module LambdaLayerCake
+  class RakeHelper
+    include Rake::DSL
+
+    #Files used to generate the gem layer
+    INPUT_FILES = Rake::FileList.new(
+      ['Gemfile', 'Gemfile.lock', 'system-packages.txt'].collect { |f| File.join(Rails.root, f) }
+    )
+
+
+    #Files used to generate the 
+    APP_FILES = Rake::FileList.new(Dir['*'] - ['spec','test','log', 'tmp'])
+    OUTPUT_DIR = File.expand_path(File.join(Rails.root,'.layer_cake/'))
+
+    def layer_directory
+      ".layer_cake/layer-#{input_hash}"
+    end
+    def layer_dependencies
+      INPUT_FILES.existing
+    end
+    def layer_build
+      FileUtils.mkdir_p(inputs_dir)
+      FileUtils.cp(INPUT_FILES.existing, inputs_dir)
+  
+      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 build_ruby.rb}
+      STDERR.puts("Excuting cmd: #{cmd.join(' ')}")
+      system(*cmd) or raise    
+    end
+
+    def layer_task_definitions!
+      desc "Builds a layer.zip with gems and libraries"
+      task build_layer: ".layer_cake/layer.zip"
+    
+      desc "Build a layer for version #{input_hash}"
+      directory ".layer_cake/layer-#{input_hash}"
+      file ".layer_cake/layer-#{input_hash}" => layer_dependencies do
+        layer_build
+      end
+
+      file ".layer_cake/layer-#{input_hash}.zip" => ".layer_cake/layer-#{input_hash}" do
+        pwd = Dir.pwd
+        begin
+          Dir.chdir(outputs_dir)
+          cmd = %W{zip -r #{File.join(working_dir, "layer-#{input_hash}.zip")} lib bundle}
+          system(*cmd) or raise
+        ensure
+          Dir.chdir(pwd)
+        end
+      end
+
+      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
+
+    def app_task_definitions!
+      desc "Zip up Rails directory into an app"
+      file ".layer_cake/app.zip": APP_FILES do
+        FileUtils.mkdir_p(working_dir)
+
+        cmd = %W{zip -r .layer_cake/app.zip}  + APP_FILES
+        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)
+        Dir.chdir(working_dir("app")) do
+          system(*((%W{zip --symlinks -r} << working_dir("app.zip")) + Dir["*"])) or raise
+        end
+      end    
+    end
+
+    def version_task_definitions!
+      desc "Output the version hash for the current input files (Gemfile, Gemfile.lock, system-packages.txt)"
+      task :version do
+        $stdout.write input_hash
+      end
+
+      desc "Reports the ruby version of the lambda environment"
+      task :ruby_version do
+        $stdout.write ruby_version
+      end
+
+    end
+
+    def clean_task_definitions!
+      desc "Clean out intermediate files"
+      task :clean do
+        FileUtils.rm_r(working_dir) if File.exists?(working_dir)
+      end
+    end
+
+    private
+    # Some helper methods
+    def input_hash
+      @input_hash ||= begin
+        hash = Digest::SHA1.hexdigest(INPUT_FILES.existing.collect do |f|
+          File.read(f)
+        end.join("\x1C"))
+        hash[0..7]
+      end
+    end
+
+    def inputs_dir
+      working_dir("layer_inputs")
+    end
+
+    def outputs_dir
+      working_dir("layer-#{input_hash}")
+    end
+
+    def working_dir(path_suffix = "")
+      File.expand_path(
+        File.join(
+          OUTPUT_DIR,
+          path_suffix
+        )
+      )
+    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.0'
+  VERSION = '0.2.0'
 end

data/lib/tasks/layer_cake.rake

@@ -3,90 +3,13 @@ require 'fileutils'
 
 require 'rake/packagetask'
 
-namespace :layer_cake do
-  desc 'Clean the build directories'
-  task :clean do
-    LambdaLayerCake.clean!
-  end
-
-  #Files used to generate the gem layer
-  INPUT_FILES = Rake::FileList.new(
-    ['Gemfile', 'Gemfile.lock', 'system-packages.txt'].collect { |f| File.join(Rails.root, f) }
-  )
-  #Files used to generate the 
-  APP_FILES = Rake::FileList.new(Dir['*'] - ['spec','test','log', 'tmp'])
-  OUTPUT_DIR = '.layer_cake'
-
-  # Some helper methods
-  def self.input_hash
-    @input_hash ||= begin
-      hash = Digest::SHA1.hexdigest(INPUT_FILES.existing.collect do |f|
-        File.read(f)
-      end.join("\x1C"))
-      hash[0..7]
-    end
-  end
-
-  def inputs_dir
-    working_dir("layer_inputs")
-  end
-
-  def outputs_dir
-    working_dir("layer-#{input_hash}")
-  end
-
-  def working_dir(path_suffix = "")
-    File.expand_path(
-      File.join(
-        Rails.root,
-        '.layer_cake/',
-        path_suffix
-      )
-    )
-  end
-
-  desc "Output the version hash for the current input files (Gemfile, Gemfile.lock, system-packages.txt)"
-  task :version do
-    $stdout.write input_hash
-  end
-
-  desc "Builds a layer.zip with gems and libraries"
-  task build_layer: '.layer_cake/layer.zip'
-
-  desc "Build a layer for version #{input_hash}"
-  directory ".layer_cake/layer-#{input_hash}"
-  file ".layer_cake/layer-#{input_hash}": INPUT_FILES.existing do
-    FileUtils.mkdir_p(inputs_dir)
-    FileUtils.cp(INPUT_FILES.existing, inputs_dir)
+require 'lambda_layer_cake/rake_helper'
 
-    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:build-ruby2.5 ruby build_ruby.rb}
-    STDERR.puts("Excuting cmd: #{cmd.join(' ')}")
-    system(*cmd) or raise
-  end
-  
-  file ".layer_cake/layer-#{input_hash}.zip": ".layer_cake/layer-#{input_hash}" do
-    pwd = Dir.pwd
-    begin
-      Dir.chdir(outputs_dir)
-      cmd = %W{zip -r #{File.join(working_dir, "layer-#{input_hash}.zip")} lib ruby}
-      system(*cmd) or raise
-    ensure
-      Dir.chdir(pwd)
-    end
-  end
-  
-  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
-
-  desc "Zip up Rails directory into an app"
-  file ".layer_cake/app.zip": APP_FILES do
-    cmd = %W{zip -r .layer_cake/app.zip} + APP_FILES
-    system(*cmd) or raise
+namespace :layer_cake do
+  LambdaLayerCake::RakeHelper.new.tap do |rh| 
+    rh.clean_task_definitions!
+    rh.version_task_definitions!
+    rh.layer_task_definitions!
+    rh.app_task_definitions!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lambda-layer-cake
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Logan Bowers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2020-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A set of Rake tasks to bundle Rails apps for use on AWS Lambda
 email:
 - logan@datacurrent.com
@@ -52,13 +66,14 @@ files:
 - build_env/installed-packages.txt
 - lib/lambda-layer-cake.rb
 - lib/lambda_layer_cake/railtie.rb
+- lib/lambda_layer_cake/rake_helper.rb
 - lib/lambda_layer_cake/version.rb
 - lib/tasks/layer_cake.rake
 homepage: http://github.com/loganb/lambda-layer-cake
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -73,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: []