jets 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b439f0c17028d8e6ba1a990fc738e6920e074da8f2d43a08717f55ffc7c32c
-  data.tar.gz: b9ec45848d7d53db76e9b3e222f01262bfdc11076923508932033a1f6d0e9d42
+  metadata.gz: ba1ae625286077b458d497643590d72d83d10e800ce1d8fc1bf18599260501a0
+  data.tar.gz: cdccc52793152392901ae9c27e5bfbeafaccf49d4fc78fea70dc28feeda0d8ee
 SHA512:
-  metadata.gz: 9c145fc325470e209d0b219a5cd3a77052e6b15b4ba9b4d5e9786ea8b9d05e254f14136565f8e70552449ca82c0c7976a6a5e248165a1aeee63583bab17978cf
-  data.tar.gz: f78b28c18e767a2d43ad0bb719d6c91eaed94b0b5ac6ffb85fc44d933adbacc38167391512d986ac7b4b6b3b487654cd6d065f3e8f67238d71d880a1c0f63514
+  metadata.gz: 6ead8f6f9e01613c614e6815e25ad777413fb2222e07b065962a7ee3e33d19dad7dcb7fd9a158da57543ba9ec65c3634043081ea44636227a633d29dbb914035
+  data.tar.gz: 59a7f19c9e3486d68462f929d0ef93b54ec752edc4ae9b880bd535fd57d969370088a4053c4bf37cd0da63ed2b113ffe75b8804e6f7842da182c39a5b6223ace

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.6.6]
+- improve puts handling: PR #15
+
 ## [0.6.5]
 - fix prewarming after a deploy
 

data/Gemfile.lock

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

data/lib/jets.rb

@@ -44,13 +44,16 @@ module Jets
   extend Core # root, logger, etc
 
   autoload :RubyServer, "jets/ruby_server"
+  autoload :IO, "jets/io"
+  autoload :Logger, "jets/logger"
 end
 
+require "jets/core_ext/kernel"
+
 $:.unshift(File.expand_path("../../vendor/lambdagem/lib", __FILE__))
 require "lambdagem"
 require "gems" # lambdagem dependency
 
-
 # lazy loaded dependencies: depends what project. Mainly determined by Gemfile
 # and config files.
 if File.exist?("#{Jets.root}config/dynamodb.yml")

data/lib/jets/booter.rb

@@ -4,7 +4,7 @@ class Jets::Booter
     def boot!(options={})
       return if @booted
 
-      redirect_output(options)
+      redirect_output
       confirm_jets_project!
       require_bundle_gems
       Jets::Dotenv.load!
@@ -14,37 +14,21 @@ class Jets::Booter
       @booted = true
     end
 
-    # TODO: Reconsider if we should redirect stdout to stderr globally for local request.
-    # Dont think we need to anymore now that we're not using the old shim.
+    # AWS Lambda for natively supported languages prints to CloudWatch instead of
+    # mungling up the response. We'll redirect stdout to stderr to mimic AWS Lambda
+    # behavior.
     #
-    # So for `{stringio: false}` and `jets call --local`, redirecting helps
-    # but we can also just go fix that jets call method. Though there might be a lot
-    # of other places where we might have to fix puts calls.
-    def redirect_output(options={})
+    # Also, for local use, printing to stdout can mangle up the response when piping
+    # the value to jq. For example:
+    #
+    #   `jets call --local .. | jq`
+    #
+    # By redirecting stderr we can use jq safely.
+    #
+    def redirect_output
       $stdout.sync = true
       $stderr.sync = true
-      if options[:stringio]
-        # Set both $stdout and $stdout to a StringIO object as a buffer.
-        # At the end of the request, write this buffer to the filesystem.
-        # In the node shim, read it back and write it to AWS Lambda logs.
-        #
-        # This allows using `puts` to write to CloudWatch.
-        $stdout = $stderr = StringIO.new # for ruby_server and AWS Lambda to capture log
-      else
-        # Printing to stdout can mangle up the response if we're piping the value to
-        # jq. For exampe, `jets call --local .. | jq`
-        # By redirecting stderr we can use jq.
-        #
-        $stdout = $stderr # jets call and local jets operation
-      end
-    end
-
-    # Used in ruby_server.rb
-    def flush_output
-      IO.write("/tmp/jets-output.log", $stdout.string)
-      # Thanks: https://stackoverflow.com/questions/28445000/how-can-i-clear-a-stringio-instance
-      $stdout.truncate(0)
-      $stdout.rewind
+      $stdout = $stderr # jets call and local jets operation
     end
 
     # require_bundle_gems called when environment boots up via Jets.boot.  It

