jets 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee1fb12f1e6271e22fca7680fc8f47c117fc4c6a81ea43f5890790dfad0d10d
-  data.tar.gz: f74fbb708e6fe7dc7d46840c7fc5823175bda8fa288b48d68d8f62147d69b700
+  metadata.gz: d2f49380cd0963ba7e18923f0415ab7809c44210093b96c0a59564600f0b73c8
+  data.tar.gz: c6d074dec9a4f790f5ae0a8819fe89839ced01def6d90de15831714cc717f34d
 SHA512:
-  metadata.gz: bce25cb0b17ab514ac8afaebdca5743ef8f2251f2818b8e8bb2f64497adbb8a03fa72db233d6dba2b8e628fd4fde2c1052608a04ac81072de683eb74e644fed7
-  data.tar.gz: 874e792ef63a0da0c64f6b1afdff355d799385134e66dbd273542c90f28b83b2748e1afe3e450e31c9226727fbdb1a79e06754bf0f713a4335481ef7e6cc68af
+  metadata.gz: '08e247f3811ac8853ff644188692d564e4518c2b74746701dfd4688b6ec8eab72d9fa5d103ded268dfbad3e7d66ab86e902adc1093ef28aecec8f60829003f0e'
+  data.tar.gz: e03b64bfa9a81b9842946650586c433ae8630a829147e55b3eba83cbba8896016b499cb477d6e5167adca032435f9215ef41667bf3cfa0dfa6c4708068e16c0c

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,7 @@
+Please fill out one of the templates on https://github.com/tongueroo/jets/issues/new/choose
+
+If you want to ask a question please do so on the Jets Community forum: https://community.rubyonjets.com
+
+To be sensitive to everyone's time, we will close issues asking questions without comment. Here are some additional options for questions http://rubyonjets.com/docs/support/ 👌
+
+Thank you!

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,67 @@
+---
+name: Reproducible Bug Report
+about: Is something not working as expected?
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+<!--
+Hi! Thanks for considering to file a bug with Jets. Please take the time to
+answer the basic questions. Please try to be as detailed as possible.
+To be sensitive to everyone's time, if not enough details are provided, the
+issue may be closed without comment. Please use your best judgment. 👌
+
+If you are unsure this is a bug in Jets, please consider asking your question at https://community.rubyonjets.com
+
+Thanks!
+-->
+
+## Checklist
+
+<!--
+Make sure that you've done all of these.  To mark a checkbox done, replace [ ] with [x].
+-->
+
+- [ ] Upgrade Jets: Are you using the latest version of Jets? This allows Jets to fix issues fast. There's a `jets upgrade` command that makes this a simple task. There's also an Upgrading Guide: http://rubyonjets.com/docs/upgrading/
+- [ ] Reproducibility: Are you reporting a bug others will be able to reproduce and not asking a question. If you're unsure or want to ask a question, do so on https://community.rubyonjets.com
+- [ ] Code sample: Have you put together a code sample to reproduce the issue and make it available?  Code samples help speed up fixes dramatically. If it's an easily reproducible issue, then code samples are not needed. If you're unsure, please include a code sample.
+
+## My Environment
+
+<!-- Please fill out the table below with debugging info to help: -->
+
+| Software         | Version |
+| ---------------- | ------- |
+| Operating System |         |
+| `jets`           |         |
+| `ruby`           |         |
+
+---
+
+## Expected Behaviour
+
+<!--
+What is it you expected to happen? This should be a description of how the functionality you tried to use is supposed to work. Try to keep this to one-paragraph.
+-->
+
+## Current Behavior
+
+<!--   
+Describe the details of the bug.  Try to keep this to one-paragraph.
+-->
+
+## Step-by-step reproduction instructions
+
+<!--   
+Be sure to include any steps you took for the problem to exist. This is likely the longest part of the report.
+
+Please include any logs you think relevant here. If the logs are long (more than 50 lines) please make a gist of the logs and link to it. https://gist.github.com   
+-->
+
+## Code Sample
+
+<!--
+Please provide a code repository, gist, code snippet or sample files to reproduce the issue.
+-->

data/.github/ISSUE_TEMPLATE/documentation.md

