lambchop 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d607485929bdedcc55e072af39a00736661e1041
-  data.tar.gz: e72fe6ee2862fc20f743d90a4d0510e16fcc2214
+  metadata.gz: af92c0434b1eaee3913c61dabd3c37ef13331bb9
+  data.tar.gz: fd47747f8ce5b91ac328f6657068ac66ada0623c
 SHA512:
-  metadata.gz: 9bac84c065741bc0fcb796bef23547260b55aed61f9d270a9231a67ab456bd5369006b3d4d2335cb01f6655193e7a547cb1d33b8488147540364b6ee09095f4a
-  data.tar.gz: 0d6761c396b2098a9f8c233b0f1943139ce67d015b56b17c6b9ec3ee1627418be06a622f8954f5de5ad7026c96bfd668a7767964f96ae6b24d1589e5a217d8fc
+  metadata.gz: d5cb59aadc02c8d4d3e4920bbf8b7019ba04be442620311ffb7cffd61ad5bb8f51826dfc105d75be7274da981199bd0f4065b6caf7dacaa91d416fcd5cd0940f
+  data.tar.gz: 5ea2cc893308c21336f04243d1e241742734769eeb48aa8970a19575f847e1c9f0b9387dacae01fcdcb91761a8e86ccafe5b7ae47f51d310205665b69fe39026

data/README.md

@@ -38,6 +38,7 @@ timeout: 3          # default: 3
 memory_size: 128    # default: 128
 role: arn:aws:iam::NNNNNNNNNNNN:role/lambda_exec_role
 handler: test.handler
+include_files: */*  # default: nil
 # Handler module name is filename.
 # `handler:` is `index.handler` when filename is `index.js`
 */
@@ -179,6 +180,17 @@ START RequestId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
 └── node_modules/
 ```
 
+## Include extra files
+
+```javascript
+#!/usr/bin/env lambchop
+/*
+...
+include_files: *.txt
+*/
+...
+```
+
 ## Diff
 ```sh
 $ lambchop-diff

data/bin/lambchop

@@ -27,6 +27,7 @@ timeout:       3            # default: 3
 memory_size:   128          # default: 128
 handler:       test.handler # Module name is filename, e.g. index.js -> index.handler
 role: arn:aws:iam::NNNNNNNNNNNN:role/any_lambda_exec_role
+include_files: */*          # default: nil
 */
   EOS
   exit 1

data/lib/lambchop/client.rb

@@ -21,11 +21,11 @@ class Lambchop::Client
     config, src = Lambchop::Utils.parse_magic_comment(src)
 
     config['function_name'] ||= File.basename(@path, '.js')
-    function_name = config['function_name']
-
     config['runtime'] ||= 'nodejs'
+    function_name = config['function_name']
+    include_files = config.delete('include_files')
 
-    create_or_update_function(config, src)
+    create_or_update_function(config, src, include_files)
 
     exit if @options[:detach]
 
@@ -37,10 +37,10 @@ class Lambchop::Client
 
   private
 
-  def create_or_update_function(config, src)
+  def create_or_update_function(config, src, include_files)
     params = {}
     config.each {|k, v| params[k.to_sym] = v }
-    buf, node_modules = zip_source(src)
+    buf, node_modules, extra_files = zip_source(src, include_files)
 
     begin
       params[:code] = {:zip_file => buf.string}
@@ -61,6 +61,7 @@ class Lambchop::Client
         raise e
       end
     end
+
     resp_h = {}
 
     [
@@ -80,13 +81,15 @@ class Lambchop::Client
 
     $stderr.puts('Function was uploaded:')
     $stderr.puts(JSON.pretty_generate(resp_h))
-    $stderr.puts('Node modules:')
-    $stderr.puts(JSON.pretty_generate(node_modules))
+    $stderr.puts('Node modules: ' + JSON.dump(node_modules))
+    $stderr.puts('Extra files: ' + JSON.dump(extra_files))
   end
 
-  def zip_source(src)
+  def zip_source(src, include_files)
     src_dir = File.dirname(@path)
+    script_file = File.basename(@path)
     node_modules = []
+    extra_files = []
 
     Dir.glob("#{src_dir}/node_modules/**/*") do |file|
       if File.file?(file)
@@ -94,20 +97,34 @@ class Lambchop::Client
       end
     end
 
+    if include_files
+      Dir.glob(include_files) do |file|
+        next unless File.file?(file)
+        next if node_modules.include?(file)
+        next if file.sub(%r|\A#{src_dir}/|, '') == script_file
+        extra_files << file
+      end
+    end
+
     buf = Zip::OutputStream.write_buffer do |out|
-      out.put_next_entry(File.basename(@path))
+      out.put_next_entry(script_file)
       out.write(src)
 
       node_modules.each do |file|
         out.put_next_entry(file.sub(%r|\A#{src_dir}/|, ''))
         out.write(open(file, &:read))
       end
+
+      extra_files.each do |file|
+        out.put_next_entry(file.sub(%r|\A#{src_dir}/|, ''))
+        out.write(open(file, &:read))
+      end
     end
 
     node_modules = node_modules.map {|file|
       file.sub(%r|\A#{src_dir}/|, '').split('/', 3)[1]
     }.uniq.sort
 
-    [buf, node_modules]
+    [buf, node_modules, extra_files]
   end
 end

data/lib/lambchop/version.rb

@@ -1,3 +1,3 @@
 module Lambchop
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambchop
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Sugawara