data/lib/jets/commands/deploy.rb

@@ -12,6 +12,7 @@ module Jets::Commands
       puts "Deploying to Lambda #{deployment_env} environment..."
       return if @options[:noop]
 
+      check_dev_mode
       build_code
       validate_routes!
 
@@ -24,6 +25,13 @@ module Jets::Commands
     end
     time :run
 
+    def check_dev_mode
+      if File.exist?("#{Jets.root}dev.mode")
+        puts "The dev.mode file exists. Please removed it and run bundle update before you deploy.".colorize(:red)
+        exit 1
+      end
+    end
+
     def build_code
       Jets::Commands::Build.new(@options).build_code
     end

data/lib/jets/core.rb

@@ -1,4 +1,3 @@
-require 'logger'
 require 'active_support/dependencies'
 require 'memoist'
 
@@ -65,7 +64,7 @@ module Jets::Core
   memoize :build_root
 
   def logger
-    Logger.new($stderr)
+    Jets::Logger.new($stderr)
   end
   memoize :logger
 

data/lib/jets/core_ext/kernel.rb

@@ -0,0 +1,23 @@
+# Works with jets/io.rb
+module Kernel
+  @@io_buffer = []
+
+  alias_method :original_puts, :puts
+  def puts(message)
+    @@io_buffer << message
+    original_puts(message)
+  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
+
+  def io_flush
+    IO.write("/tmp/jets-output.log", @@io_buffer.join("\n"))
+    @@io_buffer = []
+  end
+end

data/lib/jets/io.rb

@@ -0,0 +1,14 @@
+# Wrapper class works with jets/core_ext/kernel.rb
+module Jets
+  class IO
+    class << self
+      def buffer
+        Kernel.io_buffer
+      end
+
+      def flush
+        Kernel.io_flush
+      end
+    end
+  end
+end

data/lib/jets/logger.rb

@@ -0,0 +1,24 @@
+require 'logger'
+
+module Jets
+  class Logger < ::Logger
+    # Only need to override the add method as the other calls all lead to it.
+    def add(severity, message = nil, progname = nil)
+      # Taken from Logger#add source
+      # https://ruby-doc.org/stdlib-2.5.1/libdoc/logger/rdoc/Logger.html#method-i-add
+      if message.nil?
+        if block_given?
+          message = yield
+        else
+          message = progname
+          progname = @progname
+        end
+      end
+      # Put the message in the Jets::IO.buffer which will get flushed to CloudWatch.
+      # No need to include timestamp as CloudWatch already has a timestamp.
+      IO.buffer << message
+
+      super # original logical
+    end
+  end
+end

data/lib/jets/ruby_server.rb

@@ -66,7 +66,7 @@ module Jets
           prewarm_request(event) :
           standard_request(event, '{}', handler)
 
-        Jets::Booter.flush_output # flushing output as soon we dont need it anymore
+        Jets::IO.flush # flush output and write to disk for node shim
 
         client.puts(result)
         client.close
@@ -76,6 +76,7 @@ module Jets
     def prewarm_request(event)
       # JSON.dump("prewarmed_at" => Time.now.to_s)
       Jets.increase_prewarm_count
+      Jets.logger.info("Prewarm request")
       %Q|{"prewarmed_at":"#{Time.now.to_s}"}| # raw json for speed
     end
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -548,6 +548,7 @@ files:
 - lib/jets/controller/rendering.rb
 - lib/jets/controller/request.rb
 - lib/jets/core.rb
+- lib/jets/core_ext/kernel.rb
 - lib/jets/default/application.rb
 - lib/jets/dotenv.rb
 - lib/jets/erb.rb
@@ -571,6 +572,7 @@ files:
 - lib/jets/internal/app/controllers/jets/welcome_controller.rb
 - lib/jets/internal/app/controllers/jets/welcome_controller/python/index.py
 - lib/jets/internal/app/jobs/jets/preheat_job.rb
+- lib/jets/io.rb
 - lib/jets/job.rb
 - lib/jets/job/base.rb
 - lib/jets/job/dsl.rb
@@ -582,6 +584,7 @@ files:
 - lib/jets/lambda/function_constructor.rb
 - lib/jets/lambda/functions.rb
 - lib/jets/lambda/task.rb
+- lib/jets/logger.rb
 - lib/jets/naming.rb
 - lib/jets/pascalize.rb
 - lib/jets/poly_fun.rb