#36 Added example and test for bundler.require all. Include Gemfile and Gemfile.lock in package if lock file is present

Author: navarasu

examples/bundler-require-all/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'httparty'
+gem 'nokogiri'

examples/bundler-require-all/Gemfile.lock

@@ -0,0 +1,25 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    httparty (0.18.1)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.1104)
+    mini_portile2 (2.5.1)
+    multi_xml (0.6.0)
+    nokogiri (1.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    racc (1.5.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  httparty
+  nokogiri
+
+BUNDLED WITH
+   2.1.4

examples/bundler-require-all/handler.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default)
+
+def hello(event:, context:)
+  body = HTTParty.get("https://github.com").body
+  doc = Nokogiri::HTML(body)
+
+  { statusCode: 200, body: doc.title }
+end

examples/bundler-require-all/serverless.yml

@@ -0,0 +1,15 @@
+service: bundler-require-all 
+
+plugins:
+  - serverless-ruby-layer
+provider:
+  name: aws
+  runtime: ruby2.5
+
+custom:
+  rubyLayer:
+    use_docker: true
+
+functions:
+  hello:
+    handler: handler.hello

lib/bundle.js

@@ -47,8 +47,7 @@ function bundleInstall(){
 
   fs.copySync(path.join(this.servicePath,'Gemfile'), path.join(this.ruby_layer,'Gemfile') )
   const gem_file_lock_path = path.join(this.servicePath,'Gemfile.lock')
-  const gem_file_lock_exists = fs.pathExistsSync(gem_file_lock_path)
-  if (!this.options.ignore_gemfile_lock && gem_file_lock_exists){
+  if (this.use_gemfile_lock){
     fs.copySync(gem_file_lock_path, path.join(this.ruby_layer,'Gemfile.lock') )
   }
 
@@ -102,7 +101,7 @@ function bundleInstall(){
     this.docker_gem_path = '/var/gem_build'
     docker(['exec', docker_id, 'mkdir', this.docker_gem_path], options, this.cli)
     docker(['cp', '-L', 'Gemfile', container_id+':'+this.docker_gem_path], options,this.cli)
-    if (!this.options.ignore_gemfile_lock && gem_file_lock_exists) {
+    if (this.use_gemfile_lock){
       docker(['cp', '-L', 'Gemfile.lock', container_id+':'+this.docker_gem_path], options,this.cli)
       const data = fs.readFileSync(gem_file_lock_path).toString().match(/BUNDLED WITH[\r\n]+([^\r\n]+)/)
       docker(['exec','-w',this.docker_gem_path, docker_id].concat(['gem','install','bundler:'+ data[data.length - 1].trim()]),options,this.cli)
@@ -207,7 +206,12 @@ function excludePackage(){
     this.serverless.service.package["exclude"] = Object.assign([])
   }
   this.serverless.service.package["exclude"].push("node_modules/**", "package-lock.json", "package.json",
-                                                  "vendor/**", "Gemfile", "Gemfile.lock")
+                                                  "vendor/**")
+  this.use_gemfile_lock = !this.options.ignore_gemfile_lock && fs.pathExistsSync(path.join(this.servicePath,'Gemfile.lock'))
+
+  if (!this.use_gemfile_lock) {
+    this.serverless.service.package["exclude"].push("Gemfile", "Gemfile.lock")
+  }
   if (this.options.docker_file) {
     this.serverless.service.package["exclude"].push(this.options.docker_file)
   }

test/test.js

@@ -38,18 +38,19 @@ let test_data = [
     function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
 
   { folder: 'basic-with-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
-    function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
+    function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
 
 { folder: 'use-docker-with-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
-    function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
+    function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
 
   { folder: 'basic-ignore-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2021.0225/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
     function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
 
  { folder: 'use-docker-ignore-gemfile-lock', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2021.0225/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/'],
      function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
 
-
+  { folder: 'bundler-require-all', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/','/gems/nokogiri-1.11.3-x86_64-linux/', '/gems/racc-1.5.2/', '/extensions/x86_64-linux/', '/gems/mini_portile2-2.5.1/' ],
+    function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
 
 ]