jets 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240ea62121417687a7b24ed6cf556ac1d6f4f2c543238af1b4ac83b6893b28dc
-  data.tar.gz: 45856a9db0ae99ad504f07e83620b96e45a461261103ed336b02e35705ccc5fa
+  metadata.gz: 3264a5fe8f2efe3fd744fa432d0ae6e73ada5bde0d9b816be1e39f0ba57e710d
+  data.tar.gz: a375816841050159a774bb104f97327fae41ab0935466fff959c3f54127aa26e
 SHA512:
-  metadata.gz: 1d9d8ab908e3206a94011151ea57200f8ddd2d4a6f30adb962d29b7282f11a724fd72ad5ad4682726ff66f20de3fe204b0492bae9fdcb3b92083322a7e7bb45d
-  data.tar.gz: c9a98f6f292ef8383533b7de5bc62d75f15374c932028a5c8e7370c79961b7693d5152754e74b4c1208de7b07dc8ab3e589d92336eafe77730a9d33246987e31
+  metadata.gz: 74694ae655562a8d40610a4f3ceba61d845f1695100966fd6bb424ad8c9a083f818f2921cdd40274c8b2844afa4ca61fcfaecb7d245b7528752fb72d37f2a039
+  data.tar.gz: 7fc5634ed17b2abd762cdf3014686caafec5e7bfc6add32ccc5c3172b6d75dae7406010a5275658a45dfb1dae0d705a3e17e4aa0621d54c4afe0ee7f022f041e

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.11]
+- Inherit class properties from parent classes PR #25
+- Make more puts like methods show up in cloudwatch logs
+- Fix add_logical_id_counter to events
+
 ## [0.8.10]
 - allow perform_now to run with default empty event
 - fix env_properties in function resource, fixes stage name

data/Gemfile.lock

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

data/README.md

