jets 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce580a14e5051954606f507aa2a9f4edcca4930045970966762d8ceb9857c814
-  data.tar.gz: da3d1d6d89c829ee6c28b9808f45c4db6b648925502f20164a725a5ad2acc59f
+  metadata.gz: 240ea62121417687a7b24ed6cf556ac1d6f4f2c543238af1b4ac83b6893b28dc
+  data.tar.gz: 45856a9db0ae99ad504f07e83620b96e45a461261103ed336b02e35705ccc5fa
 SHA512:
-  metadata.gz: 9a77865cdc7eea19c9bbfb7a82d33c1196c9dbfdb29a990c5c5e268cd9cb3c4dc569d59fe88be10f0ad68b59af9800ed7809fede94f691d4a8e10763af46ea90
-  data.tar.gz: b1fab039f595fa5555d4239499868d66d9e1ed72f007c7e9f0fa10bb85fadb41c4cb26e470eedd839f42bd5fcb7da8412a069c5a658e49f004ccc5544178c4a5
+  metadata.gz: 1d9d8ab908e3206a94011151ea57200f8ddd2d4a6f30adb962d29b7282f11a724fd72ad5ad4682726ff66f20de3fe204b0492bae9fdcb3b92083322a7e7bb45d
+  data.tar.gz: c9a98f6f292ef8383533b7de5bc62d75f15374c932028a5c8e7370c79961b7693d5152754e74b4c1208de7b07dc8ab3e589d92336eafe77730a9d33246987e31

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.8.10]
+- allow perform_now to run with default empty event
+- fix env_properties in function resource, fixes stage name
+
 ## [0.8.9]
 - clean up convenience properties and add rest of them PR #24
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.8.9)
+    jets (0.8.10)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/lib/jets/commands/main.rb

@@ -14,8 +14,6 @@ module Jets::Commands
 
     desc "deploy [environment]", "Builds and deploys project to AWS Lambda"
     long_desc Help.text(:deploy)
-    option :capabilities, type: :array, desc: "iam capabilities. Ex: CAPABILITY_IAM, CAPABILITY_NAMED_IAM"
-    option :iam, type: :boolean, desc: "Shortcut for common IAM capabilities: CAPABILITY_IAM, CAPABILITY_NAMED_IAM"
     # Note the environment is here to trick the Thor parser to allowing an
     # environment parameter. It is not actually set here.  It is set earlier
     # in cli.rb: set_jets_env_for_deploy_command!

data/lib/jets/controller/rendering.rb

@@ -62,7 +62,7 @@ class Jets::Controller
       return url unless actual_host
 
       if actual_host.include?("amazonaws.com") && url.starts_with?('/')
-        stage_name = [Jets.config.short_env, Jets.config.env_extra].compact.join('_').gsub('-','_') # Stage name only allows a-zA-Z0-9_
+        stage_name = Jets::Resource::ApiGateway::Deployment.stage_name
         url = "/#{stage_name}#{url}"
       end
       url

data/lib/jets/job/base.rb

@@ -15,11 +15,11 @@ class Jets::Job
         job.send(meth)
       end
 
-      def perform_now(meth, event, context=nil)
+      def perform_now(meth, event={}, context={})
         new(event, context, meth).send(meth)
       end
 
-      def perform_later(meth, event, context=nil)
+      def perform_later(meth, event={}, context={})
         function_name = "#{self.to_s.underscore}-#{meth}"
         call = Jets::Commands::Call.new(function_name, JSON.dump(event), invocation_type: "Event")
         call.run

data/lib/jets/resource/function.rb

@@ -23,16 +23,24 @@ class Jets::Resource
     end
 
     def combined_properties
-      props = env_file_properties
+      props = env_properties
         .deep_merge(global_properties)
         .deep_merge(class_properties)
         .deep_merge(function_properties)
       finalize_properties!(props)
     end
 
-    def env_file_properties
+    def env_properties
       env_vars = Jets::Dotenv.load!(true)
-      {environment: { variables: env_vars }}
+      variables = environment.merge(env_vars)
+      {environment: { variables: variables }}
+    end
+
+    def environment
+      env = Jets.config.environment ? Jets.config.environment.to_h : {}
+      jets_env_options = {JETS_ENV: Jets.env.to_s}
+      jets_env_options[:JETS_ENV_EXTRA] = Jets.config.env_extra if Jets.config.env_extra
+      env.deep_merge(jets_env_options)
     end
 
     # Global properties example:
@@ -173,12 +181,5 @@ class Jets::Resource
       method = method.sub('/','-') + "-#{@task.meth}"
       "#{Jets.config.project_namespace}-#{method}"
     end
-
-    def environment
-      env = Jets.config.environment ? Jets.config.environment.to_h : {}
-      jets_env_options = {JETS_ENV: Jets.env.to_s}
-      jets_env_options[:JETS_ENV_EXTRA] = Jets.config.env_extra if Jets.config.env_extra
-      env.deep_merge(jets_env_options)
-    end
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Tung Nguyen