jets 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 525a55f0013d6870b5bd4a0fa2f63b981c8af0f82e1fbf6b2cabc847a9e6cb76
-  data.tar.gz: 17171ba50a0c0e422d7d128465c21c529b13ddfbe7513a7d752f20112a5f81b9
+  metadata.gz: 35b8d7335c644339643a2c97c53d4e320967f43761949eeda46909b33f140776
+  data.tar.gz: 49d1cd847f9423e21d899107534a81c5d51c368999d60cefe70a89b39b434b9c
 SHA512:
-  metadata.gz: ea140c8868652da36b15d10da8a681792d6623cfb76e8480841900e76a2ea7ce9fd0a7fbe30c570d0d51b7d514bc8d0c6a5d8f3259a9f97ff7df6ee85b484df9
-  data.tar.gz: cc4b2ac99cbb56a2ec20d276d57e6b3a232ca8e292decd9ceb26af704d668acdca1329ae29fdcb4d0b44317c4b6a77747d194c5d767f5fd9b10240388607f6cb
+  metadata.gz: fa356ebc6da237b6046e44bf6307af25bfce9fec40746346b52d7a4bc774cdd25ef6a449573c14b3fed5b514ffddc8327c0c7d4fbdc65040abdd7a5749642271
+  data.tar.gz: 99b185e759621461ce327b014c51345fe11843732395b79d3604216c60ef668a56ba0004e14ef68faf7151dee2379ae81939084e03e4f6b6bb58cc28e716fcad

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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.
 
+## [1.6.1]
+- #162 from patchkit-net/feature/spec_helpers
+- #163 from tongueroo/spec-helpers
+- Add jets/spec/helpers.rb with rails-style controller testing helpers
+- #164 from tongueroo/encoding-fix: use encoding from content-type for mega request
+- use rainbow gem for terminal colors
+
 ## [1.6.0]
 - #158 from mmyoji/fix-docs-urls
 - #159 from patchkit-net/bugfix/invalid-longpath-collision Fix invalid collision detection on paths that already contains path variables
@@ -58,7 +65,7 @@ This project *loosely tries* to adhere to [Semantic Versioning](http://semver.or
 
 ## [1.5.0]
 - #135 from tongueroo/remove-rails-constant Remove Rails Constant
-- #136 from tongueroo/routes-namespace routes namespace support (will be adjusted)
+- #136 from tongueroo/routes-namespace routes namespace support (experimental: will be adjusted)
 
 ## [1.4.11]
 - #133 from tongueroo/custom-layer add custom lambda layer support

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.6.0)
+    jets (1.6.1)
       activerecord (~> 5.2.1)
       activesupport (~> 5.2.1)
       aws-sdk-apigateway
@@ -22,7 +22,6 @@ PATH
       aws-sdk-s3
       aws-sdk-sns
       aws-sdk-sqs
-      colorize
       dotenv
       gems
       hashie
@@ -33,6 +32,7 @@ PATH
       mimemagic
       rack
       railties (~> 5.2.1)
+      rainbow
       recursive-open-struct
       text-table
       thor