@@ -131,3 +131,10 @@ For more documentation, check out the official docs: [Ruby on Jets](http://rubyo
 * [CLI Reference](http://rubyonjets.com/reference/)
 * [Contributing](http://rubyonjets.com/docs/contributing/)
 * [Support Jets](http://rubyonjets.com/support-jets/)
+
+## Articles
+
+* [Introducing Jets: A Ruby Serverless Framework](https://blog.boltops.com/2018/08/18/introducing-jets-a-ruby-serverless-framework)
+* [AWS Lambda Ruby Support at Native Speed with Jets](https://blog.boltops.com/2018/09/02/aws-lambda-ruby-support-at-native-speed-with-jets)
+* [Jets Tutorial An Introductory CRUD App Part 1](https://blog.boltops.com/2018/09/07/jets-tutorial-crud-app-introduction-part-1)
+* [Jets Tutorial Deploy to AWS Lambda Part 2](https://blog.boltops.com/2018/09/08/jets-tutorial-deploy-to-aws-lambda-part-2)

data/lib/jets/cfn/builders/api_deployment_builder.rb

@@ -12,7 +12,6 @@ class Jets::Cfn::Builders
     def compose
       return if @options[:stack_type] == :minimal
 
-      puts "Building API Gateway Deployment template."
       deployment = Jets::Resource::ApiGateway::Deployment.new
       add_resource(deployment)
       add_parameters(deployment.parameters)

data/lib/jets/cfn/builders/api_gateway_builder.rb

@@ -12,7 +12,6 @@ class Jets::Cfn::Builders
     def compose
       return if @options[:stack_type] == :minimal
 
-      puts "Building API Gateway template."
       add_gateway_rest_api
       add_gateway_routes
     end

data/lib/jets/cfn/builders/parent_builder.rb

@@ -12,7 +12,7 @@ class Jets::Cfn::Builders
 
     # compose is an interface method
     def compose
-      puts "Building parent template."
+      puts "Building parent CloudFormation template."
 
       build_minimal_resources
       build_child_resources unless @options[:stack_type] == :minimal
@@ -36,6 +36,8 @@ class Jets::Cfn::Builders
     end
 
     def build_child_resources
+      puts "Building child CloudFormation templates."
+
       expression = "#{Jets::Naming.template_path_prefix}-*"
       # IE: path: #{Jets.build_root}/templates/demo-dev-2-comments_controller.yml
       Dir.glob(expression).each do |path|

data/lib/jets/commands/build.rb

@@ -42,7 +42,6 @@ module Jets::Commands
     def build_all_templates
       clean_templates
       # CloudFormation templates
-      puts "Building Lambda functions as CloudFormation templates."
       # 1. Shared templates - child templates needs them
       build_api_gateway_templates
       # 2. Child templates - parent template needs them

data/lib/jets/core_ext/kernel.rb

@@ -2,16 +2,36 @@
 module Kernel
   @@io_buffer = []
 
-  alias_method :original_puts, :puts
-  def puts(message)
-    @@io_buffer << message
-    original_puts(message)
+  # List from https://ruby-doc.org/core-2.5.1/Kernel.html
+  # Note, will lose pp format in the @io_buffer but looks like a lot of work to keep the pp format.
+  # Must override stdout which can be messy quick: https://www.ruby-forum.com/topic/43725
+  OVERRIDE_METHODS = %w[
+    p
+    pp
+    print
+    printf
+    putc
+    puts
+    sprintf
+  ]
+  OVERRIDE_METHODS.each do |meth|
+    # Example of generated code:
+    #
+    #   alias_method :original_puts, :puts
+    #   def puts(*args, &block)
+    #     @@io_buffer << args.first # message
+    #     original_puts(*args, &block)
+    #   end
+    #
+    class_eval <<~CODE
+      alias_method :original_#{meth}, :#{meth}
+      def #{meth}(*args, &block)
+        @@io_buffer << args.first # message
+        original_#{meth}(*args, &block)
+      end
+    CODE
   end
 
-  # TODO: implement other methods that write output:
-  # p, print, printf, putc, puts, sprintf?
-  # Also, would be nice to figure out pp method also.
-
   def io_buffer
     @@io_buffer
   end
@@ -24,9 +44,8 @@ module Kernel
     begin
       IO.write("/tmp/jets-output.log", chunk)
     # Writing to log with binary content will crash the process so rescuing it and writing an info message.
-    rescue Encoding::UndefinedConversionError => e
-      error_message = "Encoding::UndefinedConversionError: Binary data was written to Jets::IO buffer. Writing binary data to the log will crash the process, so discarding it.  This is an info message only. If you want to return binary data please base64 encode the data."
-      IO.write("/tmp/jets-output.log", error_message)
+    rescue Encoding::UndefinedConversionError
+      IO.write("/tmp/jets-output.log", "[BINARY DATA]")
     end
     @@io_buffer = []
   end

data/lib/jets/job/dsl.rb

@@ -66,6 +66,7 @@ module Jets::Job::Dsl
         n = 1
         @resources.map do |definition|
           logical_id = definition.keys.first
+          logical_id = logical_id.sub(/\d+$/,'')
           numbered_resources << { "#{logical_id}#{n}" => definition.values.first }
           n += 1
         end

data/lib/jets/resource/base.rb

@@ -4,7 +4,6 @@ class Jets::Resource
     delegate :logical_id, :type, :properties, :attributes, :parameters, :outputs,
              to: :resource
 
-    # Usually overridden
     def resource
       Jets::Resource.new(definition, replacements)
     end

data/lib/jets/resource/function.rb

@@ -81,11 +81,28 @@ class Jets::Resource
     def class_properties
       # klass is PostsController, HardJob, GameRule, Hello or HelloFunction
       klass = Jets::Klass.from_task(@task)
-      class_properties = klass.class_properties
+
+      class_properties = lookup_class_properties(klass)
       if klass.build_class_iam?
         iam_policy = Jets::Resource::Iam::ClassRole.new(klass)
         class_properties[:role] = "!GetAtt #{iam_policy.logical_id}.Arn"
       end
+
+      class_properties
+    end
+
+    # Accounts for inherited class_properties
+    def lookup_class_properties(klass)
+      all_classes = []
+      while klass != Object
+        all_classes << klass
+        klass = klass.superclass
+      end
+      class_properties = {}
+      # Go back down class heirachry top to down
+      all_classes.reverse.each do |k|
+        class_properties.merge!(k.class_properties)
+      end
       class_properties
     end
 

data/lib/jets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor