lamma 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 48c666ef5bf2f86912462d63b6e29c20165c1bfd
-  data.tar.gz: bb28bc07806ce282888ceb94431b56d513fc42f1
+SHA256:
+  metadata.gz: c924bb615fcc7c4b5f4baa03624dddf90cb7ab4b6836ac0921658f2477b9e258
+  data.tar.gz: 7b645cecaf5342501c9b8b256861e156f6f1231b38da0b0c0f906dcb6600ce18
 SHA512:
-  metadata.gz: 3a53c581460c7981e90c9258f169b0180b7fd3d7b254b4448f7acbf939ce844ffebc45662c010e699c0641cabb11252fb1d0a205b299957335f5d1565d3acdbe
-  data.tar.gz: 8642d8f477ca8ac025c7b52be42504395a3f6a49bbbc1030c60f9e624f161eec960b9028ab24ecdd99387f7c96b04c6dc3d61e39ab0dbfa36c117d873e711fff
+  metadata.gz: 74b3b5bd632f8fd27a6b7d6c84779952476df001b3d47b26c6a2c3e55a03ff72f564c71c1283001d3ab7a15884c15d9115a6d06dfc71452734b41df434f9914f
+  data.tar.gz: 2e4d4b8e122a32eca8e92856d42473b2050e09a3c4d204c7d03e211932f0de856cb5b3463c29ee388241beec9d63fb1f8e852ae37e70f937f0d3460c88045bd7

data/.travis.yml

@@ -20,3 +20,4 @@ deploy:
   on:
     tags: true
     repo: ayemos/lamma
+    rvm: 2.4.0

data/README.md