@@ -66,14 +66,14 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.133.0)
+    aws-partitions (1.135.0)
     aws-sdk-apigateway (1.23.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-cloudformation (1.14.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-cloudwatchlogs (1.12.0)
+    aws-sdk-cloudwatchlogs (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-core (3.46.0)
@@ -103,25 +103,24 @@ GEM
     aws-sigv4 (1.0.3)
     builder (3.2.3)
     byebug (10.0.2)
-    colorize (0.8.1)
     concurrent-ruby (1.1.4)
     crass (1.0.4)
     diff-lcs (1.3)
     dotenv (2.6.0)
-    dynomite (1.2.0)
+    dynomite (1.2.1)
       activesupport
       aws-sdk-dynamodb
     erubi (1.8.0)
     gems (1.1.1)
       json
     hashie (3.6.0)
-    i18n (1.5.2)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     jets-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
     jmespath (1.4.0)
     json (2.1.0)
-    kramdown (1.17.0)
+    kramdown (2.0.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -149,6 +148,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
     rake (12.3.2)
     recursive-open-struct (1.1.0)
     rspec (3.8.0)

data/README.md

@@ -7,7 +7,7 @@ Ruby and Lambda splat out a baby and that child's name is [Jets](http://rubyonje
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUE12K3ljQTFQUjVpRW0reGhGVHVQdkplTHlOdUtENnBya2JhVWVXaFIvTU92MlBtV3hIUE9pb25jWGw0MS9jN2RXMERKRHh5Nzhvd01Za0NyeUs5SCtzPSIsIml2UGFyYW1ldGVyU3BlYyI6IkMybEJFaXdzejJEaHNWVmEiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
 [![CircleCI](https://circleci.com/gh/tongueroo/jets.svg?style=svg)](https://circleci.com/gh/tongueroo/jets)
 [![Gem Version](https://badge.fury.io/rb/jets.svg)](https://badge.fury.io/rb/jets)
-[![Support](https://img.shields.io/badge/Support-Help-blue.svg)](http://rubyonjets.com/docs/support/)
+[![Support](https://img.shields.io/badge/Support-Help-blue.svg)](http://rubyonjets.com/support/)
 
 **Upgrading**: If you are upgrading Jets, please check on the [Upgrading Notes](http://rubyonjets.com/docs/upgrading/).
 

data/jets.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-s3"
   spec.add_dependency "aws-sdk-sns"
   spec.add_dependency "aws-sdk-sqs"
-  spec.add_dependency "colorize"
   spec.add_dependency "dotenv"
   spec.add_dependency "gems" # jets-gems dependency
   spec.add_dependency "hashie"
@@ -50,6 +49,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mimemagic"
   spec.add_dependency "rack"
   spec.add_dependency "railties", "~> 5.2.1" # ActiveRecord database_tasks.rb require this
+  spec.add_dependency "rainbow"
   spec.add_dependency "recursive-open-struct"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"

data/lib/jets.rb

@@ -1,15 +1,15 @@
 $:.unshift(File.expand_path("../", __FILE__))
-require "jets/version"
-require "jets/camelizer"
 require "active_support"
+require "active_support/concern"
 require "active_support/core_ext"
 require "active_support/dependencies"
 require "active_support/ordered_hash"
 require "active_support/ordered_options"
-require "active_support/concern"
-require "colorize"
 require "fileutils"
+require "jets/camelizer"
+require "jets/version"
 require "memoist"
+require "rainbow/ext/string"
 
 module Jets
   RUBY_VERSION = "2.5.3"

data/lib/jets/application.rb

@@ -90,6 +90,13 @@ class Jets::Application
     config.lambda = ActiveSupport::OrderedOptions.new
     config.lambda.layers = []
 
+    # Only used for Jets Afterburner, Mega Mode currently. This is a fallback default
+    # encoding.  Usually, the Rails response will return a content-type header and
+    # the encoding in there is used when possible. Example Content-Type header:
+    #   Content-Type    text/html; charset=utf-8
+    config.encoding = ActiveSupport::OrderedOptions.new
+    config.encoding.default = "utf-8"
+
     config
   end
 
@@ -147,8 +154,8 @@ class Jets::Application
 
   def deprecated_configs_message
     unless config.ruby.lazy_load.nil?
-      puts "Detected config.ruby.lazy_load = #{config.ruby.lazy_load.inspect}".colorize(:yellow)
-      puts "Deprecated: config.ruby.lazy_load".colorize(:yellow)
+      puts "Detected config.ruby.lazy_load = #{config.ruby.lazy_load.inspect}".color(:yellow)
+      puts "Deprecated: config.ruby.lazy_load".color(:yellow)
       puts "Gems are now bundled with with Lambda Layer and there's no need to lazy load them."
       puts "Please remove the config in your config/application.rb or config/environments files."
       puts "You can have Jets automatically do this by running:"

data/lib/jets/aws_info.rb

@@ -20,10 +20,10 @@ module Jets
         if exit_code != 0
           exception_message = region.split("\n").grep(/botocore\.exceptions/).first
           if exception_message
-            puts "WARN: #{exception_message}".colorize(:yellow)
+            puts "WARN: #{exception_message}".color(:yellow)
           else
             # show full message as warning
-            puts region.colorize(:yellow)
+            puts region.color(:yellow)
           end
           puts "You can also get rid of this message by setting AWS_REGION or configuring ~/.aws/config with the region"
           region = nil

data/lib/jets/aws_services/stack_status.rb

@@ -36,7 +36,7 @@ module Jets::AwsServices
       status = resp.stacks[0].stack_status
       if status =~ /_IN_PROGRESS$/
         puts "The '#{stack_name}' stack status is #{status}. " \
-             "Please wait until the stack is ready and try again.".colorize(:red)
+             "Please wait until the stack is ready and try again.".color(:red)
         exit 0
       elsif resp.stacks[0].outputs.empty? && status != 'ROLLBACK_COMPLETE'
         # This Happens when the miminal stack fails at the very beginning.

data/lib/jets/booter.rb

@@ -107,19 +107,19 @@ class Jets::Booter
     # Cannot call this for the jets new
     def confirm_jets_project!
       unless File.exist?("#{Jets.root}config/application.rb")
-        puts "It does not look like you are running this command within a jets project.  Please confirm that you are in a jets project and try again.".colorize(:red)
+        puts "It does not look like you are running this command within a jets project.  Please confirm that you are in a jets project and try again.".color(:red)
         exit 1
       end
     end
 
     def message
-      "Jets booting up in #{Jets.env.colorize(:green)} mode!"
+      "Jets booting up in #{Jets.env.color(:green)} mode!"
     end
 
     def check_config_ru!
       config_ru = File.read("#{Jets.root}config.ru")
       unless config_ru.include?("Jets.boot")
-        puts 'The config.ru file is missing Jets.boot.  Please add Jets.boot after require "jets"'.colorize(:red)
+        puts 'The config.ru file is missing Jets.boot.  Please add Jets.boot after require "jets"'.color(:red)
         puts "This was changed as made in Jets v1.1.0."
         puts "To have Jets update the config.fu file for you, you can run:\n\n"
         puts "  jets upgrade"

data/lib/jets/builders/code_builder.rb

@@ -1,5 +1,4 @@
 require "action_view"
-require "colorize"
 require "fileutils"
 require "net/http"
 require "open-uri"
@@ -174,7 +173,7 @@ class Jets::Builders
     # This is because the node and yarn has likely been set up correctly there.
     def compile_assets
       if ENV['JETS_SKIP_ASSETS']
-        puts "Skip compiling assets".colorize(:yellow) # useful for debugging
+        puts "Skip compiling assets".color(:yellow) # useful for debugging
         return
       end
 
@@ -206,7 +205,7 @@ class Jets::Builders
       return unless Jets.rack? && rails? && !rails_api?
 
       if ENV['JETS_SKIP_ASSETS']
-        puts "Skip compiling rack assets".colorize(:yellow) # useful for debugging
+        puts "Skip compiling rack assets".color(:yellow) # useful for debugging
         return
       end
 
@@ -270,7 +269,7 @@ class Jets::Builders
       FileUtils.rm_rf("#{stage_area}/code") # remove current code folder
       move_node_modules(Jets.root, Jets.build_root)
       begin
-        # puts "cp -r #{@full_project_path} #{"#{stage_area}/code"}".colorize(:yellow) # uncomment to debug
+        # puts "cp -r #{@full_project_path} #{"#{stage_area}/code"}".color(:yellow) # uncomment to debug
         Jets::Util.cp_r(@full_project_path, "#{stage_area}/code")
       ensure
         move_node_modules(Jets.build_root, Jets.root) # move node_modules directory back
@@ -354,7 +353,7 @@ class Jets::Builders
       unless ruby_version_supported?
         puts "You are using Ruby version #{RUBY_VERSION} which is not supported by Jets."
         ruby_variant = Jets::RUBY_VERSION.split('.')[0..1].join('.') + '.x'
-        abort("Jets uses Ruby #{Jets::RUBY_VERSION}.  You should use a variant of Ruby #{ruby_variant}".colorize(:red))
+        abort("Jets uses Ruby #{Jets::RUBY_VERSION}.  You should use a variant of Ruby #{ruby_variant}".color(:red))
       end
     end
 

data/lib/jets/builders/code_size.rb

@@ -9,7 +9,7 @@ class Jets::Builders
 
     def check
       return if within_lambda_limit?
-      say "Over the Lambda size limit of #{LAMBDA_SIZE_LIMIT}MB".colorize(:red)
+      say "Over the Lambda size limit of #{LAMBDA_SIZE_LIMIT}MB".color(:red)
       say "Please reduce the size of your code."
       display_sizes
       exit 1

data/lib/jets/builders/gem_replacer.rb

@@ -25,7 +25,7 @@ class Jets::Builders
     end
 
     def sh(command)
-      puts "=> #{command}".colorize(:green)
+      puts "=> #{command}".color(:green)
       success = system(command)
       abort("Command Failed") unless success
       success

data/lib/jets/builders/handler_generator.rb

@@ -75,7 +75,7 @@ class Jets::Builders
         end
 
         unless missing.empty?
-          puts "ERROR: Missing source files. Please make sure these source files exist or remove their declarations".colorize(:red)
+          puts "ERROR: Missing source files. Please make sure these source files exist or remove their declarations".color(:red)
           puts missing
           exit 1
         end
@@ -114,7 +114,7 @@ class Jets::Builders
       unless source_path
         attributes = fun.template.values.first
         function_name = attributes['Properties']['FunctionName']
-        puts "WARN: missing source file for: '#{function_name}' function".colorize(:yellow)
+        puts "WARN: missing source file for: '#{function_name}' function".color(:yellow)
         return
       end
 

data/lib/jets/builders/md5_zip.rb

@@ -34,7 +34,7 @@ class Jets::Builders
       FileUtils.mv(zip_dest, md5_dest)
 
       file_size = number_to_human_size(File.size(md5_dest))
-      puts "Zip file created at: #{md5_dest.colorize(:green)} (#{file_size})"
+      puts "Zip file created at: #{md5_dest.color(:green)} (#{file_size})"
     end
 
     # /tmp/jets/demo/stage/zips/code.zip

data/lib/jets/builders/tidy.rb

@@ -90,7 +90,7 @@ class Jets::Builders
       exists = File.exist?("#{path}/.gitkeep") || File.exist?("#{path}/.keep")
       return if exists
 
-      # say "  rm -rf #{path}".colorize(:yellow) # uncomment to debug
+      # say "  rm -rf #{path}".color(:yellow) # uncomment to debug
       system("rm -rf #{path}") unless @noop
     end
 

data/lib/jets/builders/util.rb

@@ -2,10 +2,10 @@ class Jets::Builders
   module Util
   private
     def sh(command)
-      puts "=> #{command}".colorize(:green)
+      puts "=> #{command}".color(:green)
       success = system(command)
       unless success
-        puts "#{command} failed to run.".colorize(:red)
+        puts "#{command} failed to run.".color(:red)
         puts caller[0]
         exit 1
       end
@@ -13,7 +13,7 @@ class Jets::Builders
     end
 
     def headline(message)
-      puts "=> #{message}".colorize(:cyan)
+      puts "=> #{message}".color(:cyan)
     end
 
     def build_area

data/lib/jets/cfn/ship.rb

@@ -23,7 +23,7 @@ class Jets::Cfn
         confirm = prompt_for_iam(capabilities)
         if confirm =~ /^y/
           @options.merge!(capabilities: [capabilities])
-          puts "Re-running: #{command_with_iam(capabilities).colorize(:green)}"
+          puts "Re-running: #{command_with_iam(capabilities).color(:green)}"
           retry
         else
           puts "Exited"

data/lib/jets/cfn/status.rb

@@ -12,14 +12,14 @@ class Jets::Cfn
     # used for the jets status command
     def run
       unless stack_exists?(@stack_name)
-        puts "The stack #{@stack_name.colorize(:green)} does not exist."
+        puts "The stack #{@stack_name.color(:green)} does not exist."
         return
       end
 
       resp = cfn.describe_stacks(stack_name: @stack_name)
       stack = resp.stacks.first
 
-      puts "The current status for the stack #{@stack_name.colorize(:green)} is #{stack.stack_status.colorize(:green)}"
+      puts "The current status for the stack #{@stack_name.color(:green)} is #{stack.stack_status.color(:green)}"
       if stack.stack_status =~ /_IN_PROGRESS$/
         puts "Stack events (tailing):"
         # tail all events until done
@@ -56,12 +56,12 @@ class Jets::Cfn
 
       success = false
       if last_event_status =~ /_FAILED/
-        puts "Stack failed: #{last_event_status}".colorize(:red)
-        puts "Stack reason #{@events[0]["resource_status_reason"]}".colorize(:red)
+        puts "Stack failed: #{last_event_status}".color(:red)
+        puts "Stack reason #{@events[0]["resource_status_reason"]}".color(:red)
       elsif last_event_status =~ /_ROLLBACK_/
-        puts "Stack rolled back: #{last_event_status}".colorize(:red)
+        puts "Stack rolled back: #{last_event_status}".color(:red)
       else # success
-        puts "Stack success status: #{last_event_status}".colorize(:green)
+        puts "Stack success status: #{last_event_status}".color(:green)
         success = true
       end
 
@@ -69,7 +69,7 @@ class Jets::Cfn
       # once the stack is deleted. Gets here for stack create and update though.
       return if @hide_time_took # set in run
       took = Time.now - start_time
-      puts "Time took for stack deployment: #{pretty_time(took).green}."
+      puts "Time took for stack deployment: #{pretty_time(took).color(:green)}."
 
       success
     end
@@ -116,7 +116,7 @@ class Jets::Cfn
         e["logical_resource_id"],
         e["resource_status_reason"]
       ].join(" ")
-      message = message.colorize(:red) if e["resource_status"] =~ /_FAILED/
+      message = message.color(:red) if e["resource_status"] =~ /_FAILED/
       puts message
     end
 

data/lib/jets/cfn/upload.rb

@@ -45,15 +45,15 @@ class Jets::Cfn
       s3_key = "jets/code/#{File.basename(path)}"
       obj = s3_resource.bucket(bucket_name).object(s3_key)
       obj.upload_file(path)
-      puts "Uploaded to s3://#{bucket_name}/#{s3_key}".colorize(:green)
-      puts "Time to upload code to s3: #{pretty_time(Time.now-start_time).colorize(:green)}"
+      puts "Uploaded to s3://#{bucket_name}/#{s3_key}".color(:green)
+      puts "Time to upload code to s3: #{pretty_time(Time.now-start_time).color(:green)}"
     end
 
     def upload_assets
       puts "Checking for modified public assets and uploading to S3."
       start_time = Time.now
       upload_public_assets
-      puts "Time for public assets to s3: #{pretty_time(Time.now-start_time).colorize(:green)}"
+      puts "Time for public assets to s3: #{pretty_time(Time.now-start_time).color(:green)}"
     end
 
     def upload_public_assets

data/lib/jets/commands/call.rb

@@ -67,12 +67,12 @@ class Jets::Commands::Call
     begin
       resp = lambda.invoke(options)
     rescue Aws::Lambda::Errors::ResourceNotFoundException
-      puts "The function #{function_name} was not found.  Maybe check the spelling or the AWS_PROFILE?".colorize(:red)
+      puts "The function #{function_name} was not found.  Maybe check the spelling or the AWS_PROFILE?".color(:red)
       return
     end
 
     if @options[:show_log]
-      puts "Last 4KB of log in the x-amz-log-result header:".colorize(:green)
+      puts "Last 4KB of log in the x-amz-log-result header:".color(:green)
       puts Base64.decode64(resp.log_result)
     end
 
@@ -104,7 +104,7 @@ class Jets::Commands::Call
 
     check_valid_json!(text)
 
-    puts "Function name: #{function_name.colorize(:green)}" unless @options[:mute]
+    puts "Function name: #{function_name.color(:green)}" unless @options[:mute]
     return text unless function_name.include?("_controller-")
     return text if @options[:lambda_proxy] == false
 
@@ -117,7 +117,7 @@ class Jets::Commands::Call
     path = text.gsub('file://','')
     path = "#{Jets.root}#{path}" unless path[0..0] == '/'
     unless File.exist?(path)
-      puts "File #{path} does not exist.  Are you sure the file exists?".colorize(:red)
+      puts "File #{path} does not exist.  Are you sure the file exists?".color(:red)
       exit
     end
     text = IO.read(path)

data/lib/jets/commands/delete.rb

@@ -20,13 +20,13 @@ class Jets::Commands::Delete
     stack_in_progress?(parent_stack_name)
 
     cfn.delete_stack(stack_name: parent_stack_name)
-    puts "Deleting #{Jets.config.project_namespace.colorize(:green)}..."
+    puts "Deleting #{Jets.config.project_namespace.color(:green)}..."
 
     wait_for_stack if @options[:wait]
 
     delete_logs
 
-    puts "Project #{Jets.config.project_namespace.colorize(:green)} deleted!"
+    puts "Project #{Jets.config.project_namespace.color(:green)} deleted!"
   end
 
   def wait_for_stack
@@ -34,7 +34,7 @@ class Jets::Commands::Delete
     start_time = Time.now
     status.wait
     took = Time.now - start_time
-    puts "Time took for deletion: #{status.pretty_time(took).green}."
+    puts "Time took for deletion: #{status.pretty_time(took).color(:green)}."
   end
 
   def delete_logs
@@ -49,7 +49,7 @@ class Jets::Commands::Delete
     rescue Aws::CloudFormation::Errors::ValidationError
       # Aws::CloudFormation::Errors::ValidationError is thrown when the stack
       # does not exist
-      puts "The parent stack #{Jets.config.project_namespace.colorize(:green)} for the project #{Jets.config.project_name.colorize(:green)} does not exist. So it cannot be deleted."
+      puts "The parent stack #{Jets.config.project_namespace.color(:green)} for the project #{Jets.config.project_name.color(:green)} does not exist. So it cannot be deleted."
       exit 0
     end
   end
@@ -104,12 +104,12 @@ class Jets::Commands::Delete
     if @options[:sure]
       sure = 'y'
     else
-      puts "Are you sure you want to want to delete the #{Jets.config.project_namespace.colorize(:green)} project? (y/N)"
+      puts "Are you sure you want to want to delete the #{Jets.config.project_namespace.color(:green)} project? (y/N)"
       sure = $stdin.gets
     end
 
     unless sure =~ /^y/
-      puts "Phew! Jets #{Jets.config.project_namespace.colorize(:green)} project was not deleted."
+      puts "Phew! Jets #{Jets.config.project_namespace.color(:green)} project was not deleted."
       exit 0
     end
   end
@@ -128,7 +128,7 @@ class Jets::Commands::Delete
 
       if status =~ /_IN_PROGRESS$/
         puts "The '#{@parent_stack_name}' stack status is #{status}. " \
-             "It is not in an updateable status. Please wait until the stack is ready and try again.".colorize(:red)
+             "It is not in an updateable status. Please wait until the stack is ready and try again.".color(:red)
         exit 0
       elsif resp.stacks[0].outputs.empty?
         # This Happens when the miminal stack fails at the very beginning.

data/lib/jets/commands/deploy.rb

@@ -7,7 +7,7 @@ module Jets::Commands
     end
 
     def run
-      deployment_env = Jets.config.project_namespace.colorize(:green)
+      deployment_env = Jets.config.project_namespace.color(:green)
       puts "Deploying to Lambda #{deployment_env} environment..."
       return if @options[:noop]
 
@@ -40,7 +40,7 @@ module Jets::Commands
 
     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)
+        puts "The dev.mode file exists. Please removed it and run bundle update before you deploy.".color(:red)
         exit 1
       end
     end
@@ -57,7 +57,7 @@ module Jets::Commands
     def check_route_connected_functions
       return if Jets::Router.all_routes_valid
 
-      puts "Deploy fail: The jets application contain invalid routes.".colorize(:red)
+      puts "Deploy fail: The jets application contain invalid routes.".color(:red)
       puts "Please double check the routes below map to valid controllers:"
       Jets::Router.invalid_routes.each do |route|
         puts "  /#{route.path} => #{route.controller_name}##{route.action_name}"
@@ -121,8 +121,8 @@ module Jets::Commands
          status =~ /_IN_PROGRESS$/
         region = `aws configure get region`.strip rescue "us-east-1"
         url = "https://console.aws.amazon.com/cloudformation/home?region=#{region}#/stacks"
-        puts "The parent stack of the #{Jets.config.project_name.colorize(:green)} project is not in an updateable state."
-        puts "Stack name #{stack_name.colorize(:yellow)} status #{stack["stack_status"].colorize(:yellow)}"
+        puts "The parent stack of the #{Jets.config.project_name.color(:green)} project is not in an updateable state."
+        puts "Stack name #{stack_name.color(:yellow)} status #{stack["stack_status"].color(:yellow)}"
         puts "Here's the CloudFormation url to check for more details #{url}"
         exit 1
       end

data/lib/jets/commands/import/sequence.rb

@@ -1,5 +1,4 @@
 require 'bundler'
-require 'colorize'
 require 'fileutils'
 require 'thor'
 
@@ -42,7 +41,7 @@ class Jets::Commands::Import
       begin
         directory ".", rack_folder, exclude_pattern: %r{.git}
       rescue Thor::Error => e
-        puts e.message.colorize(:red)
+        puts e.message.color(:red)
         exit 1
       end
     end

data/lib/jets/commands/main.rb

@@ -42,7 +42,7 @@ module Jets::Commands
       o = options
       server_command = o[:reload] ? "shotgun" : "rackup"
       command = "bundle exec #{server_command} --port #{o[:port]} --host #{o[:host]}"
-      puts "=> #{command}".colorize(:green)
+      puts "=> #{command}".color(:green)
       puts Jets::Booter.message
       Jets::Booter.check_config_ru!
       Jets::RackServer.start(options) unless ENV['JETS_RACK'] == '0' # rack server runs in background by default

data/lib/jets/commands/new.rb

@@ -41,7 +41,7 @@ module Jets::Commands
         @database = false
         @webpacker = false
       else
-        puts "Invalid mode provided: #{@options[:mode].colorize(:red)}. Please pass in an valid mode: #{VALID_MODES.join(',').colorize(:green)}."
+        puts "Invalid mode provided: #{@options[:mode].color(:red)}. Please pass in an valid mode: #{VALID_MODES.join(',').color(:green)}."
         exit 1
       end
     end
@@ -68,7 +68,7 @@ module Jets::Commands
     def webpacker_install
       return unless @webpacker
       unless yarn_installed?
-        puts "Yarn is not installed or has not been detected. Please double check that yarn has been installed.".colorize(:red)
+        puts "Yarn is not installed or has not been detected. Please double check that yarn has been installed.".color(:red)
         puts <<~EOL
           To check:
 

data/lib/jets/commands/runner.rb

@@ -8,7 +8,7 @@ class Jets::Commands::Runner
       if File.exist?(full_path)
         code = IO.read(full_path)
       else
-        puts "ERROR: file not found at #{full_path}".colorize(:red)
+        puts "ERROR: file not found at #{full_path}".color(:red)
         exit 1
       end
     end

data/lib/jets/commands/sequence.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'colorize'
 require 'thor'
 require 'bundler'
 
@@ -27,7 +26,7 @@ private
   def confirm_jets_project
     jets_project = File.exist?("#{project_folder}/config/application.rb")
     unless jets_project
-      puts "It does not look like the repo #{options[:repo]} is a jets project. Maybe double check that it is?  Exited.".colorize(:red)
+      puts "It does not look like the repo #{options[:repo]} is a jets project. Maybe double check that it is?  Exited.".color(:red)
       exit 1
     end
   end

data/lib/jets/commands/templates/skeleton/spec/controllers/posts_controller_spec.rb

@@ -1,16 +1,15 @@
 # Example:
 # describe PostsController, type: :controller do
 #   it "index returns a success response" do
-#     event = payload("posts-index")
-#     controller = PostsController.new(event)
-#     response = controller.index
-#     # pp response
+#     get '/posts'
+#     expect(response.status).to eq 200
+#     pp response.body
 #   end
-
+#
 #   it "show returns a success response" do
-#     event = payload("posts-show")
-#     controller = PostsController.new(event)
-#     response = controller.show
-#     # pp response
+#     Post.create(id: 1) unless Post.find_by(id: 1) # TODO: set up factory_bot
+#     get '/posts/:id', id: 1
+#     expect(response.status).to eq 200
+#     pp response.body
 #   end
 # end

data/lib/jets/commands/templates/skeleton/spec/spec_helper.rb.tt

@@ -10,6 +10,8 @@ require "jets"
 abort("The Jets environment is running in production mode!") if Jets.env == "production"
 Jets.boot
 
+require "jets/spec_helpers"
+
 <% if @webpacker -%>
 require 'capybara/rspec'
 Capybara.app = Jets.application

data/lib/jets/commands/url.rb

@@ -9,7 +9,7 @@ module Jets::Commands
     def display
       stack_name = Jets::Naming.parent_stack_name
       unless stack_exists?(stack_name)
-        puts "Stack for #{Jets.config.project_name.colorize(:green)} project for environment #{Jets.env.colorize(:green)}.  Couldn't find #{stack_name.colorize(:green)} stack."
+        puts "Stack for #{Jets.config.project_name.color(:green)} project for environment #{Jets.env.color(:green)}.  Couldn't find #{stack_name.color(:green)} stack."
         exit
       end
 
@@ -21,7 +21,7 @@ module Jets::Commands
         STDOUT.puts "API Gateway Endpoint: #{api_gateway_endpoint}"
         show_custom_domain
       else
-        puts "API Gateway not found. This jets app does have an API Gateway associated with it.  Please double check your config/routes.rb if you were expecting to see a url for the app. Also check that #{stack_name.colorize(:green)} is a jets app."
+        puts "API Gateway not found. This jets app does have an API Gateway associated with it.  Please double check your config/routes.rb if you were expecting to see a url for the app. Also check that #{stack_name.color(:green)} is a jets app."
       end
     end
 

data/lib/jets/core.rb

@@ -97,7 +97,8 @@ module Jets::Core
     path =~ %r{/templates/} ||
     path =~ %r{/turbo/project/} ||
     path =~ %r{/version} ||
-    path =~ %r{/webpacker}
+    path =~ %r{/webpacker} ||
+    path =~ %r{/jets/spec}
   end
 
   def class_mappings(class_name)
@@ -159,7 +160,7 @@ module Jets::Core
   end
 
   def report_exception(exception)
-    puts "DEPRECATED: report_exception. Use on_exception instead.".colorize(:yellow)
+    puts "DEPRECATED: report_exception. Use on_exception instead.".color(:yellow)
     on_exception(exception)
   end
 

data/lib/jets/erb.rb

@@ -24,7 +24,7 @@ class Jets::Erb
         error_info ||= e.backtrace.grep(/\(erb\)/)[0]
         raise unless error_info # unable to find the (erb):xxx: error line
         line = error_info.split(':')[1].to_i
-        puts "Error evaluating ERB template on line #{line.to_s.colorize(:red)} of: #{path.sub(/^\.\//, '').colorize(:green)}"
+        puts "Error evaluating ERB template on line #{line.to_s.color(:red)} of: #{path.sub(/^\.\//, '').color(:green)}"
 
         template_lines = template.split("\n")
         context = 5 # lines of context
@@ -33,7 +33,7 @@ class Jets::Erb
         template_lines[top..bottom].each_with_index do |line_content, index|
           line_number = top+index+1
           if line_number == line
-            printf("%#{spacing}d %s\n".colorize(:red), line_number, line_content)
+            printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
           else
             printf("%#{spacing}d %s\n", line_number, line_content)
           end

data/lib/jets/mega/request.rb

@@ -48,13 +48,27 @@ module Jets::Mega
 
       puts_rack_output
 
+      status = response.code.to_i
+      headers = response.each_header.to_h
+      encoding = get_encoding(headers['content-type'])
+      body = response.body.force_encoding(encoding)
       {
-        status: response.code.to_i,
-        headers: response.each_header.to_h,
-        body: response.body,
+        status: status,
+        headers: headers,
+        body: body,
       }
     end
 
+    def get_encoding(content_type)
+      default = Jets.config.encoding.default
+      return default unless content_type
+
+      md = content_type.match(/charset=(.+)/)
+      return default unless md
+
+      md[1]
+    end
+
     # Grab the rack output from the /tmp/jets-output.log and puts it back in the
     # main process' stdout
     def puts_rack_output

data/lib/jets/poly_fun/base_executor.rb

@@ -87,7 +87,7 @@ class Jets::PolyFun
       interpreter = @task.lang
       command = %Q|#{interpreter} #{lambda_executor_script} '#{JSON.dump(event)}' '#{JSON.dump(context)}'|
       stdout, stderr, status = Open3.capture3(command)
-      # puts "=> #{command}".colorize(:green)
+      # puts "=> #{command}".color(:green)
       # puts "stdout #{stdout}"
       # puts "stderr #{stderr}"
       # puts "status #{status}"

data/lib/jets/rack_server.rb

@@ -39,7 +39,7 @@ module Jets
         args << " --host #{@options[:host]}" if @options[:host] # only forward the host option
                                                                 # port is always 9292 for simplicity
         command = "cd #{rack_project} && bin/rackup#{args}" # leads to the same wrapper rack scripts
-        puts "=> #{command}".colorize(:green)
+        puts "=> #{command}".color(:green)
         system(command)
       end
     end

data/lib/jets/resource/lambda/function/environment.rb

@@ -27,7 +27,7 @@ class Jets::Resource::Lambda::Function
       found_reserved_vars = variables.keys & reserved_variables
       return if found_reserved_vars.empty?
 
-      puts "You have configured some environment variables that are reserved by AWS Lambda.".colorize(:red)
+      puts "You have configured some environment variables that are reserved by AWS Lambda.".color(:red)
       puts found_reserved_vars
       puts "The deployment to AWS Lambda will failed when using reserved variables."
       puts "Please remove these reserved variables. "

data/lib/jets/router.rb

@@ -71,7 +71,7 @@ module Jets
 
     def api_mode?
       if Jets.config.key?(:api_mode) || Jets.config.key?(:api_generator)
-        puts <<~EOL.colorize(:yellow)
+        puts <<~EOL.color(:yellow)
           DEPRECATED: Jets.config.api_generator
           Instead, please update your config/application.rb to use:
             Jets.config.mode = 'api'

data/lib/jets/spec_helpers.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'base64'
+
+module Jets
+  module SpecHelpers
+    autoload :Params, 'jets/spec_helpers/params'
+    autoload :Request, 'jets/spec_helpers/request'
+    autoload :Response, 'jets/spec_helpers/response'
+
+    attr_reader :request, :response
+    def initialize(*)
+      super
+      @request = Request.new(:get, '/', {}, Params.new)
+      @response = nil # will be set after http_call
+    end
+
+    rest_methods = %w[get post put patch delete]
+    rest_methods.each do |meth|
+      define_method(meth) do |path, **params|
+        http_call(method: meth, path: path, **params)
+      end
+      # Example:
+      # def get(path, **params)
+      #   http_call(method: :get, path: path, **params)
+      # end
+    end
+
+    def http_call(method:, path:, **params)
+      request.method = method.to_sym
+      request.path = path
+      request.headers.deep_merge!(params.delete(:headers) || {})
+
+      request.params.body_params = params.delete(:params) || params || {}
+      request.params.path_params = params
+
+      @response = request.dispatch!
+    end
+
+    def fixture_path(filename)
+      "#{Jets.root}/spec/fixtures/#{filename}"
+    end
+
+    def fixture_file(filename)
+      File.new(fixture_path(filename))
+    end
+  end
+end
+
+RSpec.configure do |c|
+  c.include Jets::SpecHelpers
+end

data/lib/jets/spec_helpers/params.rb

@@ -0,0 +1,10 @@
+module Jets
+  module SpecHelpers
+    class Params
+      attr_accessor :path_params, :body_params
+      def initialize(path_params={}, body_params={})
+        @path_params, @body_params = path_params, body_params
+      end
+    end
+  end
+end

data/lib/jets/spec_helpers/request.rb

@@ -0,0 +1,98 @@
+module Jets
+  module SpecHelpers
+    class Request
+      attr_accessor :method, :path, :headers, :params
+      def initialize(method, path, headers={}, params={})
+        @method, @path, @headers, @params = method, path, headers, params
+      end
+
+      def event
+        json = {}
+        id_params = path.scan(%r{:([^/]+)}).flatten
+        expanded_path = path.dup
+        path_parameters = {}
+
+        id_params.each do |id_param|
+          raise "missing param: :#{id_param}" unless params.path_params.include? id_param.to_sym
+
+          path_param_value = params.path_params[id_param.to_sym]
+          raise "Path param :#{id_param} value cannot be blank" if path_param_value.blank?
+
+          expanded_path.gsub!(":#{id_param}", path_param_value.to_s)
+          path_parameters.deep_merge!(id_param => path_param_value.to_s)
+        end
+
+        json['resource'] = path
+        json['path'] = expanded_path
+        json['httpMethod'] = method.to_s.upcase
+        json['pathParameters'] = path_parameters
+        json['headers'] = (headers || {}).stringify_keys
+
+        if method != :get
+          json['headers']['Content-Type'] = "multipart/form-data; boundary=#{multipart_boundary}"
+          body = +''
+          params.body_params.to_a.each do |e|
+            key, value = e
+            body << multipart_item(name: key, value: value)
+          end
+          body << multipart_end
+
+          json['body'] = Base64.encode64 body
+          json['isBase64Encoded'] = true
+        end
+
+        json
+      end
+
+      def multipart_boundary
+        @boundary ||= '-' * 16 + SecureRandom.hex(32)
+      end
+
+      def multipart_item(name:, value:)
+        if value.is_a? File
+          multipart_file(name: name, filename: File.basename(value.path),
+                         data: ::IO.read(value.path))
+        else
+          multipart_text(name: name, text: value)
+        end
+      end
+
+      def multipart_text(name:, text:)
+        "--#{multipart_boundary}\r\nContent-Disposition: form-data; name=\"#{name}\"\r\n"\
+        "Content-Type: text/plain\r\n\r\n#{text}\r\n"
+      end
+
+      def multipart_file(name:, filename:, data:)
+        "--#{multipart_boundary}\r\nContent-Disposition: form-data; name=\"#{name}\"; "\
+        "filename=\"#{filename}\"\r\n\r\n#{data}\r\n"
+      end
+
+      def multipart_end
+        "--#{multipart_boundary}--"
+      end
+
+      def find_route!
+        path = self.path
+        path = path[0..-2] if path.end_with? '/'
+        path = path[1..-1] if path.start_with? '/'
+
+        route = Jets::Router.routes.find { |r| r.path == path && r.method == method.to_s.upcase }
+        raise "Route not found: #{method.to_s.upcase} #{path}" if route.blank?
+
+        route
+      end
+
+      def dispatch!
+        route = find_route!
+        controller = Object.const_get(route.controller_name).new(event, {}, route.action_name)
+        response = controller.dispatch!
+
+        if !response.is_a?(Array) || response.size != 3
+          raise "Expected response to be an array of size 3. Are you rendering correctly?"
+        end
+
+        Response.new(response[0].to_i, response[2].read)
+      end
+    end
+  end
+end

data/lib/jets/spec_helpers/response.rb

@@ -0,0 +1,5 @@
+module Jets
+  module SpecHelpers
+    Response = Struct.new(:status, :body)
+  end
+end

data/lib/jets/stack/function.rb

@@ -19,7 +19,7 @@ class Jets::Stack
         ext = File.extname(source_file).sub(/^\./,'').to_sym
         lang_map[ext]
       else
-        puts "WARN: Unable to find a source file for function. Looked at: #{search_expression}".colorize(:yellow)
+        puts "WARN: Unable to find a source file for function. Looked at: #{search_expression}".color(:yellow)
       end
     end
 

data/lib/jets/turbo/rail.rb

@@ -20,9 +20,9 @@ class Jets::Turbo
     def afterburners_message
       command = ARGV.first
       if command == "deploy"
-        puts "=> Rails app detected: Enabling Jets Afterburner to deploy to AWS Lambda.".colorize(:green)
+        puts "=> Rails app detected: Enabling Jets Afterburner to deploy to AWS Lambda.".color(:green)
       else
-        puts "=> Rails app detected: Enabling Jets Afterburner.".colorize(:green)
+        puts "=> Rails app detected: Enabling Jets Afterburner.".color(:green)
       end
     end
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/vendor/jets-gems/lib/jets/gems/check.rb

@@ -158,7 +158,7 @@ EOL
     # Thanks: https://gist.github.com/aelesbao/1414b169a79162b1d795 and
     #   https://stackoverflow.com/questions/5165950/how-do-i-get-a-list-of-gems-that-are-installed-that-have-native-extensions
     def specs_with_extensions
-      # puts "Jets::Gems::Check#specs_with_extensions".colorize(:red)
+      # puts "Jets::Gems::Check#specs_with_extensions".color:red)
       # puts "BUNDLE_GEMFILE #{ENV['BUNDLE_GEMFILE'].inspect}"
       # puts "Jets.root #{Jets.root}"
       # puts "Dir.pwd #{Dir.pwd}"

data/vendor/jets-gems/lib/jets/gems/extract/base.rb

@@ -24,7 +24,7 @@ module Jets::Gems::Extract
     end
 
     def sh(command)
-      say "=> #{command}".colorize(:green)
+      say "=> #{command}".color(:green)
       success = system(command)
       abort("Command Failed") unless success
       success

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  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: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +290,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.1
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  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: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
@@ -749,6 +749,10 @@ files:
 - lib/jets/rule.rb
 - lib/jets/rule/base.rb
 - lib/jets/rule/dsl.rb
+- lib/jets/spec_helpers.rb
+- lib/jets/spec_helpers/params.rb
+- lib/jets/spec_helpers/request.rb
+- lib/jets/spec_helpers/response.rb
 - lib/jets/stack.rb
 - lib/jets/stack/builder.rb
 - lib/jets/stack/definition.rb