@@ -0,0 +1,27 @@
+---
+name: Documentation
+about: Found a typo or something that isn't crystal clear in the docs?
+title: ''
+labels: docs
+assignees: ''
+
+---
+
+<!-- 
+Thanks for taking the time to open a documentation issue and help us make Jets better!
+
+Great documentation is key to great software and is very important. So thank you!
+
+If it is just a typo or grammar fix, you don't have to fill out any of the sections below. 🚀
+-->
+
+## Motivation
+
+<!-- Why should the docs be updated? -->
+
+
+## Suggestion
+
+<!-- What can be done instead? -->
+
+<!-- Thanks again for taking the time to open an issue and help us make Jets better! -->

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,64 @@
+---
+name: New Feature Suggestion
+about: Want to add a feature to Jets?
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+<!--
+Hi! Thanks for considering to file a feature request with Jets. Please take the time to answer the basic questions. Please try to be as detailed as possible.
+
+Thanks!
+-->
+
+## Summary
+
+<!--
+A one-paragraph explanation of the feature.
+-->
+
+## Motivation
+
+<!--
+Why do you want to see this feature in Jets? What use cases does it support?
+
+How the feature would be relevant to 80% or more of Jets users.
+-->
+
+## Guide-level explanation
+
+<!--
+Explain the proposal as if it was already included in the project and you were teaching it to another programmer. That generally means:
+
+- Introducing new named concepts.
+- Explaining the feature largely in terms of examples.
+- If applicable, provide sample error messages, deprecation warnings, or upgrade guidance.
+
+If this is a small feature, you may omit this section.
+-->
+
+## Reference-level explanation
+
+<!--
+This is the technical portion of the feature request. Explain the design in sufficient detail that:
+
+- Its interaction with other features is clear.
+- It is reasonably clear how the feature would be implemented.
+- Corner cases are dissected by example.
+
+If you do not know how to answer this, you can omit it. No worries!
+-->
+
+## Drawbacks
+
+<!--
+Why should we *not* do this?
+-->
+
+## Unresolved Questions
+
+<!--
+What related issues do you consider out of scope for this feature that could be addressed in the future independently of the solution that comes out of this feature?
+-->

data/.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,16 @@
+---
+name: Question
+about: Have any questions about how Jets works?
+title: ''
+labels: 'question'
+assignees: ''
+
+---
+
+<!--
+The Jets issue tracker IS NOT for usage questions! Please post your question on our dedicated forum at https://community.rubyonjets.com
+
+Also, here are some additional options for questions http://rubyonjets.com/docs/support/ 👌
+
+Thank you!
+-->

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,40 @@
+<!--
+Thanks for creating a Pull Request! Before you submit, please make sure you've done the following:
+
+- I read the contributing document at https://rubyonjets.com/docs/contributing/
+-->
+
+<!--
+Make our lives easier! Choose one of the following by uncommenting it:
+-->
+
+<!-- This is a 🐞 bug fix. -->
+<!-- This is a 🙋‍♂️ feature or enhancement. -->
+<!-- This is a 🧐 documentation change. -->
+
+<!--
+Before you submit this pull request, make sure to have a look at the following checklist. If you don't know how to do some of these, that's fine!  Submit your pull request and we will help you out on the way.
+-->
+
+- [] I've added tests (if it's a bug, feature or enhancement)
+- [] I've adjusted the documentation (if it's a feature or enhancement)
+- [] The test suite passes (run `bundle exec rspec` to verify this)
+
+## Summary
+
+<!--
+Provide a description of what your pull request changes.
+-->
+
+## Context
+
+<!--
+Is this related to any GitHub issue(s)?
+-->
+
+## Version Changes
+
+<!--
+Which semantic version change would you recommend?
+If you don't know, feel free to omit it.
+-->

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 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.4.6]
+- #118 from tongueroo/fix-mega-query-string
+- #120 from tongueroo/tidy-webpacker
+- #123 from tongueroo/cp-r
+- #124 from tongueroo/webpacker-update
+- #125 from tongueroo/fix-redirect-for-custom-domains
+- #126 from tongueroo/route-53-option config.domain.route53 option
+- #127 from tongueroo/github-templates
+- more specific regexp for project_name in parse_project_name
+- tidy webpacker app/javascript/src and public/packs to keep code sizes down
+
 ## [1.4.5]
 - include JETS_PROJECT_NAME as jets_env function var when set
 
