lambchop 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd5da57f0b09c3e6e39a68d3b664481e2d9bc5b3
-  data.tar.gz: bd10121b385df746d1d0ea585e2826fc0a134ce5
+  metadata.gz: 767cf7d18e8ec7aaa5aae1d17b9b0746b3915404
+  data.tar.gz: f11c95fb9f7cac65425c15ab9753bc45141ff120
 SHA512:
-  metadata.gz: 8ca61c4caf048beb364c3a266d6ef1198f68a92e0250d6eef9af7d61001e718fb67701c3b9c059442fa44cdc16c6a04380a7b2f6c0b46b95c11670ad64f29083
-  data.tar.gz: 099a37fa085f58629d5a08064d0a76be3dcf56c6dcc18386335e3899b1642e2830c9d231e63662662ba5234285d72bd9bfec29523a2f6206a7923202a27330bd
+  metadata.gz: f0852b44385802c6f1ffd2ec6277568dc9e43b53b9c4e983bbb83dd54c4ddcdce884d1544f6d7022e54e340702e0556a2bce7e18f638b76b3d871c624d669ec7
+  data.tar.gz: d585b6dc88ea810b56936f9aa9ad641d5dd747a5aed3706054f5040c12d73b1166b0e62c39194549035f3936d8c939ffd7c108f1f3446c0944bdfec8db802b66

data/README.md