@@ -4,7 +4,7 @@
 [![Test Coverage](https://codeclimate.com/github/ayemos/lamma/badges/coverage.svg)](https://codeclimate.com/github/ayemos/lamma/coverage)
 [![Issue Count](https://codeclimate.com/github/ayemos/lamma/badges/issue_count.svg)](https://codeclimate.com/github/ayemos/lamma)
 
-It will help [Amazon Lambda](http://aws.amazon.com/lambda/) developer to, 
+It will help [AWS Lambda](http://aws.amazon.com/lambda/) developers to,
 - Create new function,
 - Deploy current code,
 - and to Rollback last deployment.
@@ -35,15 +35,21 @@ export AWS_ACCESS_KEY_ID = [YOUR_AWS_ACCESS_KEY_ID]
 export AWS_SECRET_ACCESS_KEY = [YOUR_AWS_SECRET_ACCESS_KEY]
 ```
 
+## Examples
+see `./examples`
+
 # Todo
-- [ ] Support Automatic IAM Role initialization
+- [x] Support Automatic IAM Role initialization
 - [ ] Support dead letter queue configuration
-- [ ] Support environment variables
-- [ ] Support KMS encripted variable configuration
+- [x] Support environment variables
+- [x] Support KMS encripted variable configuration
 - [ ] Support VPC configuration
 - [ ] Prepare init templates
   - [x] python2.7
+  - [ ] python3
   - [ ] node4.3
   - [ ] node4.3 edge
   - [ ] C#
   - [ ] Java8
+- [ ] Support permission setting (add another command ?)
+- [ ] Support python3 runtime

data/examples/hello/lammda.yml

@@ -0,0 +1,8 @@
+function:
+  name: hello
+  role_arn: YOUR_ROLE_ARN
+  description: Hello, world.
+  timeout: 3
+  memory_size: 128
+  runtime: python2.7
+  region: ap-northeast-1

data/lamma.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "lamma"
   spec.version       = Lamma::VERSION
   spec.authors       = ["Yuichiro Someya"]
-  spec.email         = ["ayemos.y@gmail.com"]
+  spec.email         = ["me@ayemos.me"]
 
   spec.summary       = %q{Deploy toolset for Amazon Lambda functions.}
   spec.description   = %q{Deploy toolset for Amazon Lambda functions..}

data/lib/lamma/cli.rb

@@ -20,7 +20,7 @@ module Lamma
     end
 
     desc 'deploy', 'Upload local lambda function to AWS and deploy.'
-    method_option :path, aliases: '-p', type: :string
+    method_option :conf_path, aliases: '-c', type: :string
     method_option :alias, aliases: '-a', type: :string
     method_option :message, aliases: '-m', type: :string
     def deploy
@@ -29,7 +29,7 @@ module Lamma
     end
 
     desc 'rollback', 'Rollback last deploy.'
-    method_option :path, aliases: '-p', type: :string
+    method_option :conf_path, aliases: '-c', type: :string
     method_option :alias, aliases: '-a', type: :string
     def rollback
       require 'lamma/cli/rollback'
@@ -37,7 +37,7 @@ module Lamma
     end
 
     desc 'create', 'Create new remote function.'
-    method_option :path, aliases: '-p', type: :string
+    method_option :conf_path, aliases: '-c', type: :string
     def create
       require 'lamma/cli/create'
       Create.new(options, self).run
@@ -46,6 +46,7 @@ module Lamma
     desc 'init FUNCTION_NAME', 'Initialize local function'
     method_option :runtime, aliases: '-r', type: :string, required: true
     method_option :role_arn, aliases: %w(--role-arn -R), type: :string
+    method_option :skip_git, aliases: %w(--skip-git -G), type: :boolean
     def init(function_name)
       require 'lamma/cli/init'
       Init.new(options, function_name, self).run

data/lib/lamma/cli/create.rb

@@ -5,7 +5,7 @@ module Lamma
     def initialize(options, thor)
       @options = options
       @thor = thor
-      @conf_path = options[:path] || Lamma::DEFAULT_CONF_PATH
+      @conf_path = options[:conf_path] || Lamma::DEFAULT_CONF_PATH
     end
 
     def run

data/lib/lamma/cli/deploy.rb

@@ -14,7 +14,7 @@ module Lamma
     def initialize(options, thor)
       @options = options
       @thor = thor
-      @conf_path = search_conf_path(options['path'] || Lamma::DEFAULT_CONF_PATH)
+      @conf_path = search_conf_path(options['conf_path'] || Lamma::DEFAULT_CONF_PATH)
     end
 
     def run

data/lib/lamma/cli/init.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'aws-sdk'
 require 'uri'
 require 'json'
@@ -43,10 +44,12 @@ module Lamma
 
     def run
       if Dir.exist?(target)
-        abort("Directory '#{target}' already exists.")
+        Lamma.logger.fatal "Directory '#{target}' already exists."
+        exit(1)
       end
 
       tpath = File.join(File.dirname(__FILE__), '..', 'templates', runtime.to_dirname)
+      p tpath
       templates = Dir.glob(File.join(tpath, '**/*.erb')).map do |path|
         tar_file = path[tpath.length..path.length - 5] # /foo/bar/templates/RUNTIME/baz/lambda_function.py.erb => /baz/lambda_function.py
 
@@ -54,7 +57,7 @@ module Lamma
       end.to_h
 
       unless Dir.exist?(target)
-        FileUtils.makedirs(target)
+        ::FileUtils.makedirs(target)
       end
 
       role_arn = options['role_arn']
@@ -82,10 +85,12 @@ module Lamma
       end
 
 
-      Lamma.logger.info "Initializing git repo in #{target}"
-      Dir.chdir(target) do
-        `git init`
-        `git add .`
+      unless options['skip_git']
+        p options
+        Lamma.logger.info "Initializing git repo in #{target}"
+        Dir.chdir(target) do
+          `git init`
+        end
       end
     end
 

data/lib/lamma/cli/rollback.rb

@@ -14,7 +14,7 @@ module Lamma
     def initialize(options, thor)
       @options = options
       @thor = thor
-      @conf_path = search_conf_path(options['path'] || Lamma::DEFAULT_CONF_PATH)
+      @conf_path = search_conf_path(options['conf_path'] || Lamma::DEFAULT_CONF_PATH)
     end
 
     def run

data/lib/lamma/cli/show.rb

@@ -4,7 +4,7 @@ module Lamma
       @options = options
       @thor = thor
       @function_name = function_name
-      @conf_path = options[:path] || Lamma::DEFAULT_CONF_PATH
+      @conf_path = options[:conf_path] || Lamma::DEFAULT_CONF_PATH
     end
 
     def run

data/lib/lamma/code.rb

@@ -69,10 +69,10 @@ module Lamma
       if @prebuild
         Lamma.logger.info 'Running prebuild script...'
         raise unless system(@prebuild)
-      elsif @function.runtime == Lamma::Runtime::PYTHON_27 \
+      elsif [Lamma::Runtime::PYTHON_27, Lamma::Runtime::PYTHON_36].include?(@function.runtime.type) \
         && File.exist?(File.join(@source_path, 'requirements.txt'))
         raise unless system("pip", "install", "-r", "requirements.txt", "-t", ".")
-      elsif [Lamma::Runtime::EDGE_NODE_43, Lamma::Runtime::NODE_43].include?(@function.runtime) \
+      elsif [Lamma::Runtime::EDGE_NODE_43, Lamma::Runtime::NODE_43].include?(@function.runtime.type) \
         && File.exist?(File.join(@source_path, 'package.json'))
         raise unless system("npm", "install", "--production")
       end

data/lib/lamma/environment.rb

@@ -1,5 +1,7 @@
 module Lamma
   class Environment
+    attr_accessor :variables
+
     def initialize(yaml)
       @variables = yaml.fetch('variables', {})
     end

data/lib/lamma/function.rb

@@ -152,11 +152,11 @@ module Lamma
     end
 
     def dead_letter_config
-      DeadLetterConfig.new(@conf.fetch('dead_letter_config', {}))
+      @dead_letter_config ||= DeadLetterConfig.new(@conf.fetch('dead_letter_config', {}))
     end
 
     def environment
-      Environment.new(@conf.fetch('environment', {}))
+      @environment ||= Environment.new(@conf.fetch('environment', {}))
     end
 
     def vpc_config
@@ -173,7 +173,7 @@ module Lamma
         'index.handler'
       when Runtime::EDGE_NODE_43
         'index.handler'
-      when Runtime::PYTHON_27
+      when Runtime::PYTHON_27, Runtime::PYTHON_36
         'lambda_function.lambda_handler'
       end
     end

data/lib/lamma/runtime.rb

@@ -11,6 +11,7 @@ module Lamma
     NODE_43 = 30
     EDGE_NODE_43 = 31
     PYTHON_27 = 40
+    PYTHON_36 = 41
 
     def initialize(str)
       @type =
@@ -25,6 +26,8 @@ module Lamma
           ::Lamma::Runtime::EDGE_NODE_43
         when /^python([-_\.\s]*2(\.?7)?)?$/i
           ::Lamma::Runtime::PYTHON_27
+        when /^python([-_\.\s]*3(\.?6)?)?$/i
+          ::Lamma::Runtime::PYTHON_36
         else
           raise ArgumentError.new("invalid runtime. #{str}")
         end
@@ -35,7 +38,8 @@ module Lamma
       JAVA_8 => 'java8',
       NODE_43 => 'nodejs4.3',
       EDGE_NODE_43 => 'nodejs4.3-edge',
-      PYTHON_27 => 'python2.7'
+      PYTHON_27 => 'python2.7',
+      PYTHON_36 => 'python3.6',
     }
 
     def to_s

data/lib/lamma/templates/python3_6/lambda_function.py.erb

@@ -0,0 +1,13 @@
+import json
+
+
+print('Loading function')
+
+
+def lambda_handler(event, context):
+    #print("Received event: " + json.dumps(event, indent=2))
+    print("value1 = " + event['key1'])
+    print("value2 = " + event['key2'])
+    print("value3 = " + event['key3'])
+    return event['key1']  # Echo back the first key value
+    #raise Exception('Something went wrong')

data/lib/lamma/templates/python3_6/lamma.yml.erb

@@ -0,0 +1,8 @@
+function:
+  name: <%= function_name %>
+  role_arn: <%= role_arn %>
+  description: Hello, world.
+  timeout: 3
+  memory_size: 128
+  runtime: python3.6
+  region: <%= region_or_raise %>

data/lib/lamma/version.rb

@@ -1,3 +1,3 @@
 module Lamma
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamma
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Yuichiro Someya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,7 +124,7 @@ dependencies:
         version: '3.0'
 description: Deploy toolset for Amazon Lambda functions..
 email:
-- ayemos.y@gmail.com
+- me@ayemos.me
 executables:
 - lamma
 extensions: []
@@ -163,6 +163,8 @@ files:
 - lib/lamma/shared_helpers.rb
 - lib/lamma/templates/python2_7/lambda_function.py.erb
 - lib/lamma/templates/python2_7/lamma.yml.erb
+- lib/lamma/templates/python3_6/lambda_function.py.erb
+- lib/lamma/templates/python3_6/lamma.yml.erb
 - lib/lamma/version.rb
 - lib/lamma/vpc_config.rb
 homepage: https://github.com/ayemos/Lamma
@@ -186,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Deploy toolset for Amazon Lambda functions.