@@ -107,7 +118,7 @@ This project *loosely tries* to adhere to [Semantic Versioning](http://semver.or
 - fix jets new, comment out building of middleware during boot for now
 
 ## [1.1.1]
-- provide instructions to run jets upgrade:v1 for config.ru update
+- provide instructions to run jets upgrade for config.ru update
 
 ## [1.1.0]
 - rack compatibility pull request #72 from tongueroo/rack
@@ -178,7 +189,7 @@ This project *loosely tries* to adhere to [Semantic Versioning](http://semver.or
 - jets gems:sources hidden command
 
 ## [1.0.1]
-- jets upgrade:v1 command
+- jets upgrade command
 - Merge pull request #52 from tongueroo/upgrade-command
 
 ## [1.0.0]

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/tongueroo/webpacker.git
-  revision: a8c46614c6757fab65e4d0c47d8203014e7b4ef9
+  revision: 3651cc317358018ebd16de75df3b8184adf1b818
   branch: jets
   specs:
     webpacker (3.2.0)
@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.4.5)
+    jets (1.4.6)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/backers.md

@@ -0,0 +1,16 @@
+<h1 align="center">Backers</h1>
+
+[Jets](http://rubyonjets.com/) is an MIT-licensed open source project. It's an independent project with its ongoing development made possible entirely thanks to the support by these awesome [backers](https://github.com/tongueroo/jets/blob/master/backers.md). If you'd like to join them, please consider:
+
+- [Become a backer or sponsor on Patreon](https://www.patreon.com/tongueroo).
+
+Funds donated via Patreon go directly to support Tung Nguyen's full-time work on Jets.
+
+<br><br>
+
+<h2 align="center">Backers via Patreon</h2>
+
+<!--10 start-->
+- Erlend Finvåg
+- Nate Clark
+<!--10 end-->

data/lib/jets/application.rb

@@ -81,6 +81,9 @@ class Jets::Application
     # config.domain.name = "#{Jets.project_namespace}.coolapp.com" # Default is nil
     # config.domain.cert_arn = "..."
     config.domain.endpoint_type = "REGIONAL" # EDGE or REGIONAL. Default to EDGE because CloudFormation update is faster
+    config.domain.route53 = true # controls whether or not to create the managed route53 record.
+      # Useful to disable this when user wants to manage the route themself like pointing
+      # it to CloudFront for blue-green deployments instead.
 
     config
   end
@@ -96,7 +99,7 @@ class Jets::Application
     return ENV['JETS_PROJECT_NAME'] if ENV['JETS_PROJECT_NAME'] # override
 
     lines = IO.readlines("#{Jets.root}config/application.rb")
-    project_name_line = lines.find { |l| l =~ /project_name/ }
+    project_name_line = lines.find { |l| l =~ /config\.project_name.*=/ }
     project_name_line.gsub(/.*=/,'').strip.gsub(/["']/,'') # project_name
   end
 
@@ -144,7 +147,7 @@ class Jets::Application
       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:"
-      puts "  jets upgrade:v1"
+      puts "  jets upgrade"
     end
   end
 

data/lib/jets/booter.rb

@@ -122,7 +122,7 @@ class Jets::Booter
         puts 'The config.ru file is missing Jets.boot.  Please add Jets.boot after require "jets"'.colorize(: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:v1"
+        puts "  jets upgrade"
         exit 1
       end
     end

data/lib/jets/builders/code_builder.rb

@@ -213,14 +213,14 @@ class Jets::Builders
       # Need to capture JETS_ROOT since can be changed by Turbo mode
       jets_root = Jets.root
       Bundler.with_clean_env do
+        # Switch gemfile for Afterburner mode
         gemfile = ENV['BUNDLE_GEMFILE']
         ENV['BUNDLE_GEMFILE'] = "#{jets_root}/rack/Gemfile"
-
         sh "cd #{jets_root} && bundle install"
+        ENV['BUNDLE_GEMFILE'] = gemfile
+
         rails_assets(:clobber, jets_root: jets_root)
         rails_assets(:precompile, jets_root: jets_root)
-
-        ENV['BUNDLE_GEMFILE'] = gemfile
       end
     end
 
@@ -260,7 +260,7 @@ class Jets::Builders
       move_node_modules(Jets.root, Jets.build_root)
       begin
         # puts "cp -r #{@full_project_path} #{"#{stage_area}/code"}".colorize(:yellow) # uncomment to debug
-        FileUtils.cp_r(@full_project_path, "#{stage_area}/code")
+        Jets::Util.cp_r(@full_project_path, "#{stage_area}/code")
       ensure
         move_node_modules(Jets.build_root, Jets.root) # move node_modules directory back
       end
@@ -307,6 +307,7 @@ class Jets::Builders
     def package_ruby
       return if Jets.poly_only?
 
+      check_agree
       ruby_packager.install
       reconfigure_rails # call here after "#{stage_area}/code" is available
       rack_packager.install
@@ -316,6 +317,11 @@ class Jets::Builders
       build_lambda_layer
     end
 
+    def check_agree
+      agree = Jets::Gems::Agree.new
+      agree.prompt
+    end
+
     def build_lambda_layer
       return if Jets.poly_only?
       lambda_layer = LambdaLayer.new

data/lib/jets/builders/purger.rb

@@ -9,7 +9,7 @@ class Jets::Builders
     def purge
       if version_changed?
         last_version = @last_version || "unknown"
-        puts "The jets version has changed enough since the last build to merit freshing the build cache."
+        puts "The jets version has changed enough since the last build to merit refreshing the build cache."
         puts "Current jets version: #{Jets::VERSION} Last built jets version: #{last_version}"
         puts "Removing /tmp/jets/#{@project_name} to start fresh."
         FileUtils.rm_rf("/tmp/jets/#{@project_name}")

data/lib/jets/builders/ruby_packager.rb

@@ -68,7 +68,7 @@ class Jets::Builders
     def copy_gemfile_lock
       src = "#{cache_area}/Gemfile.lock"
       dest = "#{@full_app_root}/Gemfile.lock"
-      FileUtils.cp_r(src, dest)
+      FileUtils.cp(src, dest)
     end
 
     # Clean up extra unneeded files to reduce package size
@@ -171,7 +171,7 @@ EOL
       # Leave #{Jets.build_root}/vendor_gems behind to act as cache
       if File.exist?("#{cache_area}/vendor/gems")
         FileUtils.mkdir_p(File.dirname(vendor_gems))
-        FileUtils.cp_r("#{cache_area}/vendor/gems", vendor_gems)
+        Jets::Util.cp_r("#{cache_area}/vendor/gems", vendor_gems)
       end
     end
   end

data/lib/jets/builders/tidy.rb

@@ -1,5 +1,7 @@
 class Jets::Builders
   class Tidy
+    include Util
+
     def initialize(project_root, noop: false)
       @project_root = project_root
       @noop = noop
@@ -12,7 +14,21 @@ class Jets::Builders
         rm_rf(path)
       end
 
-      tidy_bundled
+      clean_vendor_gems
+      clean_webpack_assets
+    end
+
+    # Clean out unnecessary src and compiled packs because Jets serves them out of s3.
+    # This keeps the code size down to help keep it in size limit so we can use the
+    # live Lambda console editor.
+    def clean_webpack_assets
+      FileUtils.rm_rf("#{@project_root}/app/javascript/src")
+
+      return unless File.exist?("#{@project_root}/public/packs") # this class works for rack subfolder too
+      FileUtils.mv("#{@project_root}/public/packs/manifest.json", "#{stage_area}/manifest.json")
+      FileUtils.rm_rf("#{@project_root}/public/packs")
+      FileUtils.mkdir_p("#{@project_root}/public/packs")
+      FileUtils.mv("#{stage_area}/manifest.json", "#{@project_root}/public/packs/manifest.json")
     end
 
     def removals
@@ -39,17 +55,17 @@ class Jets::Builders
     # We clean out ignored files pretty aggressively. So provide
     # a way for users to keep files from being cleaned out.
     def jetskeep
-      defaults = %w[.bundle pack handlers public/assets]
+      always = %w[.bundle packs]
       path = "#{@project_root}/.jetskeep"
-      return defaults unless File.exist?(path)
+      return always unless File.exist?(path)
 
       keep = IO.readlines(path)
       keep = keep.map {|i| i.strip}.reject { |i| i =~ /^#/ || i.empty? }
-      (defaults + keep).uniq
+      (always + keep).uniq
     end
 
     # folders to remove in the vendor/gems folder regardless of the level of the folder
-    def tidy_bundled
+    def clean_vendor_gems
       Dir.glob("#{@project_root}/vendor/gems/**/*").each do |path|
         next unless File.directory?(path)
         dir = File.basename(path)

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

@@ -41,7 +41,7 @@ class Jets::Cfn::Builders
     def add_custom_domain
       return unless Jets.custom_domain?
       add_domain_name
-      add_route53_dns
+      add_route53_dns if Jets.config.domain.route53
     end
 
     def add_domain_name

data/lib/jets/cfn/ship.rb

@@ -130,7 +130,7 @@ class Jets::Cfn
     end
 
     def show_custom_domain
-      return unless endpoint_available? && Jets.custom_domain?
+      return unless endpoint_available? && Jets.custom_domain? && Jets.config.domain.route53
 
       domain_name = Jets::Resource::ApiGateway::DomainName.new
       # Looks funny but its right.

data/lib/jets/commands/help/upgrade.md

@@ -0,0 +1,5 @@
+Upgrades the Jets project structure to the latest version. This command is designed to be idempotent, so it should be safe to run this command multiple times.
+
+## Example
+
+    $ jets upgrade

data/lib/jets/commands/main.rb

@@ -131,6 +131,12 @@ module Jets::Commands
       puts "run #{Jets.application.endpoint}"
     end
 
+    desc "upgrade", "Upgrade Jets"
+    long_desc Help.text(:upgrade)
+    def upgrade
+      Jets::Commands::Upgrade.new(options).run
+    end
+
     desc "version", "Prints Jets version"
     long_desc Help.text(:version)
     def version

data/lib/jets/commands/new.rb

@@ -55,6 +55,7 @@ module Jets::Commands
     end
 
     def make_bin_executable
+      return unless File.exist?("bin")
       chmod "bin", 0755 & ~File.umask, verbose: false
     end
 

data/lib/jets/commands/templates/skeleton/.gitignore

@@ -2,7 +2,7 @@
 .bundle
 .byebug_history
 .DS_Store
-.env.*
+.env*
 /node_modules
 /public/packs
 /public/packs-test

data/lib/jets/commands/upgrade.rb

@@ -1,11 +1,129 @@
+require 'fileutils'
+
+# This class tries to be idempotent, so users should be able to run it multiple times safely.
 module Jets::Commands
-  class Upgrade < Jets::Commands::Base
-    autoload :V1, "jets/commands/upgrade/v1"
+  class Upgrade
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      puts "Upgrading to Jets structure to latest version"
+      environment_configs
+      update_routes
+      update_mode_setting
+      update_config_ru
+      remove_ruby_lazy_load
+      update_webpack_binstubs
+      puts "Upgrade complete."
+    end
+
+    def environment_configs
+      path = File.expand_path("templates/skeleton/config/environments", File.dirname(__FILE__))
+      puts "path #{path}"
+      Dir.glob("#{path}/*").each do |src|
+        config_file = "config/environments/#{File.basename(src)}"
+        dest = "#{Jets.root}#{config_file}"
+
+        puts "src #{src}"
+        puts "dest #{dest}"
+        unless File.exist?(dest)
+          puts "Create: #{config_file}"
+          FileUtils.mkdir_p(File.dirname(dest))
+          FileUtils.cp(src, dest)
+        end
+      end
+    end
+
+    def update_routes
+      routes_file = "#{Jets.root}config/routes.rb"
+      return unless File.exist?(routes_file)
+
+      lines = IO.readlines(routes_file)
+      deprecated_code = 'root "jets/welcome#index"'
+      return unless lines.detect { |l| l.include?(deprecated_code) }
+
+      puts "Update: config/routes.rb"
+      lines.map! do |line|
+        if line.include?(deprecated_code)
+          %Q|  root "jets/public#show"\n| # assume 2 spaces for simplicity
+        else
+          line
+        end
+      end
+
+      content = lines.join
+      IO.write(routes_file, content)
+    end
+
+    def update_mode_setting
+      application_file = "#{Jets.root}config/application.rb"
+      lines = IO.readlines(application_file)
+      deprecated_code = 'config.api_generator'
+      return unless lines.detect { |l| l.include?(deprecated_code) }
+
+      puts "Update: config/application.rb"
+      lines.map! do |line|
+        if line.include?(deprecated_code)
+          mode = Jets.config.api_generator ? 'api' : 'html'
+          %Q|  config.mode = "#{mode}"\n| # assume 2 spaces for simplicity
+        else
+          line
+        end
+      end
+
+      content = lines.join
+      IO.write(application_file, content)
+    end
+
+    def update_config_ru
+      config_ru = File.read("#{Jets.root}config.ru")
+      return if config_ru.include?("Jets.boot")
+
+      src = File.expand_path("templates/skeleton/config.ru", File.dirname(__FILE__))
+      dest = "#{Jets.root}config.ru"
+      puts "Update: config.ru"
+      FileUtils.cp(src, dest)
+    end
+
+    def remove_ruby_lazy_load
+      app_config = "#{Jets.root}config/application.rb"
+      remove_ruby_lazy_load_for(app_config)
+      Dir.glob("#{Jets.root}config/environments/*.rb").each do |env_config|
+        remove_ruby_lazy_load_for(env_config)
+      end
+    end
+
+    def remove_ruby_lazy_load_for(path)
+      lines = IO.readlines(path)
+      new_lines = lines.reject do |l|
+        l =~ %r{config.ruby.lazy_load}
+      end
+      return unless lines != new_lines
+
+      content = new_lines.join("")
+      IO.write(path, content)
+      puts "Update: #{path}"
+    end
+
+    def update_webpack_binstubs
+      lines = IO.readlines("bin/webpack")
+      already_upgraded = lines.detect { |l| l =~ /WebpackRunner/ }
+      return if already_upgraded
+
+      update_project_file("bin/webpack")
+      update_project_file("bin/webpack-dev-server")
+      puts "Updated webpack binstubs."
+    end
 
-    desc "v1", "Upgrades application to version 1"
-    long_desc Help.text('upgrade:v1')
-    def v1
-      V1.new(options).run
+  private
+    def update_project_file(relative_path)
+      templates = File.expand_path("upgrade/templates", File.dirname(__FILE__))
+      src = "#{templates}/#{relative_path}"
+      dest = relative_path
+      FileUtils.mkdir_p(File.dirname(dest))
+      FileUtils.cp(src, dest)
+      puts "Update: #{dest}"
     end
   end
 end

data/lib/jets/commands/upgrade/templates/bin/webpack

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+ENV["JETS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/webpack_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::WebpackRunner.run(ARGV)
+end

data/lib/jets/commands/upgrade/templates/bin/webpack-dev-server

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+ENV["JETS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/dev_server_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::DevServerRunner.run(ARGV)
+end

data/lib/jets/commands/url.rb

@@ -37,7 +37,7 @@ module Jets::Commands
     end
 
     def show_custom_domain
-      return unless endpoint_available? && Jets.custom_domain?
+      return unless endpoint_available? && Jets.custom_domain? && Jets.config.domain.route53
 
       domain_name = Jets::Resource::ApiGateway::DomainName.new
       # Looks funny but its right.

data/lib/jets/controller/redirection.rb

@@ -39,7 +39,7 @@ class Jets::Controller
       # check out:
       #   spec/fixtures/dumps/api_gateway/posts/create.json
       #   spec/fixtures/dumps/rack/posts/create.json
-      protocol = if actual_host.include?("amazonaws.com") # API Gateway
+      protocol = if headers["x-forwarded-proto"] # API Gateway
           headers["x-forwarded-proto"]
         elsif headers["origin"] # Rack / localhost
           URI.parse(headers["origin"]).scheme

data/lib/jets/mega/request.rb

@@ -28,7 +28,7 @@ module Jets::Mega
       http_class.capitalize!
 
       request_class = "Net::HTTP::#{http_class}".constantize # IE: Net::HTTP::Get
-      request = request_class.new(uri.path)
+      request = request_class.new(uri)
 
       # Set form data
       if %w[Post Patch Put].include?(http_class)

data/lib/jets/router.rb

@@ -38,7 +38,7 @@ module Jets
           Instead, please update your config/application.rb to use:
             Jets.config.mode = 'api'
           You can also run:
-            jets upgrade:v1
+            jets upgrade
         EOL
       end
       api_mode = Jets.config.mode == 'api' || Jets.config.api_mode || Jets.config.api_generator

data/lib/jets/turbo/rail.rb

@@ -39,7 +39,7 @@ class Jets::Turbo
 
       FileUtils.mkdir_p(build_area)
       FileUtils.rm_rf(project_path)
-      FileUtils.cp_r(jets_project, project_path)
+      Jets::Util.cp_r(jets_project, project_path)
 
       IO.write("#{project_path}/date.txt", Time.now) # update date.txt file to ensure Lambda function code changes and updates
     end
@@ -90,7 +90,7 @@ class Jets::Turbo
     def copy_rack_project
       dest = "#{build_area}/#{@project_folder}/rack"
       # puts "cp -r #{Dir.pwd} #{dest}" # uncomment to see and debug
-      FileUtils.cp_r(Dir.pwd, dest)
+      Jets::Util.cp_r(Dir.pwd, dest)
     end
 
     # TODO: remove duplication, copied from jets/commands/import/base.rb

data/lib/jets/util.rb

@@ -4,5 +4,21 @@ class Jets::Util
     def normalize_result(result)
       JSON.dump(result)
     end
+
+    def cp_r(src, dest)
+      # Fix for https://github.com/tongueroo/jets/issues/122
+      #
+      # Using FileUtils.cp_r doesnt work if there are special files like socket files in the src dir.
+      # Instead of using this hack https://bugs.ruby-lang.org/issues/10104
+      # Using rsync to perform the copy.
+      src.chop! if src.ends_with?('/')
+      dest.chop! if dest.ends_with?('/')
+      sh "rsync -a --links --no-specials --no-devices #{src}/ #{dest}/", quiet: true
+    end
+
+    def sh(command, quiet: false)
+      puts "=> #{command}" unless quiet
+      system(command)
+    end
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.4.5"
+  VERSION = "1.4.6"
 end

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

@@ -8,8 +8,12 @@ module Jets::Gems
     def prompt
       return if File.exist?(@agree_file)
 
-      puts "The Jets project contains binary gems that are not yet available in your gems source. You can help make Jets and the community better by reporting the missing binary gems.  Reported gems get built more quickly.  BoltOps takes privacy seriously and only collects anonymous non-identifiable data. You will only be asked this once."
-      puts "Do you want send reporting data to BoltOps? (Y/n)?"
+      puts <<~EOL
+        Jets sends data about your gems to your specified lambda build service **lambdagems.com** so that it can compile and generate the necessary Lambda layers.  Lambdagems only collects anonymous non-identifiable data.
+
+        Is it okay to send your gem data to Lambdagems? (Y/n)?
+      EOL
+
       answer = $stdin.gets.strip
       value = answer =~ /y/i ? 'yes' : 'no'
 

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

@@ -47,7 +47,6 @@ module Jets::Gems
         # Provide users with message about using their own lambdagems source.
         puts missing_message
 
-        agree.prompt
         Report.missing(@missing_gems) if agree.yes?
         exit 1
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2019-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -437,6 +437,12 @@ files:
 - ".codebuild/scripts/install-dynamodb-local.sh"
 - ".codebuild/scripts/install-java.sh"
 - ".codebuild/scripts/install-node.sh"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/documentation.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/ISSUE_TEMPLATE/question.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".gitmodules"
 - ".python-version"
@@ -452,6 +458,7 @@ files:
 - Procfile
 - README.md
 - Rakefile
+- backers.md
 - bin/release
 - buildspec.yml
 - exe/jets
@@ -545,6 +552,7 @@ files:
 - lib/jets/commands/help/runner.md
 - lib/jets/commands/help/server.md
 - lib/jets/commands/help/status.md
+- lib/jets/commands/help/upgrade.md
 - lib/jets/commands/help/url.md
 - lib/jets/commands/import.rb
 - lib/jets/commands/import/base.rb
@@ -582,8 +590,6 @@ files:
 - lib/jets/commands/templates/skeleton/app/models/application_item.rb
 - lib/jets/commands/templates/skeleton/app/models/application_record.rb
 - lib/jets/commands/templates/skeleton/app/views/layouts/application.html.erb.tt
-- lib/jets/commands/templates/skeleton/bin/ruby_server
-- lib/jets/commands/templates/skeleton/bin/ruby_server.rb
 - lib/jets/commands/templates/skeleton/config.ru
 - lib/jets/commands/templates/skeleton/config/application.rb.tt
 - lib/jets/commands/templates/skeleton/config/database.yml.tt
@@ -605,7 +611,8 @@ files:
 - lib/jets/commands/templates/webpacker/app/javascript/packs/theme.scss.tt
 - lib/jets/commands/templates/webpacker/app/javascript/src/jets/crud.js
 - lib/jets/commands/upgrade.rb
-- lib/jets/commands/upgrade/v1.rb
+- lib/jets/commands/upgrade/templates/bin/webpack
+- lib/jets/commands/upgrade/templates/bin/webpack-dev-server
 - lib/jets/commands/url.rb
 - lib/jets/commands/webpacker_template.rb
 - lib/jets/controller.rb

data/lib/jets/commands/templates/skeleton/bin/ruby_server

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Figure out where this script is located.
-PROJECTDIR="`dirname \"$0\"`"
-PROJECTDIR="`cd \"$PROJECTDIR/..\" && pwd`"
-
-unset BUNDLE_IGNORE_CONFIG
-# When jets packages the app code it creates .bundle/config in the project root.
-# We want that to be used.
-
-# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
-if [ -n "$C9_USER" ]; then
-  exec ruby -rbundler/setup bin/ruby_server.rb
-else
-  exec "$PROJECTDIR/bundled/rbenv/shims/ruby" -rbundler/setup "$PROJECTDIR/bin/ruby_server.rb"
-fi

data/lib/jets/commands/templates/skeleton/bin/ruby_server.rb

@@ -1,2 +0,0 @@
-require 'jets'
-Jets::RubyServer.run

data/lib/jets/commands/upgrade/v1.rb

@@ -1,104 +0,0 @@
-require 'fileutils'
-
-# This class tries to be idempotent, so users should be able to run it multiple times safely.
-class Jets::Commands::Upgrade
-  class V1
-    def initialize(options)
-      @options = options
-    end
-
-    def run
-      puts "Upgrading to Jets v1..."
-      environment_configs
-      update_routes
-      update_mode_setting
-      update_config_ru
-      remove_ruby_lazy_load
-      puts "Upgrade complete."
-    end
-
-    def environment_configs
-      path = File.expand_path("../templates/skeleton/config/environments", File.dirname(__FILE__))
-      Dir.glob("#{path}/*").each do |src|
-        config_file = "config/environments/#{File.basename(src)}"
-        dest = "#{Jets.root}#{config_file}"
-        unless File.exist?(dest)
-          puts "Create: #{config_file}"
-          FileUtils.mkdir_p(File.dirname(dest))
-          FileUtils.cp(src, dest)
-        end
-      end
-    end
-
-    def update_routes
-      routes_file = "#{Jets.root}config/routes.rb"
-      return unless File.exist?(routes_file)
-
-      lines = IO.readlines(routes_file)
-      deprecated_code = 'root "jets/welcome#index"'
-      return unless lines.detect { |l| l.include?(deprecated_code) }
-
-      puts "Update: config/routes.rb"
-      lines.map! do |line|
-        if line.include?(deprecated_code)
-          %Q|  root "jets/public#show"\n| # assume 2 spaces for simplicity
-        else
-          line
-        end
-      end
-
-      content = lines.join
-      IO.write(routes_file, content)
-    end
-
-    def update_mode_setting
-      application_file = "#{Jets.root}config/application.rb"
-      lines = IO.readlines(application_file)
-      deprecated_code = 'config.api_generator'
-      return unless lines.detect { |l| l.include?(deprecated_code) }
-
-      puts "Update: config/application.rb"
-      lines.map! do |line|
-        if line.include?(deprecated_code)
-          mode = Jets.config.api_generator ? 'api' : 'html'
-          %Q|  config.mode = "#{mode}"\n| # assume 2 spaces for simplicity
-        else
-          line
-        end
-      end
-
-      content = lines.join
-      IO.write(application_file, content)
-    end
-
-    def update_config_ru
-      config_ru = File.read("#{Jets.root}config.ru")
-      return if config_ru.include?("Jets.boot")
-
-      src = File.expand_path("../templates/skeleton/config.ru", File.dirname(__FILE__))
-      dest = "#{Jets.root}config.ru"
-      puts "Update: config.ru"
-      FileUtils.cp(src, dest)
-    end
-
-    def remove_ruby_lazy_load
-      app_config = "#{Jets.root}config/application.rb"
-      remove_ruby_lazy_load_for(app_config)
-      Dir.glob("#{Jets.root}config/environments/*.rb").each do |env_config|
-        remove_ruby_lazy_load_for(env_config)
-      end
-    end
-
-    def remove_ruby_lazy_load_for(path)
-      lines = IO.readlines(path)
-      new_lines = lines.reject do |l|
-        l =~ %r{config.ruby.lazy_load}
-      end
-      return unless lines != new_lines
-
-      content = new_lines.join("")
-      IO.write(path, content)
-      puts "Update: #{path}"
-    end
-  end
-end