@@ -33,7 +33,6 @@ $ cat test.js
 /*
 function_name: test # default: file name without ext
 runtime: nodejs     # default: nodejs
-mode: event         # default: event
 description: ''     # default: (empty)
 timeout: 3          # default: 3
 memory_size: 128    # default: 128
@@ -48,7 +47,7 @@ exports.handler = function(event, context) {
     console.log('value1 = ' + event.key1);
     console.log('value2 = ' + event.key2);
     console.log('value3 = ' + event.key3);
-    context.done(null, 'Hello World');  // SUCCESS with message
+    context.success('Hello World');
 };
 
 $ ./test.js
@@ -64,8 +63,11 @@ $ export AWS_REGION=us-east-1
 $ lambchop-cat
 usage: lambchop-cat <function-name>
 
-$ lambchop-cat
 $ echo '{"key1":100, "key2":200, "key3":300}' | lambchop-cat test
+---
+status_code: 200
+function_error:
+payload: '"Hello World"'
 ```
 
 **Terminal 1**:
@@ -80,6 +82,44 @@ END RequestId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
 REPORT RequestId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  Duration: 117.54 ms Billed Duration: 200 ms   Memory Size: 128 MB Max Memory Used: 9 MB
 ```
 
+### Invoke async
+
+```sh
+$ echo '{"key1":100, "key2":200, "key3":300}' | lambchop-cat test -t event
+---
+status_code: 202
+function_error:
+payload: ''
+```
+
+### Invoke with tail
+
+```sh
+$ echo '{"key1":100, "key2":200, "key3":300}' | lambchop-cat test -l tail
+status_code: 200
+function_error:
+payload: '"Hello world!"'
+log_result: |-
+  2014-11-23T08:06:53.212Z  xxxxxxxxxxxxxxxx  Loading event
+  START RequestId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  2014-11-23T08:06:53.330Z  xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  value1 = 100
+  2014-11-23T08:06:53.330Z  xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  value3 = 300
+  2014-11-23T08:06:53.330Z  xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  value2 = 200
+  END RequestId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  REPORT RequestId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  Duration: 117.54 ms Billed Duration: 200 ms   Memory Size: 128 MB Max Memory Used: 9 MB
+```
+
+
+### DryRun
+
+```sh
+$ echo '{"key1":100, "key2":200, "key3":300}' | lambchop-cat test -t dry_run
+---
+status_code: 204
+function_error:
+payload: ''
+```
+
 ## Dump function
 
 ```sh
@@ -93,7 +133,6 @@ function_name: test
 runtime: nodejs
 role: arn:aws:iam::NNNNNNNNNNNN:role/lambda_exec_role
 handler: test.handler
-mode: event
 description: ''
 timeout: 3
 memory_size: 128
@@ -104,7 +143,7 @@ exports.handler = function(event, context) {
     console.log('value1 = ' + event.key1);
     console.log('value2 = ' + event.key2);
     console.log('value3 = ' + event.key3);
-    context.done(null, 'Hello World');  // SUCCESS with message
+    context.success('Hello World');
 };
 ```
 

data/bin/lambchop

@@ -22,7 +22,6 @@ Please run the lambda script that has the following header:
 /*
 function_name: any_name     # default: file name without ext
 runtime:       nodejs       # default: nodejs
-mode:          event        # default: event
 description:   any_desc     # default: (empty)
 timeout:       3            # default: 3
 memory_size:   128          # default: 128

data/bin/lambchop-cat

@@ -2,12 +2,21 @@
 $: << File.expand_path("#{File.dirname __FILE__}/../lib")
 require 'rubygems'
 require 'lambchop'
+require 'optparse'
 
-if ARGV.length != 1
-  puts 'usage: lambchop-cat <function-name>'
-  exit 1
+Version = Lambchop::VERSION
+
+options = {
+  :invocation_type => :request_response,
+  :log_type => :none
+}
+
+ARGV.options do |opt|
+  opt.on('-t', '--invocation-type=TYPE', [:request_response, :event, :dry_run]) {|v| options[:invocation_type] = v }
+  opt.on('-l', '--log-type=TYPE', [:none, :tail]) {|v| options[:log_type] = v }
+  opt.parse!
 end
 
 Lambchop::Utils.with_error_logging do
-  Lambchop::Cat.cat(ARGV[0], $stdin)
+  Lambchop::Cat.cat(ARGV[0], $stdin, options)
 end

data/lambchop.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
 
-  spec.add_dependency 'aws-sdk-core', '~> 2.0.9'
+  spec.add_dependency 'aws-sdk-core', '~> 2.1'
   spec.add_dependency 'rubyzip', '>= 1.0.0'
   spec.add_dependency 'diffy'
   spec.add_development_dependency 'bundler'

data/lib/lambchop.rb

@@ -1,3 +1,4 @@
+require 'base64'
 require 'erb'
 require 'json'
 require 'open-uri'

data/lib/lambchop/cat.rb

@@ -7,6 +7,7 @@ class Lambchop::Cat
     @function_name = function_name
     @invoke_args   = invoke_args
     @client        = options[:client] || Aws::Lambda::Client.new
+    @out           = options[:out] || $stdout
     @options       = options
   end
 
@@ -17,9 +18,33 @@ class Lambchop::Cat
       invoke_args = invoke_args.read
     end
 
-    @client.invoke_async(
+    resp = @client.invoke(
       :function_name => @function_name,
-      :invoke_args => invoke_args
+      :payload => invoke_args,
+      :invocation_type => Lambchop::Utils.camelize(@options[:invocation_type] || :request_response),
+      :log_type => Lambchop::Utils.camelize(@options[:log_type] || :none)
     )
+
+    out = {
+      'status_code' => resp[:status_code],
+      'function_error' => resp[:function_error],
+      'payload' => nil
+    }
+
+    log_result = resp[:log_result]
+    payload = resp[:payload]
+
+    if log_result
+      log_result = Base64.strict_decode64(log_result)
+      log_result.gsub!("\t", '    ').strip!
+      def log_result.yaml_style() Psych::Nodes::Scalar::LITERAL end
+      out['log_result'] = log_result
+    end
+
+    if payload
+      out['payload'] = payload.string
+    end
+
+    @out.puts YAML.dump(out)
   end
 end

data/lib/lambchop/client.rb

@@ -23,10 +23,9 @@ class Lambchop::Client
     config['function_name'] ||= File.basename(@path, '.js')
     function_name = config['function_name']
 
-    config['mode']    ||= 'event'
     config['runtime'] ||= 'nodejs'
 
-    upload_function(config, src)
+    create_or_update_function(config, src)
 
     exit if @options[:detach]
 
@@ -38,23 +37,35 @@ class Lambchop::Client
 
   private
 
-  def upload_function(config, src)
+  def create_or_update_function(config, src)
     params = {}
     config.each {|k, v| params[k.to_sym] = v }
     buf, node_modules = zip_source(src)
-    params[:function_zip] = buf.string
 
-    resp = @client.upload_function(params)
+    begin
+      params[:code] = {:zip_file => buf.string}
+      resp = @client.create_function(params)
+    rescue Aws::Lambda::Errors::ResourceConflictException => e
+      if e.message =~ /\AFunction already exist:/
+        params = {
+          :function_name => config['function_name'],
+          :zip_file => buf.string
+        }
+
+        resp = @client.update_function_code(params)
+      else
+        raise e
+      end
+    end
     resp_h = {}
 
     [
       :function_name,
       :function_arn,
-      :configuration_id,
       :runtime,
       :role,
       :handler,
-      :mode,
+      :code_size,
       :description,
       :timeout,
       :memory_size,

data/lib/lambchop/diff.rb

@@ -21,7 +21,7 @@ class Lambchop::Diff
     file = Lambchop::Utils.remove_shebang(file)
     config, file = Lambchop::Utils.parse_magic_comment(file)
 
-    page = @client.get_function(:function_name => @function_name).first
+    page = @client.get_function(:function_name => @function_name)
 
     Lambchop::Utils.open_source(page.code.location) do |name, func|
       diff = Diffy::Diff.new(func, file, :include_diff_info => true).to_s

data/lib/lambchop/dump.rb

@@ -11,7 +11,7 @@ class Lambchop::Dump
   end
 
   def dump
-    page = @client.get_function(:function_name => @function_name).first
+    page = @client.get_function(:function_name => @function_name)
     puts_shebang
     puts_magic_comment(page.configuration)
     puts_source(page.code.location)
@@ -29,7 +29,6 @@ class Lambchop::Dump
       runtime
       role
       handler
-      mode
       description
       timeout
       memory_size

data/lib/lambchop/utils.rb

@@ -43,6 +43,10 @@ class Lambchop::Utils
       end
     end
 
+    def camelize(obj)
+      obj.to_s.gsub(/(?:\A|_)([a-z])/) { $1.upcase }
+    end
+
     def debug?
       ENV['DEBUG'] == '1'
     end

data/lib/lambchop/version.rb

@@ -1,3 +1,3 @@
 module Lambchop
-  VERSION = '0.0.13'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: lambchop
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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: It is a tool that invoke AWS Lambda function from the local machine as
@@ -93,7 +93,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -123,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: It is a tool that invoke AWS Lambda function from the local machine as a